Merge pull request #65 from fga-gpp-mds/devel

Devel
fga-eps-mds · May 19, 2017 · e011ab9 · e011ab9
2 parents 1b26d32 + d8aecde
commit e011ab9
Show file tree

Hide file tree

Showing 109 changed files with 10,113 additions and 740 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -24,3 +24,4 @@ exclude_paths:
   - darcyWeb/spec/
   - darcyWeb/test/
   - darcyWeb/vendor/
+  - Vagrantfile
diff --git a/.imdone/config.json b/.imdone/config.json
@@ -0,0 +1,83 @@
+{
+  "exclude": [
+    "^(node_modules|bower_components|\\.imdone|target|build|dist|logs)[\\/\\\\]?|\\.(git|svn|hg|npmignore)|\\~$|\\.(jpg|png|gif|swp|ttf|otf)$"
+  ],
+  "watcher": true,
+  "keepEmptyPriority": false,
+  "code": {
+    "include_lists": [
+      "TODO",
+      "DOING",
+      "DONE",
+      "PLANNING",
+      "FIXME",
+      "ARCHIVE",
+      "HACK",
+      "CHANGED",
+      "XXX",
+      "IDEA",
+      "NOTE",
+      "REVIEW",
+      "11290",
+      "8152",
+      "10093",
+      "9682",
+      "1450",
+      "14683"
+    ]
+  },
+  "lists": [
+    {
+      "name": "FIXME",
+      "hidden": false
+    },
+    {
+      "name": "TODO",
+      "hidden": false
+    },
+    {
+      "name": "Scenario",
+      "hidden": false
+    },
+    {
+      "name": "NOTE",
+      "hidden": false
+    },
+    {
+      "name": "11290",
+      "hidden": false
+    },
+    {
+      "name": "8152",
+      "hidden": false
+    },
+    {
+      "name": "XXX",
+      "hidden": false
+    },
+    {
+      "name": "10093",
+      "hidden": false
+    },
+    {
+      "name": "9682",
+      "hidden": false
+    },
+    {
+      "name": "1450",
+      "hidden": false
+    },
+    {
+      "name": "14683",
+      "hidden": false
+    }
+  ],
+  "marked": {
+    "gfm": true,
+    "tables": true,
+    "breaks": false,
+    "pedantic": false,
+    "smartLists": true,
+    "langPrefix": "language-"
+  }
+}
diff --git a/Vagrantfile b/Vagrantfile
@@ -47,7 +47,7 @@ Vagrant.configure("2") do |config|
   #   # Display the VirtualBox GUI when booting the machine
   #   vb.gui = true
   #
-    # Customize the amount of memory on the VM:
+  # Customize the amount of memory on the VM:
     vb.memory = "1024"
   end
   #

diff --git a/circle.yml b/circle.yml
@@ -21,27 +21,29 @@ deployment:
       - |
         cat >~/.netrc <<EOF
         machine api.heroku.com
-          login ondeeunb@gmail.com
-          password ondeeunb123
+          login ${HEROKU_EMAIL}
+          password ${HEROKU_PASSWORD}
         machine git.heroku.com
-          login ondeeunb@gmail.com
-          password ondeeunb123
+          login ${HEROKU_EMAIL}
+          password ${HEROKU_PASSWORD}
         EOF
       - chmod 600 ~/.netrc # Heroku cli complains about permissions without this
       - "[[ ! -s \"$(git rev-parse --git-dir)/shallow\" ]] || git fetch --unshallow"
-      - git subtree push --prefix darcyWeb git@heroku.com:ondeeunb-prod.git master
+      # - git subtree push --prefix darcyWeb git@heroku.com:ondeeunb-prod.git master
+      - git push git@heroku.com:ondeeunb-prod.git `git subtree split --prefix darcyWeb master`:master --force
   staging:
     branch: devel
     commands:
       - |
         cat >~/.netrc <<EOF
         machine api.heroku.com
-          login ondeeunb@gmail.com
-          password ondeeunb123
+          login ${HEROKU_EMAIL}
+          password ${HEROKU_PASSWORD}
         machine git.heroku.com
-          login ondeeunb@gmail.com
-          password ondeeunb123
+          login ${HEROKU_EMAIL}
+          password ${HEROKU_PASSWORD}
         EOF
       - chmod 600 ~/.netrc # Heroku cli complains about permissions without this
       - "[[ ! -s \"$(git rev-parse --git-dir)/shallow\" ]] || git fetch --unshallow"
-      - git subtree push --prefix darcyWeb git@heroku.com:ondeeunb-dev.git master
+      # - git subtree push --prefix darcyWeb git@heroku.com:ondeeunb-dev.git master
+      - git push git@heroku.com:ondeeunb-dev.git `git subtree split --prefix darcyWeb devel`:master --force
diff --git a/darcyWeb/Gemfile b/darcyWeb/Gemfile
@@ -5,7 +5,6 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.2'
 # Use sqlite3 as the database for Active Record
@@ -38,32 +37,36 @@ gem 'jbuilder', '~> 2.5'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
-
-  gem 'cucumber-rails', :require => false
+  gem 'capybara'
+  gem 'poltergeist'
+  gem 'cucumber-rails', require: false
   gem 'database_cleaner'
-
-  gem "rspec-rails", "~> 3.5.0"
   gem 'factory_girl_rails'
+  gem 'rspec-rails', '~> 3.5.0'
 end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
   gem 'listen', '~> 3.0.5'
+  gem 'web-console', '>= 3.3.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'active_record-acts_as'
 gem 'devise'
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Gem responsible for test coverage
-gem 'simplecov', :group => :test
+gem 'simplecov', group: :test
 
 gem 'rails-controller-testing'
 
 gem 'client_side_validations'
+
+# Gem responsible for test on javascript
+group :development, :test do
+  gem 'jasmine'
+end