From 71c6a4a04824794d7401050ec9d010ccb6fbca7b Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Tue, 24 Nov 2015 14:25:33 -0500
Subject: [PATCH] [STABLE] Update all the gems

---
 Gemfile                           |   7 +-
 Gemfile.lock                      | 314 +++++++++++++++---------------
 config/environments/production.rb |   2 +-
 config/environments/test.rb       |   2 +-
 config/mongoid.yml                |  12 +-
 spec/spec_helper.rb               |   2 +-
 6 files changed, 174 insertions(+), 165 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6b95cb0c9..6a83fef6e 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,16 @@
 source 'https://rubygems.org'
 ruby '2.2.3'
 
-gem 'rails',  '4.1.0'
+gem 'rails',  '4.2.4'
 
 #Dokku demands this one.
 gem 'rails_12factor'
 gem 'ng-rails-csrf'
-gem 'mongoid', '~> 4.0.0', github: 'mongoid/mongoid'
+gem 'mongoid', '~> 5.0.1'#, github: 'mongoid/mongoid'
 
 #Asset stuff
-gem 'sass-rails', github: 'rails/sass-rails'
+gem 'sprockets'
+gem 'sass-rails'#, github: 'rails/sass-rails'
 gem 'coffee-rails'
 gem 'font-awesome-rails'
 gem 'uglifier'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fdff5b4c..225cea947 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,14 @@
 GIT
   remote: git://github.com/RickCarlino/smarf_doc.git
-  revision: 9b4cb42312f971dc565811da713584b2979dd913
+  revision: 88394bf9dbadf1fa4b89c370ffc5ae12d0c0611e
   specs:
     smarf_doc (0.0.1)
 
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 6632302e7fc88f99aa7cff24719b95e6347048f7
-  specs:
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: 61ec44b76edb7f4f0df9683ebb515beb80196fe9
+  revision: d22ac4a4fb304ea93c728efe955535cb6b8b6a86
   specs:
-    devise (3.4.1)
+    devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -26,70 +16,68 @@ GIT
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
 
-GIT
-  remote: git://github.com/rails/sass-rails.git
-  revision: 4ec13b1e10c86695b4a094ff9c5049c28567c7d2
-  specs:
-    sass-rails (5.0.1)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
     abstract_type (0.0.7)
-    actionmailer (4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      mail (~> 2.5.4)
-    actionpack (4.1.0)
-      actionview (= 4.1.0)
-      activesupport (= 4.1.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.0)
-      activesupport (= 4.1.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
-      arel (~> 5.0.0)
-    activesupport (4.1.0)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.3.7)
-    arel (5.0.1.20140414130214)
+    addressable (2.3.8)
+    arel (6.0.3)
     arrayfields (4.9.2)
-    ast (2.0.0)
+    ast (2.1.0)
     bcrypt (3.1.10)
-    bson (2.3.0)
+    bson (3.2.6)
     builder (3.2.2)
     cane (2.6.2)
       parallel
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-angular (0.1.0)
-      capybara
+    capybara-angular (0.2.2)
+      capybara (>= 2.5.0)
     childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
@@ -104,32 +92,33 @@ GEM
     code_analyzer (0.4.5)
       sexp_processor
     code_metrics (0.1.3)
-    codeclimate-test-reporter (0.4.7)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.10.0)
     colored (1.2)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    connection_pool (2.1.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    equalizer (0.0.9)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faker (1.4.3)
+    faker (1.6.1)
       i18n (~> 0.5)
     fattr (2.2.2)
     ffi (1.9.10)
@@ -139,23 +128,27 @@ GEM
     flog (4.3.2)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
-    font-awesome-rails (4.3.0.0)
+    font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    haml (4.0.6)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    haml (4.0.7)
       tilt
     high_voltage (2.1.0)
-    hike (1.2.3)
     hirb (0.7.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
-    ice_cube (0.12.1)
+    ice_cube (0.13.0)
     ice_nine (0.11.1)
-    json (1.8.2)
-    json_pure (1.8.2)
+    json (1.8.3)
+    json_pure (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     main (6.1.0)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
@@ -165,7 +158,7 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    metric_fu (4.11.3)
+    metric_fu (4.12.0)
       cane (~> 2.5, >= 2.5.2)
       churn (~> 0.0.35)
       code_metrics (~> 0.1)
@@ -177,60 +170,62 @@ GEM
       multi_json
       rails_best_practices (~> 1.14, >= 1.14.3)
       redcard
-      reek (~> 1.3, >= 1.3.4)
+      reek (>= 1.3.4, < 3.0)
       roodi (~> 3.1)
     metric_fu-Saikuro (1.1.3)
-    mime-types (1.25.1)
+    mime-types (2.99)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    moped (2.0.4)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
+    minitest (5.8.3)
+    mongo (2.1.2)
+      bson (~> 3.0)
+    mongoid (5.0.1)
+      activemodel (~> 4.0)
+      mongo (~> 2.1)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    multi_json (1.11.2)
     mutations (0.7.2)
       activesupport
-    netrc (0.10.2)
+    netrc (0.11.0)
     ng-rails-csrf (0.1.0)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
-    optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
-    parallel (1.4.0)
-    parser (2.2.0.3)
+    parallel (1.6.1)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
-    polyglot (0.3.5)
     procto (0.0.2)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.6.4)
     rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.0)
-      actionmailer (= 4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      activemodel (= 4.1.0)
-      activerecord (= 4.1.0)
-      activesupport (= 4.1.0)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0)
-      sprockets-rails (~> 2.0)
-    rails-assets-angular (1.4.6)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-assets-angular (1.4.8)
     rails-assets-jquery (2.1.4)
-    rails-assets-js-data (2.3.0)
-    rails-assets-js-data-angular (3.0.0)
+    rails-assets-js-data (2.8.2)
+    rails-assets-js-data-angular (3.1.0)
       rails-assets-angular (>= 1.1.0)
       rails-assets-js-data (>= 2.0.0)
       rails-assets-js-data-http (>= 2.0.0)
-    rails-assets-js-data-http (2.1.0)
+    rails-assets-js-data-http (2.1.2)
       rails-assets-js-data (>= 2.0.0)
     rails-assets-lodash (3.10.1)
-    rails-assets-ng-pickadate (0.2.2)
+    rails-assets-ng-pickadate (0.2.3)
       rails-assets-angular (~> 1.4.5)
       rails-assets-pickadate (~> 3.5.6)
     rails-assets-ng-sortable (1.2.3)
@@ -238,10 +233,18 @@ GEM
     rails-assets-pickadate (3.5.6)
       rails-assets-jquery (>= 1.7)
     rails-assets-sio-client (1.3.6)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_best_practices (1.15.6)
+    rails_best_practices (1.15.7)
       activesupport
       code_analyzer (>= 0.4.3)
       colored
@@ -251,92 +254,96 @@ GEM
       require_all
       ruby-progressbar
     rails_serve_static_assets (0.0.4)
-    rails_stdout_logging (0.0.3)
-    railties (4.1.0)
-      actionpack (= 4.1.0)
-      activesupport (= 4.1.0)
+    rails_stdout_logging (0.0.4)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)
     redcard (1.1.0)
-    reek (1.6.6)
-      parser (~> 2.2.0.pre.7)
-      rainbow (>= 1.99, < 3.0)
+    reek (2.2.1)
+      parser (~> 2.2)
+      rainbow (~> 2.0)
       unparser (~> 0.2.2)
-    require_all (1.3.2)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    rest-client (1.7.3)
+    require_all (1.3.3)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     roodi (3.3.1)
       ruby_parser (~> 3.2, >= 3.2.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    ruby-progressbar (1.7.1)
-    ruby_parser (3.6.4)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    ruby-progressbar (1.7.5)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
     rubyzip (1.1.7)
-    sass (3.4.12)
+    sass (3.4.19)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     selenium-webdriver (2.48.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.4.5)
-    simplecov (0.9.2)
+    sexp_processor (4.6.0)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unparser (0.2.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    unparser (0.2.4)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.2.5)
       equalizer (~> 0.0.9)
-      parser (~> 2.2.0.2)
+      parser (~> 2.2.2)
       procto (~> 0.0.2)
     warden (1.2.3)
       rack (>= 1.0)
@@ -362,12 +369,12 @@ DEPENDENCIES
   ice_cube
   launchy
   metric_fu
-  mongoid (~> 4.0.0)!
+  mongoid (~> 5.0.1)
   mutations
   ng-rails-csrf
   pry
   rack-cors
-  rails (= 4.1.0)
+  rails (= 4.2.4)
   rails-assets-jquery!
   rails-assets-js-data!
   rails-assets-js-data-angular!
@@ -379,10 +386,11 @@ DEPENDENCIES
   rails_12factor
   rspec
   rspec-rails
-  sass-rails!
+  sass-rails
   selenium-webdriver
   simplecov
   smarf_doc!
+  sprockets
   uglifier
 
 BUNDLED WITH
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9c5813d82..c0513f7a6 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,7 +14,7 @@ FarmBot::Application.configure do
   config.i18n.fallbacks = true
   config.log_formatter = ::Logger::Formatter.new
   config.log_level = :info
-  config.serve_static_assets = false
+  config.serve_static_files = false
   config.action_mailer.smtp_settings = { address:   'smtp.mandrillapp.com',
                                          port:      587,
                                          user_name: ENV['MANDRILL_USERNAME'],
diff --git a/config/environments/test.rb b/config/environments/test.rb
index faa0dbae8..458d7ce1b 100755
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@ FarmBot::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.assets.debug = true
   config.static_cache_control = "public, max-age=3600"
 
diff --git a/config/mongoid.yml b/config/mongoid.yml
index 7f69d8b05..434d6986a 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -1,5 +1,5 @@
 development:
-  sessions:
+  clients:
     default:
       database: farmbot_web_development
       hosts:
@@ -7,18 +7,18 @@ development:
       options:
   options:
 test:
-  sessions:
+  clients:
     default:
       database: farmbot_web_test
       hosts:
         - <%= ENV['MONGO_HOST'] || 'localhost:27017' %>
       options:
-        read: primary
+        # read: primary
         # In the test environment we lower the retries and retry interval to
         # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
+        # max_retries: 1
+        # retry_interval: 0
 production:
-  sessions:
+  clients:
     default:
       uri: <%= ENV['MONGOHQ_URL'] || ENV['MONGO_URL'] %>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 285d9662f..115bb71b6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -56,4 +56,4 @@ end
 # Moped was making the test output buffer look ugly every time the database was
 # purged. These settings stop that.
 Mongoid.logger.level = Logger::WARN
-Moped.logger.level = Logger::WARN
+Mongo::Logger.logger.level = Logger::WARN