pec 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0bc6884d3d93c8344fd46712242696363ad170
-  data.tar.gz: 3e278d7dad848ba1a9010dc41cb18c1f4272ad86
+  metadata.gz: bc3b7fee6db286e6000ac9fc5f3009ecdf6f1b44
+  data.tar.gz: a62986406f39396e9e0cd9983a5bb7d9939d4f6b
 SHA512:
-  metadata.gz: 63567aafec9bb8f7341a3e0faf23a29fd56cc17141ce8daaa5a9cf7bd32656d450a98bc6e3f3d6c2f25e7e35dedd5d3999c29c0b06f886686f90969941397400
-  data.tar.gz: 4e3851f0b4bb95bf9185bd93423e29e4ff321d74363f8cadb98d0d888807b02af49841197e7c5d06f52ad544956fc7e14f04558a052478dd986cfc3b595699f5
+  metadata.gz: b0619b9640d1248e4b28d7ee74f4a4a6357c128c21bd60dd3391165def475f637c4eaca18f01238f92906a316a1c2341f3bbc207c279cf35881d9c2a53c9adb4
+  data.tar.gz: 63b2b52cc9f4a340f8e261242a66e98b15677282c3beb2ca1f0fbdb9912bcda11ccb13fcb3f0fceeb4bfe7bcdaad5e1199538cb4afb2f7ffdf7245d49e11686e

data/lib/pec.rb

@@ -60,17 +60,13 @@ module Pec
     server_list(config).find {|s|s.name == config.name}
   end
 
-  def self.get_tenant_id(config)
-    config.tenant_id || tenant_list.find {|tenant| tenant.name == config.tenant}.id
+  def self.get_tenant_id
+    Yao.current_tenant_id
   end
 
   def self.server_list(config)
     @_server_list ||= {}
-    @_server_list[config.tenant] ||= Yao::Server.list_detail({tenant_id: get_tenant_id(config)})
-  end
-
-  def self.tenant_list
-    @_tenant_list ||= Yao::Tenant.list
+    @_server_list[config.tenant] ||= Yao::Server.list_detail({ tenant_id: get_tenant_id })
   end
 
   def self.flavor_list(server)

data/lib/pec/command/status.rb

@@ -2,14 +2,10 @@ module Pec::Command
   class Status < Base
     def self.task(server, config)
       if server
-        tenant_name = safe_was_delete(config.name, config.tenant, :tenant) do
-          fetch_tenant(server).name
-        end
-
+        tenant_name = config.tenant
         flavor_name = safe_was_delete(config.name, config.flavor, :flavor) do
           fetch_flavor(server).name
         end
-
         puts sprintf(
           " %-35s %-10s %-10s %-10s %-10s %-10s %-35s %-48s",
           config.name,
@@ -29,10 +25,6 @@ module Pec::Command
       end
     end
 
-    def self.fetch_tenant(server)
-      Pec.tenant_list.find {|tenant| tenant.id == server.tenant_id}
-    end
-
     def self.fetch_flavor(server)
       Pec.flavor_list(server).find {|f|f.id == server.flavor['id']}
     end

data/lib/pec/handler/networks.rb

@@ -74,9 +74,8 @@ module Pec::Handler
       end
 
       def security_group(config)
-        tenant_id = config.tenant_id || Yao::Tenant.list.find {|t| t.name == config.tenant }.id
         ids = config.security_group.map do |name|
-          sg = Yao::SecurityGroup.list.find {|sg| sg.name == name && tenant_id == sg.tenant_id }
+          sg = Yao::SecurityGroup.list.find {|sg| sg.name == name && Pec.get_tenant_id == sg.tenant_id }
           raise "security group #{name} is not found" unless sg
           sg.id
         end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/pec.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'thor', '~> 0.19.1'
-  spec.add_dependency 'yao', '~> 0.2.2'
+  spec.add_dependency 'yao', '~> 0.2.13'
   spec.add_dependency 'ruby-ip', '~> 0.9.3'
   spec.add_dependency 'colorator', '~> 0.1'
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement