pec 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 350cb27b8eccbde2325bc58c5990cc4ff6fe60e4
-  data.tar.gz: 533a29a9be01f3c2cf08034aecc4574673a5711b
+  metadata.gz: 1a615c6aea01b3e516f72fc1806e0915730ec4a8
+  data.tar.gz: 45adb312f61ef71c5206bb00b2ebca11d6d563ef
 SHA512:
-  metadata.gz: ebcaf262a0f6fcf8a298da144df6299f053b4d95d549cc76d514f6229c547382da34b0ffbafe48249d4a0c4759ae4fd8ed0f059e2199f2e846a339c9f5abb203
-  data.tar.gz: cf7518813e5014a3980f41a4712753e9189de1a82fc8b6d4b898afedaacaf69ad9d17cd856570ccc16a1bfe2a84f79e7889854d6d1e1e144e18a718a455e6080
+  metadata.gz: 124c0ca363138d554dcad5fad3248574025c85c96cd1d4ae579481799443fd152e392053deb54c6f288d56f245c5ef26358d9b7f96e72570e7c6adaee16b82da
+  data.tar.gz: fc002a6b3b3d6bef233c4638aedc420c793471ac6f21f1000a4f32c9626c6b5589b7b97f2a6f692bcd745d1cbe986034a42fed689057a06eb84372240b088d9a

data/README.md

@@ -1,5 +1,5 @@
 # Pec
-[![Build Status](https://travis-ci.org/pyama86/pec.svg?branch=master)](https://travis-ci.org/pyama86/pec)
+[![Build Status](https://travis-ci.org/yaocloud/pec.svg?branch=v0.7.7)](https://travis-ci.org/yaocloud/pec)
 [![Code Climate](https://codeclimate.com/github/pyama86/pec/badges/gpa.svg)](https://codeclimate.com/github/pyama86/pec)
 [![Test Coverage](https://codeclimate.com/github/pyama86/pec/badges/coverage.svg)](https://codeclimate.com/github/pyama86/pec/coverage)
 
@@ -20,10 +20,14 @@ create - /user_data/web_server.yaml.sample
 
     $ pec up <hostname_regex> <hostname_regex>...
 
-    $ pec destroy <hostname_regex> <hostname_regex>... 
+    $ pec destroy <hostname_regex> <hostname_regex>...
+
+    $ pec halt <hostname_regex> <hostname_regex>...
 
     $ pec status <hostname_regex> <hostname_regex>...
 
+    $ pec list
+
     $ pec config <hostname_regex> <hostname_regex>...
 
 ### Configure

data/lib/pec.rb

@@ -58,11 +58,41 @@ module Pec
     self.configure.each do |config|
       next if hosts.size > 0 && hosts.none? {|name| config.name.match(/^#{name}/)}
       Pec.init_yao(config.tenant)
-      server = Yao::Server.list_detail("name" => config.name).first if fetch
+      server = fetch_server(config) if fetch
       yield(server, config)
     end
   end
 
+  def self.fetch_server(config)
+    server_list(config).find {|s|s.name == config.name}
+  end
+
+  def self.fetch_tenant_by_id(server)
+    tenant_list.find {|tenant| tenant.id == server.tenant_id}
+  end
+
+  def self.fetch_tenant_by_name(config)
+    tenant_list.find {|tenant| tenant.name == config.tenant}
+  end
+
+  def self.fetch_flavor(server)
+    flavor_list(server).find {|f|f.id == server.flavor['id']}
+  end
+
+  def self.server_list(config)
+    @_server_list ||= {}
+    @_server_list[config.tenant] ||= Yao::Server.list_detail({tenant_id: fetch_tenant_by_name(config).id})
+  end
+
+  def self.tenant_list
+    @_tenant_list ||= Yao::Tenant.list
+  end
+
+  def self.flavor_list(server)
+    @_flavor_list ||= {}
+    @_flavor_list[server.tenant_id] ||= Yao::Flavor.list
+  end
+
   def self.check_env
     %w(
       OS_AUTH_URL

data/lib/pec/cli.rb

@@ -4,7 +4,7 @@ module Pec
 
     desc 'init', 'create sample config'
     def init
-      _sub_command(nil, options)
+      _sub_command([], options)
     end
 
     desc 'up [HOSTNAME1, HOSTNAME2, ...]', 'create vm by Pec.yaml'
@@ -18,6 +18,11 @@ module Pec
       _sub_command(hosts, options)
     end
 
+    desc "halt [HOSTNAME1, HOSTNAME2, ...]", "halt vm"
+    def halt(*hosts)
+      _sub_command(hosts, options)
+    end
+
     desc "status [HOSTNAME1, HOSTNAME2, ...]", "vm status"
     def status(*hosts)
       _sub_command(hosts, options)
@@ -25,7 +30,7 @@ module Pec
 
     desc "list", "vm list"
     def list
-      _sub_command(nil, options)
+      _sub_command([], options)
     end
 
     desc "config [HOSTNAME1, HOSTNAME2, ...]", "show configure"

data/lib/pec/command.rb

@@ -3,6 +3,7 @@ module Pec
     autoload :Base,    "pec/command/base"
     autoload :Up,      "pec/command/up"
     autoload :Destroy, "pec/command/destroy"
+    autoload :Halt,    "pec/command/halt"
     autoload :Status,  "pec/command/status"
     autoload :Config,  "pec/command/config"
     autoload :Init,    "pec/command/init"

data/lib/pec/command/halt.rb

@@ -0,0 +1,16 @@
+module Pec::Command
+  class Halt < Base
+    @fetch = true
+    def self.task(host_name, options, server, config)
+      case
+      when server.nil?
+        Pec::Logger.notice "not be created #{config.name}"
+      when server.status != "ACTIVE"
+        Pec::Logger.notice "#{config.name} server status is #{server.status} must be ACTIVE"
+      else
+        Yao::Server.shutoff(server.id)
+        Pec::Logger.info "#{config.name} is halted!"
+      end
+    end
+  end
+end

data/lib/pec/command/status.rb

@@ -7,8 +7,8 @@ module Pec::Command
           " %-35s %-10s %-10s %-10s %-10s %-10s %-35s %-48s",
           config.name,
           server.status,
-          tenant_name(server),
-          flavor_name(server),
+          Pec.fetch_tenant_by_id(server).name,
+          Pec.fetch_flavor(server).name,
           server.availability_zone,
           server.key_name,
           server.ext_srv_attr_host,
@@ -22,19 +22,6 @@ module Pec::Command
       end
     end
 
-    def self.tenant_name(server)
-      tenant_list.find {|tenant| tenant.id == server.tenant_id}.name
-    end
-
-    def self.tenant_list
-      @@_tenant_list ||= Yao::Tenant.list
-      @@_tenant_list
-    end
-
-    def self.flavor_name(server)
-      Yao::Flavor.get(server.flavor['id']).name
-    end
-
     def self.ip_addresses(server)
       server.addresses.map do |ethers|
         ethers[1].map do |ether|

data/lib/pec/command/up.rb

@@ -2,7 +2,8 @@ module Pec::Command
   class Up < Base
     @fetch = true
     def self.task(host_name, options, server, config)
-      unless server
+      case
+      when server.nil?
         Pec::Logger.info "make start #{config.name}"
 
         attribute = {name: config.name}
@@ -16,6 +17,9 @@ module Pec::Command
 
         Yao::Server.create(attribute)
         Pec::Logger.info "create success! #{config.name}"
+      when server.status == "SHUTOFF"
+        Yao::Server.start(server.id)
+        Pec::Logger.info "start server: #{config.name}"
       else
         Pec::Logger.notice "already server: #{config.name}"
       end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 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.0.6'
+  spec.add_dependency 'yao', '~> 0.2.2'
   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.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/pec/command/base.rb
 - lib/pec/command/config.rb
 - lib/pec/command/destroy.rb
+- lib/pec/command/halt.rb
 - lib/pec/command/init.rb
 - lib/pec/command/list.rb
 - lib/pec/command/status.rb