cigale 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e8da52824902b0708fadf47bfc2518f011e8e22
-  data.tar.gz: e538664eeb77c7764ad2da5d4942385e3ca74e0a
+  metadata.gz: b07f1262f28d7f0383c1d3c8bb6363b19a676ee8
+  data.tar.gz: 74cb08ece422e7165d68cdab550e0052d8d7f0f3
 SHA512:
-  metadata.gz: f2db3a64ecbb2c7e84f22faded75e2221152f9c1f0e6614cdf90fc837f8bac5ceb9d42765b1f1aa80bdf09f35da2e6b90f09c29734eabba0f8f04b5becf9f296
-  data.tar.gz: cf9f8e9df365065e69379772766b90194cfe1c4636910efdc7fd1a4bf6bcc911cbf424eebfed1bec5f45ec10d4ca4105d2b213f0db684d629d1d26cb20d69f87
+  metadata.gz: f45a495d38116f3b30bdad86eb1802ceb1c2976a5ff3d92a7753e079e47c8dee7e556c3187bf7ac16da584335c62822473dc8950d9ae1ee88a6b81f08d94080d
+  data.tar.gz: 24317ebc76150c8036ee092c56b918faf0ff06a3c30072a02dccd98b2d6cb364293d26b85c08826257a9b304eb2e19064f81b86c18b6251945d501e52ca469be

data/lib/cigale/cli.rb

@@ -113,12 +113,13 @@ module Cigale
         all_jobs.each { |x| logger.info "  - #{x}" }
       end
 
-      for entry in @definitions
-        entry = fully_expand(entry)
+      expanded_entries = []
+      integrate_defs(expanded_entries, @definitions)
 
+      for entry in expanded_entries
         etype, edef = first_pair(entry)
         if edef["name"].nil?
-          raise "Jobs must have names" unless opts[:fixture]
+          raise "Jobs must have names: #{edef.inspect}" unless opts[:fixture]
           edef["name"] = "fixture"
           edef["project-type"] ||= "project"
         end
@@ -128,6 +129,7 @@ module Cigale
 
         case etype
         when "job"
+          @numjobs += 1
           case cmd
           when "dump"
             File.open(job_path + ".yml", "w") do |f|
@@ -155,6 +157,21 @@ module Cigale
       logger.info "Generated #{@numjobs} jobs."
     end
 
+    def integrate_defs (expanded_entries, defs)
+      for entry in defs
+        case e = fully_expand(entry)
+        when Cigale::Splat
+          logger.info "Got splat from #{entry.inspect}"
+          for ch in e.elems
+            logger.info "Splat entry: #{ch.inspect}"
+          end
+          integrate_defs(expanded_entries, e.elems)
+        else
+          expanded_entries << e
+        end
+      end
+    end
+
     def fully_expand (entry)
       original = entry
       iterations = 0

data/lib/cigale/generator.rb

@@ -18,8 +18,6 @@ include Cigale::Trigger
 module Cigale
   module Generator
     def translate_job (xml, jdef)
-      @numjobs += 1
-
       type = jdef["project-type"]
       testcat = @opts[:test_category]
 

data/lib/cigale/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cigale
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Amos Wenger