github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-09 14:58:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not depend on orm_adapter git repo.

Browse Source
This commit is contained in:
José Valim
2010-10-10 22:06:53 +02:00
parent 8a8ba6c70c
commit 8539f5f915
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@@ -7,12 +7,6 @@ gem "webrat", "0.7.1"
gem "mocha", :require => false
gem "oauth2"
if File.exist?("../orm_adapter")
gem "orm_adapter", :path => "../orm_adapter"
else
gem "orm_adapter", :git => "http://github.com/ianwhite/orm_adapter.git"
end
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end

9
Gemfile.lock
View File

@@ -3,13 +3,9 @@ PATH
specs:
devise (1.2.rc)
bcrypt-ruby (~> 2.1.2)
orm_adapter (~> 0.0.2)
warden (~> 1.0.0)
PATH
remote: /Users/jose/Work/github/orm_adapter
specs:
orm_adapter (0.0.1)
GEM
remote: http://rubygems.org/
specs:
@@ -80,6 +76,7 @@ GEM
oauth2 (0.0.13)
faraday (~> 0.4.1)
multi_json (>= 0.0.4)
orm_adapter (0.0.2)
polyglot (0.3.1)
rack (1.2.1)
rack-mount (0.6.13)
@@ -131,7 +128,7 @@ DEPENDENCIES
mongo (= 1.0.7)
mongoid (= 2.0.0.beta.18)
oauth2
orm_adapter!
orm_adapter (~> 0.0.2)
rails (= 3.0.0)
ruby-debug (>= 0.10.3)
sqlite3-ruby

1
Rakefile
View File

@@ -47,6 +47,7 @@ begin
s.files = root_files + FileList["{app,config,lib}/**/*"]
s.extra_rdoc_files = root_files
s.add_dependency("warden", "~> 1.0.0")
s.add_dependency("orm_adapter", "~> 0.0.2")
s.add_dependency("bcrypt-ruby", "~> 2.1.2")
end

5
devise.gemspec
View File

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
s.date = %q{2010-09-27}
s.date = %q{2010-10-10}
s.description = %q{Flexible authentication solution for Rails with Warden}
s.email = %q{contact@plataformatec.com.br}
s.extra_rdoc_files = [
@@ -192,13 +192,16 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<warden>, ["~> 1.0.0"])
s.add_runtime_dependency(%q<orm_adapter>, ["~> 0.0.2"])
s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
else
s.add_dependency(%q<warden>, ["~> 1.0.0"])
s.add_dependency(%q<orm_adapter>, ["~> 0.0.2"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
end
else
s.add_dependency(%q<warden>, ["~> 1.0.0"])
s.add_dependency(%q<orm_adapter>, ["~> 0.0.2"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
end
end