arvados 0.1.20150116063758 → 0.1.20150128223752

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e69c326ebdfbd4759f072b1143baa76bb8f215
-  data.tar.gz: b17e6cbcd637f0cfbed773f71459344d21eaa9d1
+  metadata.gz: 233fa50a34cf6c9c5195cef6b0fb6a1d5744a4de
+  data.tar.gz: 89bec26cdbc1a2c646ffa8d666ddbf9f5b70805b
 SHA512:
-  metadata.gz: cc23ff188453b70428cd851ce3d13e34973ed7e229f696ce9a413a1e3bdadeb1ffe84a30eeccf0c411e7b45f349d5378335c450a2b95e29864b6e9c828337359
-  data.tar.gz: d67bcfd4e0af3a717b4648608e7d5c91041fcb701499c0058eb3fdb0198341d54cef66637f3bb14bb3c5969d5866a7a2d3c5c304e8bb5c350058607eab6c73f1
+  metadata.gz: 685d2babbaa167b408bf87e555d92c2b981fda8b4c1dcf2ed007d758d88649694e3d8ca483d20134f1a3bc40cbfb54f2fff66ad67974130c685d427444556ff9
+  data.tar.gz: f8ade0a881674e7e81e13193ca2ee95278f5fc6f5887ddb4ea4cee52bbd535f03995643f74965ee4a6ef5b14c03dba9122ed0655bb00c5392ee96e550945f258

data/lib/arvados.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
-require 'google/api_client'
 require 'active_support/inflector'
 require 'json'
 require 'fileutils'
 require 'andand'
 
+require 'arvados/google_api_client'
+
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'specimen', 'specimens'
   inflect.irregular 'human', 'humans'
@@ -105,34 +106,6 @@ class Arvados
     end
   end
 
-  class Google::APIClient
-    def discovery_document(api, version)
-      api = api.to_s
-      discovery_uri = self.discovery_uri(api, version)
-      discovery_uri_hash = Digest::MD5.hexdigest(discovery_uri)
-      return @discovery_documents[discovery_uri_hash] ||=
-        begin
-          # fetch new API discovery doc if stale
-          cached_doc = File.expand_path "~/.cache/arvados/discovery-#{discovery_uri_hash}.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 => discovery_uri,
-                                     :authenticated => false)
-            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
-
-          File.open(cached_doc) { |f| JSON.load f }
-        end
-    end
-  end
-
   def client
     @client ||= Google::APIClient.
       new(:host => @arvados_api_host,

data/lib/arvados/google_api_client.rb

@@ -0,0 +1,55 @@
+require 'google/api_client'
+require 'json'
+require 'tempfile'
+
+class Google::APIClient
+  def discovery_document(api, version)
+    api = api.to_s
+    discovery_uri = self.discovery_uri(api, version)
+    discovery_uri_hash = Digest::MD5.hexdigest(discovery_uri)
+    discovery_cache_path =
+      File.expand_path("~/.cache/arvados/discovery-#{discovery_uri_hash}.json")
+    @discovery_documents[discovery_uri_hash] ||=
+      disk_cached_discovery_document(discovery_cache_path) or
+      fetched_discovery_document(discovery_uri, discovery_cache_path)
+  end
+
+  private
+
+  def disk_cached_discovery_document(cache_path)
+    begin
+      if (Time.now - File.mtime(cache_path)) < 86400
+        open(cache_path) do |cache_file|
+          return JSON.load(cache_file)
+        end
+      end
+    rescue IOError, SystemCallError, JSON::JSONError
+      # Error reading the cache.  Act like it doesn't exist.
+    end
+    nil
+  end
+
+  def write_cached_discovery_document(cache_path, body)
+    cache_dir = File.dirname(cache_path)
+    cache_file = nil
+    begin
+      FileUtils.makedirs(cache_dir)
+      cache_file = Tempfile.new("discovery", cache_dir)
+      cache_file.write(body)
+      cache_file.flush
+      File.rename(cache_file.path, cache_path)
+    rescue IOError, SystemCallError
+      # Failure to write the cache is non-fatal.  Do nothing.
+    ensure
+      cache_file.close! unless cache_file.nil?
+    end
+  end
+
+  def fetched_discovery_document(uri, cache_path)
+    response = self.execute!(:http_method => :get,
+                             :uri => uri,
+                             :authenticated => false)
+    write_cached_discovery_document(cache_path, response.body)
+    JSON.load(response.body)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 0.1.20150116063758
+  version: 0.1.20150128223752
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -104,13 +104,14 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados client library, git commit 3fec99e70492e163763ed185aafbf022bf5e16b7
+description: Arvados client library, git commit 0fb26747fa229d6b19ec911b907259a8e84acd83
 email: gem-dev@curoverse.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/arvados.rb
+- lib/arvados/google_api_client.rb
 - lib/arvados/keep.rb
 homepage: https://arvados.org
 licenses:
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Arvados client library