dm-active_model 1.2.0.rc1 → 1.2.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Gemfile +17 -8
  2. data/VERSION +1 -1
  3. data/dm-active_model.gemspec +7 -7
  4. metadata +31 -31
data/Gemfile CHANGED
@@ -2,18 +2,25 @@ require 'pathname'
2
2
 
3
3
  source 'http://rubygems.org'
4
4
 
5
- SOURCE = ENV.fetch('SOURCE', :git).to_sym
6
- REPO_POSTFIX = SOURCE == :path ? '' : '.git'
7
- DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
8
- DM_VERSION = '~> 1.2.0.rc1'
9
- RAILS_VERSION = '~> 3.1.0'
5
+ SOURCE = ENV.fetch('SOURCE', :git).to_sym
6
+ REPO_POSTFIX = SOURCE == :path ? '' : '.git'
7
+ DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
8
+ DM_VERSION = '~> 1.2.0.rc2'
9
+ CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
10
+ RAILS_VERSION = '~> 3.1.0'
11
+
12
+ gem 'dm-core', DM_VERSION,
13
+ SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
14
+ :branch => CURRENT_BRANCH
10
15
 
11
- gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
12
16
  gem 'activemodel', RAILS_VERSION, :require => nil
13
17
 
14
18
  group :development do
15
19
 
16
- gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
20
+ gem 'dm-validations', DM_VERSION,
21
+ SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}",
22
+ :branch => CURRENT_BRANCH
23
+
17
24
  gem 'jeweler', '~> 1.6.4'
18
25
  gem 'rake', '~> 0.9.2'
19
26
  gem 'rspec', '~> 1.3.2'
@@ -37,7 +44,9 @@ group :datamapper do
37
44
  plugins = plugins.to_s.tr(',', ' ').split.uniq
38
45
 
39
46
  plugins.each do |plugin|
40
- gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
47
+ gem plugin, DM_VERSION,
48
+ SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
49
+ :branch => CURRENT_BRANCH
41
50
  end
42
51
 
43
52
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.0.rc1
1
+ 1.2.0.rc2
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "dm-active_model"
8
- s.version = "1.2.0.rc1"
8
+ s.version = "1.2.0.rc2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Martin Gamsjaeger (snusnu)"]
@@ -50,26 +50,26 @@ Gem::Specification.new do |s|
50
50
  s.specification_version = 3
51
51
 
52
52
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
53
- s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
53
+ s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
54
54
  s.add_runtime_dependency(%q<activemodel>, ["~> 3.1.0"])
55
- s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
55
+ s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0.rc2"])
56
56
  s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
57
57
  s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
58
58
  s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
59
59
  s.add_development_dependency(%q<test-unit>, ["= 1.2.3"])
60
60
  else
61
- s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
61
+ s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
62
62
  s.add_dependency(%q<activemodel>, ["~> 3.1.0"])
63
- s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
63
+ s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc2"])
64
64
  s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
65
65
  s.add_dependency(%q<rake>, ["~> 0.9.2"])
66
66
  s.add_dependency(%q<rspec>, ["~> 1.3.2"])
67
67
  s.add_dependency(%q<test-unit>, ["= 1.2.3"])
68
68
  end
69
69
  else
70
- s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
70
+ s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
71
71
  s.add_dependency(%q<activemodel>, ["~> 3.1.0"])
72
- s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
72
+ s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc2"])
73
73
  s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
74
74
  s.add_dependency(%q<rake>, ["~> 0.9.2"])
75
75
  s.add_dependency(%q<rspec>, ["~> 1.3.2"])
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-active_model
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424023
4
+ hash: 15424017
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 1
8
8
  - 2
9
9
  - 0
10
10
  - rc
11
- - 1
12
- version: 1.2.0.rc1
11
+ - 2
12
+ version: 1.2.0.rc2
13
13
  platform: ruby
14
14
  authors:
15
15
  - Martin Gamsjaeger (snusnu)
@@ -17,29 +17,30 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2011-09-09 00:00:00 Z
20
+ date: 2011-09-21 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  type: :runtime
24
- version_requirements: &id001 !ruby/object:Gem::Requirement
24
+ prerelease: false
25
+ requirement: &id001 !ruby/object:Gem::Requirement
25
26
  none: false
26
27
  requirements:
27
28
  - - ~>
28
29
  - !ruby/object:Gem::Version
29
- hash: 15424023
30
+ hash: 15424017
30
31
  segments:
31
32
  - 1
32
33
  - 2
33
34
  - 0
34
35
  - rc
35
- - 1
36
- version: 1.2.0.rc1
37
- prerelease: false
38
- requirement: *id001
36
+ - 2
37
+ version: 1.2.0.rc2
38
+ version_requirements: *id001
39
39
  name: dm-core
40
40
  - !ruby/object:Gem::Dependency
41
41
  type: :runtime
42
- version_requirements: &id002 !ruby/object:Gem::Requirement
42
+ prerelease: false
43
+ requirement: &id002 !ruby/object:Gem::Requirement
43
44
  none: false
44
45
  requirements:
45
46
  - - ~>
@@ -50,30 +51,30 @@ dependencies:
50
51
  - 1
51
52
  - 0
52
53
  version: 3.1.0
53
- prerelease: false
54
- requirement: *id002
54
+ version_requirements: *id002
55
55
  name: activemodel
56
56
  - !ruby/object:Gem::Dependency
57
57
  type: :development
58
- version_requirements: &id003 !ruby/object:Gem::Requirement
58
+ prerelease: false
59
+ requirement: &id003 !ruby/object:Gem::Requirement
59
60
  none: false
60
61
  requirements:
61
62
  - - ~>
62
63
  - !ruby/object:Gem::Version
63
- hash: 15424023
64
+ hash: 15424017
64
65
  segments:
65
66
  - 1
66
67
  - 2
67
68
  - 0
68
69
  - rc
69
- - 1
70
- version: 1.2.0.rc1
71
- prerelease: false
72
- requirement: *id003
70
+ - 2
71
+ version: 1.2.0.rc2
72
+ version_requirements: *id003
73
73
  name: dm-validations
74
74
  - !ruby/object:Gem::Dependency
75
75
  type: :development
76
- version_requirements: &id004 !ruby/object:Gem::Requirement
76
+ prerelease: false
77
+ requirement: &id004 !ruby/object:Gem::Requirement
77
78
  none: false
78
79
  requirements:
79
80
  - - ~>
@@ -84,12 +85,12 @@ dependencies:
84
85
  - 6
85
86
  - 4
86
87
  version: 1.6.4
87
- prerelease: false
88
- requirement: *id004
88
+ version_requirements: *id004
89
89
  name: jeweler
90
90
  - !ruby/object:Gem::Dependency
91
91
  type: :development
92
- version_requirements: &id005 !ruby/object:Gem::Requirement
92
+ prerelease: false
93
+ requirement: &id005 !ruby/object:Gem::Requirement
93
94
  none: false
94
95
  requirements:
95
96
  - - ~>
@@ -100,12 +101,12 @@ dependencies:
100
101
  - 9
101
102
  - 2
102
103
  version: 0.9.2
103
- prerelease: false
104
- requirement: *id005
104
+ version_requirements: *id005
105
105
  name: rake
106
106
  - !ruby/object:Gem::Dependency
107
107
  type: :development
108
- version_requirements: &id006 !ruby/object:Gem::Requirement
108
+ prerelease: false
109
+ requirement: &id006 !ruby/object:Gem::Requirement
109
110
  none: false
110
111
  requirements:
111
112
  - - ~>
@@ -116,12 +117,12 @@ dependencies:
116
117
  - 3
117
118
  - 2
118
119
  version: 1.3.2
119
- prerelease: false
120
- requirement: *id006
120
+ version_requirements: *id006
121
121
  name: rspec
122
122
  - !ruby/object:Gem::Dependency
123
123
  type: :development
124
- version_requirements: &id007 !ruby/object:Gem::Requirement
124
+ prerelease: false
125
+ requirement: &id007 !ruby/object:Gem::Requirement
125
126
  none: false
126
127
  requirements:
127
128
  - - "="
@@ -132,8 +133,7 @@ dependencies:
132
133
  - 2
133
134
  - 3
134
135
  version: 1.2.3
135
- prerelease: false
136
- requirement: *id007
136
+ version_requirements: *id007
137
137
  name: test-unit
138
138
  description: A datamapper plugin for active_model compliance and thus rails 3 compatibility.
139
139
  email: gamsnjaga [a] gmail [d] com