upgrade Rails to 4.1.0.rc1, add Guard, Spring

1 files changed, 15 insertions, 16 deletions

diff --git a/Gemfile b/Gemfile
index a02f2a0..1692d3f 100644
--- a/Gemfile
+++ b/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
-