arvados-cli 0.1.20161011231816 → 0.1.20161017193526

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11bf49b99002560203aef7cc8fc4b4e33cabadb2
-  data.tar.gz: 4bed16915c6b334e51e54560dd627112d2f3f1f8
+  metadata.gz: 57833719e09fb7eb4b39afa7a2d129a8788883a6
+  data.tar.gz: 7ad15cd9b2b43cb9f4394fe544c824737a992d1d
 SHA512:
-  metadata.gz: d845904d4cb266c995c375ba81e2234eee001f51e82f5d98472f86ed9d19dc8f3f8d9743e7573b93f4f0f6602e89d68ea5aaec7b50e756ab74e607f580527dc8
-  data.tar.gz: 497c1e4bf813cd60dda6a239c18f6353ea79e422b387425aada7715229685e8501affb1e335f8ced1a1ee0d2582c9c08e25c16955bad3a27e52bfbfe3ce2995e
+  metadata.gz: 8ffb3a40c55f0ed87ddf25793df6948c44759355b5d939f5962d3fdba46653207d47786fca427a778b7a7d78f3785d2a3117a79eb4b3b83d71af414a63febc2d
+  data.tar.gz: 7e581bca19e77f19155dc0da34fd1a7cfe745aae207d497283f593b0837817e72a306b5827938d772dd8ec3f7ed1495769ff1decc1bce64f75c47265438d34ce

data/bin/arv-run-pipeline-instance

@@ -364,22 +364,25 @@ class WhRunPipelineInstance
     @components.each do |componentname, component|
       component[:script_parameters].each do |parametername, parameter|
         parameter = { :value => parameter } unless parameter.is_a? Hash
-        value =
-          (params["#{componentname}::#{parametername}"] ||
-           parameter[:value] ||
-           (parameter[:output_of].nil? &&
-            (params[parametername.to_s] ||
-             parameter[:default])) ||
-           nil)
-        if value.nil? and
-            ![false,'false',0,'0'].index parameter[:required]
-          if parameter[:output_of]
-            if not @components[parameter[:output_of].intern]
-              errors << [componentname, parametername, "output_of refers to nonexistent component '#{parameter[:output_of]}'"]
-            end
-            next
+        if params.has_key?("#{componentname}::#{parametername}")
+          value = params["#{componentname}::#{parametername}"]
+        elsif parameter.has_key?(:value)
+          value = parameter[:value]
+        elsif parameter.has_key?(:output_of)
+          if !@components[parameter[:output_of].intern]
+            errors << [componentname, parametername, "output_of refers to nonexistent component '#{parameter[:output_of]}'"]
+          else
+            # value will be filled in later when the upstream
+            # component's output becomes known
           end
+          next
+        elsif params.has_key?(parametername.to_s)
+          value = params[parametername.to_s]
+        elsif parameter.has_key?(:default)
+          value = parameter[:default]
+        else
           errors << [componentname, parametername, "required parameter is missing"]
+          next
         end
         debuglog "parameter #{componentname}::#{parametername} == #{value}"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20161011231816
+  version: 0.1.20161017193526
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Arvados command line tools, git commit c98596a46dc7c166acb2a26b742a09ae0493224a
+description: Arvados command line tools, git commit 921fef9e349cada916934ae0131067adac8d0335
 email: gem-dev@curoverse.com
 executables:
 - arv