arvados-cli 0.1.20140425100736 → 0.1.20140425125602

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd834b3c9e7d5ba0a2ba08966283b70b06233756
-  data.tar.gz: 9388473209fe3ba26a58ab7c395eb53e606dad12
+  metadata.gz: 6351840df801def389676433741b47fc9570487f
+  data.tar.gz: 52d36f4542bb029a7a976d113dc69e35d6158d2c
 SHA512:
-  metadata.gz: 0e94a37c552c61a6945aa6399b03e8b5642679ce4f773526b0de86c2f884409499c60378af78ed7761d10a7615e7715f42abf1f7c9ac429ef60f8865f4d5c6b0
-  data.tar.gz: a10c0b4a0b26b79692a8bb459b469f4e862e201d20686123b9cb5568d099679a8b8f119c97acf779bb091bcf82f7cbd590a3475de01640c85bf1e83dd795e652
+  metadata.gz: 34aea3f55d930446c5825ec5aad474690a8ebf86849a558ee62948f1428398fc9f3738c1dc91cd2c1493470d280cd6c80cf7ec052f0cf0bc8bd1923ea8d3d7ee
+  data.tar.gz: 6ce4b6c1c68d9feb26045f55ff461de96851c85e318d493e3d909878d8462116322a86e73694e84bfda0737d1d3b3c493b733f5a0687b9c9a2fc16d4702a1510

data/bin/arv-run-pipeline-instance

@@ -312,19 +312,19 @@ class JobCache
       []
     end
   end
-  def self.create(attributes)
+  def self.create(job, create_params)
     @cache ||= {}
     result = $client.execute(:api_method => $arvados.jobs.create,
                              :parameters => {
                                :api_token => ENV['ARVADOS_API_TOKEN'],
-                               :job => attributes.to_json
-                             },
+                               :job => job.to_json
+                             }.merge(create_params),
                              :authenticated => false)
     j = JSON.parse result.body, :symbolize_names => true
     if j.is_a? Hash and j[:uuid]
       @cache[j[:uuid]] = j
     else
-      debuglog "create job: #{j[:errors] rescue nil} with attribute #{attributes}", 0
+      debuglog "create job: #{j[:errors] rescue nil} with attributes #{job}", 0
       nil
     end
   end
@@ -437,15 +437,27 @@ class WhRunPipelineInstance
           # No job yet associated with this component and is component inputs
           # are fully specified (any output_of script_parameters are resolved
           # to real value)
-          job = JobCache.create({:script => c[:script],
-                            :script_parameters => c[:script_parameters],
-                            :script_version => c[:script_version],
-                            :repository => c[:repository],
-                            :minimum_script_version => c[:minimum_script_version],
-                            :exclude_script_versions => c[:exclude_minimum_script_versions],
-                            :nondeterministic => c[:nondeterministic],
-                            :no_reuse => @options[:no_reuse],
-                            :output_is_persistent => c[:output_is_persistent] || false})
+          job = JobCache.create {
+            :script => c[:script],
+            :script_parameters => c[:script_parameters],
+            :script_version => c[:script_version],
+            :repository => c[:repository],
+            :nondeterministic => c[:nondeterministic],
+            :output_is_persistent => c[:output_is_persistent] || false,
+            # TODO: Delete the following three attributes when
+            # supporting pre-20140418 API servers is no longer
+            # important. New API servers take these as flags that
+            # control behavior of create, rather than job attributes.
+            :minimum_script_version => c[:minimum_script_version],
+            :exclude_script_versions => c[:exclude_minimum_script_versions],
+            :no_reuse => @options[:no_reuse] || c[:nondeterministic],
+          }, {
+            # This is the right place to put these attributes when
+            # dealing with new API servers.
+            :minimum_script_version => c[:minimum_script_version],
+            :exclude_script_versions => c[:exclude_minimum_script_versions],
+            :find_or_create => !(@options[:no_reuse] || c[:nondeterministic]),
+          }
           if job
             debuglog "component #{cname} new job #{job[:uuid]}"
             c[:job] = job

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140425100736
+  version: 0.1.20140425125602
 platform: ruby
 authors:
 - Arvados Authors
@@ -146,7 +146,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: This is the Arvados SDK CLI gem, git revision d61f56590d4c1bc2c965b640698217a5d4af1d8c
+description: This is the Arvados SDK CLI gem, git revision 6d2128ae15825ef03472897e09710b176e3cc1d9
 email: gem-dev@curoverse.com
 executables:
 - arv