cigale 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0664c5fa543dd732fc0baacff536924777d16f
-  data.tar.gz: 4272de59a283b7acf5eb9eb46a81f9635996a018
+  metadata.gz: 91a22dd325a361b333838b733755dc3663760d65
+  data.tar.gz: f65bf376f5ec58a515e0821420f34c42d03c1c4f
 SHA512:
-  metadata.gz: dcfbaee4f0669de1fa898f2b708f3e44dff38539155c675b329ee40c9f645b45fad776ce6035df7dc9cee2e66d7ef4b7b235bf75c769d39e0abe5c941d2ae4af
-  data.tar.gz: 9adb4957b128324a325d9fa08054dfdab02d0f509ad83d002618fab067ca8c873dbd3babe17b3de03984212e51f8fcc42e7f0fadfee07ba8a2d5972f82bfdec5
+  metadata.gz: 8f6da71d58f3ee806fe0d01c0613851e8c17b80071316f65a1e1781064acb0b0665d0773771da36021148aaae78d97ce28ca7d52b1b143a07e4cf6c570e87f1f
+  data.tar.gz: d18187232ef50a8ac276ab3537e8d02194df1c44ada91e7a9fe9e8f9c7099f8ea0fa104a6437644532803ec224474fa1fb915aae877e64c5bce2b74b6b877c9a

data/lib/cigale/cli.rb

@@ -117,6 +117,8 @@ module Cigale
       integrate_defs(expanded_entries, @definitions)
 
       for entry in expanded_entries
+        logger.info "fully expanded entry:\n#{entry.to_yaml}"
+
         etype, edef = first_pair(entry)
         if edef["name"].nil?
           raise "Jobs must have names: #{edef.inspect}" unless opts[:fixture]

data/lib/cigale/macro_context.rb

@@ -63,9 +63,26 @@ module Cigale
                 splat = true
               end
 
+              params = v
               mdef = lookup(mname)
 
-              res = self.with_params(v).expand(mdef)
+              # cf. https://github.com/itchio/cigale/issues/3
+              case mdef
+              when Hash
+                if defaults = mdef.delete(:defaults)
+                  params = defaults.merge(toh(params))
+                end
+              when Array
+                case first = mdef.first
+                when Hash
+                  if defaults = first.delete(:defaults)
+                    params = defaults.merge(toh(params))
+                    mdef.shift
+                  end
+                end
+              end
+
+              res = self.with_params(params).expand(mdef)
               case res
               when Hash
                 if splat

data/lib/cigale/version.rb

@@ -1,3 +1,3 @@
 module Cigale
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/fixtures/macros/defaults001.expanded.yml

@@ -0,0 +1,6 @@
+---
+job:
+  name: defaults
+  a: a
+  b: B
+  c: c

data/spec/fixtures/macros/defaults001.yml

@@ -0,0 +1,13 @@
+- :deploy:
+    :defaults:
+        a: a
+        b: b
+        c: c
+    a: "{a}"
+    b: "{b}"
+    c: "{c}"
+
+- job:
+    name: "defaults"
+    .deploy:
+      b: B

data/spec/fixtures/macros/defaults002.expanded.yml

@@ -0,0 +1,7 @@
+---
+job:
+  name: defaults
+  list:
+  - a: a
+  - b: B
+  - c: c

data/spec/fixtures/macros/defaults002.yml

@@ -0,0 +1,14 @@
+- :deploy:
+    - :defaults:
+        a: a
+        b: b
+        c: c
+    - a: "{a}"
+    - b: "{b}"
+    - c: "{c}"
+
+- job:
+    name: "defaults"
+    list:
+      .deploy:
+        b: B

data/spec/fixtures/macros/defaults003.expanded.yml

@@ -0,0 +1,7 @@
+---
+job:
+  name: defaults
+  list:
+  - a: A
+  - b: B
+  - c: C

data/spec/fixtures/macros/defaults003.yml

@@ -0,0 +1,16 @@
+- :deploy:
+    - :defaults:
+        a: a
+        b: b
+        c: c
+    - a: "{a}"
+    - b: "{b}"
+    - c: "{c}"
+
+- job:
+    name: "defaults"
+    list:
+      .deploy:
+        a: A
+        b: B
+        c: C

data/spec/fixtures/macros/defaults004.expanded.yml

@@ -0,0 +1,7 @@
+---
+job:
+  name: defaults
+  list:
+  - a: a
+  - b: b
+  - c: c

data/spec/fixtures/macros/defaults004.yml

@@ -0,0 +1,13 @@
+- :deploy:
+    - :defaults:
+        a: a
+        b: b
+        c: c
+    - a: "{a}"
+    - b: "{b}"
+    - c: "{c}"
+
+- job:
+    name: "defaults"
+    list:
+      .deploy:

data/splats.yml

@@ -0,0 +1,8 @@
+---
+job:
+  name: splats
+  a: A
+  b: B
+  c: C
+  d: D
+  e: E

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cigale
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Amos Wenger
@@ -324,6 +324,14 @@ files:
 - lib/cigale/wrapper/workspace-cleanup.rb
 - lib/cigale/wrapper/xvfb.rb
 - lib/cigale/wrapper/xvnc.rb
+- spec/fixtures/macros/defaults001.expanded.yml
+- spec/fixtures/macros/defaults001.yml
+- spec/fixtures/macros/defaults002.expanded.yml
+- spec/fixtures/macros/defaults002.yml
+- spec/fixtures/macros/defaults003.expanded.yml
+- spec/fixtures/macros/defaults003.yml
+- spec/fixtures/macros/defaults004.expanded.yml
+- spec/fixtures/macros/defaults004.yml
 - spec/fixtures/macros/macro-builders001.expanded.yml
 - spec/fixtures/macros/macro-builders001.yml
 - spec/fixtures/macros/macro-builders002.expanded.yml
@@ -1303,6 +1311,7 @@ files:
 - spec/macro_spec.rb
 - spec/parity_spec.rb
 - spec/spec_helper.rb
+- splats.yml
 homepage: ''
 licenses:
 - MIT
@@ -1328,6 +1337,14 @@ signing_key:
 specification_version: 4
 summary: Jenkins job generator
 test_files:
+- spec/fixtures/macros/defaults001.expanded.yml
+- spec/fixtures/macros/defaults001.yml
+- spec/fixtures/macros/defaults002.expanded.yml
+- spec/fixtures/macros/defaults002.yml
+- spec/fixtures/macros/defaults003.expanded.yml
+- spec/fixtures/macros/defaults003.yml
+- spec/fixtures/macros/defaults004.expanded.yml
+- spec/fixtures/macros/defaults004.yml
 - spec/fixtures/macros/macro-builders001.expanded.yml
 - spec/fixtures/macros/macro-builders001.yml
 - spec/fixtures/macros/macro-builders002.expanded.yml