cigale 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6e8da52824902b0708fadf47bfc2518f011e8e22
4
- data.tar.gz: e538664eeb77c7764ad2da5d4942385e3ca74e0a
3
+ metadata.gz: b07f1262f28d7f0383c1d3c8bb6363b19a676ee8
4
+ data.tar.gz: 74cb08ece422e7165d68cdab550e0052d8d7f0f3
5
5
  SHA512:
6
- metadata.gz: f2db3a64ecbb2c7e84f22faded75e2221152f9c1f0e6614cdf90fc837f8bac5ceb9d42765b1f1aa80bdf09f35da2e6b90f09c29734eabba0f8f04b5becf9f296
7
- data.tar.gz: cf9f8e9df365065e69379772766b90194cfe1c4636910efdc7fd1a4bf6bcc911cbf424eebfed1bec5f45ec10d4ca4105d2b213f0db684d629d1d26cb20d69f87
6
+ metadata.gz: f45a495d38116f3b30bdad86eb1802ceb1c2976a5ff3d92a7753e079e47c8dee7e556c3187bf7ac16da584335c62822473dc8950d9ae1ee88a6b81f08d94080d
7
+ data.tar.gz: 24317ebc76150c8036ee092c56b918faf0ff06a3c30072a02dccd98b2d6cb364293d26b85c08826257a9b304eb2e19064f81b86c18b6251945d501e52ca469be
data/lib/cigale/cli.rb CHANGED
@@ -113,12 +113,13 @@ module Cigale
113
113
  all_jobs.each { |x| logger.info " - #{x}" }
114
114
  end
115
115
 
116
- for entry in @definitions
117
- entry = fully_expand(entry)
116
+ expanded_entries = []
117
+ integrate_defs(expanded_entries, @definitions)
118
118
 
119
+ for entry in expanded_entries
119
120
  etype, edef = first_pair(entry)
120
121
  if edef["name"].nil?
121
- raise "Jobs must have names" unless opts[:fixture]
122
+ raise "Jobs must have names: #{edef.inspect}" unless opts[:fixture]
122
123
  edef["name"] = "fixture"
123
124
  edef["project-type"] ||= "project"
124
125
  end
@@ -128,6 +129,7 @@ module Cigale
128
129
 
129
130
  case etype
130
131
  when "job"
132
+ @numjobs += 1
131
133
  case cmd
132
134
  when "dump"
133
135
  File.open(job_path + ".yml", "w") do |f|
@@ -155,6 +157,21 @@ module Cigale
155
157
  logger.info "Generated #{@numjobs} jobs."
156
158
  end
157
159
 
160
+ def integrate_defs (expanded_entries, defs)
161
+ for entry in defs
162
+ case e = fully_expand(entry)
163
+ when Cigale::Splat
164
+ logger.info "Got splat from #{entry.inspect}"
165
+ for ch in e.elems
166
+ logger.info "Splat entry: #{ch.inspect}"
167
+ end
168
+ integrate_defs(expanded_entries, e.elems)
169
+ else
170
+ expanded_entries << e
171
+ end
172
+ end
173
+ end
174
+
158
175
  def fully_expand (entry)
159
176
  original = entry
160
177
  iterations = 0
@@ -18,8 +18,6 @@ include Cigale::Trigger
18
18
  module Cigale
19
19
  module Generator
20
20
  def translate_job (xml, jdef)
21
- @numjobs += 1
22
-
23
21
  type = jdef["project-type"]
24
22
  testcat = @opts[:test_category]
25
23
 
@@ -1,3 +1,3 @@
1
1
  module Cigale
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.1"
3
3
  end
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.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amos Wenger