Permalink
Browse files

Merge branch 'release-1.2'

  • Loading branch information...
2 parents d48ad80 + 46b53aa commit f32ff730d82e7155ffa321c8fdcea2e6ee0ff496 @solnic solnic committed Sep 20, 2011
Showing with 14 additions and 7 deletions.
  1. +11 −4 Gemfile
  2. +1 −1 VERSION
  3. +2 −2 lib/dm-core/property/decimal.rb
View
@@ -5,9 +5,10 @@ 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 'addressable', '~> 2.2.6'
gem 'virtus', '~> 0.0.8'
@@ -49,18 +50,24 @@ 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", ENV.fetch('ADAPTER_VERSION', DM_VERSION), SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+ gem "dm-#{adapter}-adapter", ENV.fetch('ADAPTER_VERSION', 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
View
@@ -1 +1 @@
-1.2.0.rc1
+1.2.0.rc2
@@ -17,8 +17,8 @@ def initialize(model, name, options = {})
super
[ :scale, :precision ].each do |key|
- unless options.key?(key)
- warn "options[#{key.inspect}] should be set for #{self.class}, defaulting to #{send(key).inspect}"
+ unless @options.key?(key)
+ warn "options[#{key.inspect}] should be set for #{self.class}, defaulting to #{send(key).inspect} (#{caller.first})"
end
end

0 comments on commit f32ff73

Please sign in to comment.