upgrade Rails to 4.1.0.rc1, add Guard, Spring

Author: rhenium

.gitignore

@@ -19,4 +19,5 @@
 !.gitkeep
 !/.coveralls.yml
 !/.travis.yml
+!/.rspec
 

.rspec

@@ -0,0 +1 @@
+--color

Gemfile

@@ -1,43 +1,42 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.3"
+gem "rails", "~> 4.1.0.rc1"
 gem "mysql2"
 gem "settingslogic"
 gem "yajl-ruby", require: "yajl"
 gem "grape", github: "intridea/grape"
 gem "grape-rabl"
-gem "twitter"
-gem "twitter-text"
-gem "omniauth-twitter"
 gem "haml-rails"
 gem "sass-rails"
-gem "coffee-rails"
 gem "uglifier"
 gem "jquery-rails"
 gem "bootstrap-sass"
+gem "turbolinks"
+
+gem "puma"
+gem "dalli"
+gem "connection_pool"
+
+gem "omniauth-twitter"
+gem "twitter"
+gem "twitter-text"
 gem "daemon-spawn", require: "daemon_spawn"
 gem "msgpack"
 gem "msgpack-rpc"
 gem "em-work_queue"
 gem "pry-rails"
 
-group :production do
-  gem "puma"
-  gem "dalli"
-  gem "connection_pool"
-end
-
-group :development do
-  gem "thin"
+group :development, :test do
   gem "quiet_assets"
+  gem "spring"
 end
 
 group :test do
-  gem "rspec"
+  gem "webmock"
   gem "rspec-rails"
+  gem "spring-commands-rspec"
+  gem "guard-rspec"
   gem "factory_girl_rails"
-  gem "webmock"
   gem "coveralls", require: false
   gem "simplecov", require: false
 end
-

Gemfile.lock

@@ -16,40 +16,48 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      builder (~> 3.1)
+    activerecord (4.1.0.rc1)
+      activemodel (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      arel (~> 5.0.0)
+    activesupport (4.1.0.rc1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.5)
-    arel (4.0.2)
+    arel (5.0.0)
     atomic (1.1.15)
-    axiom-types (0.0.5)
-      descendants_tracker (~> 0.0.1)
-      ice_nine (~> 0.9)
+    axiom-types (0.1.0)
+      descendants_tracker (~> 0.0.3)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.1.3)
     bootstrap-sass (3.1.1.0)
       sass (~> 3.2)
     buftok (0.2.0)
-    builder (3.1.4)
+    builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -72,7 +80,6 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     daemon-spawn (0.4.2)
-    daemons (1.1.9)
     dalli (2.7.0)
     descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
@@ -90,11 +97,22 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
+    formatador (0.2.4)
     grape-rabl (0.2.2)
       grape
       i18n
       rabl
       tilt
+    guard (2.5.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.6)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     haml (4.0.5)
       tilt
     haml-rails (0.5.3)
@@ -114,23 +132,30 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    listen (2.7.0)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memoizable (0.4.0)
       thread_safe (~> 0.1.3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (4.7.5)
+    minitest (5.3.0)
     msgpack (0.5.8)
     msgpack-rpc (0.5.2)
       cool.io (~> 1.1.1)
       msgpack (~> 0.5.8)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.15)
     naught (1.0.0)
+    nio4r (1.0.0)
     oauth (0.4.7)
     omniauth (1.2.1)
       hashie (>= 1.2, < 3)
@@ -148,7 +173,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.8.0)
+    puma (2.8.1)
       rack (>= 1.1, < 2.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
@@ -161,20 +186,25 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.1.0.rc1)
+      actionmailer (= 4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
+      activemodel (= 4.1.0.rc1)
+      activerecord (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.1.0.rc1)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -194,7 +224,7 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     safe_yaml (1.0.1)
-    sass (3.2.14)
+    sass (3.3.2)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -206,7 +236,10 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.7)
+    slop (3.5.0)
+    spring (1.1.2)
+    spring-commands-rspec (1.0.1)
+      spring (>= 0.9.1)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -218,19 +251,18 @@ GEM
       sprockets (~> 2.8)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
+    timers (1.1.0)
     tins (1.0.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (5.7.1)
+    turbolinks (2.2.1)
+      coffee-rails
+    twitter (5.8.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.9)
@@ -243,18 +275,19 @@ GEM
       simple_oauth (~> 0.2.0)
     twitter-text (1.8.0)
       unf (~> 0.1.0)
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.3)
       unf_ext
     unf_ext (0.0.6)
-    virtus (1.0.1)
-      axiom-types (~> 0.0.5)
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
       coercible (~> 1.0)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
     webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -265,7 +298,6 @@ PLATFORMS
 
 DEPENDENCIES
   bootstrap-sass
-  coffee-rails
   connection_pool
   coveralls
   daemon-spawn
@@ -274,6 +306,7 @@ DEPENDENCIES
   factory_girl_rails
   grape!
   grape-rabl
+  guard-rspec
   haml-rails
   jquery-rails
   msgpack
@@ -283,13 +316,14 @@ DEPENDENCIES
   pry-rails
   puma
   quiet_assets
-  rails (~> 4.0.3)
-  rspec
+  rails (~> 4.1.0.rc1)
   rspec-rails
   sass-rails
   settingslogic
   simplecov
-  thin
+  spring
+  spring-commands-rspec
+  turbolinks
   twitter
   twitter-text
   uglifier

Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: "spring rspec" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+