From 9d14c66f8122e6e5e31374e96f41f596146e53bc Mon Sep 17 00:00:00 2001 From: Piotr Solnica Date: Wed, 14 Sep 2011 09:59:35 +0200 Subject: [PATCH] Set git branch for DM deps in Gemfile --- Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 743e558..61e6bc0 100644 --- a/Gemfile +++ b/Gemfile @@ -8,8 +8,9 @@ DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://g 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 @@ -45,18 +46,18 @@ 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 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