dm-core 1.1.0.rc1 → 1.1.0.rc2

data/Gemfile

@@ -2,24 +2,22 @@ require 'pathname'
 
 source 'http://rubygems.org'
 
-SOURCE       = ENV.fetch('SOURCE', :git).to_sym
-REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
-DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION   = '~> 1.1.0.rc1'
-
-group :runtime do
-
-  if ENV['EXTLIB']
-    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
-  else
-    gem 'activesupport', '~> 3.0.4', :require => nil
-    gem 'i18n',          '~> 0.5.0'
-  end
-
-  gem 'addressable', '~> 2.2'
-
+SOURCE         = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION     = '~> 1.1.0.rc2'
+DO_VERSION     = '~> 0.10.2'
+DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+
+if ENV['EXTLIB']
+  gem 'extlib',        '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
+else
+  gem 'activesupport', '~> 3.0.4', :require => nil
+  gem 'i18n',          '~> 0.5.0'
 end
 
+gem 'addressable', '~> 2.2.4'
+
 group :development do
 
   gem 'jeweler', '~> 1.5.2'
@@ -28,42 +26,40 @@ group :development do
 
 end
 
-group :quality do
+platforms :mri_18 do
+  group :quality do
 
-  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
-  gem 'yard',      '~> 0.6'
-  gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.9'
+    gem 'yard',      '~> 0.6'
+    gem 'yardstick', '~> 0.2'
 
+  end
 end
 
 group :datamapper do
 
-  gem 'dm-core', DM_VERSION, :path => File.dirname(__FILE__) # Make ourself available to the adapters
-
-  adapters = ENV['ADAPTERS'] || ENV['ADAPTER'] || 'in_memory'
-  adapters = adapters.to_s.tr(',', ' ').split.uniq
+  # Make ourself available to the adapters
+  gem 'dm-core', DM_VERSION, :path => File.dirname(__FILE__)
 
-  DO_VERSION     = '~> 0.10.2'
-  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+  adapters = ENV['ADAPTERS'] || ENV['ADAPTER']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
-    options = {}
-    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
+    do_options = {}
+    do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects', DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, do_options.dup
 
     do_adapters.each do |adapter|
       adapter = 'sqlite3' if adapter == 'sqlite'
-      gem "do_#{adapter}", DO_VERSION, options.dup
+      gem "do_#{adapter}", DO_VERSION, do_options.dup
     end
 
     gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
   end
 
   adapters.each do |adapter|
-    unless adapter == 'in_memory'
-      gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
-    end
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']

data/VERSION

@@ -1 +1 @@
-1.1.0.rc1
+1.1.0.rc2

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.1.0.rc1"
+  s.version = "1.1.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-01}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -411,14 +411,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.2"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.2.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
       s.add_dependency(%q<i18n>, ["~> 0.5.0"])
-      s.add_dependency(%q<addressable>, ["~> 2.2"])
+      s.add_dependency(%q<addressable>, ["~> 2.2.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
@@ -426,7 +426,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
     s.add_dependency(%q<i18n>, ["~> 0.5.0"])
-    s.add_dependency(%q<addressable>, ["~> 2.2"])
+    s.add_dependency(%q<addressable>, ["~> 2.2.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '1.1.0.rc1'
+  VERSION = '1.1.0.rc2'
 end

metadata

@@ -2,7 +2,7 @@
 name: dm-core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors: 
 - Dan Kubb
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.2"
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: *id003