cigale 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cigale/cli.rb +0 -2
- data/lib/cigale/macro_context.rb +5 -2
- data/lib/cigale/version.rb +1 -1
- data/spec/fixtures/macros/defaults005.expanded.yml +8 -0
- data/spec/fixtures/macros/defaults005.yml +13 -0
- data/spec/fixtures/macros/defaults006.expanded.yml +8 -0
- data/spec/fixtures/macros/defaults006.yml +13 -0
- metadata +9 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2c4ce2bdb988bed9167567b4e84cbda890395f33
|
|
4
|
+
data.tar.gz: 400970ce6b03b7431890ecef7236de8eaab00560
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a7b4dfd6c4823b3ee525426fea093bdc69d088b8000483fa324b5707dfe56f6e8bca6dd3ea6efbcb7007cda12e8c6a5980c07555aa889ed0008df7bfeb1f1312
|
|
7
|
+
data.tar.gz: d2d5211e2ebf161c7b0f6f960bfa3d0c2cb52cdca1214d0003f7f6259c6e1629776ac5e163b8e3c97db1775ce398c5014327433b3dcce03f47746bf7e3ff8fbc
|
data/lib/cigale/cli.rb
CHANGED
|
@@ -117,8 +117,6 @@ module Cigale
|
|
|
117
117
|
integrate_defs(expanded_entries, @definitions)
|
|
118
118
|
|
|
119
119
|
for entry in expanded_entries
|
|
120
|
-
logger.info "fully expanded entry:\n#{entry.to_yaml}"
|
|
121
|
-
|
|
122
120
|
etype, edef = first_pair(entry)
|
|
123
121
|
if edef["name"].nil?
|
|
124
122
|
raise "Jobs must have names: #{edef.inspect}" unless opts[:fixture]
|
data/lib/cigale/macro_context.rb
CHANGED
|
@@ -69,14 +69,17 @@ module Cigale
|
|
|
69
69
|
# cf. https://github.com/itchio/cigale/issues/3
|
|
70
70
|
case mdef
|
|
71
71
|
when Hash
|
|
72
|
-
if defaults = mdef
|
|
72
|
+
if defaults = mdef[:defaults]
|
|
73
73
|
params = defaults.merge(toh(params))
|
|
74
|
+
mdef = mdef.dup
|
|
75
|
+
mdef.delete(:defaults)
|
|
74
76
|
end
|
|
75
77
|
when Array
|
|
76
78
|
case first = mdef.first
|
|
77
79
|
when Hash
|
|
78
|
-
if defaults = first
|
|
80
|
+
if defaults = first[:defaults]
|
|
79
81
|
params = defaults.merge(toh(params))
|
|
82
|
+
mdef = mdef.dup
|
|
80
83
|
mdef.shift
|
|
81
84
|
end
|
|
82
85
|
end
|
data/lib/cigale/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cigale
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Amos Wenger
|
|
@@ -332,6 +332,10 @@ files:
|
|
|
332
332
|
- spec/fixtures/macros/defaults003.yml
|
|
333
333
|
- spec/fixtures/macros/defaults004.expanded.yml
|
|
334
334
|
- spec/fixtures/macros/defaults004.yml
|
|
335
|
+
- spec/fixtures/macros/defaults005.expanded.yml
|
|
336
|
+
- spec/fixtures/macros/defaults005.yml
|
|
337
|
+
- spec/fixtures/macros/defaults006.expanded.yml
|
|
338
|
+
- spec/fixtures/macros/defaults006.yml
|
|
335
339
|
- spec/fixtures/macros/macro-builders001.expanded.yml
|
|
336
340
|
- spec/fixtures/macros/macro-builders001.yml
|
|
337
341
|
- spec/fixtures/macros/macro-builders002.expanded.yml
|
|
@@ -1345,6 +1349,10 @@ test_files:
|
|
|
1345
1349
|
- spec/fixtures/macros/defaults003.yml
|
|
1346
1350
|
- spec/fixtures/macros/defaults004.expanded.yml
|
|
1347
1351
|
- spec/fixtures/macros/defaults004.yml
|
|
1352
|
+
- spec/fixtures/macros/defaults005.expanded.yml
|
|
1353
|
+
- spec/fixtures/macros/defaults005.yml
|
|
1354
|
+
- spec/fixtures/macros/defaults006.expanded.yml
|
|
1355
|
+
- spec/fixtures/macros/defaults006.yml
|
|
1348
1356
|
- spec/fixtures/macros/macro-builders001.expanded.yml
|
|
1349
1357
|
- spec/fixtures/macros/macro-builders001.yml
|
|
1350
1358
|
- spec/fixtures/macros/macro-builders002.expanded.yml
|