Browse files

Updated generated gemfiles in prep for supporting shoulda-matchers 2.x

  • Loading branch information...
1 parent e3bdf24 commit 86e39e569f80a4d42a48f5b616930ebd51381ec0 @rmm5t rmm5t committed May 7, 2013
Showing with 100 additions and 83 deletions.
  1. +1 −1 gemfiles/3.0.gemfile
  2. +25 −19 gemfiles/3.0.gemfile.lock
  3. +1 −1 gemfiles/3.1.gemfile
  4. +36 −31 gemfiles/3.1.gemfile.lock
  5. +1 −1 gemfiles/3.2.gemfile
  6. +35 −29 gemfiles/3.2.gemfile.lock
  7. +1 −1 shoulda.gemspec
View
2 gemfiles/3.0.gemfile
@@ -1,6 +1,6 @@
# This file was generated by Appraisal
-source "http://rubygems.org"
+source "https://rubygems.org"
gem "rails", "3.0.12"
View
44 gemfiles/3.0.gemfile.lock
@@ -1,12 +1,12 @@
PATH
- remote: /Users/draper/Dropbox/Development/shoulda
+ remote: /Users/rmcgeary/work/oss/shoulda
specs:
- shoulda (3.3.1)
- shoulda-context (~> 1.0.1)
- shoulda-matchers (~> 1.4.1)
+ shoulda (3.4.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 2.0)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.12)
@@ -44,9 +44,11 @@ GEM
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
+ bourne (1.4.0)
+ mocha (~> 0.13.2)
builder (2.1.2)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.9)
+ ffi (~> 1.0, >= 1.0.11)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -56,19 +58,22 @@ GEM
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- ffi (1.1.5)
+ ffi (1.8.1)
gherkin (2.9.3)
json (>= 1.4.6)
i18n (0.5.0)
- json (1.7.5)
+ json (1.7.7)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
+ metaclass (0.0.1)
+ mime-types (1.23)
+ mocha (0.13.3)
+ metaclass (~> 0.0.1)
polyglot (0.3.3)
- rack (1.2.5)
+ rack (1.2.8)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -87,8 +92,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.7.0)
rspec-core (~> 2.7.0)
@@ -103,16 +108,17 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
- shoulda-context (1.0.1)
- shoulda-matchers (1.4.1)
+ shoulda-context (1.1.1)
+ shoulda-matchers (1.5.6)
activesupport (>= 3.0.0)
- sqlite3 (1.3.6)
- term-ansicolor (1.0.7)
+ bourne (~> 1.3)
+ sqlite3 (1.3.7)
+ term-ansicolor (1.1.5)
thor (0.14.6)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
PLATFORMS
ruby
View
2 gemfiles/3.1.gemfile
@@ -1,6 +1,6 @@
# This file was generated by Appraisal
-source "http://rubygems.org"
+source "https://rubygems.org"
gem "rails", "3.1.4"
gem "jquery-rails"
View
67 gemfiles/3.1.gemfile.lock
@@ -1,12 +1,12 @@
PATH
- remote: /Users/draper/Dropbox/Development/shoulda
+ remote: /Users/rmcgeary/work/oss/shoulda
specs:
- shoulda (3.3.1)
- shoulda-context (~> 1.0.1)
- shoulda-matchers (~> 1.4.1)
+ shoulda (3.4.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 2.0)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
actionmailer (3.1.4)
actionpack (= 3.1.4)
@@ -45,9 +45,11 @@ GEM
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
+ bourne (1.4.0)
+ mocha (~> 0.13.2)
builder (3.0.4)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.9)
+ ffi (~> 1.0, >= 1.0.11)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -56,28 +58,31 @@ GEM
term-ansicolor (>= 1.0.6)
diff-lcs (1.1.3)
erubis (2.7.0)
- ffi (1.1.5)
+ ffi (1.8.1)
gherkin (2.9.3)
json (>= 1.4.6)
- hike (1.2.1)
- i18n (0.6.1)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.7.5)
+ hike (1.2.2)
+ i18n (0.6.4)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.7)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.3.6)
+ metaclass (0.0.1)
+ mime-types (1.23)
+ mocha (0.13.3)
+ metaclass (~> 0.0.1)
+ multi_json (1.7.3)
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.3.10)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -96,8 +101,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.7.0)
rspec-core (~> 2.7.0)
@@ -112,27 +117,27 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
- sass (3.2.1)
- sass-rails (3.1.6)
+ sass (3.2.8)
+ sass-rails (3.1.0)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.10)
- tilt (~> 1.3.2)
- shoulda-context (1.0.1)
- shoulda-matchers (1.4.1)
+ sass (>= 3.1.4)
+ shoulda-context (1.1.1)
+ shoulda-matchers (1.5.6)
activesupport (>= 3.0.0)
+ bourne (~> 1.3)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- term-ansicolor (1.0.7)
+ sqlite3 (1.3.7)
+ term-ansicolor (1.1.5)
thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.11)
+ tilt (1.4.0)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
PLATFORMS
ruby
View
2 gemfiles/3.2.gemfile
@@ -1,6 +1,6 @@
# This file was generated by Appraisal
-source "http://rubygems.org"
+source "https://rubygems.org"
gem "rails", "3.2.3"
gem "jquery-rails"
View
64 gemfiles/3.2.gemfile.lock
@@ -1,12 +1,12 @@
PATH
- remote: /Users/draper/Dropbox/Development/shoulda
+ remote: /Users/rmcgeary/work/oss/shoulda
specs:
- shoulda (3.3.1)
- shoulda-context (~> 1.0.1)
- shoulda-matchers (~> 1.4.1)
+ shoulda (3.4.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 2.0)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
actionmailer (3.2.3)
actionpack (= 3.2.3)
@@ -44,9 +44,11 @@ GEM
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
+ bourne (1.4.0)
+ mocha (~> 0.13.2)
builder (3.0.4)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.9)
+ ffi (~> 1.0, >= 1.0.11)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -55,27 +57,30 @@ GEM
term-ansicolor (>= 1.0.6)
diff-lcs (1.1.3)
erubis (2.7.0)
- ffi (1.1.5)
+ ffi (1.8.1)
gherkin (2.9.3)
json (>= 1.4.6)
- hike (1.2.1)
- i18n (0.6.1)
+ hike (1.2.2)
+ i18n (0.6.4)
journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.7.5)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.7)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.3.6)
+ metaclass (0.0.1)
+ mime-types (1.23)
+ mocha (0.13.3)
+ metaclass (~> 0.0.1)
+ multi_json (1.7.3)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -94,8 +99,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.7.0)
rspec-core (~> 2.7.0)
@@ -110,26 +115,27 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
- sass (3.2.1)
- sass-rails (3.2.5)
+ sass (3.2.8)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- shoulda-context (1.0.1)
- shoulda-matchers (1.4.1)
+ shoulda-context (1.1.1)
+ shoulda-matchers (1.5.6)
activesupport (>= 3.0.0)
+ bourne (~> 1.3)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- term-ansicolor (1.0.7)
+ sqlite3 (1.3.7)
+ term-ansicolor (1.1.5)
thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.11)
+ tilt (1.4.0)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
PLATFORMS
ruby
View
2 shoulda.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_dependency("shoulda-context", ["~> 1.0", ">= 1.0.1"])
- s.add_dependency("shoulda-matchers", ["~> 1.0", ">= 1.4.1"])
+ s.add_dependency("shoulda-matchers", [">= 1.4.1", "< 2.0"])
s.add_development_dependency('appraisal', '~> 0.4.0')
s.add_development_dependency("rails", "3.0.12")

0 comments on commit 86e39e5

Please sign in to comment.