arvados-cli 0.1.20140415111149 → 0.1.20140415171002

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/bin/crunch-job +12 -3
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3c2d7752c4120eafbf6fee46a5a310d2ed5d7f05
4
- data.tar.gz: 1cad27f2c0f70785b0c509932600e6ce5fcb2134
3
+ metadata.gz: 8e5bff96b6197f74a2595a83b33bad5c43a261d1
4
+ data.tar.gz: 3b3218c7638c6982eed06cdd9a8d63730f9502e8
5
5
  SHA512:
6
- metadata.gz: 2d156d689a130f3cbaf4df85f5169692b3269c9c927f25c455226ba348ca91593eb3b02089ff80ee220835ac080c04f21718ccc30cc14ca165afef0fc2108856
7
- data.tar.gz: a2847a54e34e4145824a511b68274909f36cc4dfcd6b85aedfb6e145b4dd9781df1a46f64431f456c40e2479b3a2c80db419031487f0e497a683096c4315963e
6
+ metadata.gz: c8575fe11b6d0c51b44abdea405563772a5a203936b6c6c249d6fa6eb1379eebbcb00a7e294de412f2945bdf1bb4cff019458fb897722ba3da096e646b0593d8
7
+ data.tar.gz: 712617c534e52128082a424df200bf2f0ae9da074c58cfefb2ba2042a5a7a970b791d50332a957c12355c574328f9071115a4e2f318662604835b52c48a0a6ad
data/bin/crunch-job CHANGED
@@ -95,6 +95,15 @@ $ENV{"CRUNCH_INSTALL"} = "$ENV{CRUNCH_TMP}/opt";
95
95
  $ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
96
96
  mkdir ($ENV{"JOB_WORK"});
97
97
 
98
+ my $arv_cli;
99
+
100
+ if (defined $ENV{"ARV_CLI"}) {
101
+ $arv_cli = $ENV{"ARV_CLI"};
102
+ }
103
+ else {
104
+ $arv_cli = 'arv';
105
+ }
106
+
98
107
  my $force_unlock;
99
108
  my $git_dir;
100
109
  my $jobspec;
@@ -1074,7 +1083,7 @@ sub fetch_block
1074
1083
  my $hash = shift;
1075
1084
  my ($keep, $child_out, $output_block);
1076
1085
 
1077
- my $cmd = "arv keep get \Q$hash\E";
1086
+ my $cmd = "$arv_cli keep get \Q$hash\E";
1078
1087
  open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
1079
1088
  sysread($keep, $output_block, 64 * 1024 * 1024);
1080
1089
  close $keep;
@@ -1086,7 +1095,7 @@ sub collate_output
1086
1095
  Log (undef, "collate");
1087
1096
 
1088
1097
  my ($child_out, $child_in);
1089
- my $pid = open2($child_out, $child_in, 'arv', 'keep', 'put', '--raw');
1098
+ my $pid = open2($child_out, $child_in, $arv_cli, 'keep', 'put', '--raw');
1090
1099
  my $joboutput;
1091
1100
  for (@jobstep)
1092
1101
  {
@@ -1236,7 +1245,7 @@ sub save_meta
1236
1245
  return if $justcheckpoint; # checkpointing is not relevant post-Warehouse.pm
1237
1246
 
1238
1247
  $local_logfile->flush;
1239
- my $cmd = "arv keep put --filename ''\Q$keep_logfile\E "
1248
+ my $cmd = "$arv_cli keep put --filename ''\Q$keep_logfile\E "
1240
1249
  . quotemeta($local_logfile->filename);
1241
1250
  my $loglocator = `$cmd`;
1242
1251
  die "system $cmd failed: $?" if $?;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20140415111149
4
+ version: 0.1.20140415171002
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
@@ -146,7 +146,7 @@ dependencies:
146
146
  - - ~>
147
147
  - !ruby/object:Gem::Version
148
148
  version: '0.8'
149
- description: This is the Arvados SDK CLI gem, git revision c2aeaa729c350a33ec47ae1b012e50a6685ac2d2
149
+ description: This is the Arvados SDK CLI gem, git revision 52b3716d78c410806e8aaea89994b39015694258
150
150
  email: gem-dev@curoverse.com
151
151
  executables:
152
152
  - arv