Gemfile in dm-timestamps-1.2.0.rc1 vs Gemfile in dm-timestamps-1.2.0.rc2

- old
+ new

@@ -3,15 +3,18 @@ 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' DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ] +CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master') -gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}" +gem 'dm-core', DM_VERSION, + SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", + :branch => CURRENT_BRANCH group :development do gem 'jeweler', '~> 1.6.4' gem 'rake', '~> 0.9.2' @@ -21,11 +24,10 @@ platforms :mri_18 do group :quality do gem 'rcov', '~> 0.9.10' - gem 'reek', '~> 1.2.8' gem 'yard', '~> 0.7.2' gem 'yardstick', '~> 0.4' end end @@ -44,20 +46,26 @@ do_adapters.each do |adapter| adapter = 'sqlite3' if adapter == 'sqlite' 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 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 plugins = ENV['PLUGINS'] || ENV['PLUGIN'] plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq plugins.each do |plugin| - gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}" + gem plugin, DM_VERSION, + SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}", + :branch => CURRENT_BRANCH end end