gce-host 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53b02a45029bc391a5e91a76fe7a7a876c4c25a
-  data.tar.gz: 9aaf79efe08d1dd1aca249238a0b033eeafec1ee
+  metadata.gz: 1698b100ec090d7a8739d551cfa6a55c69fb8cea
+  data.tar.gz: b7fc92d6cdaaa77cd251d9876989ac4e342e9c87
 SHA512:
-  metadata.gz: e842f07851050bdb5ef066d14163f24300a059ef1302851010d9dc201994ebd4310621e5fca21ad13aa69a1726e9813074060d9f5e0c5ae633718ce6578f0dae
-  data.tar.gz: 649c7dd20e39d3d13a297d99f6883848eb1fe66a9f9ff9706cb0a2086425f1211e6af092ec6561c9b4e6fd286d1b1ddbe4703808999ac3caa0c357e265c4e4d3
+  metadata.gz: 70e4f1ac7d6aa55a7b9e5b773f9e0465df4d145f4b00bd595084072055f07ddbc8791f7335c080c6be2a3fe2fefa36945ac5e585852a92a0b2fce3bdaa215269
+  data.tar.gz: 71376e10c41acb323debb24aff97eec453b36e0a7c2d148ed990f53ed880444b59777bfaae22a23470ed934793c547336746d1cb92973188f8d8c235c5b83317

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.0 (2016/11/25)
+
+Enhancements:
+
+* Try reading credential file from `~/.config/gcloud/legacy_credentials/#{service_account}/adc.json`
+
 # 0.1.3 (2016/11/24)
 
 Enhancements:

data/README.md

@@ -22,7 +22,7 @@ You can write a configuration file located at `/etc/sysconfig/gce-host` (You can
 GOOGLE API parameters:
 
 * **AUTH_METHOD**: Authentication method. Currently, `compute_engine`, `json_key` and `application_default` is available. The default is `applilcation_default`. 
-* **GOOGLE_CREDENTIAL_FILE**: Path of credential file. Specify your service account json file for `json_key` authentication method.
+* **GOOGLE_CREDENTIAL_FILE (optional)**: Path of credential file. Specify your service account json file for `json_key` authentication method. Try reading from `~/.config/gcloud/legacy_credentials/#{service_account}/adc.json` as default, where the `service_account`  is being read from `~/.config/gcloud/configurations/config_default`.
 
 gce-host parameters:
 

data/gce-host.gemspec

@@ -12,11 +12,13 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.bindir        = "exe"
+  gem.executables   = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'google-api-client'
   gem.add_runtime_dependency 'dotenv'
+  gem.add_runtime_dependency 'inifile'
 
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rspec'

data/lib/gce/host/config.rb

@@ -1,5 +1,6 @@
 require 'dotenv'
 Dotenv.load
+require 'inifile'
 
 class GCE
   class Host
@@ -19,17 +20,43 @@ class GCE
       end
 
       def self.credential_file
-        @credential_file ||= File.expand_path(ENV['GOOGLE_CREDENTIAL_FILE'] || config.fetch('GOOGLE_CREDENTIAL_FILE'))
+        @credential_file ||= File.expand_path(
+          ENV['GOOGLE_CREDENTIAL_FILE'] ||
+          config.fetch('GOOGLE_CREDENTIAL_FILE', nil) ||
+          "~/.config/gcloud/legacy_credentials/#{service_account}/adc.json"
+        )
+      end
+
+      def self.credential
+        File.readable?(credential_file) ? JSON.parse(File.read(credential_file)) : {}
+      end
+
+      def self.config_default_file
+        File.expand_path('~/.config/gcloud/configurations/config_default')
+      end
+
+      def self.config_default
+        @config_default ||= File.readable?(config_default_file) ? IniFile.load(config_default_file).to_h : {}
+      end
+
+      def self.service_account_default
+        (config_default['core'] || {})['account']
+      end
+
+      def self.project_default
+        (config_default['core'] || {})['project']
+      end
+
+      def self.zone_default
+        (config_default['compute'] || {})['zone']
+      end
+
+      def self.service_account
+        @service_account ||= ENV['GOOGLE_SERVICE_ACCOUNT'] || config.fetch('GOOGLE_SERVICE_ACCOUNT', nil) || service_account_default
       end
 
       def self.project
-        return @project if @project
-        # ref. terraform https://www.terraform.io/docs/providers/google/
-        @project ||= ENV['GOOGLE_PROJECT'] || config.fetch('GOOGLE_PROJECT', nil)
-        if @project.nil? and credential_file and File.readable?(credential_file)
-          @project ||= (JSON.parse(File.read(credential_file)) || {})['project_id']
-        end
-        @project
+        @project ||= ENV['GOOGLE_PROJECT'] || config.fetch('GOOGLE_PROJECT', nil) || credential['project_id'] || project_default
       end
 
       def self.log_level

data/lib/gce/host/version.rb

@@ -1,5 +1,5 @@
 class GCE
   class Host
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gce-host
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/gce-host
 - docs/GCE.html
 - docs/GCE/Host.html
 - docs/GCE/Host/CLI.html
@@ -180,6 +193,7 @@ files:
 - docs/top-level-namespace.html
 - example/example.conf
 - example/example.rb
+- exe/gce-host
 - gce-host.gemspec
 - lib/gce-host.rb
 - lib/gce/host.rb