arvados-cli 0.1.20140905131846 → 0.1.20140905165259

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c350a84f281c5ea4ebc212a224c8191d65201ae
-  data.tar.gz: f1a1ae00ed6d390d69220607159725c19954f4de
+  metadata.gz: 2c70283faebf5e804fd7514a0d302895d3741c49
+  data.tar.gz: 3df3bcaaa4885fd1fe5b434e04b40a2416b65fea
 SHA512:
-  metadata.gz: cd3eb2850608056b797c6b19994e6f719c907f42834bfbcd37a15213b2ec37009af52a9ec031500ffd50f5ef3c2e4bb20d70363e0480f30a1ed61830ed9fc13c
-  data.tar.gz: 31911f9355ce5bbc1f3ccf55d3e7401d27092d1d5293c485ade9692efdde7719f3d419fc91f49257a0e2e5093e30e77c8acf8691e005c848ccc46340bd70abea
+  metadata.gz: 77012fcf4ea2c01d673f6b41fbe77a0ca08f78f2be6b81a3d1928d05efc469f55f032b106a13d1e9e9066274d7064ca58515f3fa80e6b3260ed83d393b4e1dd8
+  data.tar.gz: 6a6b9b5a08f72470e7f867cfdc1787b90ca0b819adb23b0d0e3169f03c0c9a483b2b1b72a2f40dd77c974002f58ff72146f9d231b85e57d5487822012106a424

data/bin/arv-run-pipeline-instance

@@ -570,7 +570,6 @@ class WhRunPipelineInstance
                 pipeline_name = @template[:name]
               end
               if c[:output_name] != false
-                output_name = c[:output_name] || "Output of #{cname} of #{pipeline_name}"
                 # Create a collection located in the same project as the pipeline with the contents of the output.
                 portable_data_hash = c[:job][:output]
                 collections = $arv.collection.list(limit: 1,
@@ -578,14 +577,33 @@ class WhRunPipelineInstance
                                                    select: ["portable_data_hash", "manifest_text"]
                                                    )[:items]
                 if collections.any?
-                  newcollection = {
-                    owner_uuid: owner_uuid,
-                    name: "#{output_name} at #{c[:job][:finished_at]}",
-                    portable_data_hash: collections.first[:portable_data_hash],
-                    manifest_text: collections.first[:manifest_text]
-                  }
-                  debuglog "Creating collection #{newcollection}", 0
-                  newcollection_actual = $arv.collection.create collection: newcollection
+                  name = c[:output_name] || "Output #{portable_data_hash[0..7]} of #{cname} of #{pipeline_name}"
+
+                  # check if there is a name collision.
+                  name_collisions = $arv.collection.list(filters: [["owner_uuid", "=", owner_uuid],
+                                                                   ["name", "=", name]])[:items]
+
+                  newcollection_actual = nil
+                  if name_collisions.any? and name_collisions.first[:portable_data_hash] == portable_data_hash
+                    # There is already a collection with the same name and the
+                    # same contents, so just point to that.
+                    newcollection_actual = name_collisions.first
+                  end
+
+                  if newcollection_actual.nil?
+                    # Did not find a collection with the same name (or the
+                    # collection has a different portable data hash) so create
+                    # a new collection with ensure_unique_name: true.
+                    newcollection = {
+                      owner_uuid: owner_uuid,
+                      name: name,
+                      portable_data_hash: collections.first[:portable_data_hash],
+                      manifest_text: collections.first[:manifest_text]                      
+                    }
+                    debuglog "Creating collection #{newcollection}", 0
+                    newcollection_actual = $arv.collection.create collection: newcollection, ensure_unique_name: true
+                  end
+
                   c[:output_uuid] = newcollection_actual[:uuid]
                 else
                   debuglog "Could not find a collection with portable data hash #{portable_data_hash}", 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140905131846
+  version: 0.1.20140905165259
 platform: ruby
 authors:
 - Arvados Authors
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision 33a6cc0d0b748b4ec5a01db6218b8fa21afb11ed
+description: This is the Arvados SDK CLI gem, git revision b60e52e031eeba96ef1a301660de2f8cec4518b6
 email: gem-dev@curoverse.com
 executables:
 - arv