diff --git a/Gemfile b/Gemfile index 923c072..ad2bd6b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,24 +2,29 @@ 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' -DO_VERSION = '~> 0.10.2' +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' +DO_VERSION = '~> 0.10.6' +CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master') do_options = {} do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true' gem 'do_postgres', DO_VERSION, do_options.dup -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 group :development do - gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}" - gem 'jeweler', '~> 1.5.2' - gem 'rake', '~> 0.8.7' - gem 'rspec', '~> 1.3.1' + gem 'dm-migrations', DM_VERSION, + SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}", + :branch => CURRENT_BRANCH + + gem 'jeweler', '~> 1.6.4' + gem 'rspec', '~> 1.3.2' end @@ -35,14 +40,19 @@ end group :datamapper do - 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 'data_objects', DO_VERSION, do_options.dup 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 diff --git a/Rakefile b/Rakefile index 0cca3b6..275087d 100644 --- a/Rakefile +++ b/Rakefile @@ -2,7 +2,7 @@ require 'rubygems' require 'rake' begin - gem 'jeweler', '~> 1.5.2' + gem 'jeweler', '~> 1.6.4' require 'jeweler' Jeweler::Tasks.new do |gem| @@ -12,7 +12,6 @@ begin gem.email = 'dan.kubb@gmail.com' gem.homepage = 'http://github.com/datamapper/%s' % gem.name gem.authors = [ 'Dan Kubb' ] - gem.has_rdoc = 'yard' gem.rubyforge_project = 'datamapper' end @@ -21,5 +20,5 @@ begin FileList['tasks/**/*.rake'].each { |task| import task } rescue LoadError - puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2' + puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4' end diff --git a/VERSION b/VERSION index 9084fa2..26aaba0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0 +1.2.0 diff --git a/dm-postgres-adapter.gemspec b/dm-postgres-adapter.gemspec index 0fff778..9cd334b 100644 --- a/dm-postgres-adapter.gemspec +++ b/dm-postgres-adapter.gemspec @@ -4,14 +4,14 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = %q{dm-postgres-adapter} - s.version = "1.1.0" + s.name = "dm-postgres-adapter" + s.version = "1.2.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Kubb"] - s.date = %q{2011-03-16} - s.description = %q{PostgreSQL Adapter for DataMapper} - s.email = %q{dan.kubb@gmail.com} + s.date = "2011-10-09" + s.description = "PostgreSQL Adapter for DataMapper" + s.email = "dan.kubb@gmail.com" s.extra_rdoc_files = [ "LICENSE" ] @@ -32,41 +32,34 @@ Gem::Specification.new do |s| "tasks/yard.rake", "tasks/yardstick.rake" ] - s.homepage = %q{http://github.com/datamapper/dm-postgres-adapter} + s.homepage = "http://github.com/datamapper/dm-postgres-adapter" s.require_paths = ["lib"] - s.rubyforge_project = %q{datamapper} - s.rubygems_version = %q{1.6.2} - s.summary = %q{PostgreSQL Adapter for DataMapper} - s.test_files = [ - "spec/adapter_spec.rb", - "spec/spec_helper.rb" - ] + s.rubyforge_project = "datamapper" + s.rubygems_version = "1.8.11" + s.summary = "PostgreSQL Adapter for DataMapper" if s.respond_to? :specification_version then s.specification_version = 3 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["~> 0.10.2"]) - s.add_runtime_dependency(%q, ["~> 1.1.0"]) - s.add_development_dependency(%q, ["~> 1.1.0"]) - s.add_development_dependency(%q, ["~> 1.5.2"]) - s.add_development_dependency(%q, ["~> 0.8.7"]) - s.add_development_dependency(%q, ["~> 1.3.1"]) + s.add_runtime_dependency(%q, ["~> 0.10.6"]) + s.add_runtime_dependency(%q, ["~> 1.2.0"]) + s.add_development_dependency(%q, ["~> 1.2.0"]) + s.add_development_dependency(%q, ["~> 1.6.4"]) + s.add_development_dependency(%q, ["~> 1.3.2"]) else - s.add_dependency(%q, ["~> 0.10.2"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 1.5.2"]) - s.add_dependency(%q, ["~> 0.8.7"]) - s.add_dependency(%q, ["~> 1.3.1"]) + s.add_dependency(%q, ["~> 0.10.6"]) + s.add_dependency(%q, ["~> 1.2.0"]) + s.add_dependency(%q, ["~> 1.2.0"]) + s.add_dependency(%q, ["~> 1.6.4"]) + s.add_dependency(%q, ["~> 1.3.2"]) end else - s.add_dependency(%q, ["~> 0.10.2"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 1.1.0"]) - s.add_dependency(%q, ["~> 1.5.2"]) - s.add_dependency(%q, ["~> 0.8.7"]) - s.add_dependency(%q, ["~> 1.3.1"]) + s.add_dependency(%q, ["~> 0.10.6"]) + s.add_dependency(%q, ["~> 1.2.0"]) + s.add_dependency(%q, ["~> 1.2.0"]) + s.add_dependency(%q, ["~> 1.6.4"]) + s.add_dependency(%q, ["~> 1.3.2"]) end end