Permalink
Browse files

testing clearance against rails 3.1. also moving towards 'all depende…

…ncies are in the gemspec, a gem's Gemfile should just use the gemspec method' best practice as stated by Yehuda
  • Loading branch information...
1 parent 0db11ce commit 90ca670f6830714431ddbf1629970f90baf944d0 @croaky croaky committed Sep 2, 2011
View
@@ -2,11 +2,6 @@ appraise "3.0.9" do
gem "rails", "3.0.9"
end
-appraise "3.1.0.rc4" do
- gem "rails", "3.1.0.rc4"
- gem 'sass-rails'
- gem 'coffee-script'
- gem 'uglifier'
- gem 'jquery-rails'
- gem 'turn'
+appraise "3.1.0" do
+ gem "rails", "3.1.0"
end
View
@@ -1,15 +1,9 @@
source "http://rubygems.org"
gemspec
-gem "sqlite3"
-
-gem "cucumber-rails", '~> 1.0.2'
gem "capybara", "~> 1.0.0"
gem "factory_girl_rails"
gem "shoulda-matchers", :git => "git://github.com/thoughtbot/shoulda-matchers.git"
gem "database_cleaner"
-gem "rspec-rails", "~> 2.6.0"
gem "launchy"
-gem "mocha"
-gem "appraisal", :git => "git://github.com/thoughtbot/appraisal.git"
gem "aruba", "~> 0.4.2"
View
@@ -1,15 +1,6 @@
GIT
- remote: git://github.com/thoughtbot/appraisal.git
- revision: 549f3fac473572741708bd058cd78c9212b2391b
- specs:
- appraisal (0.3.6)
- aruba (~> 0.4.2)
- bundler
- rake
-
-GIT
remote: git://github.com/thoughtbot/shoulda-matchers.git
- revision: a922b8ec38b65ae3274f194e90eaff6ac642d0b1
+ revision: 5190a39bba699d4989c2500c98622b505e2de828
specs:
shoulda-matchers (1.0.0.beta3)
@@ -50,30 +41,33 @@ GEM
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
+ addressable (2.2.6)
+ appraisal (0.3.8)
+ bundler
+ rake
arel (2.0.10)
- aruba (0.4.3)
+ aruba (0.4.6)
bcat (>= 0.6.1)
- childprocess (>= 0.1.9)
- cucumber (>= 0.10.7)
+ childprocess (>= 0.2.0)
+ cucumber (>= 1.0.2)
rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
bcat (0.6.1)
rack (~> 1.0)
builder (2.1.2)
- capybara (1.0.0)
+ capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 0.2.0)
+ selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.1.9)
+ childprocess (0.2.2)
ffi (~> 1.0.6)
- configuration (1.3.1)
- cucumber (1.0.0)
+ cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (~> 2.4.1)
+ gherkin (~> 2.4.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (1.0.2)
@@ -83,22 +77,22 @@ GEM
database_cleaner (0.6.7)
diesel (0.1.5)
railties
- diff-lcs (1.1.2)
+ diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (1.3.3)
- factory_girl_rails (1.0.1)
- factory_girl (~> 1.3)
+ factory_girl (2.0.5)
+ factory_girl_rails (1.1.0)
+ factory_girl (~> 2.0.0)
railties (>= 3.0.0)
ffi (1.0.9)
- gherkin (2.4.1)
+ gherkin (2.4.16)
json (>= 1.4.6)
i18n (0.5.0)
- json (1.5.3)
- json_pure (1.5.3)
- launchy (0.4.0)
- configuration (>= 0.0.5)
- rake (>= 0.8.1)
+ json (1.5.4)
+ json_pure (1.5.4)
+ spruz (~> 0.2.8)
+ launchy (2.0.5)
+ addressable (~> 2.2.6)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -144,13 +138,14 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
- selenium-webdriver (0.2.2)
- childprocess (>= 0.1.9)
+ selenium-webdriver (2.5.0)
+ childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- sqlite3 (1.3.3)
- term-ansicolor (1.0.5)
+ spruz (0.2.13)
+ sqlite3 (1.3.4)
+ term-ansicolor (1.0.6)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
@@ -162,7 +157,7 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal!
+ appraisal (~> 0.3.8)
aruba (~> 0.4.2)
bundler (~> 1.0.0)
capybara (~> 1.0.0)
View
@@ -25,7 +25,12 @@ Gem::Specification.new do |s|
s.add_dependency('rails', '>= 3.0')
s.add_dependency('diesel', '~> 0.1.5')
- s.add_development_dependency('bundler', '~> 1.0.0')
+ s.add_development_dependency('bundler', '~> 1.0.0')
+ s.add_development_dependency('appraisal', '~> 0.3.8')
+ s.add_development_dependency('cucumber-rails', '~> 1.0.2')
+ s.add_development_dependency('rspec-rails', '~> 2.6.0')
+ s.add_development_dependency('sqlite3')
+ s.add_development_dependency('mocha')
if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -13,7 +13,6 @@ Feature: integrate with application
And I add the "factory_girl_rails" gem
And I add the "database_cleaner" gem
And I add the "clearance" gem from this project
- And I add the "diesel" gem from git "git://github.com/thoughtbot/diesel.git"
And I run `bundle install --local`
And I successfully run `bundle exec rails generate cucumber:install`
And I disable Capybara Javascript emulation
@@ -2,17 +2,12 @@
source "http://rubygems.org"
-gem "sqlite3"
-gem "rails", "3.0.9"
-gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
-gem "database_cleaner"
-gem "rspec-rails", "~> 2.6.0"
-gem "aruba", "~> 0.4.2"
-gem "cucumber-rails", "~> 1.0.2"
-gem "mocha"
-gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
gem "capybara", "~> 1.0.0"
gem "factory_girl_rails"
+gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "database_cleaner"
gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "rails", "3.0.9"
gemspec :path=>"../"
@@ -1,20 +1,11 @@
GIT
- remote: git://github.com/thoughtbot/appraisal.git
- revision: 549f3fac473572741708bd058cd78c9212b2391b
- specs:
- appraisal (0.3.6)
- aruba (~> 0.4.2)
- bundler
- rake
-
-GIT
remote: git://github.com/thoughtbot/shoulda-matchers.git
- revision: 85d3e5ea000cf162ef672059ea5e5f77f3ca9f03
+ revision: 5190a39bba699d4989c2500c98622b505e2de828
specs:
shoulda-matchers (1.0.0.beta3)
PATH
- remote: /Users/cpytel/projects/clearance
+ remote: /Users/croaky/dev/clearance
specs:
clearance (0.12.0)
diesel (~> 0.1.5)
@@ -50,8 +41,12 @@ GEM
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
+ addressable (2.2.6)
+ appraisal (0.3.8)
+ bundler
+ rake
arel (2.0.10)
- aruba (0.4.3)
+ aruba (0.4.5)
bcat (>= 0.6.1)
childprocess (>= 0.1.9)
cucumber (>= 0.10.7)
@@ -69,7 +64,6 @@ GEM
xpath (~> 0.1.4)
childprocess (0.1.9)
ffi (~> 1.0.6)
- configuration (1.2.0)
cucumber (1.0.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -86,19 +80,18 @@ GEM
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (1.3.3)
- factory_girl_rails (1.0.1)
- factory_girl (~> 1.3)
+ factory_girl (2.0.5)
+ factory_girl_rails (1.1.0)
+ factory_girl (~> 2.0.0)
railties (>= 3.0.0)
ffi (1.0.9)
gherkin (2.4.1)
json (>= 1.4.6)
i18n (0.5.0)
json (1.5.3)
json_pure (1.5.2)
- launchy (0.4.0)
- configuration (>= 0.0.5)
- rake (>= 0.8.1)
+ launchy (2.0.5)
+ addressable (~> 2.2.6)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -162,7 +155,7 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal!
+ appraisal (~> 0.3.8)
aruba (~> 0.4.2)
bundler (~> 1.0.0)
capybara (~> 1.0.0)
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "capybara", "~> 1.0.0"
+gem "factory_girl_rails"
+gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "database_cleaner"
+gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "rails", "3.1.0"
+
+gemspec :path=>"../"
Oops, something went wrong. Retry.

0 comments on commit 90ca670

Please sign in to comment.