dm-rails 1.2.0.rc1 → 1.2.0.rc2

data/Gemfile

@@ -5,14 +5,15 @@ 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.2.0.rc1'
+DM_VERSION     = '~> 1.2.0.rc2'
 DO_VERSION     = '~> 0.10.6'
 RAILS_VERSION  = '~> 3.1.0'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
 # DataMapper dependencies
-gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
-gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}"
+gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
+gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
 
 # Rails dependencies
 gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
@@ -51,12 +52,12 @@ group :datamapper do
       gem "do_#{adapter}", DO_VERSION, do_options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
   end
 
-  gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}"
+  gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
   end
 end

data/VERSION

@@ -1 +1 @@
-1.2.0.rc1
+1.2.0.rc2

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-rails"
-  s.version = "1.2.0.rc1"
+  s.version = "1.2.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = "2011-09-09"
+  s.date = "2011-09-14"
   s.description = "Integrate DataMapper with Rails 3"
   s.email = "gamsnjaga@gmail.com"
   s.extra_rdoc_files = [
@@ -65,16 +65,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.2.0.rc2"])
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<railties>, ["~> 3.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc2"])
       s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
       s.add_dependency(%q<railties>, ["~> 3.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -82,8 +82,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc2"])
     s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
     s.add_dependency(%q<railties>, ["~> 3.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424023
+  hash: 15424017
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - rc
-  - 1
-  version: 1.2.0.rc1
+  - 2
+  version: 1.2.0.rc2
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -18,47 +18,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424023
+        hash: 15424017
         segments: 
         - 1
         - 2
         - 0
         - rc
-        - 1
-        version: 1.2.0.rc1
-  prerelease: false
-  requirement: *id001
+        - 2
+        version: 1.2.0.rc2
+  version_requirements: *id001
   name: dm-core
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424023
+        hash: 15424017
         segments: 
         - 1
         - 2
         - 0
         - rc
-        - 1
-        version: 1.2.0.rc1
-  prerelease: false
-  requirement: *id002
+        - 2
+        version: 1.2.0.rc2
+  version_requirements: *id002
   name: dm-active_model
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -69,12 +70,12 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
   name: actionpack
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,12 +86,12 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
   name: railties
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,12 +102,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  requirement: *id005
+  version_requirements: *id005
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,12 +118,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  prerelease: false
-  requirement: *id006
+  version_requirements: *id006
   name: rake
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,8 +134,7 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  prerelease: false
-  requirement: *id007
+  version_requirements: *id007
   name: rspec
 description: Integrate DataMapper with Rails 3
 email: gamsnjaga@gmail.com