Skip to content

Commit

Permalink
Bump DM dependency to 1.1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
gix committed Mar 8, 2011
1 parent 200edc4 commit d7e2839
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@ source 'http://rubygems.org'
SOURCE = ENV.fetch('SOURCE', :git).to_sym SOURCE = ENV.fetch('SOURCE', :git).to_sym
REPO_POSTFIX = SOURCE == :path ? '' : '.git' REPO_POSTFIX = SOURCE == :path ? '' : '.git'
DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper' DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
DM_VERSION = '~> 1.0.0' DM_VERSION = '>= 1.1.0.rc0'
DM_UVERSION = '< 1.2'
DO_VERSION = '~> 0.10.3' DO_VERSION = '~> 0.10.3'
DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ] DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]


gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}" gem 'dm-core', DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"


group :development do group :development do


gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}" gem 'dm-validations', DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
gem 'dm-constraints', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-constraints#{REPO_POSTFIX}" gem 'dm-constraints', DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/dm-constraints#{REPO_POSTFIX}"


gem 'rake', '~> 0.8.7' gem 'rake', '~> 0.8.7'
gem 'rspec', '~> 1.3' gem 'rspec', '~> 1.3'
gem 'yard', '~> 0.5' gem 'yard', '~> 0.5'
gem 'rcov', '~> 0.9.7' gem 'rcov', '~> 0.9.7'
gem 'jeweler', '~> 1.4' gem 'jeweler', '~> 1.5.2'


end end


Expand Down Expand Up @@ -48,18 +49,18 @@ group :datamapper do
gem "do_#{adapter}", DO_VERSION, do_options.dup gem "do_#{adapter}", DO_VERSION, do_options.dup
end end


gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}" gem 'dm-do-adapter', DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
end end


adapters.each do |adapter| adapters.each do |adapter|
gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}" gem "dm-#{adapter}-adapter", DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
end end


plugins = ENV['PLUGINS'] || ENV['PLUGIN'] plugins = ENV['PLUGINS'] || ENV['PLUGIN']
plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq


plugins.each do |plugin| plugins.each do |plugin|
gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}" gem plugin, DM_VERSION, DM_UVERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
end end


end end
14 changes: 5 additions & 9 deletions Rakefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,29 +2,25 @@ require 'rubygems'
require 'rake' require 'rake'


begin begin

gem 'jeweler', '~> 1.5.2'
require 'jeweler' require 'jeweler'


Jeweler::Tasks.new do |gem| Jeweler::Tasks.new do |gem|

gem.name = 'dm-accepts_nested_attributes' gem.name = 'dm-accepts_nested_attributes'
gem.summary = 'Nested model assignment for datamapper' gem.summary = 'Nested model assignment for datamapper'
gem.description = 'A datamapper plugin that allows nested model assignment like activerecord.' gem.description = 'A datamapper plugin that allows nested model assignment like activerecord.'
gem.email = 'gamsnjaga [a] gmail [d] com' gem.email = 'gamsnjaga [a] gmail [d] com'
gem.homepage = 'http://github.com/snusnu/dm-accepts_nested_attributes' gem.homepage = 'http://github.com/snusnu/dm-accepts_nested_attributes'
gem.authors = [ 'Martin Gamsjaeger (snusnu)' ] gem.authors = [ 'Martin Gamsjaeger (snusnu)' ]

gem.has_rdoc = 'yard'
gem.add_dependency 'dm-core', '~> 1.0.0'

gem.add_development_dependency 'rspec', '~> 1.3'
gem.add_development_dependency 'yard', '~> 0.5'

end end


Jeweler::GemcutterTasks.new Jeweler::GemcutterTasks.new


FileList['tasks/**/*.rake'].each { |task| import task } FileList['tasks/**/*.rake'].each { |task| import task }


rescue LoadError rescue LoadError => e
puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler' puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
puts '-----------------------------------------------------------------------------'
puts e.backtrace # Let's help by actually showing *which* dependency is missing
end end

0 comments on commit d7e2839

Please sign in to comment.