arvados-cli 0.1.20140707163414 → 0.1.20140707170034

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645ffed4e475d2544b9bacc61fea0cd7aa166821
-  data.tar.gz: 4562b63c5b2bd96425b21985557d83e06e4d77d4
+  metadata.gz: a6aec2818685e5f827f6b599a28ab5a6f2d1a094
+  data.tar.gz: 6078a7e29762149543b088f5c9dbed2197d84e08
 SHA512:
-  metadata.gz: 96dfcdcad9833bd63f30e47fc91c9900b92eb6972a3bc880022e9b47ae7dd3f4852bd9a83de937e223246e65ebc6f19a59ce8f3032b20eed97048d183ff81ca5
-  data.tar.gz: 795e862efeaba341e60d1f3547b84207edbdae00a8ff5d59b55ae422ee6fc38e6def9c97a892657a76dad8c5f298109f9f85d06dd1fd94f9c570bca31f8fd98f
+  metadata.gz: 5d702e55f466d6eb565f0aff0663f51232dbf1a130fb845ee4844e992bd968046c9d0d367275fda2e8a05aa4428d9ddfc030e7576445c9c763f8b7054184e5ad
+  data.tar.gz: c38b3d306e73030e90bf032fcca7f5304265b793bc60e8b55a911a6ac8aa24bd7824e694fd95be5f622c5b05077ba5202c6a81da4ea7fe2758149b76c2860ce7

data/bin/crunch-job

@@ -96,15 +96,6 @@ $ENV{"CRUNCH_INSTALL"} = "$ENV{CRUNCH_TMP}/opt";
 $ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
 mkdir ($ENV{"JOB_WORK"});
 
-my $arv_cli;
-
-if (defined $ENV{"ARV_CLI"}) {
-  $arv_cli = $ENV{"ARV_CLI"};
-}
-else {
-  $arv_cli = 'arv';
-}
-
 my $force_unlock;
 my $git_dir;
 my $jobspec;
@@ -841,7 +832,7 @@ if ($job_has_uuid) {
 if ($collated_output)
 {
   eval {
-    open(my $orig_manifest, '-|', 'arv', 'keep', 'get', $collated_output)
+    open(my $orig_manifest, '-|', 'arv-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.
@@ -1179,7 +1170,7 @@ sub fetch_block
   my $hash = shift;
   my ($keep, $child_out, $output_block);
 
-  my $cmd = "$arv_cli keep get \Q$hash\E";
+  my $cmd = "arv-get \Q$hash\E";
   open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
   sysread($keep, $output_block, 64 * 1024 * 1024);
   close $keep;
@@ -1191,7 +1182,7 @@ sub collate_output
   Log (undef, "collate");
 
   my ($child_out, $child_in);
-  my $pid = open2($child_out, $child_in, $arv_cli, 'keep', 'put', '--raw');
+  my $pid = open2($child_out, $child_in, 'arv-put', '--raw');
   my $joboutput;
   for (@jobstep)
   {
@@ -1228,7 +1219,7 @@ sub collate_output
       sysread($child_out, $joboutput, 64 * 1024 * 1024);
       chomp($joboutput);
     } else {
-      Log (undef, "timed out reading from 'arv keep put'");
+      Log (undef, "timed out reading from 'arv-put'");
     }
   }
   waitpid($pid, 0);
@@ -1341,7 +1332,7 @@ sub save_meta
   return if $justcheckpoint;  # checkpointing is not relevant post-Warehouse.pm
 
   $local_logfile->flush;
-  my $cmd = "$arv_cli keep put --filename ''\Q$keep_logfile\E "
+  my $cmd = "arv-put --filename ''\Q$keep_logfile\E "
       . quotemeta($local_logfile->filename);
   my $loglocator = `$cmd`;
   die "system $cmd failed: $?" if $?;

metadata

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