From 47be6e09f27e2976ad0ad34f1fee60fbabc41911 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Wed, 29 Apr 2015 13:18:12 +0000 Subject: [PATCH] Declare and lock all dependencies * Remove custom gemfile usage; * Move essential gems from custom gemfile to the standard one; * Include bundler lock file in version control. --- .gitignore | 2 - Gemfile | 12 ++- Gemfile.lock | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index ab6086b..16ddf48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -/Gemfile-custom.rb -/Gemfile.lock /config/database.yml /config/secrets.yml /data/ diff --git a/Gemfile b/Gemfile index dddbb0a..735bb12 100644 --- a/Gemfile +++ b/Gemfile @@ -3,18 +3,26 @@ source 'https://rubygems.org' gem 'rails', '~> 4.2.1' gem 'pg', '~> 0.17' gem 'bcrypt', '~> 3.0' +gem 'unicorn-rails' gem 'haml', '~> 4.0' gem 'rabl', '~> 0.6' group :development, :test do + gem 'pry-rails' +end + +group :test do gem 'rspec-rails', '~> 2.6' 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' -end -eval File.read('Gemfile-custom.rb') if File.exist?('Gemfile-custom.rb') + gem 'rb-kqueue', require: false + gem 'guard', require: false + gem 'guard-rspec', require: false + gem 'guard-spork', require: false +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..a0dc86f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,229 @@ +GIT + remote: git://github.com/tjouan/spork.git + revision: 49ab62dd1e3f250cc438be928cf47f6dd0763923 + branch: rspec-3 + specs: + spork (1.0.0rc4) + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.1) + actionview (= 4.2.1) + activesupport (= 4.2.1) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.1) + activesupport (= 4.2.1) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.1) + activesupport (= 4.2.1) + globalid (>= 0.3.0) + activemodel (4.2.1) + activesupport (= 4.2.1) + builder (~> 3.1) + activerecord (4.2.1) + activemodel (= 4.2.1) + activesupport (= 4.2.1) + arel (~> 6.0) + activesupport (4.2.1) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.0) + bcrypt (3.1.10) + builder (3.2.2) + capybara (2.4.4) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + celluloid (0.16.0) + timers (~> 4.0.0) + childprocess (0.5.6) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.0) + diff-lcs (1.2.5) + erubis (2.7.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) + ffi (1.9.8) + formatador (0.2.5) + globalid (0.3.5) + activesupport (>= 4.1.0) + guard (2.12.5) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.5.0) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + guard-spork (2.1.0) + childprocess (>= 0.2.3) + guard (~> 2.0) + guard-compat (~> 1.0) + spork (>= 0.8.4) + haml (4.0.6) + tilt + hitimes (1.2.2) + i18n (0.7.0) + json (1.8.2) + kgio (2.9.3) + listen (2.10.0) + celluloid (~> 0.16.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + loofah (2.0.1) + nokogiri (>= 1.5.9) + lumberjack (1.0.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + method_source (0.8.2) + mime-types (2.5) + mini_portile (0.6.2) + minitest (5.6.1) + nenv (0.2.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + notiffany (0.0.6) + nenv (~> 0.1) + shellany (~> 0.0) + pg (0.18.1) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + rabl (0.11.6) + activesupport (>= 2.3.14) + rack (1.6.0) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.1) + actionmailer (= 4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) + activemodel (= 4.2.1) + activerecord (= 4.2.1) + activesupport (= 4.2.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.1) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.6) + 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) + railties (4.2.1) + actionpack (= 4.2.1) + activesupport (= 4.2.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.13.0) + rake (10.4.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rb-kqueue (0.2.3) + ffi (>= 0.5.0) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-activemodel-mocks (1.0.1) + activemodel (>= 3.0) + activesupport (>= 3.0) + rspec-mocks (>= 2.99, < 4.0) + rspec-collection_matchers (1.1.2) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.2) + rspec-expectations (2.99.2) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.99.3) + rspec-rails (2.99.0) + actionpack (>= 3.0) + activemodel (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-collection_matchers + 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) + slop (3.6.0) + sprockets (3.0.3) + rack (~> 1.0) + sprockets-rails (2.2.4) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.1) + timers (4.0.1) + hitimes + tzinfo (1.2.2) + thread_safe (~> 0.1) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-rails (2.2.0) + rack + unicorn + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bcrypt (~> 3.0) + capybara (~> 2.2) + factory_girl_rails (~> 4.4) + guard + guard-rspec + guard-spork + haml (~> 4.0) + pg (~> 0.17) + pry-rails + rabl (~> 0.6) + rails (~> 4.2.1) + rb-kqueue + rspec-activemodel-mocks + rspec-rails (~> 2.6) + shoulda-matchers (~> 2.5) + spork! + unicorn-rails