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

- old
+ new

@@ -3,23 +3,30 @@ 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 + gem 'fastercsv', '~> 1.5.4' gem 'multi_json', '~> 1.0.3' gem 'json', '~> 1.5.4', :platforms => [ :ruby_18, :jruby ] gem 'json_pure', '~> 1.5.4', :platforms => [ :mswin ] group :development do - gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}" + gem 'dm-validations', DM_VERSION, + SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}", + :branch => CURRENT_BRANCH + gem 'jeweler', '~> 1.6.4' gem 'rake', '~> 0.9.2' gem 'rspec', '~> 1.3.2' end @@ -55,20 +62,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