Update to rails 4.2 + spring

Gemfile

@@ -1,23 +1,26 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 ruby '2.3.8'
 
 # Rails core
-gem 'rails', '~> 4.1.16'
+gem 'rails', '~> 4.2.11.1'
 gem 'rake', '< 11.0'
+gem 'responders'
 
 # Dotenv
 gem 'dotenv-rails'
 
 # DB
 # Fixme: using this bc puma startup problem
-gem 'mysql2', '0.3.18'
-gem 'dalli', '~> 2.7.0'
 gem 'active_record_union'
+gem 'dalli', '~> 2.7.0'
+gem 'mysql2', '0.3.18'
 
 # Web server
-gem 'puma'
 gem 'faraday', '~> 0.9.0'
+gem 'puma'
 
 # Model plugins
 # FIXME: using this b/c ruby 2.4 not supported
@@ -25,18 +28,18 @@ gem 'unread', '0.10.1'
 # gem "acts_as_rateable", :git => "git://github.com/anton-zaytsev/acts_as_rateable.git"
 
 # View helper gems
-gem 'nokogiri', '~> 1.9.0'
-gem 'bbcoder', '~> 1.0.1'
-gem 'sanitize', '~> 2.1.0'
-gem 'carrierwave', '~> 0.10.0'
-gem 'bluecloth', '~> 2.2.0'
-gem 'rmagick'
-gem 'will_paginate', '~> 3.0.5'
-gem 'dynamic_form', '~> 1.1.4'
 gem 'active_link_to', '~> 1.0.2'
+gem 'bbcoder', '~> 1.0.1'
+gem 'bluecloth', '~> 2.2.0'
+gem 'carrierwave', '~> 0.10.0'
 gem 'country_select', require: 'country_select_without_sort_alphabetical'
+gem 'dynamic_form', '~> 1.1.4'
 gem 'i18n_country_select'
+gem 'nokogiri', '~> 1.9.0'
 gem 'public_suffix', '~> 3.1.1'
+gem 'rmagick'
+gem 'sanitize', '~> 2.1.0'
+gem 'will_paginate', '~> 3.0.5'
 
 # External APIs
 gem 'google-api-client', '~> 0.10.3'
@@ -48,18 +51,18 @@ gem 'rails_autolink', '~> 1.1.5'
 
 # Javascript
 gem 'coffee-rails', '~> 4.0.0'
-gem 'jquery-rails', '~> 2.0.2'
 gem 'i18n-js'
+gem 'jquery-rails', '~> 2.0.2'
 gem 'tinymce-rails', '~> 3.5.9'
 
 # Please install nodejs locally.
-#gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux'
+# gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux'
 
-gem 'sass-rails', '~> 5.0.3'
-gem 'font-awesome-sass', '~> 4.1.0.0'
 gem 'bourbon', '~> 3.1.8'
-gem 'neat', '~> 1.6.0'
+gem 'font-awesome-sass', '~> 4.1.0.0'
 gem 'haml', '~> 4.0.5'
+gem 'neat', '~> 1.6.0'
+gem 'sass-rails', '~> 5.0.3'
 gem 'uglifier', '~> 2.5.0'
 
 # Dependency version fix
@@ -70,27 +73,28 @@ group :production do
 end
 
 group :development do
+  gem 'annotate'
   gem 'better_errors'
   gem 'binding_of_caller'
-  gem 'annotate'
   gem 'quiet_assets'
+  gem 'spring', '2.0.2'
   gem 'web-console'
 end
 
 group :test do
-#  gem 'spring'
+  #  gem 'spring'
+  gem 'capybara', '~> 2.4.4'
+  gem 'codeclimate-test-reporter', '~> 0.3.0', require: nil
+  gem 'database_cleaner', '~> 1.2.0'
+  gem 'factory_bot_rails'
+  gem 'phantomjs', require: 'phantomjs/poltergeist'
+  gem 'poltergeist', '~> 1.6.0'
   gem 'rspec'
   gem 'rspec-rails', '~> 3.3.3'
-  gem 'factory_bot_rails'
-  gem 'database_cleaner', '~> 1.2.0'  
-  gem 'capybara', '~> 2.4.4'
-  gem 'poltergeist', '~> 1.6.0'
   gem 'selenium-webdriver'
-  gem 'timecop', '~> 0.7.1'
   gem 'simplecov', '~> 0.7.1', require: false
-  gem 'codeclimate-test-reporter', '~> 0.3.0', require: nil
   gem 'test-unit', '~> 3.1.3'
-  gem 'phantomjs', :require => 'phantomjs/poltergeist'
+  gem 'timecop', '~> 0.7.1'
 end
 
 group :development, :test do

Gemfile.lock

@@ -9,43 +9,51 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.16)
+    actionmailer (4.2.11.1)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.11.1)
-      actionview (= 4.1.16)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.16)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      actionview (= 4.1.16)
+    actionpack (4.2.11.1)
-      activesupport (= 4.1.16)
+      actionview (= 4.2.11.1)
-      rack (~> 1.5.2)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.16)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 4.1.16)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_link_to (1.0.5)
       actionpack
       addressable
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activemodel (4.1.16)
+    activejob (4.2.11.1)
-      activesupport (= 4.1.16)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.1.16)
+    activerecord (4.2.11.1)
-      activemodel (= 4.1.16)
+      activemodel (= 4.2.11.1)
-      activesupport (= 4.1.16)
+      activesupport (= 4.2.11.1)
-      arel (~> 5.0.0)
+      arel (~> 6.0)
-    activesupport (4.1.16)
+    activesupport (4.2.11.1)
-      i18n (~> 0.6, >= 0.6.9)
+      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)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.0)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    arel (5.0.1.20140414130214)
+    arel (6.0.4)
     bbcoder (1.0.1)
     better_errors (2.6.0)
       coderay (>= 1.0.0)
@@ -94,6 +102,7 @@ GEM
     country_select (4.0.0)
       countries (~> 3.0)
       sort_alphabetical (~> 1.0)
+    crass (1.0.6)
     dalli (2.7.10)
     database_cleaner (1.2.0)
     debug_inspector (0.0.3)
@@ -119,6 +128,8 @@ GEM
     ffi (1.12.2)
     font-awesome-sass (4.1.0)
       sass (~> 3.2)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     google-api-client (0.10.3)
       addressable (~> 2.3)
       googleauth (~> 0.5)
@@ -155,12 +166,15 @@ GEM
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.8.6)
+    json (2.3.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     memoist (0.16.2)
@@ -203,24 +217,33 @@ GEM
       nio4r (~> 2.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.16)
+    rails (4.2.11.1)
-      actionmailer (= 4.1.16)
+      actionmailer (= 4.2.11.1)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.11.1)
-      actionview (= 4.1.16)
+      actionview (= 4.2.11.1)
-      activemodel (= 4.1.16)
+      activejob (= 4.2.11.1)
-      activerecord (= 4.1.16)
+      activemodel (= 4.2.11.1)
-      activesupport (= 4.1.16)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.16)
+      railties (= 4.2.11.1)
-      sprockets-rails (~> 2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.1.16)
+    railties (4.2.11.1)
-      actionpack (= 4.1.16)
+      actionpack (= 4.2.11.1)
-      activesupport (= 4.1.16)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -231,6 +254,9 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     retriable (3.1.2)
     rmagick (4.0.0)
     rspec (3.3.0)
@@ -285,13 +311,15 @@ GEM
     sixarm_ruby_unaccent (1.2.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
+    spring (2.0.2)
+      activesupport (>= 4.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
+    sprockets-rails (3.2.1)
-      actionpack (>= 3.0)
+      actionpack (>= 4.0)
-      activesupport (>= 3.0)
+      activesupport (>= 4.0)
-      sprockets (>= 2.8, < 4.0)
+      sprockets (>= 3.0.0)
     test-unit (3.1.9)
       power_assert
     thor (0.20.3)
@@ -362,9 +390,10 @@ DEPENDENCIES
   public_suffix (~> 3.1.1)
   puma
   quiet_assets
-  rails (~> 4.1.16)
+  rails (~> 4.2.11.1)
   rails_autolink (~> 1.1.5)
   rake (< 11.0)
+  responders
   rmagick
   rspec
   rspec-rails (~> 3.3.3)
@@ -373,6 +402,7 @@ DEPENDENCIES
   selenium-webdriver
   signet (= 0.11.0)
   simplecov (~> 0.7.1)
+  spring (= 2.0.2)
   steam-condenser!
   test-unit (~> 3.1.3)
   timecop (~> 0.7.1)

docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
   web:
     # Debug
     stdin_open: true
-    command: /bin/bash 
+    # command: /bin/bash 
     tty: true 
     build:
       context: ./
@@ -19,6 +19,7 @@ services:
     links:
      - db
      - memcached
+     #- spring
      #- selenium
      #- redis
 
@@ -60,6 +61,22 @@ services:
       - 5900:5900
       - 4444:4444
 
+#  spring:
+#    build:
+#      context: ./
+#      dockerfile: Dockerfile.dev
+#      args:
+#        buildno: 1
+#    volumes:
+#      - .:/var/www
+#    command: spring server
+
+    # This ensures that the pid namespace is shared between the host
+    # and the container. It's not necessary to be able to run spring
+    # commands, but it is necessary for "spring status" and "spring stop"
+    # to work properly.
+#    pid: host
+
   db:
     # Debug
     #command: bash