simp-rake-helpers 2.4.4 → 2.4.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/lib/simp/rake/build/auto.rb +1 -1
  4. data/lib/simp/rake/build/deps.rb +4 -3
  5. data/lib/simp/rake/helpers/version.rb +1 -1
  6. metadata +62 -61
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ca8c5e93f3ab81bb2a6f0f58160b4606f6408f24
4
- data.tar.gz: 021fa60851a3687f9247209659b5700d2d2030aa
3
+ metadata.gz: 61c8ed45126f431116f002d450f2d141cb7f077f
4
+ data.tar.gz: e1bdd52db3327f71cf02022a0df16d3367fcb1e3
5
5
  SHA512:
6
- metadata.gz: 9bb85632b3ba1c224e5f2d7bc907bd7f3457a89f05e87ba114f1ca4981d4c7b62589d0e490324c6bc724a7f450f26f7c80643df373f774ff05cd42048b8c47b0
7
- data.tar.gz: fb9b0da68506785f526e5f399b98383dc9808c00f98fad50722ebcb1001f15f1069ee606c22e63b8207e24f2b8d9d4e0fdd8c95795330c26afa6413bf467d81f
6
+ metadata.gz: a284f6b12c684b2d6dc1db95b37d6bd00ebf89bb5632255617168c604f278d43c898e548827c550b5aa4e25e61e783469a55e1072bf0b04b749f501ef1828eb9
7
+ data.tar.gz: e57d9448a0e8cc815c3e4472a8dcbcf620ea693604c8467e59c56d7920dbb25a8eed43aa02f83bca3e67621f6465eda5e1e2456058c6970758fedf1c9aedae91
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ### 2.4.6 / 2016-08-03
2
+ * Fix a broken method call between `r10k` 2.4.0 and `R10KHelper.new()`
3
+ * Add `:insync` status to acceptable module statuses for `deps:checkout`
4
+
5
+ ### 2.4.5 / 2016-08-03
6
+ * No longer run the recursive Bundle by default
7
+
1
8
  ### 2.4.4 / 2016-07-29
2
9
  * Fixed a circular dependency potential in the requires for simplib and stdlib
3
10
  * Updated the spec tests to work more cleanly
data/lib/simp/rake/build/auto.rb CHANGED
@@ -94,7 +94,7 @@ module Simp::Rake::Build
94
94
  do_merge = ENV['SIMP_BUILD_unpack_merge'] != 'no'
95
95
  do_prune = ENV['SIMP_BUILD_prune'] != 'no' ? 'true' : 'false'
96
96
  do_checkout = ENV['SIMP_BUILD_checkout'] != 'no'
97
- do_bundle = ENV['SIMP_BUILD_bundle'] != 'no'
97
+ do_bundle = ENV['SIMP_BUILD_bundle'] == 'yes' ? true : false
98
98
  do_unpack = ENV['SIMP_BUILD_unpack'] != 'no'
99
99
  full_iso_name = ENV.fetch('SIMP_BUILD_iso_name', false)
100
100
  iso_name_tag = ENV.fetch('SIMP_BUILD_iso_tag', false)
data/lib/simp/rake/build/deps.rb CHANGED
@@ -69,9 +69,10 @@ class R10KHelper
69
69
  FileUtils.mkdir_p(R10K::Git::Cache.settings[:cache_root])
70
70
  end
71
71
 
72
- r10k = R10K::Puppetfile.new(Dir.pwd, nil, puppetfile).load!
72
+ r10k = R10K::Puppetfile.new(Dir.pwd, nil, puppetfile)
73
+ r10k.load!
73
74
 
74
- @modules = r10k.entries.collect do |mod|
75
+ @modules = r10k.modules.collect do |mod|
75
76
  mod_status = mod.repo.repo.dirty?
76
77
 
77
78
  mod = {
@@ -200,7 +201,7 @@ module Simp::Rake::Build
200
201
  unless mod[:status] == :unknown
201
202
  # Since r10k is destructive, we're enumerating all valid states
202
203
  # here
203
- if [:absent, :mismatched, :outdated].include?(mod[:r10k_module].status)
204
+ if [:absent, :mismatched, :outdated, :insync].include?(mod[:r10k_module].status)
204
205
  unless mod[:r10k_cache].synced?
205
206
  mod[:r10k_cache].sync
206
207
  end
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 = '2.4.4'
5
+ VERSION = '2.4.6'
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: 2.4.4
4
+ version: 2.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,368 +9,368 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-07-29 00:00:00.000000000 Z
12
+ date: 2016-08-12 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
  type: :runtime
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.0'
90
90
  - !ruby/object:Gem::Dependency
91
91
  name: puppetlabs_spec_helper
92
92
  requirement: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0.0'
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0.0'
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: parallel
106
106
  requirement: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: '1.0'
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
117
  version: '1.0'
118
118
  - !ruby/object:Gem::Dependency
119
119
  name: simp-rspec-puppet-facts
120
120
  requirement: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - ~>
123
123
  - !ruby/object:Gem::Version
124
124
  version: '1.0'
125
125
  type: :runtime
126
126
  prerelease: false
127
127
  version_requirements: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: '1.0'
132
132
  - !ruby/object:Gem::Dependency
133
133
  name: puppet-blacksmith
134
134
  requirement: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ~>
137
137
  - !ruby/object:Gem::Version
138
138
  version: '3.3'
139
139
  type: :runtime
140
140
  prerelease: false
141
141
  version_requirements: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - ~>
144
144
  - !ruby/object:Gem::Version
145
145
  version: '3.3'
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: simp-beaker-helpers
148
148
  requirement: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - "~>"
150
+ - - ~>
151
151
  - !ruby/object:Gem::Version
152
152
  version: '1.0'
153
153
  type: :runtime
154
154
  prerelease: false
155
155
  version_requirements: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - "~>"
157
+ - - ~>
158
158
  - !ruby/object:Gem::Version
159
159
  version: '1.0'
160
160
  - !ruby/object:Gem::Dependency
161
161
  name: parallel_tests
162
162
  requirement: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - "~>"
164
+ - - ~>
165
165
  - !ruby/object:Gem::Version
166
166
  version: '2.4'
167
167
  type: :runtime
168
168
  prerelease: false
169
169
  version_requirements: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - "~>"
171
+ - - ~>
172
172
  - !ruby/object:Gem::Version
173
173
  version: '2.4'
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: r10k
176
176
  requirement: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - "~>"
178
+ - - ~>
179
179
  - !ruby/object:Gem::Version
180
180
  version: '2.2'
181
181
  type: :runtime
182
182
  prerelease: false
183
183
  version_requirements: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - "~>"
185
+ - - ~>
186
186
  - !ruby/object:Gem::Version
187
187
  version: '2.2'
188
188
  - !ruby/object:Gem::Dependency
189
189
  name: pager
190
190
  requirement: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  type: :runtime
196
196
  prerelease: false
197
197
  version_requirements: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: rspec
204
204
  requirement: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - "~>"
206
+ - - ~>
207
207
  - !ruby/object:Gem::Version
208
208
  version: '3.0'
209
209
  type: :runtime
210
210
  prerelease: false
211
211
  version_requirements: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - "~>"
213
+ - - ~>
214
214
  - !ruby/object:Gem::Version
215
215
  version: '3.0'
216
216
  - !ruby/object:Gem::Dependency
217
217
  name: beaker
218
218
  requirement: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - "~>"
220
+ - - ~>
221
221
  - !ruby/object:Gem::Version
222
222
  version: '2.0'
223
223
  type: :runtime
224
224
  prerelease: false
225
225
  version_requirements: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - "~>"
227
+ - - ~>
228
228
  - !ruby/object:Gem::Version
229
229
  version: '2.0'
230
230
  - !ruby/object:Gem::Dependency
231
231
  name: beaker-rspec
232
232
  requirement: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - "~>"
234
+ - - ~>
235
235
  - !ruby/object:Gem::Version
236
236
  version: '5.0'
237
237
  type: :runtime
238
238
  prerelease: false
239
239
  version_requirements: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - "~>"
241
+ - - ~>
242
242
  - !ruby/object:Gem::Version
243
243
  version: '5.0'
244
244
  - !ruby/object:Gem::Dependency
245
245
  name: rspec-core
246
246
  requirement: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - "~>"
248
+ - - ~>
249
249
  - !ruby/object:Gem::Version
250
250
  version: '3.0'
251
251
  type: :runtime
252
252
  prerelease: false
253
253
  version_requirements: !ruby/object:Gem::Requirement
254
254
  requirements:
255
- - - "~>"
255
+ - - ~>
256
256
  - !ruby/object:Gem::Version
257
257
  version: '3.0'
258
258
  - !ruby/object:Gem::Dependency
259
259
  name: listen
260
260
  requirement: !ruby/object:Gem::Requirement
261
261
  requirements:
262
- - - "~>"
262
+ - - ~>
263
263
  - !ruby/object:Gem::Version
264
264
  version: 3.0.6
265
265
  type: :runtime
266
266
  prerelease: false
267
267
  version_requirements: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - "~>"
269
+ - - ~>
270
270
  - !ruby/object:Gem::Version
271
271
  version: 3.0.6
272
272
  - !ruby/object:Gem::Dependency
273
273
  name: gitlog-md
274
274
  requirement: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - "~>"
276
+ - - ~>
277
277
  - !ruby/object:Gem::Version
278
278
  version: '0'
279
279
  type: :development
280
280
  prerelease: false
281
281
  version_requirements: !ruby/object:Gem::Requirement
282
282
  requirements:
283
- - - "~>"
283
+ - - ~>
284
284
  - !ruby/object:Gem::Version
285
285
  version: '0'
286
286
  - !ruby/object:Gem::Dependency
287
287
  name: pry
288
288
  requirement: !ruby/object:Gem::Requirement
289
289
  requirements:
290
- - - "~>"
290
+ - - ~>
291
291
  - !ruby/object:Gem::Version
292
292
  version: '0.0'
293
293
  type: :development
294
294
  prerelease: false
295
295
  version_requirements: !ruby/object:Gem::Requirement
296
296
  requirements:
297
- - - "~>"
297
+ - - ~>
298
298
  - !ruby/object:Gem::Version
299
299
  version: '0.0'
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: pry-doc
302
302
  requirement: !ruby/object:Gem::Requirement
303
303
  requirements:
304
- - - "~>"
304
+ - - ~>
305
305
  - !ruby/object:Gem::Version
306
306
  version: '0.0'
307
307
  type: :development
308
308
  prerelease: false
309
309
  version_requirements: !ruby/object:Gem::Requirement
310
310
  requirements:
311
- - - "~>"
311
+ - - ~>
312
312
  - !ruby/object:Gem::Version
313
313
  version: '0.0'
314
314
  - !ruby/object:Gem::Dependency
315
315
  name: highline
316
316
  requirement: !ruby/object:Gem::Requirement
317
317
  requirements:
318
- - - "~>"
318
+ - - ~>
319
319
  - !ruby/object:Gem::Version
320
320
  version: '1.6'
321
- - - ">"
321
+ - - '>'
322
322
  - !ruby/object:Gem::Version
323
323
  version: 1.6.1
324
324
  type: :development
325
325
  prerelease: false
326
326
  version_requirements: !ruby/object:Gem::Requirement
327
327
  requirements:
328
- - - "~>"
328
+ - - ~>
329
329
  - !ruby/object:Gem::Version
330
330
  version: '1.6'
331
- - - ">"
331
+ - - '>'
332
332
  - !ruby/object:Gem::Version
333
333
  version: 1.6.1
334
334
  - !ruby/object:Gem::Dependency
335
335
  name: guard
336
336
  requirement: !ruby/object:Gem::Requirement
337
337
  requirements:
338
- - - "~>"
338
+ - - ~>
339
339
  - !ruby/object:Gem::Version
340
340
  version: '2.0'
341
341
  type: :development
342
342
  prerelease: false
343
343
  version_requirements: !ruby/object:Gem::Requirement
344
344
  requirements:
345
- - - "~>"
345
+ - - ~>
346
346
  - !ruby/object:Gem::Version
347
347
  version: '2.0'
348
348
  - !ruby/object:Gem::Dependency
349
349
  name: guard-shell
350
350
  requirement: !ruby/object:Gem::Requirement
351
351
  requirements:
352
- - - "~>"
352
+ - - ~>
353
353
  - !ruby/object:Gem::Version
354
354
  version: '0.0'
355
355
  type: :development
356
356
  prerelease: false
357
357
  version_requirements: !ruby/object:Gem::Requirement
358
358
  requirements:
359
- - - "~>"
359
+ - - ~>
360
360
  - !ruby/object:Gem::Version
361
361
  version: '0.0'
362
362
  - !ruby/object:Gem::Dependency
363
363
  name: guard-rspec
364
364
  requirement: !ruby/object:Gem::Requirement
365
365
  requirements:
366
- - - "~>"
366
+ - - ~>
367
367
  - !ruby/object:Gem::Version
368
368
  version: '4.0'
369
369
  type: :development
370
370
  prerelease: false
371
371
  version_requirements: !ruby/object:Gem::Requirement
372
372
  requirements:
373
- - - "~>"
373
+ - - ~>
374
374
  - !ruby/object:Gem::Version
375
375
  version: '4.0'
376
376
  description: |2
@@ -380,9 +380,9 @@ executables: []
380
380
  extensions: []
381
381
  extra_rdoc_files: []
382
382
  files:
383
- - ".gitignore"
384
- - ".rspec"
385
- - ".travis.yml"
383
+ - .gitignore
384
+ - .rspec
385
+ - .travis.yml
386
386
  - CHANGELOG.md
387
387
  - CONTRIBUTING.md
388
388
  - Gemfile
@@ -442,12 +442,12 @@ require_paths:
442
442
  - lib
443
443
  required_ruby_version: !ruby/object:Gem::Requirement
444
444
  requirements:
445
- - - ">="
445
+ - - '>='
446
446
  - !ruby/object:Gem::Version
447
447
  version: '0'
448
448
  required_rubygems_version: !ruby/object:Gem::Requirement
449
449
  requirements:
450
- - - ">="
450
+ - - '>='
451
451
  - !ruby/object:Gem::Version
452
452
  version: '0'
453
453
  requirements: []
@@ -457,3 +457,4 @@ signing_key:
457
457
  specification_version: 4
458
458
  summary: SIMP rake helpers
459
459
  test_files: []
460
+ has_rdoc: