arvados-cli 0.1.20140808173203 → 0.1.20140811105915

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebc834ac4efeb562f01beeb994c1b599f6f8f8d
-  data.tar.gz: 16a45c0a08794cb09cc473c6772725a3317dd919
+  metadata.gz: 00e797969da0fa5d629cdddbdd03465bf1c2f06e
+  data.tar.gz: 071e35af30962776b9f6554e821a6651b770ee33
 SHA512:
-  metadata.gz: 292ebcad2872ae49e78b920bf73974f778975c43e316470f6d8ef30b9fa1004eb197652329b1c90f6158db319f3e4f7b57c1266f4d325056434c487e06e7aa4c
-  data.tar.gz: 14068afee1bd98fc6042bb60f158afa4a2283d835eff77e6331f0455d2de0f15d3b278d000f7927809b3ec2bea5bcf08a120c80511a3d8535750467b27488e3c
+  metadata.gz: 98658c50eff22505e3eab8e98933ba16ffad4b207f59d0d980f58b21df8ee8a4f5e6f01436e47265d9b493e35fe27f51129b7cbf5dc3530e51e5f31f18474846
+  data.tar.gz: 314ed284d5966bc3e00a146e0fb205519bbea647442a6357463cd827b0c8671415cf8d57152d819f055cfaa3b6e86bccc997b9a0f547f02cc16e2370948ef0e5

data/bin/arv-run-pipeline-instance

@@ -454,16 +454,28 @@ class WhRunPipelineInstance
   end
 
   def setup_instance
-    if $options[:submit]
-      @instance ||= PipelineInstance.
-        create(:components => @components,
-              :pipeline_template_uuid => @template[:uuid],
-              :state => 'New')
+    if @instance
+      @instance[:properties][:run_options] ||= {}
+      if @options[:no_reuse]
+        # override properties of existing instance
+        @instance[:properties][:run_options][:enable_job_reuse] = false
+      else
+        # Default to "enable reuse" if not specified. (This code path
+        # can go away when old clients go away.)
+        if @instance[:properties][:run_options][:enable_job_reuse].nil?
+          @instance[:properties][:run_options][:enable_job_reuse] = true
+        end
+      end
     else
-      @instance ||= PipelineInstance.
-        create(:components => @components,
-             :pipeline_template_uuid => @template[:uuid],
-             :state => 'RunningOnClient')
+      @instance = PipelineInstance.
+        create(components: @components,
+               properties: {
+                 run_options: {
+                   enable_job_reuse: !@options[:no_reuse]
+                 }
+               },
+               pipeline_template_uuid: @template[:uuid],
+               state: ($options[:submit] ? 'New' : 'RunningOnClient'))
     end
     self
   end
@@ -503,7 +515,8 @@ class WhRunPipelineInstance
             # 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]),
+            :find_or_create => (@instance[:properties][:run_options].andand[:enable_job_reuse] &&
+                                !c[:nondeterministic]),
             :filters => c[:filters]
           })
           if job

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140808173203
+  version: 0.1.20140811105915
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision 381926c94a3b41d04101f68ec6a33e88fc795254
+description: This is the Arvados SDK CLI gem, git revision cedd2b046ddf4d2f819a4d1dedbbe82d4e70e72d
 email: gem-dev@curoverse.com
 executables:
 - arv