Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history 
* Support Rails 3.0.15, 3.1.6, 3.2.6.
* Apply style guidelines to test suite.
* Be more strict about development dependencies.
  • Loading branch information
Dan Croak committed Jul 22, 2012
1 parent 7184e7d commit 2900d73
Show file tree
Hide file tree
Showing 34 changed files with 643 additions and 699 deletions.
4 changes: 2 additions & 2 deletions Appraisals
View file
@@ -1,5 +1,5 @@
['3.0.12', '3.1.4', '3.2.3'].each do |rails_version|
['3.0.15', '3.1.6', '3.2.6'].each do |rails_version|
appraise "#{rails_version}" do
gem "rails", rails_version
gem 'rails', rails_version
end
end
2 changes: 1 addition & 1 deletion Gemfile
View file
@@ -1,3 +1,3 @@
source "http://rubygems.org"
source 'http://rubygems.org'

gemspec
159 changes: 78 additions & 81 deletions Gemfile.lock
View file
Expand Up @@ -3,40 +3,40 @@ PATH
specs:
clearance (0.16.2)
bcrypt-ruby
diesel (~> 0.1.5)
diesel (= 0.1.5)
rails (>= 3.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.1)
actionpack (= 3.2.1)
mail (~> 2.4.0)
actionpack (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
actionmailer (3.2.6)
actionpack (= 3.2.6)
mail (~> 2.4.4)
actionpack (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.1)
activesupport (= 3.2.1)
sprockets (~> 2.1.3)
activemodel (3.2.6)
activesupport (= 3.2.6)
builder (~> 3.0.0)
activerecord (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
arel (~> 3.0.0)
activerecord (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
activesupport (3.2.1)
activeresource (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
addressable (2.3.1)
appraisal (0.4.1)
bundler
rake
Expand All @@ -57,47 +57,46 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.0)
ffi (~> 1.0.6)
cucumber (1.1.4)
childprocess (0.3.4)
ffi (~> 1.0, >= 1.0.6)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.7.1)
diff-lcs (>= 1.1.3)
gherkin (~> 2.11.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.1.1)
capybara (>= 1.1.1)
cucumber (>= 1.1.0)
nokogiri (>= 1.5.0)
database_cleaner (0.7.1)
database_cleaner (0.8.0)
diesel (0.1.5)
railties
diff-lcs (1.1.3)
erubis (2.7.0)
factory_girl (3.1.1)
factory_girl (3.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.1.0)
factory_girl (~> 3.1.0)
factory_girl_rails (3.5.0)
factory_girl (~> 3.5.0)
railties (>= 3.0.0)
ffi (1.0.11)
gherkin (2.7.6)
ffi (1.1.0)
gherkin (2.11.1)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
json (1.6.6)
launchy (2.0.5)
addressable (~> 2.2.6)
journey (1.0.4)
json (1.7.3)
libwebsocket (0.1.4)
addressable
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.17.2)
mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.0.4)
nokogiri (1.5.0)
multi_json (1.3.6)
nokogiri (1.5.5)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
Expand All @@ -106,52 +105,51 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.2.1)
actionmailer (= 3.2.1)
actionpack (= 3.2.1)
activerecord (= 3.2.1)
activeresource (= 3.2.1)
activesupport (= 3.2.1)
rails (3.2.6)
actionmailer (= 3.2.6)
actionpack (= 3.2.6)
activerecord (= 3.2.6)
activeresource (= 3.2.6)
activesupport (= 3.2.6)
bundler (~> 1.0)
railties (= 3.2.1)
railties (3.2.1)
actionpack (= 3.2.1)
activesupport (= 3.2.1)
railties (= 3.2.6)
railties (3.2.6)
actionpack (= 3.2.6)
activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rspec (2.9.0)
rspec-core (~> 2.9.0)
rspec-expectations (~> 2.9.0)
rspec-mocks (~> 2.9.0)
rspec-core (2.9.0)
rspec-expectations (2.9.1)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.9.0)
rspec-rails (2.9.0)
rspec-mocks (2.11.1)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.9.0)
rubyzip (0.9.5)
selenium-webdriver (2.18.0)
rspec (~> 2.11.0)
rubyzip (0.9.9)
selenium-webdriver (2.25.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
shoulda-matchers (1.1.0)
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
sprockets (2.1.2)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
term-ansicolor (1.0.7)
thor (0.14.6)
sqlite3 (1.3.6)
thor (0.15.4)
tilt (1.3.3)
timecop (0.3.5)
treetop (1.4.10)
Expand All @@ -165,17 +163,16 @@ PLATFORMS
ruby

DEPENDENCIES
appraisal (~> 0.4.1)
aruba (~> 0.4.11)
bourne (~> 1.1.2)
bundler (~> 1.1)
capybara (~> 1.1.2)
appraisal (= 0.4.1)
aruba (= 0.4.11)
bourne (= 1.1.2)
bundler (= 1.1.3)
capybara (= 1.1.2)
clearance!
cucumber-rails (~> 1.1.1)
database_cleaner
factory_girl_rails (~> 3.1.0)
launchy
rspec-rails (~> 2.9.0)
shoulda-matchers (~> 1.1.0)
sqlite3
timecop
cucumber-rails (= 1.1.1)
database_cleaner (= 0.8.0)
factory_girl_rails (= 3.5.0)
rspec-rails (= 2.11.0)
shoulda-matchers (= 1.2.0)
sqlite3 (= 1.3.6)
timecop (= 0.3.5)
23 changes: 11 additions & 12 deletions README.md
View file
Expand Up @@ -179,14 +179,14 @@ for the default behavior.

To override a view, create your own:

app/views/clearance_mailer/change_password.html.erb
app/views/passwords/create.html.erb
app/views/passwords/edit.html.erb
app/views/passwords/new.html.erb
app/views/sessions/_form.html.erb
app/views/sessions/new.html.erb
app/views/users/_form.html.erb
app/views/users/new.html.erb
app/views/clearance_mailer/change_password.html.erb
app/views/passwords/create.html.erb
app/views/passwords/edit.html.erb
app/views/passwords/new.html.erb
app/views/sessions/_form.html.erb
app/views/sessions/new.html.erb
app/views/users/_form.html.erb
app/views/users/new.html.erb

There is a shortcut to copy all Clearance views into your app:

Expand Down Expand Up @@ -350,13 +350,12 @@ Credits

![thoughtbot](http://thoughtbot.com/images/tm/logo.png)

Clearance is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)

Clearance is maintained by [thoughtbot, inc](http://thoughtbot.com/community).
Thank you to all [the contributors](https://github.com/thoughtbot/clearance/contributors)!

The names and logos for thoughtbot are trademarks of thoughtbot, inc.

License
-------

Clearance is copyright © 2009-2012 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

The names and logos for thoughtbot are trademarks of thoughtbot, inc.
60 changes: 29 additions & 31 deletions clearance.gemspec
View file
Expand Up @@ -3,37 +3,35 @@ require 'clearance/version'
require 'date'

Gem::Specification.new do |s|
s.name = %q{clearance}
s.version = Clearance::VERSION
s.email = %q{support@thoughtbot.com}
s.homepage = %q{http://github.com/thoughtbot/clearance}

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.add_dependency 'bcrypt-ruby'
s.add_dependency 'diesel', '0.1.5'
s.add_dependency 'rails', '>= 3.0'
s.add_development_dependency 'appraisal', '0.4.1'
s.add_development_dependency 'aruba', '0.4.11'
s.add_development_dependency 'bourne', '1.1.2'
s.add_development_dependency 'bundler', '1.1.3'
s.add_development_dependency 'capybara', '1.1.2'
s.add_development_dependency 'cucumber-rails', '1.1.1'
s.add_development_dependency 'database_cleaner', '0.8.0'
s.add_development_dependency 'factory_girl_rails', '3.5.0'
s.add_development_dependency 'rspec-rails', '2.11.0'
s.add_development_dependency 'shoulda-matchers', '1.2.0'
s.add_development_dependency 'sqlite3', '1.3.6'
s.add_development_dependency 'timecop', '0.3.5'
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.description = %q{Rails authentication & authorization with email & password.}
s.email = %q{support@thoughtbot.com}
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.add_dependency('rails', '>= 3.0')
s.add_dependency('diesel', '~> 0.1.5')
s.add_dependency('bcrypt-ruby')

s.add_development_dependency('bundler', '~> 1.1')
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', '~> 1.1.2')
s.add_development_dependency('timecop')
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')
s.files = `git ls-files`.split('\n')
s.homepage = %q{http://github.com/thoughtbot/clearance}
s.name = %q{clearance}
s.rdoc_options = ['--charset=UTF-8']
s.require_paths = ['lib']
s.summary = %q{Rails authentication & authorization with email & password.}
s.test_files = `git ls-files -- {features,spec}/*`.split('\n')
s.version = Clearance::VERSION
end
17 changes: 0 additions & 17 deletions features/support/env.rb
View file
Expand Up @@ -29,25 +29,8 @@
Capybara.default_selector = :css
Capybara.save_and_open_page_path = 'tmp'

# By default, any exception happening in your Rails application will bubble up
# to Cucumber so that your scenario will fail. This is a different from how
# your application behaves in the production environment, where an error page will
# be rendered instead.
#
# Sometimes we want to override this default behaviour and allow Rails to rescue
# exceptions and display an error page (just like when the app is running in production).
# Typical scenarios where you want to do this is when you test your error pages.
# There are two ways to allow Rails to rescue exceptions:
#
# 1) Tag your scenario (or feature) with @allow-rescue
#
# 2) Set the value below to true. Beware that doing this globally is not
# recommended as it will mask a lot of errors for you!
#
ActionController::Base.allow_rescue = false

# Remove/comment out the lines below if your app doesn't have a database.
# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
begin
DatabaseCleaner.strategy = :transaction
rescue NameError
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.0.12.gemfile → gemfiles/3.0.15.gemfile
View file
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "rails", "3.0.12"
gem "rails", "3.0.15"

gemspec :path=>"../"

0 comments on commit 2900d73

Please sign in to comment.