cigale 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb61ed014851e56049896db0a290096bdefb6a4
-  data.tar.gz: 7a754966a5b5341078cc55ca3114e09a53755ac5
+  metadata.gz: 6e8da52824902b0708fadf47bfc2518f011e8e22
+  data.tar.gz: e538664eeb77c7764ad2da5d4942385e3ca74e0a
 SHA512:
-  metadata.gz: a3f5c930de2cd19c7e3c032ac494418a51259412f58612d2b09c97b6174a7d26e0e0b40894972019190c3114d12733600b6fcb49fbd23fa5da1875dbd0f8b3c5
-  data.tar.gz: 2582f5e78e9768a5eb9dfb245ca6f3d96e23d10d073b296799d061a7986e5532b85e7d2fff9c1cc7b1f1b89e2765e4b96317c6099db919bc9128ef99368a03e0
+  metadata.gz: f2db3a64ecbb2c7e84f22faded75e2221152f9c1f0e6614cdf90fc837f8bac5ceb9d42765b1f1aa80bdf09f35da2e6b90f09c29734eabba0f8f04b5becf9f296
+  data.tar.gz: cf9f8e9df365065e69379772766b90194cfe1c4636910efdc7fd1a4bf6bcc911cbf424eebfed1bec5f45ec10d4ca4105d2b213f0db684d629d1d26cb20d69f87

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+# 0.3.0
+  
+  * Add support for splats, see [issue #2](https://github.com/itchio/cigale/issues/2)
+
+# 0.2.0
+
+  * Add support for `skip-tag` in scm/git
+
+# 0.1.0
+
+  * Initial release
+  * Compatibility with most jenkins-job-builder fixtures

data/README.md

@@ -99,6 +99,56 @@ If you're unsure what something will expand to, you can use the `dump` command:
 cigale dump my-def.yml -o tmp
 ```
 
+## Splats
+
+Sometimes you want to do this:
+
+```yaml
+- :cool-wrappers:
+    - ansi-color
+    - inject
+
+- job:
+    name: foobar
+    wrappers:
+      - .cool-wrappers:
+      - xvfb
+      
+```
+
+But that will expand to:
+
+```yaml
+- job:
+    name: foobar
+    wrappers:
+      - - ansi-color
+        - inject
+      - xvfb
+```
+
+Which isn't valid. What you want instead is use a splat when calling
+cool-wrappers (see [issue #2](https://github.com/itchio/cigale/issues/2))
+
+```yaml
+- job:
+    name: foobar
+    wrappers:
+      - ..cool-wrappers:
+      - xvfb
+```
+
+Which will expand to the expected result:
+
+```yaml
+- job:
+    name: foobar
+    wrappers:
+      - ansi-color
+      - inject
+      - xvfb
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/itchio/cigale/fork )

data/lib/cigale/macro_context.rb

@@ -2,6 +2,16 @@
 require "cigale/exts"
 
 module Cigale
+  class Splat
+    def initialize (elems)
+      @elems = elems
+    end
+
+    def elems
+      @elems
+    end
+  end
+
   class MacroContext < Exts
     def initialize (options)
       @library = options[:library]
@@ -21,34 +31,69 @@ module Cigale
       case entity
       when Array
         # list of things, need to expand each individually
-        entity.map do |x|
-          expand(x)
+        array = []
+
+        entity.each do |x|
+          case child = expand(x)
+          when Splat
+            array += child.elems
+          else
+            array << child
+          end
         end
+
+        array
       when Hash
-        entity.map do |k, v|
+        pairs = []
+
+        entity.each do |k, v|
           case k
           when /^\.(.*)$/
             # macro call
             if expanding?
               # keep child macro as-is for later expansion
-              [k, expand(v)]
+              pairs << [k, expand(v)]
             else
-              mdef = lookup($1)
+              splat = false
+              mname = $1
+
+              # cf. https://github.com/itchio/cigale/issues/2 for 'spec'
+              if mname =~ /^\./
+                mname = mname[1..-1]
+                splat = true
+              end
+
+              mdef = lookup(mname)
 
               res = self.with_params(v).expand(mdef)
               case res
               when Hash
-                first_pair(res)
-              when String, Array
-                return res
+                if splat
+                  raise "Unnecessary use of splat: #{entity.inspect}"
+                end
+                res.each_pair { |p| pairs << p }
+              when Array
+                if splat
+                  if entity.size > 1
+                    raise "Invalid array splat (needs to be single-pair hash): #{entity.inspect}"
+                  end
+                  return Splat.new(res)
+                else
+                  return res
+                end
               else
-                raise "Invalid macro expansion result: #{res.inspect}"
+                if splat
+                  raise "Invalid macro expansion result for splat: #{res.inspect}"
+                end
+                return res
               end
             end
           else
-            [k, expand(v)]
+            pairs << [k, expand(v)]
           end
-        end.to_h
+        end
+
+        pairs.to_h
       else
         # not a list, not a hash
         interpolate(entity)

data/lib/cigale/version.rb

@@ -1,3 +1,3 @@
 module Cigale
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

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

@@ -0,0 +1,9 @@
+---
+job:
+  name: splats
+  builders:
+  - shell: echo 0
+  - - shell: echo 1
+    - shell: echo 2
+    - shell: echo 3
+  - shell: echo 4

data/spec/fixtures/macros/splats001.yml

@@ -0,0 +1,11 @@
+- :multi-shell:
+    - shell: "echo 1"
+    - shell: "echo 2"
+    - shell: "echo 3"
+
+- job:
+    name: "splats"
+    builders:
+      - shell: "echo 0"
+      - .multi-shell:
+      - shell: "echo 4"

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

@@ -0,0 +1,9 @@
+---
+job:
+  name: splats
+  builders:
+  - shell: echo 0
+  - shell: echo 1
+  - shell: echo 2
+  - shell: echo 3
+  - shell: echo 4

data/spec/fixtures/macros/splats002.yml

@@ -0,0 +1,11 @@
+- :multi-shell:
+    - shell: "echo 1"
+    - shell: "echo 2"
+    - shell: "echo 3"
+
+- job:
+    name: "splats"
+    builders:
+      - shell: "echo 0"
+      - ..multi-shell:
+      - shell: "echo 4"

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

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

data/spec/fixtures/macros/splats003.yml

@@ -0,0 +1,10 @@
+- :some-keys:
+    b: "B"
+    c: "C"
+    d: "D"
+
+- job:
+    name: "splats"
+    a: "A"
+    .some-keys:
+    e: "E"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cigale
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Amos Wenger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -333,6 +334,12 @@ files:
 - spec/fixtures/macros/macro-scm001.yml
 - spec/fixtures/macros/macro-scm002.expanded.yml
 - spec/fixtures/macros/macro-scm002.yml
+- spec/fixtures/macros/splats001.expanded.yml
+- spec/fixtures/macros/splats001.yml
+- spec/fixtures/macros/splats002.expanded.yml
+- spec/fixtures/macros/splats002.yml
+- spec/fixtures/macros/splats003.expanded.yml
+- spec/fixtures/macros/splats003.yml
 - spec/fixtures/parity/builders/__init__.py
 - spec/fixtures/parity/builders/fixtures/ant001.xml
 - spec/fixtures/parity/builders/fixtures/ant001.yaml
@@ -1331,6 +1338,12 @@ test_files:
 - spec/fixtures/macros/macro-scm001.yml
 - spec/fixtures/macros/macro-scm002.expanded.yml
 - spec/fixtures/macros/macro-scm002.yml
+- spec/fixtures/macros/splats001.expanded.yml
+- spec/fixtures/macros/splats001.yml
+- spec/fixtures/macros/splats002.expanded.yml
+- spec/fixtures/macros/splats002.yml
+- spec/fixtures/macros/splats003.expanded.yml
+- spec/fixtures/macros/splats003.yml
 - spec/fixtures/parity/builders/__init__.py
 - spec/fixtures/parity/builders/fixtures/ant001.xml
 - spec/fixtures/parity/builders/fixtures/ant001.yaml