pec 0.9.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce0bc6884d3d93c8344fd46712242696363ad170
4
- data.tar.gz: 3e278d7dad848ba1a9010dc41cb18c1f4272ad86
3
+ metadata.gz: bc3b7fee6db286e6000ac9fc5f3009ecdf6f1b44
4
+ data.tar.gz: a62986406f39396e9e0cd9983a5bb7d9939d4f6b
5
5
  SHA512:
6
- metadata.gz: 63567aafec9bb8f7341a3e0faf23a29fd56cc17141ce8daaa5a9cf7bd32656d450a98bc6e3f3d6c2f25e7e35dedd5d3999c29c0b06f886686f90969941397400
7
- data.tar.gz: 4e3851f0b4bb95bf9185bd93423e29e4ff321d74363f8cadb98d0d888807b02af49841197e7c5d06f52ad544956fc7e14f04558a052478dd986cfc3b595699f5
6
+ metadata.gz: b0619b9640d1248e4b28d7ee74f4a4a6357c128c21bd60dd3391165def475f637c4eaca18f01238f92906a316a1c2341f3bbc207c279cf35881d9c2a53c9adb4
7
+ data.tar.gz: 63b2b52cc9f4a340f8e261242a66e98b15677282c3beb2ca1f0fbdb9912bcda11ccb13fcb3f0fceeb4bfe7bcdaad5e1199538cb4afb2f7ffdf7245d49e11686e
data/lib/pec.rb CHANGED
@@ -60,17 +60,13 @@ module Pec
60
60
  server_list(config).find {|s|s.name == config.name}
61
61
  end
62
62
 
63
- def self.get_tenant_id(config)
64
- config.tenant_id || tenant_list.find {|tenant| tenant.name == config.tenant}.id
63
+ def self.get_tenant_id
64
+ Yao.current_tenant_id
65
65
  end
66
66
 
67
67
  def self.server_list(config)
68
68
  @_server_list ||= {}
69
- @_server_list[config.tenant] ||= Yao::Server.list_detail({tenant_id: get_tenant_id(config)})
70
- end
71
-
72
- def self.tenant_list
73
- @_tenant_list ||= Yao::Tenant.list
69
+ @_server_list[config.tenant] ||= Yao::Server.list_detail({ tenant_id: get_tenant_id })
74
70
  end
75
71
 
76
72
  def self.flavor_list(server)
@@ -2,14 +2,10 @@ module Pec::Command
2
2
  class Status < Base
3
3
  def self.task(server, config)
4
4
  if server
5
- tenant_name = safe_was_delete(config.name, config.tenant, :tenant) do
6
- fetch_tenant(server).name
7
- end
8
-
5
+ tenant_name = config.tenant
9
6
  flavor_name = safe_was_delete(config.name, config.flavor, :flavor) do
10
7
  fetch_flavor(server).name
11
8
  end
12
-
13
9
  puts sprintf(
14
10
  " %-35s %-10s %-10s %-10s %-10s %-10s %-35s %-48s",
15
11
  config.name,
@@ -29,10 +25,6 @@ module Pec::Command
29
25
  end
30
26
  end
31
27
 
32
- def self.fetch_tenant(server)
33
- Pec.tenant_list.find {|tenant| tenant.id == server.tenant_id}
34
- end
35
-
36
28
  def self.fetch_flavor(server)
37
29
  Pec.flavor_list(server).find {|f|f.id == server.flavor['id']}
38
30
  end
@@ -74,9 +74,8 @@ module Pec::Handler
74
74
  end
75
75
 
76
76
  def security_group(config)
77
- tenant_id = config.tenant_id || Yao::Tenant.list.find {|t| t.name == config.tenant }.id
78
77
  ids = config.security_group.map do |name|
79
- sg = Yao::SecurityGroup.list.find {|sg| sg.name == name && tenant_id == sg.tenant_id }
78
+ sg = Yao::SecurityGroup.list.find {|sg| sg.name == name && Pec.get_tenant_id == sg.tenant_id }
80
79
  raise "security group #{name} is not found" unless sg
81
80
  sg.id
82
81
  end
@@ -1,3 +1,3 @@
1
1
  module Pec
2
- VERSION = "0.9.0"
2
+ VERSION = "0.9.1"
3
3
  end
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18
18
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
19
19
  spec.require_paths = ["lib"]
20
20
  spec.add_dependency 'thor', '~> 0.19.1'
21
- spec.add_dependency 'yao', '~> 0.2.2'
21
+ spec.add_dependency 'yao', '~> 0.2.13'
22
22
  spec.add_dependency 'ruby-ip', '~> 0.9.3'
23
23
  spec.add_dependency 'colorator', '~> 0.1'
24
24
  spec.add_development_dependency "bundler"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pec
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - kazuhiko yamashita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-20 00:00:00.000000000 Z
11
+ date: 2016-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.2
33
+ version: 0.2.13
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.2.2
40
+ version: 0.2.13
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-ip
43
43
  requirement: !ruby/object:Gem::Requirement