gce-host 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62b31646dd076986d8c0cc9bbd2c25a47c39c68d
-  data.tar.gz: 160b97e5f289c5e44f3391e59a4702d55a1750e8
+  metadata.gz: a53b02a45029bc391a5e91a76fe7a7a876c4c25a
+  data.tar.gz: 9aaf79efe08d1dd1aca249238a0b033eeafec1ee
 SHA512:
-  metadata.gz: 23878d91ddc9527713a68d263d19c77ee0b57cc875e06dbc95e162f479523fad4ac1bda7873860e0f41df275ee0f69c3cac344995c0f9756d96e2de10e80a1a4
-  data.tar.gz: 99db823d6e304bc8ef7071cbd14186470b55d86fdfc81f814c38d7ec3ca8d0d38a4aa31355a45457902d951f428ca67c7a56ba43484af667416212bd1b089bce
+  metadata.gz: e842f07851050bdb5ef066d14163f24300a059ef1302851010d9dc201994ebd4310621e5fca21ad13aa69a1726e9813074060d9f5e0c5ae633718ce6578f0dae
+  data.tar.gz: 649c7dd20e39d3d13a297d99f6883848eb1fe66a9f9ff9706cb0a2086425f1211e6af092ec6561c9b4e6fd286d1b1ddbe4703808999ac3caa0c357e265c4e4d3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 0.1.3 (2016/11/24)
+
+Enhancements:
+
+* Support ~ (home directory) in GCE_HOST_CONFIG_FILE and GOOGLE_CREDENTIAL_FILE
+
+# 0.1.2 (2016/11/24)
+
+yanked
+
+# 0.1.1 (2016/11/24)
+
+Enhancements:
+
+* Add machine_type to show
+
 # 0.1.0 (2016/11/18)
 
 first version
+

data/example/example.conf

@@ -1,5 +1,5 @@
 AUTH_METHOD=json_key
-GOOGLE_CREDENTIAL_FILE=example/your-project-000.json
+GOOGLE_CREDENTIAL_FILE=~/.config/gcloud/your-project-000.json
 ROLES_KEY=roles
 ROLE_VALUE_DELIMITER=:
 OPTIONAL_STRING_KEYS=service,status

data/gce-host.gemspec

@@ -1,6 +1,8 @@
+require_relative 'lib/gce/host/version'
+
 Gem::Specification.new do |gem|
   gem.name          = "gce-host"
-  gem.version       = '0.1.0'
+  gem.version       = GCE::Host::VERSION
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/gce-host'

data/lib/gce/host/config.rb

@@ -11,7 +11,7 @@ class GCE
       end
 
       def self.config_file
-        @config_file ||= ENV.fetch('GCE_HOST_CONFIG_FILE', '/etc/sysconfig/gce-host')
+        @config_file ||= File.expand_path(ENV.fetch('GCE_HOST_CONFIG_FILE', '/etc/sysconfig/gce-host'))
       end
 
       def self.auth_method
@@ -19,7 +19,7 @@ class GCE
       end
 
       def self.credential_file
-        @credential_file ||= ENV['GOOGLE_CREDENTIAL_FILE'] || config.fetch('GOOGLE_CREDENTIAL_FILE', nil)
+        @credential_file ||= File.expand_path(ENV['GOOGLE_CREDENTIAL_FILE'] || config.fetch('GOOGLE_CREDENTIAL_FILE'))
       end
 
       def self.project

data/lib/gce/host/host_data.rb

@@ -51,6 +51,10 @@ class GCE
         instance.zone.split('/').last
       end
 
+      def machine_type
+        instance.machine_type.split('/').last
+      end
+
       def private_ip_address
         instance.network_interfaces.first.network_ip
       end
@@ -121,7 +125,6 @@ class GCE
         params = {
           "hostname" => hostname,
           "roles" => roles,
-          "zone" => zone,
         }
         Config.optional_string_keys.each do |key|
           field = StringUtil.underscore(key)
@@ -132,7 +135,8 @@ class GCE
           params[field] = send(field)
         end
         params.merge!(
-          "instance_id" => instance_id,
+          "zone" => zone,
+          "machine_type" => machine_type,
           "private_ip_address" => private_ip_address,
           "public_ip_address" => public_ip_address,
           "creation_timestamp" => creation_timestamp,

data/lib/gce/host/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gce-host
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client