Gemfile in dm-is-remixable-1.1.0.rc1 vs Gemfile in dm-is-remixable-1.1.0.rc2

- old
+ new

@@ -1,61 +1,51 @@ 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' +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 ] -group :runtime do +gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}" - 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 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}" - -end - group :development do gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}" gem 'dm-types', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-types#{REPO_POSTFIX}" gem 'jeweler', '~> 1.5.2' gem 'rake', '~> 0.8.7' gem 'rspec', '~> 1.3.1' 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 adapters = ENV['ADAPTER'] || ENV['ADAPTERS'] adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ] - DO_VERSION = '~> 0.10.2' - DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ] - 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