simp-rake-helpers 3.0.0 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/lib/simp/rake/build/constants.rb +1 -1
  4. data/lib/simp/rake/build/pkg.rb +15 -4
  5. data/lib/simp/rake/helpers/rpm_spec.rb +5 -0
  6. data/lib/simp/rake/helpers/version.rb +1 -1
  7. metadata +63 -63
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3dc63bb56b51334e5e5a31fa9a6d843889174561
4
- data.tar.gz: 7eee12246c9f05e1c2af04ab158ee2c6bcb8e266
3
+ metadata.gz: efe677e7e859802df732b13dd3835d71b6c05dd0
4
+ data.tar.gz: 488113e4842dea057ae1d719625505674c6474bc
5
5
  SHA512:
6
- metadata.gz: fa82d78040ca5e394ef902e09552099810267729b4c285a464ce80c6f05b07031bcf20f6cabf5d6bb935c8f689ec01c7722410670bdaf2b796f255c05c4e3012
7
- data.tar.gz: 1cb550b16bc737f5ee25e2fffd23b3fdedf466ce4b5e73f68275be40a47527c277c03417a03491573a21a7fa2cd7f2daaa032efc296ba27d202eeece057c6225
6
+ metadata.gz: 42c8e4e9b38aff156a4ff5aa493f03e4f5a1a1192fc10839dc5bc55b9469b526a278df8160fd3e9f1692c0a060923201d49346ad1bcb060ec6e26fde013ecb2b
7
+ data.tar.gz: 0ca86b3f3c265d513dde50e16ad09543a91b6a544aa219d0acc3162403050ff3cfad28c5ef4a5e62d961b7aacf063d3d015c9e17a50c7aabd42d6568d02efb8c
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ### 3.0.1 / 2016-10-28
2
+ * Updated to provide backwards compatibility for SIMP 4 and 5
3
+
1
4
  ### 3.0.0 / 2016-09-22
2
5
  * Updated the RPM spec template to handle the new SIMP 6 requirements
3
6
 
data/lib/simp/rake/build/constants.rb CHANGED
@@ -16,7 +16,7 @@ module Simp::Rake::Build::Constants
16
16
  @spec_file = FileList["#{@spec_dir}/*.spec"]
17
17
  @target_dists = ['CentOS','RHEL'] # The first item is the default build...
18
18
  @simp_version = Simp::RPM.get_info("#{@spec_dir}/simp.spec")[:full_version]
19
- @rhel_version = ENV['rhel_version'] || '6'
19
+ @rhel_version = ENV['rhel_version'] || '7'
20
20
  @simp_dvd_dirs = ["SIMP","ks","Config"]
21
21
  end
22
22
  end
data/lib/simp/rake/build/pkg.rb CHANGED
@@ -41,7 +41,10 @@ module Simp::Rake::Build
41
41
  "#{@build_dir}/GPGKEYS",
42
42
  "#{@src_dir}/rsync",
43
43
  # Anything in here gets built!
44
- "#{@src_dir}/assets/*"
44
+ "#{@src_dir}/assets/*",
45
+ # Legacy Compat
46
+ "#{@src_dir}/utils",
47
+ "#{@src_dir}/puppet/bootstrap"
45
48
  ],
46
49
  :doc => "#{@src_dir}/doc",
47
50
  :simp_cli => "#{@src_dir}/rubygems/simp_cli",
@@ -666,7 +669,8 @@ protect=1
666
669
  unique_build = (get_cpu_limit != 1)
667
670
 
668
671
  rake_flags = Rake.application.options.trace ? '--trace' : ''
669
- cmd = %{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
672
+
673
+ cmd = %{SIMP_BUILD_version=#{@simp_version} rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
670
674
  begin
671
675
  if _verbose
672
676
  $stderr.puts("Running 'rake pkg:rpm'")
@@ -698,16 +702,23 @@ protect=1
698
702
  raise("No RPMs generated for #{dir}") if rpms.empty?
699
703
 
700
704
  # Glob all generated rpms, and add their metadata to a result array.
701
- pkginfo = Hash.new
702
705
  rpms.each do |rpm|
703
706
  # get_info from each generated rpm, not the spec file, so macros in the
704
707
  # metadata have already been resolved in the mock chroot.
705
- result << Simp::RPM.get_info(rpm)
708
+ metadata = Simp::RPM.get_info(rpm)
709
+
710
+ if File.exist?('build/package_metadata.yaml')
711
+ metadata.merge!(YAML.load_file('build/package_metadata.yaml'))
712
+ end
713
+
714
+ result << metadata
706
715
  end
707
716
  else
708
717
  puts "Warning: Could not find Rakefile in '#{dir}'"
709
718
  end
710
719
  end
720
+
721
+ result
711
722
  end
712
723
 
713
724
  metadata.each do |mod|
data/lib/simp/rake/helpers/rpm_spec.rb CHANGED
@@ -2,8 +2,13 @@ module Simp; end
2
2
  module Simp::Rake; end
3
3
  class Simp::Rake::Helpers
4
4
  module Simp::Rake::Helpers::RPMSpec
5
+ require 'simp/rake/build/constants'
6
+
7
+ include Simp::Rake::Build::Constants
8
+
5
9
  def self.template
6
10
  simp_version = ENV.fetch('SIMP_BUILD_version', @simp_version)
11
+
7
12
  if simp_version
8
13
  simp_main_version = simp_version.split('.').first
9
14
  else
data/lib/simp/rake/helpers/version.rb CHANGED
@@ -2,5 +2,5 @@ module Simp; end
2
2
  module Simp::Rake; end
3
3
 
4
4
  class Simp::Rake::Helpers
5
- VERSION = '3.0.0'
5
+ VERSION = '3.0.1'
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-rake-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,374 +9,374 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-10-27 00:00:00.000000000 Z
12
+ date: 2016-11-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '1.0'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '1.0'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rake
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - '>='
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: '10.0'
35
- - - <
35
+ - - "<"
36
36
  - !ruby/object:Gem::Version
37
37
  version: '12.0'
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  requirements:
42
- - - '>='
42
+ - - ">="
43
43
  - !ruby/object:Gem::Version
44
44
  version: '10.0'
45
- - - <
45
+ - - "<"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '12.0'
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: coderay
50
50
  requirement: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '1.0'
55
55
  type: :runtime
56
56
  prerelease: false
57
57
  version_requirements: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.0'
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: puppet
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '3.0'
69
69
  type: :runtime
70
70
  prerelease: false
71
71
  version_requirements: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '3.0'
76
76
  - !ruby/object:Gem::Dependency
77
77
  name: puppet-lint
78
78
  requirement: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.0'
83
- - - <
83
+ - - "<"
84
84
  - !ruby/object:Gem::Version
85
85
  version: '3.0'
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
89
89
  requirements:
90
- - - '>='
90
+ - - ">="
91
91
  - !ruby/object:Gem::Version
92
92
  version: '1.0'
93
- - - <
93
+ - - "<"
94
94
  - !ruby/object:Gem::Version
95
95
  version: '3.0'
96
96
  - !ruby/object:Gem::Dependency
97
97
  name: puppetlabs_spec_helper
98
98
  requirement: !ruby/object:Gem::Requirement
99
99
  requirements:
100
- - - ~>
100
+ - - "~>"
101
101
  - !ruby/object:Gem::Version
102
102
  version: '0.0'
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - ~>
107
+ - - "~>"
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0.0'
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: parallel
112
112
  requirement: !ruby/object:Gem::Requirement
113
113
  requirements:
114
- - - ~>
114
+ - - "~>"
115
115
  - !ruby/object:Gem::Version
116
116
  version: '1.0'
117
117
  type: :runtime
118
118
  prerelease: false
119
119
  version_requirements: !ruby/object:Gem::Requirement
120
120
  requirements:
121
- - - ~>
121
+ - - "~>"
122
122
  - !ruby/object:Gem::Version
123
123
  version: '1.0'
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: simp-rspec-puppet-facts
126
126
  requirement: !ruby/object:Gem::Requirement
127
127
  requirements:
128
- - - ~>
128
+ - - "~>"
129
129
  - !ruby/object:Gem::Version
130
130
  version: '1.0'
131
131
  type: :runtime
132
132
  prerelease: false
133
133
  version_requirements: !ruby/object:Gem::Requirement
134
134
  requirements:
135
- - - ~>
135
+ - - "~>"
136
136
  - !ruby/object:Gem::Version
137
137
  version: '1.0'
138
138
  - !ruby/object:Gem::Dependency
139
139
  name: puppet-blacksmith
140
140
  requirement: !ruby/object:Gem::Requirement
141
141
  requirements:
142
- - - ~>
142
+ - - "~>"
143
143
  - !ruby/object:Gem::Version
144
144
  version: '3.3'
145
145
  type: :runtime
146
146
  prerelease: false
147
147
  version_requirements: !ruby/object:Gem::Requirement
148
148
  requirements:
149
- - - ~>
149
+ - - "~>"
150
150
  - !ruby/object:Gem::Version
151
151
  version: '3.3'
152
152
  - !ruby/object:Gem::Dependency
153
153
  name: simp-beaker-helpers
154
154
  requirement: !ruby/object:Gem::Requirement
155
155
  requirements:
156
- - - ~>
156
+ - - "~>"
157
157
  - !ruby/object:Gem::Version
158
158
  version: '1.0'
159
159
  type: :runtime
160
160
  prerelease: false
161
161
  version_requirements: !ruby/object:Gem::Requirement
162
162
  requirements:
163
- - - ~>
163
+ - - "~>"
164
164
  - !ruby/object:Gem::Version
165
165
  version: '1.0'
166
166
  - !ruby/object:Gem::Dependency
167
167
  name: parallel_tests
168
168
  requirement: !ruby/object:Gem::Requirement
169
169
  requirements:
170
- - - ~>
170
+ - - "~>"
171
171
  - !ruby/object:Gem::Version
172
172
  version: '2.4'
173
173
  type: :runtime
174
174
  prerelease: false
175
175
  version_requirements: !ruby/object:Gem::Requirement
176
176
  requirements:
177
- - - ~>
177
+ - - "~>"
178
178
  - !ruby/object:Gem::Version
179
179
  version: '2.4'
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: r10k
182
182
  requirement: !ruby/object:Gem::Requirement
183
183
  requirements:
184
- - - ~>
184
+ - - "~>"
185
185
  - !ruby/object:Gem::Version
186
186
  version: '2.2'
187
187
  type: :runtime
188
188
  prerelease: false
189
189
  version_requirements: !ruby/object:Gem::Requirement
190
190
  requirements:
191
- - - ~>
191
+ - - "~>"
192
192
  - !ruby/object:Gem::Version
193
193
  version: '2.2'
194
194
  - !ruby/object:Gem::Dependency
195
195
  name: pager
196
196
  requirement: !ruby/object:Gem::Requirement
197
197
  requirements:
198
- - - '>='
198
+ - - ">="
199
199
  - !ruby/object:Gem::Version
200
200
  version: '0'
201
201
  type: :runtime
202
202
  prerelease: false
203
203
  version_requirements: !ruby/object:Gem::Requirement
204
204
  requirements:
205
- - - '>='
205
+ - - ">="
206
206
  - !ruby/object:Gem::Version
207
207
  version: '0'
208
208
  - !ruby/object:Gem::Dependency
209
209
  name: rspec
210
210
  requirement: !ruby/object:Gem::Requirement
211
211
  requirements:
212
- - - ~>
212
+ - - "~>"
213
213
  - !ruby/object:Gem::Version
214
214
  version: '3.0'
215
215
  type: :runtime
216
216
  prerelease: false
217
217
  version_requirements: !ruby/object:Gem::Requirement
218
218
  requirements:
219
- - - ~>
219
+ - - "~>"
220
220
  - !ruby/object:Gem::Version
221
221
  version: '3.0'
222
222
  - !ruby/object:Gem::Dependency
223
223
  name: beaker
224
224
  requirement: !ruby/object:Gem::Requirement
225
225
  requirements:
226
- - - ~>
226
+ - - "~>"
227
227
  - !ruby/object:Gem::Version
228
228
  version: '2.0'
229
229
  type: :runtime
230
230
  prerelease: false
231
231
  version_requirements: !ruby/object:Gem::Requirement
232
232
  requirements:
233
- - - ~>
233
+ - - "~>"
234
234
  - !ruby/object:Gem::Version
235
235
  version: '2.0'
236
236
  - !ruby/object:Gem::Dependency
237
237
  name: beaker-rspec
238
238
  requirement: !ruby/object:Gem::Requirement
239
239
  requirements:
240
- - - ~>
240
+ - - "~>"
241
241
  - !ruby/object:Gem::Version
242
242
  version: '5.0'
243
243
  type: :runtime
244
244
  prerelease: false
245
245
  version_requirements: !ruby/object:Gem::Requirement
246
246
  requirements:
247
- - - ~>
247
+ - - "~>"
248
248
  - !ruby/object:Gem::Version
249
249
  version: '5.0'
250
250
  - !ruby/object:Gem::Dependency
251
251
  name: rspec-core
252
252
  requirement: !ruby/object:Gem::Requirement
253
253
  requirements:
254
- - - ~>
254
+ - - "~>"
255
255
  - !ruby/object:Gem::Version
256
256
  version: '3.0'
257
257
  type: :runtime
258
258
  prerelease: false
259
259
  version_requirements: !ruby/object:Gem::Requirement
260
260
  requirements:
261
- - - ~>
261
+ - - "~>"
262
262
  - !ruby/object:Gem::Version
263
263
  version: '3.0'
264
264
  - !ruby/object:Gem::Dependency
265
265
  name: listen
266
266
  requirement: !ruby/object:Gem::Requirement
267
267
  requirements:
268
- - - ~>
268
+ - - "~>"
269
269
  - !ruby/object:Gem::Version
270
270
  version: 3.0.6
271
271
  type: :runtime
272
272
  prerelease: false
273
273
  version_requirements: !ruby/object:Gem::Requirement
274
274
  requirements:
275
- - - ~>
275
+ - - "~>"
276
276
  - !ruby/object:Gem::Version
277
277
  version: 3.0.6
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: gitlog-md
280
280
  requirement: !ruby/object:Gem::Requirement
281
281
  requirements:
282
- - - ~>
282
+ - - "~>"
283
283
  - !ruby/object:Gem::Version
284
284
  version: '0'
285
285
  type: :development
286
286
  prerelease: false
287
287
  version_requirements: !ruby/object:Gem::Requirement
288
288
  requirements:
289
- - - ~>
289
+ - - "~>"
290
290
  - !ruby/object:Gem::Version
291
291
  version: '0'
292
292
  - !ruby/object:Gem::Dependency
293
293
  name: pry
294
294
  requirement: !ruby/object:Gem::Requirement
295
295
  requirements:
296
- - - ~>
296
+ - - "~>"
297
297
  - !ruby/object:Gem::Version
298
298
  version: '0.0'
299
299
  type: :development
300
300
  prerelease: false
301
301
  version_requirements: !ruby/object:Gem::Requirement
302
302
  requirements:
303
- - - ~>
303
+ - - "~>"
304
304
  - !ruby/object:Gem::Version
305
305
  version: '0.0'
306
306
  - !ruby/object:Gem::Dependency
307
307
  name: pry-doc
308
308
  requirement: !ruby/object:Gem::Requirement
309
309
  requirements:
310
- - - ~>
310
+ - - "~>"
311
311
  - !ruby/object:Gem::Version
312
312
  version: '0.0'
313
313
  type: :development
314
314
  prerelease: false
315
315
  version_requirements: !ruby/object:Gem::Requirement
316
316
  requirements:
317
- - - ~>
317
+ - - "~>"
318
318
  - !ruby/object:Gem::Version
319
319
  version: '0.0'
320
320
  - !ruby/object:Gem::Dependency
321
321
  name: highline
322
322
  requirement: !ruby/object:Gem::Requirement
323
323
  requirements:
324
- - - ~>
324
+ - - "~>"
325
325
  - !ruby/object:Gem::Version
326
326
  version: '1.6'
327
- - - '>'
327
+ - - ">"
328
328
  - !ruby/object:Gem::Version
329
329
  version: 1.6.1
330
330
  type: :development
331
331
  prerelease: false
332
332
  version_requirements: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - ~>
334
+ - - "~>"
335
335
  - !ruby/object:Gem::Version
336
336
  version: '1.6'
337
- - - '>'
337
+ - - ">"
338
338
  - !ruby/object:Gem::Version
339
339
  version: 1.6.1
340
340
  - !ruby/object:Gem::Dependency
341
341
  name: guard
342
342
  requirement: !ruby/object:Gem::Requirement
343
343
  requirements:
344
- - - ~>
344
+ - - "~>"
345
345
  - !ruby/object:Gem::Version
346
346
  version: '2.0'
347
347
  type: :development
348
348
  prerelease: false
349
349
  version_requirements: !ruby/object:Gem::Requirement
350
350
  requirements:
351
- - - ~>
351
+ - - "~>"
352
352
  - !ruby/object:Gem::Version
353
353
  version: '2.0'
354
354
  - !ruby/object:Gem::Dependency
355
355
  name: guard-shell
356
356
  requirement: !ruby/object:Gem::Requirement
357
357
  requirements:
358
- - - ~>
358
+ - - "~>"
359
359
  - !ruby/object:Gem::Version
360
360
  version: '0.0'
361
361
  type: :development
362
362
  prerelease: false
363
363
  version_requirements: !ruby/object:Gem::Requirement
364
364
  requirements:
365
- - - ~>
365
+ - - "~>"
366
366
  - !ruby/object:Gem::Version
367
367
  version: '0.0'
368
368
  - !ruby/object:Gem::Dependency
369
369
  name: guard-rspec
370
370
  requirement: !ruby/object:Gem::Requirement
371
371
  requirements:
372
- - - ~>
372
+ - - "~>"
373
373
  - !ruby/object:Gem::Version
374
374
  version: '4.0'
375
375
  type: :development
376
376
  prerelease: false
377
377
  version_requirements: !ruby/object:Gem::Requirement
378
378
  requirements:
379
- - - ~>
379
+ - - "~>"
380
380
  - !ruby/object:Gem::Version
381
381
  version: '4.0'
382
382
  description: |2
@@ -386,9 +386,9 @@ executables: []
386
386
  extensions: []
387
387
  extra_rdoc_files: []
388
388
  files:
389
- - .gitignore
390
- - .rspec
391
- - .travis.yml
389
+ - ".gitignore"
390
+ - ".rspec"
391
+ - ".travis.yml"
392
392
  - CHANGELOG.md
393
393
  - CONTRIBUTING.md
394
394
  - Gemfile
@@ -492,12 +492,12 @@ require_paths:
492
492
  - lib
493
493
  required_ruby_version: !ruby/object:Gem::Requirement
494
494
  requirements:
495
- - - '>='
495
+ - - ">="
496
496
  - !ruby/object:Gem::Version
497
497
  version: '0'
498
498
  required_rubygems_version: !ruby/object:Gem::Requirement
499
499
  requirements:
500
- - - '>='
500
+ - - ">="
501
501
  - !ruby/object:Gem::Version
502
502
  version: '0'
503
503
  requirements: []