From 093268eac41ec3fe86d37eb316c2ab15ae3b9a46 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Thu, 5 Feb 2015 18:01:20 -0700 Subject: [PATCH] Clean up Gemfile * Remove Aruba and Bourne since we don't use them anymore * Remove Rails from main Gemfile as it's already a dependency in each of the appraisals * Tighten dependency on Rake to 10.x * Move dependencies shared among appraisals to Appraisals --- Appraisals | 13 ++ Gemfile | 20 +-- Gemfile.lock | 123 +----------------- gemfiles/3.0.gemfile | 10 +- gemfiles/3.0.gemfile.lock | 28 +--- gemfiles/3.1.gemfile | 10 +- gemfiles/3.1.gemfile.lock | 27 +--- gemfiles/3.1_1.9.2.gemfile | 10 +- gemfiles/3.1_1.9.2.gemfile.lock | 61 +++------ gemfiles/3.2.gemfile | 10 +- gemfiles/3.2.gemfile.lock | 27 +--- gemfiles/3.2_1.9.2.gemfile | 10 +- gemfiles/3.2_1.9.2.gemfile.lock | 61 +++------ gemfiles/4.0.0.gemfile | 10 +- gemfiles/4.0.0.gemfile.lock | 27 +--- gemfiles/4.0.1.gemfile | 10 +- gemfiles/4.0.1.gemfile.lock | 27 +--- gemfiles/4.1.gemfile | 10 +- gemfiles/4.1.gemfile.lock | 27 +--- gemfiles/4.2.gemfile | 10 +- gemfiles/4.2.gemfile.lock | 27 +--- .../doublespeak/stub_implementation_spec.rb | 2 +- 22 files changed, 128 insertions(+), 432 deletions(-) diff --git a/Appraisals b/Appraisals index e2a81909..20d3a5d9 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,23 @@ ruby_version = Gem::Version.new(RUBY_VERSION + '') +shared_dependencies = proc do + gem 'rspec-rails', '~> 3.0' + gem 'shoulda-context', '~> 1.2.0' + gem 'sqlite3', platform: :ruby + gem 'activerecord-jdbc-adapter', platform: :jruby + gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby + gem 'jdbc-sqlite3', platform: :jruby + gem 'jruby-openssl', platform: :jruby + gem 'therubyrhino', platform: :jruby +end + spring = proc do gem 'spring' gem 'spring-commands-rspec' end rails_3 = proc do + instance_eval(&shared_dependencies) gem 'strong_parameters' gem 'minitest', '~> 4.0' gem 'minitest-reporters' @@ -36,6 +48,7 @@ rails_3_2 = proc do end rails_4 = proc do + instance_eval(&shared_dependencies) instance_eval(&spring) gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.0.0' diff --git a/Gemfile b/Gemfile index 0d3752ad..3a5f01be 100644 --- a/Gemfile +++ b/Gemfile @@ -1,28 +1,14 @@ source 'https://rubygems.org' gem 'appraisal', '~> 1.0' -gem 'aruba' -gem 'bourne', '~> 1.3' gem 'bundler', '~> 1.1' gem 'pry-nav' -gem 'rails', '~> 3.0' -gem 'rake', '>= 0.9.2' -gem 'rspec-rails', '~> 3.0' +gem 'rake', '~> 10.0' +gem 'rspec-core', '~> 3.0' +gem 'rspec-expectations', '~> 3.0' # YARD gem 'yard' gem 'redcarpet' gem 'pygments.rb' gem 'watchr' - -# For test Rails application -gem 'shoulda-context', '~> 1.2.0' -gem 'sqlite3', :platform => :ruby - -# Can't wrap in platform :jruby do...end block because appraisal doesn't -# support it -gem 'activerecord-jdbc-adapter', :platform => :jruby -gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby -gem 'jdbc-sqlite3', :platform => :jruby -gem 'jruby-openssl', :platform => :jruby -gem 'therubyrhino', :platform => :jruby diff --git a/Gemfile.lock b/Gemfile.lock index cdec5926..a8ffbdde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,13 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.16) - actionpack (= 3.2.16) - mail (~> 2.5.4) - actionpack (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.16) - activesupport (= 3.2.16) - builder (~> 3.0.0) - activerecord (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - activesupport (3.2.16) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) appraisal (1.0.2) bundler rake thor (>= 0.14.0) - arel (3.0.3) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) - builder (3.0.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) - erubis (2.7.0) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) - hike (1.2.3) - i18n (0.7.0) - journey (1.0.4) - json (1.8.2) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) - mime-types (1.25.1) - mocha (0.14.0) - metaclass (~> 0.0.1) - multi_json (1.10.1) - multi_test (0.1.1) - polyglot (0.3.3) posix-spawn (0.3.8) pry (0.10.1) coderay (~> 1.1.0) @@ -79,63 +18,16 @@ GEM pygments.rb (0.3.7) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.4) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (3.2.16) - actionmailer (= 3.2.16) - actionpack (= 3.2.16) - activerecord (= 3.2.16) - activeresource (= 3.2.16) - activesupport (= 3.2.16) - bundler (~> 1.0) - railties (= 3.2.16) - railties (3.2.16) - actionpack (= 3.2.16) - activesupport (= 3.2.16) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) rake (10.4.2) - rdoc (3.12.2) - json (~> 1.4) redcarpet (3.0.0) rspec-core (3.2.0) rspec-support (~> 3.2.0) rspec-expectations (3.2.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) - rspec-mocks (3.2.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.0) - actionpack (>= 3.0, <= 4.2) - activesupport (>= 3.0, <= 4.2) - railties (>= 3.0, <= 4.2) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) rspec-support (3.2.1) - shoulda-context (1.2.0) slop (3.6.0) - sprockets (2.2.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.8) thor (0.19.1) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.38) watchr (0.7) yajl-ruby (1.1.0) yard (0.8.7.3) @@ -144,22 +36,13 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba - bourne (~> 1.3) bundler (~> 1.1) - jdbc-sqlite3 - jruby-openssl pry-nav pygments.rb - rails (~> 3.0) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet - rspec-rails (~> 3.0) - shoulda-context (~> 1.2.0) - sqlite3 - therubyrhino + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) watchr yard diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile index 5db22720..eb3a1674 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/3.0.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 3.0.17" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -24,3 +23,4 @@ gem "therubyrhino", :platform => :jruby gem "strong_parameters" gem "minitest", "~> 4.0" gem "minitest-reporters" +gem "rails", "~> 3.0.17" diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index f977409c..ca0c6a4a 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -34,28 +34,11 @@ GEM rake thor (>= 0.14.0) arel (2.0.10) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) - bourne (1.4.0) - mocha (~> 0.13.2) builder (2.1.2) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.6.6) abstract (>= 1.0.0) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) i18n (0.5.4) json (1.8.2) @@ -64,7 +47,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.21) minitest (4.7.5) @@ -73,10 +55,6 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.13.3) - metaclass (~> 0.0.1) - multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.3) posix-spawn (0.3.8) powerbar (1.0.11) @@ -154,8 +132,6 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba - bourne (~> 1.3) bundler (~> 1.1) jdbc-sqlite3 jruby-openssl @@ -164,8 +140,10 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 3.0.17) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) shoulda-context (~> 1.2.0) sqlite3 diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile index 5eac1cb5..f196d74d 100644 --- a/gemfiles/3.1.gemfile +++ b/gemfiles/3.1.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 3.1.8" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -24,6 +23,7 @@ gem "therubyrhino", :platform => :jruby gem "strong_parameters" gem "minitest", "~> 4.0" gem "minitest-reporters" +gem "rails", "~> 3.1.8" gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" gem "sass-rails", "~> 3.1.5" diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index 5224f13f..b1a49b1c 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -35,16 +35,8 @@ GEM rake thor (>= 0.14.0) arel (2.2.3) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) - bourne (1.4.0) - mocha (~> 0.13.2) builder (3.0.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (3.1.1) coffee-script (>= 2.2.0) @@ -53,18 +45,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.7.0) @@ -76,7 +59,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.21) minitest (4.7.5) @@ -85,10 +67,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.13.3) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.3) posix-spawn (0.3.8) powerbar (1.0.11) @@ -187,9 +166,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.0.0) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 3.1.1) jdbc-sqlite3 @@ -200,8 +177,10 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 3.1.8) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 3.1.5) shoulda-context (~> 1.2.0) diff --git a/gemfiles/3.1_1.9.2.gemfile b/gemfiles/3.1_1.9.2.gemfile index f84b8a0b..c19f5220 100644 --- a/gemfiles/3.1_1.9.2.gemfile +++ b/gemfiles/3.1_1.9.2.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 3.1.8" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "2.99.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -24,6 +23,7 @@ gem "therubyrhino", :platform => :jruby gem "strong_parameters" gem "minitest", "~> 4.0" gem "minitest-reporters" +gem "rails", "~> 3.1.8" gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" gem "sass-rails", "~> 3.1.5" diff --git a/gemfiles/3.1_1.9.2.gemfile.lock b/gemfiles/3.1_1.9.2.gemfile.lock index ab1726de..73a6bb2c 100644 --- a/gemfiles/3.1_1.9.2.gemfile.lock +++ b/gemfiles/3.1_1.9.2.gemfile.lock @@ -35,16 +35,8 @@ GEM rake thor (>= 0.14.0) arel (2.2.3) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) builder (3.0.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (3.1.1) coffee-script (>= 2.2.0) @@ -53,18 +45,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.6.11) @@ -76,7 +59,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) @@ -85,10 +67,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.14.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.3) posix-spawn (0.3.8) powerbar (1.0.11) @@ -131,21 +110,23 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (3.1.2) - rspec-collection_matchers (1.0.0) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (2.99.1) - rspec-expectations (2.99.2) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.99.2) - 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-core (3.2.0) + rspec-support (~> 3.2.0) + rspec-expectations (3.2.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-mocks (3.2.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-rails (3.2.0) + actionpack (>= 3.0, <= 4.2) + activesupport (>= 3.0, <= 4.2) + railties (>= 3.0, <= 4.2) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-support (~> 3.2.0) + rspec-support (3.2.1) sass (3.2.12) sass-rails (3.1.6) actionpack (~> 3.1.0) @@ -185,9 +166,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.0.0) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 3.1.1) jdbc-sqlite3 @@ -198,9 +177,11 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 3.1.8) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet - rspec-rails (= 2.99.0) + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) + rspec-rails (~> 3.0) sass-rails (~> 3.1.5) shoulda-context (~> 1.2.0) sqlite3 diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile index 0dfbf802..0de437f9 100644 --- a/gemfiles/3.2.gemfile +++ b/gemfiles/3.2.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 3.2.13" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -24,6 +23,7 @@ gem "therubyrhino", :platform => :jruby gem "strong_parameters" gem "minitest", "~> 4.0" gem "minitest-reporters" +gem "rails", "~> 3.2.13" gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" gem "sass-rails", "~> 3.2.3" diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index 6182c63e..fab437ff 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -34,16 +34,8 @@ GEM rake thor (>= 0.14.0) arel (3.0.2) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) - bourne (1.4.0) - mocha (~> 0.13.2) builder (3.0.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -52,18 +44,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.6.1) @@ -76,7 +59,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.21) minitest (4.7.5) @@ -85,10 +67,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.13.3) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.3) posix-spawn (0.3.8) powerbar (1.0.11) @@ -186,9 +165,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.0.0) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 3.2.1) jdbc-sqlite3 @@ -199,8 +176,10 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 3.2.13) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 3.2.3) shoulda-context (~> 1.2.0) diff --git a/gemfiles/3.2_1.9.2.gemfile b/gemfiles/3.2_1.9.2.gemfile index ab9b4388..95c71087 100644 --- a/gemfiles/3.2_1.9.2.gemfile +++ b/gemfiles/3.2_1.9.2.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 3.2.13" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "2.99.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -24,6 +23,7 @@ gem "therubyrhino", :platform => :jruby gem "strong_parameters" gem "minitest", "~> 4.0" gem "minitest-reporters" +gem "rails", "~> 3.2.13" gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" gem "sass-rails", "~> 3.2.3" diff --git a/gemfiles/3.2_1.9.2.gemfile.lock b/gemfiles/3.2_1.9.2.gemfile.lock index 929eee19..e1a91dbf 100644 --- a/gemfiles/3.2_1.9.2.gemfile.lock +++ b/gemfiles/3.2_1.9.2.gemfile.lock @@ -34,16 +34,8 @@ GEM rake thor (>= 0.14.0) arel (3.0.3) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) builder (3.0.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -52,18 +44,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.2.0) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.6.11) @@ -75,7 +58,6 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.4) method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) @@ -84,10 +66,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.14.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.5) posix-spawn (0.3.8) powerbar (1.0.11) @@ -128,21 +107,23 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (3.1.2) - rspec-collection_matchers (1.0.0) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (2.99.1) - rspec-expectations (2.99.2) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.99.2) - 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-core (3.2.0) + rspec-support (~> 3.2.0) + rspec-expectations (3.2.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-mocks (3.2.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-rails (3.2.0) + actionpack (>= 3.0, <= 4.2) + activesupport (>= 3.0, <= 4.2) + railties (>= 3.0, <= 4.2) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-support (~> 3.2.0) + rspec-support (3.2.1) sass (3.3.8) sass-rails (3.2.6) railties (~> 3.2.0) @@ -181,9 +162,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.0.0) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 3.2.1) jdbc-sqlite3 @@ -194,9 +173,11 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 3.2.13) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet - rspec-rails (= 2.99.0) + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) + rspec-rails (~> 3.0) sass-rails (~> 3.2.3) shoulda-context (~> 1.2.0) sqlite3 diff --git a/gemfiles/4.0.0.gemfile b/gemfiles/4.0.0.gemfile index 82f3c12c..841c8ecf 100644 --- a/gemfiles/4.0.0.gemfile +++ b/gemfiles/4.0.0.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "4.0.0" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -31,6 +30,7 @@ gem "sdoc" gem "activeresource", "4.0.0" gem "protected_attributes" gem "minitest-reporters" +gem "rails", "4.0.0" gem "jbuilder", "~> 1.2" gem "sass-rails", "~> 4.0.0" gem "bcrypt-ruby", "~> 3.0.0" diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock index c2e0fbd2..8ca9de1f 100644 --- a/gemfiles/4.0.0.gemfile.lock +++ b/gemfiles/4.0.0.gemfile.lock @@ -35,16 +35,8 @@ GEM rake thor (>= 0.14.0) arel (4.0.2) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) builder (3.1.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -53,18 +45,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.7.0) @@ -78,7 +61,6 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) @@ -87,10 +69,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.14.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.5) posix-spawn (0.3.8) powerbar (1.0.11) @@ -194,9 +173,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.0.0) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 4.0.0) jbuilder (~> 1.2) @@ -208,8 +185,10 @@ DEPENDENCIES pry-nav pygments.rb rails (= 4.0.0) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 4.0.0) sdoc diff --git a/gemfiles/4.0.1.gemfile b/gemfiles/4.0.1.gemfile index ec38fbdc..91effba2 100644 --- a/gemfiles/4.0.1.gemfile +++ b/gemfiles/4.0.1.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "4.0.1" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -31,6 +30,7 @@ gem "sdoc" gem "activeresource", "4.0.0" gem "protected_attributes" gem "minitest-reporters" +gem "rails", "4.0.1" gem "jbuilder", "~> 1.2" gem "sass-rails", "~> 4.0.0" gem "bcrypt-ruby", "~> 3.1.2" diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock index b1ca32ba..34a8ab4b 100644 --- a/gemfiles/4.0.1.gemfile.lock +++ b/gemfiles/4.0.1.gemfile.lock @@ -35,16 +35,8 @@ GEM rake thor (>= 0.14.0) arel (4.0.1) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt-ruby (3.1.2) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) builder (3.1.4) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -53,18 +45,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hashie (3.3.1) hike (1.2.3) i18n (0.7.0) @@ -78,7 +61,6 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) @@ -87,10 +69,7 @@ GEM builder minitest (>= 2.12, < 5.0) powerbar - mocha (0.14.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) polyglot (0.3.3) posix-spawn (0.3.8) powerbar (1.0.11) @@ -193,9 +172,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) appraisal (~> 1.0) - aruba bcrypt-ruby (~> 3.1.2) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 4.0.0) jbuilder (~> 1.2) @@ -207,8 +184,10 @@ DEPENDENCIES pry-nav pygments.rb rails (= 4.0.1) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 4.0.0) sdoc diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile index 27507c26..7e4c1630 100644 --- a/gemfiles/4.1.gemfile +++ b/gemfiles/4.1.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 4.1.0" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -31,6 +30,7 @@ gem "sdoc", "~> 0.4.0" gem "activeresource", "4.0.0" gem "protected_attributes", "~> 1.0.6" gem "minitest-reporters" +gem "rails", "~> 4.1.0" gem "jbuilder", "~> 2.0" gem "sass-rails", "~> 4.0.3" gem "bcrypt", "~> 3.1.7" diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock index 153b0922..edaeed42 100644 --- a/gemfiles/4.1.gemfile.lock +++ b/gemfiles/4.1.gemfile.lock @@ -37,16 +37,8 @@ GEM rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - aruba (0.6.0) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt (3.1.7) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) builder (3.2.2) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -55,18 +47,9 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) hike (1.2.3) i18n (0.7.0) jbuilder (2.0.6) @@ -78,7 +61,6 @@ GEM json (1.8.2) mail (2.6.3) mime-types (>= 1.16, < 3) - metaclass (0.0.2) method_source (0.8.2) mime-types (2.4.3) minitest (5.5.1) @@ -87,10 +69,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar - mocha (0.14.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) posix-spawn (0.3.8) protected_attributes (1.0.7) activemodel (>= 4.0.1, < 5.0) @@ -191,9 +170,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) appraisal (~> 1.0) - aruba bcrypt (~> 3.1.7) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 4.0.0) jbuilder (~> 2.0) @@ -205,8 +182,10 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 4.1.0) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 277f3ee4..a5305534 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -3,17 +3,16 @@ source "https://rubygems.org" gem "appraisal", "~> 1.0" -gem "aruba" -gem "bourne", "~> 1.3" gem "bundler", "~> 1.1" gem "pry-nav" -gem "rails", "~> 4.2.0" -gem "rake", ">= 0.9.2" -gem "rspec-rails", "~> 3.0" +gem "rake", "~> 10.0" +gem "rspec-core", "~> 3.0" +gem "rspec-expectations", "~> 3.0" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" +gem "rspec-rails", "~> 3.0" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby @@ -31,6 +30,7 @@ gem "sdoc", "~> 0.4.0" gem "activeresource", "4.0.0" gem "protected_attributes", "~> 1.0.6" gem "minitest-reporters" +gem "rails", "~> 4.2.0" gem "sass-rails", "~> 5.0" gem "jbuilder", "~> 2.0" gem "bcrypt", "~> 3.1.7" diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index c0c74cb6..685da299 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -46,16 +46,8 @@ GEM rake thor (>= 0.14.0) arel (6.0.0) - aruba (0.6.1) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) bcrypt (3.1.9) - bourne (1.6.0) - mocha (~> 1.1) builder (3.2.2) - childprocess (0.5.5) - ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -64,18 +56,9 @@ GEM coffee-script-source execjs coffee-script-source (1.8.0) - cucumber (1.3.17) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.2.2) - ffi (1.9.6) - gherkin (2.12.2) - multi_json (~> 1.3) globalid (0.3.0) activesupport (>= 4.1.0) hike (1.2.3) @@ -92,7 +75,6 @@ GEM nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - metaclass (0.0.4) method_source (0.8.2) mime-types (2.4.3) mini_portile (0.6.2) @@ -102,10 +84,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar - mocha (1.1.0) - metaclass (~> 0.0.1) multi_json (1.10.1) - multi_test (0.1.1) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) posix-spawn (0.3.9) @@ -218,9 +197,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) appraisal (~> 1.0) - aruba bcrypt (~> 3.1.7) - bourne (~> 1.3) bundler (~> 1.1) coffee-rails (~> 4.1.0) jbuilder (~> 2.0) @@ -232,8 +209,10 @@ DEPENDENCIES pry-nav pygments.rb rails (~> 4.2.0) - rake (>= 0.9.2) + rake (~> 10.0) redcarpet + rspec-core (~> 3.0) + rspec-expectations (~> 3.0) rspec-rails (~> 3.0) sass-rails (~> 5.0) sdoc (~> 0.4.0) diff --git a/spec/unit/shoulda/matchers/doublespeak/stub_implementation_spec.rb b/spec/unit/shoulda/matchers/doublespeak/stub_implementation_spec.rb index 63fe2441..343f46da 100644 --- a/spec/unit/shoulda/matchers/doublespeak/stub_implementation_spec.rb +++ b/spec/unit/shoulda/matchers/doublespeak/stub_implementation_spec.rb @@ -7,7 +7,7 @@ module Shoulda::Matchers::Doublespeak implementation = described_class.new double = build_double - double.expects(:record_call).with(:args, :block) + allow(double).to receive(:record_call).with(:args, :block) implementation.call(double, :object, :args, :block) end