arvados-cli 0.1.20140630125016 → 0.1.20140630151639

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93dd489c88556be4e285449687a90022ee156e1
-  data.tar.gz: 7ee964d54c8bf14b31ab61938de6880b6729d7cd
+  metadata.gz: 1ab5006d538fbed03346c5d6e2afe002f31f172d
+  data.tar.gz: 232018d545f96fb365539459920aae1b28ecae97
 SHA512:
-  metadata.gz: ada1ca559f499f3284ccaf285743cfab254187eef0c7e34810a6e37d03325ce70c965ee79a48bd1ea292850da58f8279cdfcedf0915f4e8cf78606563511d872
-  data.tar.gz: e6f8f3d3a0d08d6caa0566e882f2704a6de03d0aa342ec111bb552258c3ac9627591cb279094225df70b8d13eef35f3f9690ecd3bc805f03ff9a1d5871502053
+  metadata.gz: 88a55f9823ba0230976b81f8e8a37dc026c8249e8317eee2589a2630384e30aead9863070cb95935e8dca600223a03c4793657195a4bc2e8cecf635da73a7690
+  data.tar.gz: 9fad0ffa4d13342cbb048755a631f3887d7f93433ab3e45550cfa947d39157528105ecab10430e5d7cb32a5d00e8dca16acdb976af41d42039b8f8a620db4971

data/bin/arv

@@ -56,14 +56,20 @@ class Google::APIClient
    return @discovery_documents["#{api}:#{version}"] ||=
      begin
        # fetch new API discovery doc if stale
-       cached_doc = File.expand_path '~/.cache/arvados/discovery_uri.json'
-       if not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
+       cached_doc = File.expand_path '~/.cache/arvados/discovery_uri.json' rescue nil
+
+       if cached_doc.nil? or not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
          response = self.execute!(:http_method => :get,
                                   :uri => self.discovery_uri(api, version),
                                   :authenticated => false)
-         FileUtils.makedirs(File.dirname cached_doc)
-         File.open(cached_doc, 'w') do |f|
-           f.puts response.body
+
+         begin
+           FileUtils.makedirs(File.dirname cached_doc)
+           File.open(cached_doc, 'w') do |f|
+             f.puts response.body
+           end
+         rescue
+           return JSON.load response.body
          end
        end
 
@@ -85,8 +91,8 @@ end
 def init_config
   # read authentication data from arvados configuration file if present
   lineno = 0
-  config_file = File.expand_path('~/.config/arvados/settings.conf')
-  if File.exist? config_file then
+  config_file = File.expand_path('~/.config/arvados/settings.conf') rescue nil
+  if not config_file.nil? and File.exist? config_file then
     File.open(config_file, 'r').each do |line|
       lineno = lineno + 1
       # skip comments

data/bin/crunch-job

@@ -622,6 +622,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     $ENV{"TASK_SLOT_NODE"} = $slot[$childslot]->{node}->{name};
     $ENV{"TASK_SLOT_NUMBER"} = $slot[$childslot]->{cpu};
     $ENV{"TASK_WORK"} = $ENV{"JOB_WORK"}."/$id.$$";
+    $ENV{"HOME"} = $ENV{"TASK_WORK"};
     $ENV{"TASK_KEEPMOUNT"} = $ENV{"TASK_WORK"}.".keep";
     $ENV{"TASK_TMPDIR"} = $ENV{"TASK_WORK"}; # deprecated
     $ENV{"CRUNCH_NODE_SLOTS"} = $slot[$childslot]->{node}->{ncpus};
@@ -661,6 +662,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .= "-v \Q$ENV{TASK_WORK}:/tmp/crunch-job:rw\E ";
       $command .= "-v \Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
       $command .= "-v \Q$ENV{TASK_KEEPMOUNT}:/mnt:ro\E ";
+      $command .= "-e \QHOME=/tmp/crunch-job\E ";
       while (my ($env_key, $env_val) = each %ENV)
       {
         if ($env_key =~ /^(ARVADOS|JOB|TASK)_/) {

metadata

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