diff --git a/Gemfile b/Gemfile index 735bb12..e7d5b2a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' gem 'rails', '~> 4.2.1' -gem 'pg', '~> 0.17' -gem 'bcrypt', '~> 3.0' +gem 'pg' +gem 'bcrypt' gem 'unicorn-rails' -gem 'haml', '~> 4.0' -gem 'rabl', '~> 0.6' +gem 'haml' +gem 'rabl' group :development, :test do @@ -14,12 +14,13 @@ group :development, :test do end group :test do - gem 'rspec-rails', '~> 2.6' + gem 'rspec-rails' gem 'rspec-activemodel-mocks' - gem 'spork', github: 'tjouan/spork', branch: 'rspec-3' - gem 'capybara', '~> 2.2' - gem 'factory_girl_rails', '~> 4.4' - gem 'shoulda-matchers', '~> 2.5' + + gem 'spork', github: 'tjouan/spork', branch: 'rspec-3' + gem 'capybara' + gem 'factory_girl_rails' + gem 'shoulda-matchers' gem 'rb-kqueue', require: false gem 'guard', require: false diff --git a/Gemfile.lock b/Gemfile.lock index a0dc86f..a3fefef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,7 +178,6 @@ GEM rspec-core (~> 2.99.0) rspec-expectations (~> 2.99.0) rspec-mocks (~> 2.99.0) - rspec-support (3.2.2) shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) @@ -210,20 +209,20 @@ PLATFORMS ruby DEPENDENCIES - bcrypt (~> 3.0) - capybara (~> 2.2) - factory_girl_rails (~> 4.4) + bcrypt + capybara + factory_girl_rails guard guard-rspec guard-spork - haml (~> 4.0) - pg (~> 0.17) + haml + pg pry-rails - rabl (~> 0.6) + rabl rails (~> 4.2.1) rb-kqueue rspec-activemodel-mocks - rspec-rails (~> 2.6) - shoulda-matchers (~> 2.5) + rspec-rails + shoulda-matchers spork! unicorn-rails