arvados-cli 0.1.20140603110100 → 0.1.20140603160755

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71dfc12f59d30b8923a6e7396811dbb522167171
-  data.tar.gz: f7b02e47f844ee1f51144dfd57e39acd143b0a64
+  metadata.gz: 5b102c049fb1474dde6387bcf04eb8fb4fbaf6b8
+  data.tar.gz: 4c9886bb4a024837061b9b62cd3da4b9412ac695
 SHA512:
-  metadata.gz: 5fbcdc30e1ab8e8a1131b8bb1b319f542432d774f28c94bb656f1037f7121d1b35307ed0635ebc1c151c1cd5f1a25f39ead203f148d353b49d97bf721234d7f8
-  data.tar.gz: 9c0ca35d14d329eb9b93302aacd08d6d901dd2c1bbf8c26eb5ca60ae3af449dd48966fbd35fcad63d31d19fedfe4e42348c8013a6b59976d002b2b038fae69f8
+  metadata.gz: a420ecd6b4e996bed10ed546236afe2ef037782a1a69622a05a924e0f9a8684b9adf3952bd0ae71b1275abd0958f4ebe8b56a282be67808ea37ecccd870458e6
+  data.tar.gz: 8337f875d4d1aa7de6f8427450821d258a9e0b6a6895a01c0f6845b0735f25c23c25c8305df9502a10fbdd2cb6390b5c4f2665753173504c77abc9bb91e0bb83

data/bin/crunch-job

@@ -76,6 +76,7 @@ use strict;
 use POSIX ':sys_wait_h';
 use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
 use Arvados;
+use Digest::MD5 qw(md5_hex);
 use Getopt::Long;
 use IPC::Open2;
 use IO::Select;
@@ -799,21 +800,37 @@ goto ONELEVEL if !defined $main::success;
 
 release_allocation();
 freeze();
+my $collated_output = &collate_output();
+
 if ($job_has_uuid) {
-  $Job->update_attributes('output' => &collate_output(),
-                          'running' => 0,
-                          'success' => $Job->{'output'} && $main::success,
+  $Job->update_attributes('running' => 0,
+                          'success' => $collated_output && $main::success,
                           'finished_at' => scalar gmtime)
 }
 
-if ($Job->{'output'})
+if ($collated_output)
 {
   eval {
-    my $manifest_text = `arv keep get ''\Q$Job->{'output'}\E`;
-    $arv->{'collections'}->{'create'}->execute('collection' => {
-      'uuid' => $Job->{'output'},
+    open(my $orig_manifest, '-|', 'arv', 'keep', 'get', $collated_output)
+        or die "failed to get collated manifest: $!";
+    # Read the original manifest, and strip permission hints from it,
+    # so we can put the result in a Collection.
+    my @manifest_lines = ();
+    while (my $manifest_line = <$orig_manifest>) {
+      my @words = split(/ /, $manifest_line, -1);
+      foreach my $ii (0..$#words) {
+        if ($words[$ii] =~ /^[0-9a-f]{32}\+/) {
+          $words[$ii] =~ s/\+A[0-9a-f]{40}@[0-9a-f]{8}\b//;
+        }
+      }
+      push(@manifest_lines, join(" ", @words));
+    }
+    my $manifest_text = join("", @manifest_lines);
+    my $output = $arv->{'collections'}->{'create'}->execute('collection' => {
+      'uuid' => md5_hex($manifest_text),
       'manifest_text' => $manifest_text,
     });
+    $Job->update_attributes('output' => $output->{uuid});
     if ($Job->{'output_is_persistent'}) {
       $arv->{'links'}->{'create'}->execute('link' => {
         'tail_kind' => 'arvados#user',

metadata

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