Permalink
Browse files

Bump gem versions and clean up gemspec

* Use modern FactoryGirl syntax.
* Depend on a released version of shoulda-matchers.
* Move dependencies into gemspec.
* Bump dependencies.
* Clean up gemspec.
  • Loading branch information...
1 parent c4b7c34 commit 29128a8e2535e272474a38089c475321fcb39eb4 Gabe Berke-Williams committed with croaky Apr 8, 2012
View
@@ -1,9 +1,3 @@
source "http://rubygems.org"
-gemspec
-gem "capybara", "~> 1.1.1"
-gem "factory_girl_rails", "1.7.0"
-gem "shoulda-matchers", :git => "git://github.com/thoughtbot/shoulda-matchers.git"
-gem "database_cleaner"
-gem "launchy"
-gem "aruba", "~> 0.4.2"
+gemspec
View
@@ -1,9 +1,3 @@
-GIT
- remote: git://github.com/thoughtbot/shoulda-matchers.git
- revision: 25c2623bb9d96cf6a446ecc141fdfefe5c4860fa
- specs:
- shoulda-matchers (1.0.0)
-
PATH
remote: .
specs:
@@ -42,20 +36,17 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- appraisal (0.3.8)
+ appraisal (0.4.1)
bundler
rake
arel (3.0.2)
- aruba (0.4.6)
- bcat (>= 0.6.1)
- childprocess (>= 0.2.0)
- cucumber (>= 1.0.2)
- rdiscount (>= 1.6.8)
- rspec (>= 2.6.0)
- bcat (0.6.2)
- rack (~> 1.0)
- bourne (1.0)
- mocha (= 0.9.8)
+ aruba (0.4.11)
+ childprocess (>= 0.2.3)
+ cucumber (>= 1.1.1)
+ ffi (>= 1.0.11)
+ rspec (>= 2.7.0)
+ bourne (1.1.2)
+ mocha (= 0.10.5)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -81,10 +72,10 @@ GEM
railties
diff-lcs (1.1.3)
erubis (2.7.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (3.1.1)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.1.0)
+ factory_girl (~> 3.1.0)
railties (>= 3.0.0)
ffi (1.0.11)
gherkin (2.7.6)
@@ -99,9 +90,10 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ metaclass (0.0.1)
mime-types (1.17.2)
- mocha (0.9.8)
- rake
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
@@ -128,7 +120,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdiscount (1.6.8)
rdoc (3.12)
json (~> 1.4)
rspec (2.9.0)
@@ -150,6 +141,8 @@ GEM
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
+ shoulda-matchers (1.1.0)
+ activesupport (>= 3.0.0)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -170,17 +163,17 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.8)
- aruba (~> 0.4.2)
- bourne
+ appraisal (~> 0.4.1)
+ aruba (~> 0.4.11)
+ bourne (~> 1.1.2)
bundler (~> 1.1.0)
- capybara (~> 1.1.1)
+ capybara (~> 1.1.2)
clearance!
cucumber-rails (~> 1.1.1)
database_cleaner
- factory_girl_rails (= 1.7.0)
+ factory_girl_rails (~> 3.1.0)
launchy
rspec-rails (~> 2.9.0)
- shoulda-matchers!
+ shoulda-matchers (~> 1.1.0)
sqlite3
timecop
View
@@ -1,4 +1,4 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
require 'clearance/version'
require 'date'
@@ -8,35 +8,31 @@ Gem::Specification.new do |s|
s.email = %q{support@thoughtbot.com}
s.homepage = %q{http://github.com/thoughtbot/clearance}
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Jon Yurek", "Chad Pytel"]
s.date = Date.today.to_s
s.summary = %q{Rails authentication & authorization with email & password.}
s.description = %q{Rails authentication & authorization with email & password.}
- s.extra_rdoc_files = [
- "LICENSE",
- "README.md"
- ]
+ s.extra_rdoc_files = %w(LICENSE README.md)
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,features}/*`.split("\n")
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.7}
s.add_dependency('rails', '>= 3.0')
s.add_dependency('diesel', '~> 0.1.5')
s.add_development_dependency('bundler', '~> 1.1.0')
- s.add_development_dependency('appraisal', '~> 0.3.8')
+ s.add_development_dependency('appraisal', '~> 0.4.1')
s.add_development_dependency('cucumber-rails', '~> 1.1.1')
s.add_development_dependency('rspec-rails', '~> 2.9.0')
s.add_development_dependency('sqlite3')
- s.add_development_dependency('bourne')
+ s.add_development_dependency('bourne', '~> 1.1.2')
s.add_development_dependency('timecop')
-
- if s.respond_to? :specification_version then
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
- s.specification_version = 3
- end
+ s.add_development_dependency('capybara', '~> 1.1.2')
+ s.add_development_dependency('factory_girl_rails', '~> 3.1.0')
+ s.add_development_dependency('shoulda-matchers', '~> 1.1.0')
+ s.add_development_dependency('database_cleaner')
+ s.add_development_dependency('launchy')
+ s.add_development_dependency('aruba', '~> 0.4.11')
end
@@ -1,5 +1,7 @@
# Existing users
+require 'factory_girl_rails'
+
Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
FactoryGirl.create(:user, :email => email)
end
@@ -24,7 +26,7 @@
# Sign in
Given /^I sign in$/ do
- email = Factory.next(:email)
+ email = FactoryGirl.generate(:email)
steps %{
I have signed up with "#{email}"
I sign in with "#{email}"
View
@@ -2,12 +2,6 @@
source "http://rubygems.org"
-gem "capybara", "~> 1.1.1"
-gem "factory_girl_rails", "1.7.0"
-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.12"
gemspec :path=>"../"
@@ -1,11 +1,5 @@
-GIT
- remote: git://github.com/thoughtbot/shoulda-matchers.git
- revision: d85503f86ef224bca2b54fc6b9ad96866fe12f2d
- specs:
- shoulda-matchers (1.0.0)
-
PATH
- remote: /Users/mjankowski/Development/opensource/clearance
+ remote: /Users/gabe/thoughtbot/clearance
specs:
clearance (0.16.1)
diesel (~> 0.1.5)
@@ -42,7 +36,7 @@ GEM
activesupport (= 3.0.12)
activesupport (3.0.12)
addressable (2.2.7)
- appraisal (0.3.8)
+ appraisal (0.4.1)
bundler
rake
arel (2.0.10)
@@ -79,10 +73,10 @@ GEM
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (3.1.1)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.1.0)
+ factory_girl (~> 3.1.0)
railties (>= 3.0.0)
ffi (1.0.11)
gherkin (2.9.3)
@@ -144,6 +138,8 @@ GEM
ffi (~> 1.0)
multi_json (~> 1.0)
rubyzip
+ shoulda-matchers (1.1.0)
+ activesupport (>= 3.0.0)
sqlite3 (1.3.5)
term-ansicolor (1.0.7)
thor (0.14.6)
@@ -159,18 +155,18 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.8)
- aruba (~> 0.4.2)
- bourne
+ appraisal (~> 0.4.1)
+ aruba (~> 0.4.11)
+ bourne (~> 1.1.2)
bundler (~> 1.1.0)
- capybara (~> 1.1.1)
+ capybara (~> 1.1.2)
clearance!
cucumber-rails (~> 1.1.1)
database_cleaner
- factory_girl_rails (= 1.7.0)
+ factory_girl_rails (~> 3.1.0)
launchy
rails (= 3.0.12)
rspec-rails (~> 2.9.0)
- shoulda-matchers!
+ shoulda-matchers (~> 1.1.0)
sqlite3
timecop
View
@@ -2,12 +2,6 @@
source "http://rubygems.org"
-gem "capybara", "~> 1.1.1"
-gem "factory_girl_rails", "1.7.0"
-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.4"
gemspec :path=>"../"
@@ -1,11 +1,5 @@
-GIT
- remote: git://github.com/thoughtbot/shoulda-matchers.git
- revision: d85503f86ef224bca2b54fc6b9ad96866fe12f2d
- specs:
- shoulda-matchers (1.0.0)
-
PATH
- remote: /Users/mjankowski/Development/opensource/clearance
+ remote: /Users/gabe/thoughtbot/clearance
specs:
clearance (0.16.1)
diesel (~> 0.1.5)
@@ -43,7 +37,7 @@ GEM
activesupport (3.1.4)
multi_json (~> 1.0)
addressable (2.2.7)
- appraisal (0.3.8)
+ appraisal (0.4.1)
bundler
rake
arel (2.2.3)
@@ -79,10 +73,10 @@ GEM
railties
diff-lcs (1.1.3)
erubis (2.7.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (3.1.1)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.1.0)
+ factory_girl (~> 3.1.0)
railties (>= 3.0.0)
ffi (1.0.11)
gherkin (2.9.3)
@@ -149,6 +143,8 @@ GEM
ffi (~> 1.0)
multi_json (~> 1.0)
rubyzip
+ shoulda-matchers (1.1.0)
+ activesupport (>= 3.0.0)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -169,18 +165,18 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.8)
- aruba (~> 0.4.2)
- bourne
+ appraisal (~> 0.4.1)
+ aruba (~> 0.4.11)
+ bourne (~> 1.1.2)
bundler (~> 1.1.0)
- capybara (~> 1.1.1)
+ capybara (~> 1.1.2)
clearance!
cucumber-rails (~> 1.1.1)
database_cleaner
- factory_girl_rails (= 1.7.0)
+ factory_girl_rails (~> 3.1.0)
launchy
rails (= 3.1.4)
rspec-rails (~> 2.9.0)
- shoulda-matchers!
+ shoulda-matchers (~> 1.1.0)
sqlite3
timecop
View
@@ -2,12 +2,6 @@
source "http://rubygems.org"
-gem "capybara", "~> 1.1.1"
-gem "factory_girl_rails", "1.7.0"
-gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
-gem "database_cleaner"
-gem "launchy"
-gem "aruba", "~> 0.4.2"
gem "rails", "3.2.3"
gemspec :path=>"../"
Oops, something went wrong.

0 comments on commit 29128a8

Please sign in to comment.