kakin 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9caa520a2dbba63006fe6469ec9a0a88426040b46c321c7d5f50c651b885638c
-  data.tar.gz: d90a075e0c37f7353102f57c1df6f19ff9d5af37e132c0e760d1236cc6b5dbd7
+  metadata.gz: d7aedf46ab98443805029bb0b5d29402c041b6acb8742e733928c8587fd4342c
+  data.tar.gz: fd2ba45197979df575a0b28c76c03b288346b576163b2e3327f7d5f93ca8063a
 SHA512:
-  metadata.gz: 3b454a80b04a910ddd132e158ced7cc89103500e6e3283021c12d4c42ffcd13005bda4e41a93518491df687ee79ddc0d8b5b76d44139ad97e652534e253beb15
-  data.tar.gz: 8c318fee8438f19220cb3eca59dd2898101a36131c5100689bfd176ce484053cdca152667ea7853ab7ac7b0f3d5397885ecd570edc0d163bcd2792784ced81b4
+  metadata.gz: 406f5f90699577e3897393a944f3cc490d23d976160298f6d4883793a2b904fd8a11c9352590ac032394f72cd7d4b5607e32fa3405f51da86cda1809fa4aa88c
+  data.tar.gz: 788b9855df716ef959feff6a0f357c3d91d352534e35a973ade48f35e1c25c02352ad1acc2107f443038c2dc6ef86f9ad65812e88d0fa701cd70c06ebb798e6d

data/README.md

@@ -12,12 +12,20 @@ You need to create configuration file located `~/.kakin` for openstack credentia
 
 ```
 auth_url: "http://your-openstack-host:35357/v2.0/tokens"
-management_url: "http://your-openstack-host:8774/v2"
 username: "username"
 tenant: "your-admin-tenant"
 password: "password"
 ```
 
+Or set with environment variable.
+
+```
+export OS_AUTH_URL=<your openstack auth url>
+export OS_USER=<your username>
+export OS_TENANT_NAME=<your tenant>
+export OS_PASSWORD=<your password>
+```
+
 You can get resource usage with following command.
 
 ```

data/lib/kakin/cli.rb

@@ -26,19 +26,17 @@ module Kakin
 
       STDERR.puts "Start: #{start_time}"
       STDERR.puts "End:   #{end_time}"
-      url = URI.parse("#{Kakin::Configuration.management_url}/#{Yao::Tenant.get_by_name(Kakin::Configuration.tenant).id}/os-simple-tenant-usage?start=#{start_time}&end=#{end_time}")
-      req = Net::HTTP::Get.new(url)
-      req["Accept"] = "application/json"
-      req["X-Auth-Token"] = Yao::Auth.try_new.token
-      res = Net::HTTP.start(url.host, url.port) {|http|
-        http.request(req)
-      }
-
-      if res.code != "200"
+      client = Yao.default_client.pool['compute']
+      tenant_id = Yao::Tenant.get_by_name(Kakin::Configuration.tenant).id
+      res = client.get("./os-simple-tenant-usage?start=#{start_time}&end=#{end_time}") do |req|
+        req.headers["Accept"] = "application/json"
+      end
+
+      if res.status != 200
         raise "usage data fatch is failed"
       else
         result = Hash.new
-        tenant_usages = JSON.load(res.body)["tenant_usages"]
+        tenant_usages = res.body["tenant_usages"]
         tenants = Yao::Tenant.list
 
         unless options[:t].empty?

data/lib/kakin/configuration.rb

@@ -1,28 +1,46 @@
 module Kakin
   class Configuration
 
-    def self.management_url
-      @@_management_url
-    end
-
     def self.tenant
       @@_tenant
     end
 
     def self.setup
-      yaml = YAML.load_file(File.expand_path('~/.kakin'))
+      config = {
+        'auth_url'             => ENV['OS_AUTH_URL'],
+        'tenant'               => ENV['OS_TENANT_NAME'] || ENV['OS_PROJECT_NAME'],
+        'username'             => ENV['OS_USERNAME'],
+        'password'             => ENV['OS_PASSWORD'],
+        'client_cert'          => ENV['OS_CERT'],
+        'client_key'           => ENV['OS_KEY'],
+        'identity_api_version' => ENV['OS_IDENTITY_API_VERSION'],
+        'user_domain_name'     => ENV['OS_USER_DOMAIN_NAME'],
+        'project_domain_name'  => ENV['OS_PROJECT_DOMAIN_NAME'],
+        'timeout'              => ENV['YAO_TIMEOUT'],
+        'management_url'       => ENV['YAO_MANAGEMENT_URL'],
+        'debug'                => ENV['YAO_DEBUG'] || false,
+      }
+
+      file_path = File.expand_path('~/.kakin')
+      if File.exist?(file_path)
+        yaml = YAML.load_file(file_path)
+        config.merge!(yaml)
+      end
 
-      @@_management_url = yaml['management_url']
-      @@_tenant = yaml['tenant']
+      @@_tenant = config['tenant']
 
       Yao.configure do
-        auth_url yaml['auth_url']
-        tenant_name yaml['tenant']
-        username yaml['username']
-        password yaml['password']
-        timeout yaml['timeout'] if yaml['timeout']
-        client_cert yaml['client_cert'] if yaml['client_cert']
-        client_key yaml['client_key'] if yaml['client_key']
+        auth_url config['auth_url']
+        tenant_name config['tenant']
+        username config['username']
+        password config['password']
+        timeout config['timeout'] if config['timeout']
+        client_cert config['client_cert'] if config['client_cert']
+        client_key config['client_key'] if config['client_key']
+        identity_api_version config['identity_api_version'] if config['identity_api_version']
+        user_domain_name config['user_domain_name'] if config['user_domain_name']
+        project_domain_name config['project_domain_name'] if config['project_domain_name']
+        debug config['debug']
       end
     end
   end

data/lib/kakin/version.rb

@@ -1,3 +1,3 @@
 module Kakin
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kakin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - buty4649
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor