arvados 0.1.20140429135621 → 0.1.20140429160120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60bb7aa549830bdafdb23907483883a7d88fc97e
-  data.tar.gz: 0f592b2645573f5db75de49968f8a3c4e90f0793
+  metadata.gz: 30e53a35bdb039f15e734d12fdd309394ef51232
+  data.tar.gz: 3d0059f45359f85615719fe43efb79573b4f823a
 SHA512:
-  metadata.gz: 011381380fd2528bb82af23290d383ed9305cf2a1853ac6d0e5fea76558774381db8d7a55e0ddb19be20ba23f970174787d4ada2e6e213e86c0bcaefe590a38c
-  data.tar.gz: 836f44135fd7f5183b473ff98f70d4ca6ef16220effa04e06f325b94958b1968c8df4cb52a42e3e1a361329a2b0dd8020428a2fe364845f35bc7b3e08bb521d7
+  metadata.gz: 8dbddab8972cba6ddfe70d09fd0c4f680c846069368fe497334fff219669c193cd4971aba0ee31f9dd2b81d9f445deea0ebbb0b46285a33386d38758d71164df
+  data.tar.gz: a6da92a5680504063fe0de1b83a13135376b45f929cfbcc22e8349b6ef0c72cb26e59bdc8642dbf5ac9bb7bf5ba8d4186917238221655b001c89c5f8ec4ab809

data/lib/arvados.rb

@@ -35,9 +35,8 @@ class Arvados
     @application_version ||= 0.0
     @application_name ||= File.split($0).last
 
-    @arvados_api_version = opts[:api_version] ||
-      config['ARVADOS_API_VERSION'] ||
-      'v1'
+    @arvados_api_version = opts[:api_version] || 'v1'
+
     @arvados_api_host = opts[:api_host] ||
       config['ARVADOS_API_HOST'] or
       raise "#{$0}: no :api_host or ENV[ARVADOS_API_HOST] provided."
@@ -46,7 +45,8 @@ class Arvados
       raise "#{$0}: no :api_token or ENV[ARVADOS_API_TOKEN] provided."
 
     if (opts[:suppress_ssl_warnings] or
-        config['ARVADOS_API_HOST_INSECURE'])
+        %w(1 true yes).index(config['ARVADOS_API_HOST_INSECURE'].
+                             andand.downcase))
       suppress_warnings do
         OpenSSL::SSL.const_set 'VERIFY_PEER', OpenSSL::SSL::VERIFY_NONE
       end
@@ -142,6 +142,10 @@ class Arvados
     $stderr.puts "#{File.split($0).last} #{$$}: #{message}" if @@debuglevel >= verbosity
   end
 
+  def debuglog *args
+    self.class.debuglog *args
+  end
+
   def config(config_file_path="~/.config/arvados/settings.conf")
     return @@config if @@config
 
@@ -150,7 +154,19 @@ class Arvados
     config['ARVADOS_API_HOST']          = ENV['ARVADOS_API_HOST']
     config['ARVADOS_API_TOKEN']         = ENV['ARVADOS_API_TOKEN']
     config['ARVADOS_API_HOST_INSECURE'] = ENV['ARVADOS_API_HOST_INSECURE']
-    config['ARVADOS_API_VERSION']       = ENV['ARVADOS_API_VERSION']
+
+    if config['ARVADOS_API_HOST'] and config['ARVADOS_API_TOKEN']
+      # Environment variables take precedence over the config file, so
+      # there is no point reading the config file. If the environment
+      # specifies a _HOST without asking for _INSECURE, we certainly
+      # shouldn't give the config file a chance to create a
+      # system-wide _INSECURE state for this user.
+      #
+      # Note: If we start using additional configuration settings from
+      # this file in the future, we might have to read the file anyway
+      # instead of returning here.
+      return (@@config = config)
+    end
 
     begin
       expanded_path = File.expand_path config_file_path
@@ -162,16 +178,18 @@ class Arvados
           # skip comments and blank lines
           next if line.match('^\s*#') or not line.match('\S')
           var, val = line.chomp.split('=', 2)
+          var.strip!
+          val.strip!
           # allow environment settings to override config files.
-          if var and val
+          if !var.empty? and val
             config[var] ||= val
           else
-            warn "#{expanded_path}: #{lineno}: could not parse `#{line}'"
+            debuglog "#{expanded_path}: #{lineno}: could not parse `#{line}'", 0
           end
         end
       end
-    rescue
-      debuglog "HOME environment variable (#{ENV['HOME']}) not set, not using #{config_file_path}", 0
+    rescue StandardError => e
+      debuglog "Ignoring error reading #{config_file_path}: #{e}", 0
     end
 
     @@config = config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 0.1.20140429135621
+  version: 0.1.20140429160120
 platform: ruby
 authors:
 - Arvados Authors
@@ -66,7 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: This is the Arvados SDK gem, git revision c18bde8300e115b215e58d6930d0495b2c33b49f
+description: This is the Arvados SDK gem, git revision 8eaad00b025167a7505ba11ad6a05b52a43c2399
 email: gem-dev@curoverse.com
 executables: []
 extensions: []