kakin 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb8efde1aaf89f79943e1430156764e6e96983cf35f7d6fac5bca89362dccce
-  data.tar.gz: f8ad30e03dc74e4ad47e7d8f4f423e87ab1ee0d0c8bc08a12fb458697d7df08a
+  metadata.gz: c9c6fa53613bd8220fffe498b25b31db2b40d04a1623c2779ad87355e5f8b466
+  data.tar.gz: b2a124e6ca09b58c6b59a2ffdd8c5bf1334ec942e8dcd1944a1bb08ea08b093d
 SHA512:
-  metadata.gz: '049ad99c0c396f8e80c163c990b5fd75399c80e6736f92fbb8cc6a21e1d359f528fdb3081dc538cf2a71a59293ab73042680a85bf112d3bf5d901b67a24b3e03'
-  data.tar.gz: 8e7ca17705acfd89b4187e9ec769abb0e49e741bf31b869e19d4eb08652bfe72a8e1e4c243de82f94d686d6e1addb320a21e25e6ac2255f9e4661b828a571b6c
+  metadata.gz: c4137646f75989f86fbc65ef8a6b4d48b1d33d9d21abda779d2860dc1693dc8923c158f9ecbdcbdf7f0c74c794e944e410237066371e6e423666a2c4b2d662c3
+  data.tar.gz: 2be2fa5bdbaae9f341bb6cf8aff1abc316b6a6a59affecbdd8338b9352ce25b39d5fa12f31beabf0a673cf3e360304b51723e08af6d71b7028886dbedba6edc9

data/kakin.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'yao'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
 end

data/lib/kakin/cli.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'json'
 require 'net/http'
 require 'yao'
+require 'kakin/yao_ext/yao'
 require 'kakin/yao_ext/tenant'
 require 'kakin/yao_ext/server'
 require 'kakin/yao_ext/floatingip'
@@ -27,7 +28,6 @@ module Kakin
       STDERR.puts "Start: #{start_time}"
       STDERR.puts "End:   #{end_time}"
       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
@@ -37,7 +37,7 @@ module Kakin
       else
         result = Hash.new
         tenant_usages = res.body["tenant_usages"]
-        tenants = Yao::Tenant.list
+        tenants = Yao.tenant_klass.list
 
         unless options[:t].empty?
           tenant = tenants.find { |tenant| tenant.name == options[:t] }
@@ -90,9 +90,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
 
@@ -120,9 +120,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
 
@@ -147,9 +147,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
       volume_types = Yao::VolumeType.list

data/lib/kakin/version.rb

@@ -1,3 +1,3 @@
 module Kakin
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/kakin/yao_ext/yao.rb

@@ -0,0 +1,10 @@
+module Yao
+  def self.tenant_klass
+    Yao.keystone_v2? ? Yao::Tenant : Yao::Project
+  end
+
+  # @return [Bool]
+  def self.keystone_v2?
+    Yao.default_client.pool["identity"].url_prefix.to_s.match(/v2\.0/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kakin
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - buty4649
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - lib/kakin/yao_ext/floatingip.rb
 - lib/kakin/yao_ext/server.rb
 - lib/kakin/yao_ext/tenant.rb
+- lib/kakin/yao_ext/yao.rb
 homepage: https://github.com/yaocloud/kakin
 licenses: []
 metadata: {}
@@ -125,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: kakin is resource calcuration tool for OpenStack