librarian-puppet-maestrodev 0.9.11.1 → 0.9.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/README.md +5 -0
  2. data/lib/librarian/puppet/source/git.rb +28 -17
  3. data/lib/librarian/puppet/version.rb +1 -1
  4. metadata +23 -68
data/README.md CHANGED
@@ -54,6 +54,11 @@ This Puppetfile will download all the dependencies listed in your Modulefile fro
54
54
  *See [jenkins-appliance](https://github.com/aussielunix/jenkins-appliance) for
55
55
  a puppet repo already setup to use librarian-puppet.*
56
56
 
57
+ ### Recursive module dependency resolving
58
+
59
+ When fetching a module from a `:git`-source all dependencies specified in its
60
+ `Modulefile` and `Puppetfile` will be resolved and installed.
61
+
57
62
  ### Puppetfile Breakdown
58
63
 
59
64
  forge "http://forge.puppetlabs.com"
data/lib/librarian/puppet/source/git.rb CHANGED
@@ -67,10 +67,27 @@ module Librarian
67
67
  end
68
68
 
69
69
  def fetch_dependencies(name, version, extra)
70
- dependencies.map do |k, v|
71
- v = Requirement.new(v).gem_requirement
72
- Dependency.new(k, v, forge_source)
70
+ dependencies = []
71
+
72
+ if modulefile?
73
+ metadata = ::Puppet::ModuleTool::Metadata.new
74
+
75
+ ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
76
+
77
+ metadata.dependencies.each do |dependency|
78
+ name = dependency.instance_variable_get(:@full_module_name)
79
+ version = dependency.instance_variable_get(:@version_requirement)
80
+ gem_requirement = Requirement.new(version).gem_requirement
81
+ dependencies.push Dependency.new(name, gem_requirement, forge_source)
82
+ end
83
+ end
84
+
85
+ if specfile?
86
+ spec = environment.dsl(Pathname(specfile))
87
+ dependencies.concat spec.dependencies
73
88
  end
89
+
90
+ dependencies
74
91
  end
75
92
 
76
93
  def forge_source
@@ -89,20 +106,6 @@ module Librarian
89
106
  metadata.version
90
107
  end
91
108
 
92
- def dependencies
93
- return {} unless modulefile?
94
-
95
- metadata = ::Puppet::ModuleTool::Metadata.new
96
-
97
- ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
98
-
99
- metadata.dependencies.inject({}) do |h, dependency|
100
- name = dependency.instance_variable_get(:@full_module_name)
101
- version = dependency.instance_variable_get(:@version_requirement)
102
- h.update(name => version)
103
- end
104
- end
105
-
106
109
  def modulefile
107
110
  File.join(filesystem_path, 'Modulefile')
108
111
  end
@@ -111,6 +114,14 @@ module Librarian
111
114
  File.exists?(modulefile)
112
115
  end
113
116
 
117
+ def specfile
118
+ File.join(filesystem_path, environment.specfile_name)
119
+ end
120
+
121
+ def specfile?
122
+ File.exists?(specfile)
123
+ end
124
+
114
125
  end
115
126
  end
116
127
  end
data/lib/librarian/puppet/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Librarian
2
2
  module Puppet
3
- VERSION = "0.9.11.1"
3
+ VERSION = "0.9.11.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: librarian-puppet-maestrodev
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.11.1
4
+ version: 0.9.11.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-12-16 00:00:00.000000000 Z
12
+ date: 2014-01-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: librarian
16
- requirement: !ruby/object:Gem::Requirement
16
+ requirement: &9016520 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
21
21
  version: 0.1.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
29
- version: 0.1.1
24
+ version_requirements: *9016520
30
25
  - !ruby/object:Gem::Dependency
31
26
  name: json
32
- requirement: !ruby/object:Gem::Requirement
27
+ requirement: &9016000 !ruby/object:Gem::Requirement
33
28
  none: false
34
29
  requirements:
35
30
  - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
37
32
  version: '0'
38
33
  type: :runtime
39
34
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
35
+ version_requirements: *9016000
46
36
  - !ruby/object:Gem::Dependency
47
37
  name: rake
48
- requirement: !ruby/object:Gem::Requirement
38
+ requirement: &9015400 !ruby/object:Gem::Requirement
49
39
  none: false
50
40
  requirements:
51
41
  - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
53
43
  version: '0'
54
44
  type: :development
55
45
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
46
+ version_requirements: *9015400
62
47
  - !ruby/object:Gem::Dependency
63
48
  name: rspec
64
- requirement: !ruby/object:Gem::Requirement
49
+ requirement: &9014940 !ruby/object:Gem::Requirement
65
50
  none: false
66
51
  requirements:
67
52
  - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
69
54
  version: '0'
70
55
  type: :development
71
56
  prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
- requirements:
75
- - - ! '>='
76
- - !ruby/object:Gem::Version
77
- version: '0'
57
+ version_requirements: *9014940
78
58
  - !ruby/object:Gem::Dependency
79
59
  name: cucumber
80
- requirement: !ruby/object:Gem::Requirement
60
+ requirement: &9014460 !ruby/object:Gem::Requirement
81
61
  none: false
82
62
  requirements:
83
63
  - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
85
65
  version: '0'
86
66
  type: :development
87
67
  prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
93
- version: '0'
68
+ version_requirements: *9014460
94
69
  - !ruby/object:Gem::Dependency
95
70
  name: aruba
96
- requirement: !ruby/object:Gem::Requirement
71
+ requirement: &9013760 !ruby/object:Gem::Requirement
97
72
  none: false
98
73
  requirements:
99
74
  - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
101
76
  version: '0'
102
77
  type: :development
103
78
  prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
109
- version: '0'
79
+ version_requirements: *9013760
110
80
  - !ruby/object:Gem::Dependency
111
81
  name: puppet
112
- requirement: !ruby/object:Gem::Requirement
82
+ requirement: &9029000 !ruby/object:Gem::Requirement
113
83
  none: false
114
84
  requirements:
115
85
  - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
117
87
  version: '0'
118
88
  type: :development
119
89
  prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
- requirements:
123
- - - ! '>='
124
- - !ruby/object:Gem::Version
125
- version: '0'
90
+ version_requirements: *9029000
126
91
  - !ruby/object:Gem::Dependency
127
92
  name: minitest
128
- requirement: !ruby/object:Gem::Requirement
93
+ requirement: &9027820 !ruby/object:Gem::Requirement
129
94
  none: false
130
95
  requirements:
131
96
  - - ~>
@@ -133,15 +98,10 @@ dependencies:
133
98
  version: '5'
134
99
  type: :development
135
100
  prerelease: false
136
- version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
- requirements:
139
- - - ~>
140
- - !ruby/object:Gem::Version
141
- version: '5'
101
+ version_requirements: *9027820
142
102
  - !ruby/object:Gem::Dependency
143
103
  name: mocha
144
- requirement: !ruby/object:Gem::Requirement
104
+ requirement: &9026840 !ruby/object:Gem::Requirement
145
105
  none: false
146
106
  requirements:
147
107
  - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
149
109
  version: '0'
150
110
  type: :development
151
111
  prerelease: false
152
- version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
- requirements:
155
- - - ! '>='
156
- - !ruby/object:Gem::Version
157
- version: '0'
112
+ version_requirements: *9026840
158
113
  description: ! "Simplify deployment of your Puppet infrastructure by\n automatically
159
114
  pulling in modules from the forge and git repositories with\n a single command."
160
115
  email:
@@ -198,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
198
153
  version: '0'
199
154
  segments:
200
155
  - 0
201
- hash: -3890518888719605347
156
+ hash: 1603487387827623136
202
157
  required_rubygems_version: !ruby/object:Gem::Requirement
203
158
  none: false
204
159
  requirements:
@@ -207,10 +162,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
207
162
  version: '0'
208
163
  segments:
209
164
  - 0
210
- hash: -3890518888719605347
165
+ hash: 1603487387827623136
211
166
  requirements: []
212
167
  rubyforge_project:
213
- rubygems_version: 1.8.25
168
+ rubygems_version: 1.8.9
214
169
  signing_key:
215
170
  specification_version: 3
216
171
  summary: Bundler for your Puppet modules