arvados-cli 0.1.20140905091847 → 0.1.20140905115707

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c55f5c54b170b2448cd95584656879cf1ad400d
-  data.tar.gz: cde51433dcd5d5466b111af8f047216c86e0cc46
+  metadata.gz: de0abc3f548c562fc95df1bbee5b62514ec2f614
+  data.tar.gz: d78f56a84efee56f3bf7cdf74e0cec6d6cb0f845
 SHA512:
-  metadata.gz: d3c9518b076fbad30ff6a3ed8421b4d20f6896394f77eb4cf75bccee8f14798a84efa9fa803555445f9766c4d2e1932f009a4616e433e3e088d42ff5ae46640a
-  data.tar.gz: 70029f0b6b8688dc5c4630e9e6484ec80d3117d0c04e60455c9de5e24f9630846f13c7564b690e4a4dc24b2f440943bbaa7eca8ea334e03ef5ebafe13a151702
+  metadata.gz: 52ada2ab28d11b3e443be98f40f49c3a3d218b59ec9b7ea42057c09dfb490bcebcba826b3f6a05c26897f3923403aa729270a66d28880d7219dfee63b24783c4
+  data.tar.gz: d00cae2d8e8db8fe22787572c1c2650ad46786bbf490a66b6d92c1988b8fde62b566b4b3e1e00c04ed113fac2af2e71762c265e6d786037a1bbecbaae648f8cd

data/bin/crunch-job

@@ -1465,14 +1465,26 @@ sub find_docker_image {
   # If so, return its stream name and Docker hash.
   # If not, return undef for both values.
   my $locator = shift;
+  my ($streamname, $filename);
   if (my $image = $arv->{collections}->{get}->execute(uuid => $locator)) {
-    my @file_list = @{$image->{files}};
-    if ((scalar(@file_list) == 1) &&
-        ($file_list[0][1] =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
-      return ($file_list[0][0], $1);
+    foreach my $line (split(/\n/, $image->{manifest_text})) {
+      my @tokens = split(/\s+/, $line);
+      next if (!@tokens);
+      $streamname = shift(@tokens);
+      foreach my $filedata (grep(/^\d+:\d+:/, @tokens)) {
+        if (defined($filename)) {
+          return (undef, undef);  # More than one file in the Collection.
+        } else {
+          $filename = (split(/:/, $filedata, 3))[2];
+        }
+      }
     }
   }
-  return (undef, undef);
+  if (defined($filename) and ($filename =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
+    return ($streamname, $1);
+  } else {
+    return (undef, undef);
+  }
 }
 
 __DATA__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140905091847
+  version: 0.1.20140905115707
 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 80df142a2b7a53d420c837acc467fc39ac9ae312
+description: This is the Arvados SDK CLI gem, git revision f94f97fe63d3d860d373a25d3539d559b53542c5
 email: gem-dev@curoverse.com
 executables:
 - arv