Permalink
Browse files

Updated the Gemfile dependencies.

  • Loading branch information...
1 parent 08c66d0 commit 79640da4eef59ee39a76d4349b0d3a29ea68d284 @postmodern committed Sep 1, 2010
Showing with 55 additions and 33 deletions.
  1. +36 −10 Gemfile
  2. +19 −23 Gemfile.lock
View
46 Gemfile
@@ -1,5 +1,7 @@
source 'http://rubygems.org'
-dm = 'git://github.com/datamapper'
+
+DATA_MAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0'
group :runtime do
# We bundle both AS and extlib while extlib compatibility needs to be kept
@@ -62,12 +64,12 @@ group :runtime do
#
if ENV['EXTLIB']
- gem 'extlib', '~> 0.9.15'
+ gem 'extlib', '~> 0.9.15'
else
- gem 'activesupport', '~> 3.0.0', :require => 'active_support'
+ gem 'activesupport', '~> 3.0.0', :require => 'active_support'
end
- gem 'dm-core', '~> 1.0.0'
+ gem 'dm-core', DM_VERSION, :git => "#{DATA_MAPPER}/dm-core.git"
end
group :development do
@@ -83,15 +85,39 @@ group :doc do
gem 'rdiscount', '~> 1.6.3'
end
- gem 'yard', '~> 0.5.3'
+ gem 'yard', '~> 0.6.0'
end
group :test do
- gem 'data_objects', '~> 0.10.2'
- gem 'do_sqlite3', '~> 0.10.2'
- gem 'dm-do-adapter', '~> 1.0.0'
- gem 'dm-sqlite-adapter', '~> 1.0.0'
- gem 'dm-migrations', '~> 1.0.0'
+ adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+ adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+
+ unless adapters.empty?
+ DO_VERSION = '~> 0.10.3'
+ DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+ gem 'data_objects', DO_VERSION, :git => "#{DATA_MAPPER}/do.git"
+
+ adapters.each do |adapter|
+ if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/ }
+ adapter = 'sqlite3' if adapter == 'sqlite'
+ gem "do_#{adapter}", DO_VERSION, :git => "#{DATA_MAPPER}/do.git"
+ end
+ end
+
+ gem 'dm-do-adapter', DM_VERSION, :git => "#{DATA_MAPPER}/dm-do-adapter.git"
+
+ adapters.each do |adapter|
+ gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATA_MAPPER}/dm-#{adapter}-adapter.git"
+ end
+ end
+
+ plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+ plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
+
+ plugins.each do |plugin|
+ gem plugin, DM_VERSION, :git => "#{DATA_MAPPER}/#{plugin}.git"
+ end
end
gem 'rspec', '~> 1.3.0', :group => [:development, :test]
View
@@ -1,23 +1,23 @@
-GEM
- remote: http://rubygems.org/
+GIT
+ remote: git://github.com/datamapper/dm-core.git
+ revision: 613f0593b92f026469cf171b237b4f3bf3db7ac5
specs:
- activesupport (3.0.0)
- addressable (2.2.0)
- data_objects (0.10.2)
- addressable (~> 2.1)
dm-core (1.0.0)
- addressable (~> 2.1)
+ addressable (~> 2.2)
extlib (~> 0.9.15)
- dm-do-adapter (1.0.0)
- data_objects (~> 0.10.1)
- dm-core (~> 1.0.0)
+
+GIT
+ remote: git://github.com/datamapper/dm-migrations.git
+ revision: 6fec31c554f4dcc6773abf27896bf28353df29cd
+ specs:
dm-migrations (1.0.0)
dm-core (~> 1.0.0)
- dm-sqlite-adapter (1.0.0)
- dm-do-adapter (~> 1.0.0)
- do_sqlite3 (~> 0.10.2)
- do_sqlite3 (0.10.2)
- data_objects (= 0.10.2)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ activesupport (3.0.0)
+ addressable (2.2.0)
extlib (0.9.15)
git (1.2.5)
jeweler (1.5.0.pre2)
@@ -27,21 +27,17 @@ GEM
rake (0.8.7)
rdiscount (1.6.5)
rspec (1.3.0)
- yard (0.5.8)
+ yard (0.6.0)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 3.0.0)
- data_objects (~> 0.10.2)
- dm-core (~> 1.0.0)
- dm-do-adapter (~> 1.0.0)
- dm-migrations (~> 1.0.0)
- dm-sqlite-adapter (~> 1.0.0)
- do_sqlite3 (~> 0.10.2)
+ dm-core (~> 1.0.0)!
+ dm-migrations (~> 1.0.0)!
jeweler (~> 1.5.0.pre)
rake (~> 0.8.7)
rdiscount (~> 1.6.3)
rspec (~> 1.3.0)
- yard (~> 0.5.3)
+ yard (~> 0.6.0)

0 comments on commit 79640da

Please sign in to comment.