dm-is-versioned 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.
data/Gemfile CHANGED
@@ -5,11 +5,14 @@ source 'http://rubygems.org'
5
5
  SOURCE = ENV.fetch('SOURCE', :git).to_sym
6
6
  REPO_POSTFIX = SOURCE == :path ? '' : '.git'
7
7
  DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
8
- DM_VERSION = '~> 1.2.0.rc1'
8
+ DM_VERSION = '~> 1.2.0.rc2'
9
9
  DO_VERSION = '~> 0.10.6'
10
10
  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
11
+ CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
11
12
 
12
- gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
13
+ gem 'dm-core', DM_VERSION,
14
+ SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
15
+ :branch => CURRENT_BRANCH
13
16
 
14
17
  group :development do
15
18
 
@@ -45,18 +48,24 @@ group :datamapper do
45
48
  gem "do_#{adapter}", DO_VERSION, do_options.dup
46
49
  end
47
50
 
48
- gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
51
+ gem 'dm-do-adapter', DM_VERSION,
52
+ SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
53
+ :branch => CURRENT_BRANCH
49
54
  end
50
55
 
51
56
  adapters.each do |adapter|
52
- gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
57
+ gem "dm-#{adapter}-adapter", DM_VERSION,
58
+ SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}",
59
+ :branch => CURRENT_BRANCH
53
60
  end
54
61
 
55
62
  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
56
63
  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
57
64
 
58
65
  plugins.each do |plugin|
59
- gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
66
+ gem plugin, DM_VERSION,
67
+ SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
68
+ :branch => CURRENT_BRANCH
60
69
  end
61
70
 
62
71
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.0.rc1
1
+ 1.2.0.rc2
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "dm-is-versioned"
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 = ["Bernerd Schaefer"]
12
- s.date = "2011-09-09"
12
+ s.date = "2011-09-14"
13
13
  s.description = "DataMapper plugin enabling simple versioning of models"
14
14
  s.email = "bernerd [a] wieck [d] com"
15
15
  s.extra_rdoc_files = [
@@ -43,18 +43,18 @@ Gem::Specification.new do |s|
43
43
  s.specification_version = 3
44
44
 
45
45
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
46
- s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
46
+ s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
47
47
  s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
48
48
  s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
49
49
  s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
50
50
  else
51
- s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
51
+ s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
52
52
  s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
53
53
  s.add_dependency(%q<rake>, ["~> 0.9.2"])
54
54
  s.add_dependency(%q<rspec>, ["~> 1.3.2"])
55
55
  end
56
56
  else
57
- s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
57
+ s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
58
58
  s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
59
59
  s.add_dependency(%q<rake>, ["~> 0.9.2"])
60
60
  s.add_dependency(%q<rspec>, ["~> 1.3.2"])
@@ -119,7 +119,7 @@ module DataMapper
119
119
  def versions
120
120
  version_model = model.const_get(:Version)
121
121
  query = Hash[ model.key.zip(key).map { |p, v| [ p.name, v ] } ]
122
- query.merge(:order => version_model.key.map { |k| k.name.desc })
122
+ query.merge!(:order => version_model.key.map { |k| k.name.desc })
123
123
  version_model.all(query)
124
124
  end
125
125
  end # InstanceMethods
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-is-versioned
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
  - Bernerd Schaefer
@@ -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: :development
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,12 +51,12 @@ dependencies:
50
51
  - 6
51
52
  - 4
52
53
  version: 1.6.4
53
- prerelease: false
54
- requirement: *id002
54
+ version_requirements: *id002
55
55
  name: jeweler
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
  - - ~>
@@ -66,12 +67,12 @@ dependencies:
66
67
  - 9
67
68
  - 2
68
69
  version: 0.9.2
69
- prerelease: false
70
- requirement: *id003
70
+ version_requirements: *id003
71
71
  name: rake
72
72
  - !ruby/object:Gem::Dependency
73
73
  type: :development
74
- version_requirements: &id004 !ruby/object:Gem::Requirement
74
+ prerelease: false
75
+ requirement: &id004 !ruby/object:Gem::Requirement
75
76
  none: false
76
77
  requirements:
77
78
  - - ~>
@@ -82,8 +83,7 @@ dependencies:
82
83
  - 3
83
84
  - 2
84
85
  version: 1.3.2
85
- prerelease: false
86
- requirement: *id004
86
+ version_requirements: *id004
87
87
  name: rspec
88
88
  description: DataMapper plugin enabling simple versioning of models
89
89
  email: bernerd [a] wieck [d] com