pec 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c127f2ce57f24e553a4a7a97e2e17a9b59e1d2f
-  data.tar.gz: 06ebdf5437d8f2bdb49525ce4b8adbec4863d830
+  metadata.gz: 8e7978ae9aa271cb3d4eda126f8945a7393f1b2e
+  data.tar.gz: 7f4ff934b5ec8aaa6e788f8b8b74c4e374b39f99
 SHA512:
-  metadata.gz: bc8b80525f965822e16a933ce72a4bc49db5cc0d382d0f232081f9083b383ba1fc051b974c287823412128bafd3c63e4b171b98c44694b5c49c89f4abda4a938
-  data.tar.gz: 66bfed05fd07cf6700ff9137545934c0288dfbc2e87769e5f34884b8c7e33de71ce47155b497b53ac86f6e83225a684508e113d7e9b235dd9da12aa83e0104ea
+  metadata.gz: 214dce3511f37d2b170e5f167d2953ac80497c741459a20dc597709c7f8080cf94280f7cd1aaa58b756ce9682c6fdb860e8a65045be1e86778f6791497c902d8
+  data.tar.gz: 3bc0861d03adcbd7f12dbf5b45c486605fd43ff31897914806b0af551900a1953bce6ccb88a477a456d2c64cdc1d171e47f3463665de14ec853390e9358e9f81

data/lib/pec.rb

@@ -47,9 +47,9 @@ module Pec
     @_configure
   end
 
-  def self.servers(hosts, options, not_fetch)
+  def self.servers(filter_hosts, not_fetch)
     self.configure.each do |config|
-      next if hosts.size > 0 && hosts.none? {|name| config.name.match(/^#{name}/)}
+      next if filter_hosts.size > 0 && filter_hosts.none? {|name| config.name.match(/^#{name}/)}
       Pec.init_yao(config.tenant)
       server = fetch_server(config) unless not_fetch
       yield(server, config)
@@ -106,7 +106,20 @@ module Pec
   end
 
   def self.config_reset
-    @_configure = nil
+    %w(
+      _configure
+      _tenant_list
+      _server_list
+      _flavor_list
+    ).each do |name|
+      instance_variable_set("@#{name}".to_sym, nil)
+    end
+  end
+
+  def self.options(opt=nil)
+    @_opt ||= {}
+    @_opt = opt if opt
+    @_opt
   end
 end
 

data/lib/pec/cli.rb

@@ -8,24 +8,24 @@ module Pec
     end
 
     desc 'up [HOSTNAME1, HOSTNAME2, ...]', 'create vm by Pec.yaml'
-    def up(*hosts)
-      _sub_command(hosts, options)
+    def up(*filter_hosts)
+      _sub_command(filter_hosts, options)
     end
 
     option :force , type: :boolean, aliases: "-f"
     desc "destroy [HOSTNAME1, HOSTNAME2, ...]", "delete vm"
-    def destroy(*hosts)
-      _sub_command(hosts, options)
+    def destroy(*filter_hosts)
+      _sub_command(filter_hosts, options)
     end
 
     desc "halt [HOSTNAME1, HOSTNAME2, ...]", "halt vm"
-    def halt(*hosts)
-      _sub_command(hosts, options)
+    def halt(*filter_hosts)
+      _sub_command(filter_hosts, options)
     end
 
     desc "status [HOSTNAME1, HOSTNAME2, ...]", "vm status"
-    def status(*hosts)
-      _sub_command(hosts, options)
+    def status(*filter_hosts)
+      _sub_command(filter_hosts, options)
     end
 
     desc "list", "vm list"
@@ -34,8 +34,8 @@ module Pec
     end
 
     desc "config [HOSTNAME1, HOSTNAME2, ...]", "show configure"
-    def config(*hosts)
-      _sub_command(hosts, options)
+    def config(*filter_hosts)
+      _sub_command(filter_hosts, options)
     end
 
     map %w[--version -v] => :__print_version
@@ -45,8 +45,9 @@ module Pec
     end
 
     no_commands do
-      def _sub_command(hosts, options)
-        Object.const_get("Pec::Command::#{caller[0][/`([^']*)'/, 1].capitalize}").run(hosts, options)
+      def _sub_command(filter_hosts, options)
+        Pec.options options
+        Object.const_get("Pec::Command::#{caller[0][/`([^']*)'/, 1].capitalize}").run(filter_hosts)
       end
     end
   end

data/lib/pec/command/base.rb

@@ -1,10 +1,11 @@
 module Pec::Command
   class Base
-    def self.run(host_name, options)
+    def self.run(filter_hosts)
       before_do
-      Pec.servers(host_name, options, not_fetch) do |server,config|
-        task(host_name, options, server, config)
+      Pec.servers(filter_hosts, not_fetch) do |server,config|
+        task(server, config)
       end
+      after_do
       rescue => e
         print_exception(e)
     end
@@ -15,8 +16,9 @@ module Pec::Command
     end
 
     def self.not_fetch; end
-    def self.task(host_name, options, server, config); end
+    def self.task(server, config); end
     def self.before_do; end
+    def self.after_do; end
 
   end
 end

data/lib/pec/command/config.rb

@@ -1,6 +1,6 @@
 module Pec::Command
   class Config < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       puts YAML.dump(config.inspect[0] => config.inspect[1])
     end
 

data/lib/pec/command/destroy.rb

@@ -1,10 +1,10 @@
 module Pec::Command
   class Destroy < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       unless server
         Pec::Logger.notice "not be created #{config.name}"
       else
-        if options[:force] || Thor.new.yes?("#{config.name}: Are you sure you want to destroy the '#{config.name}' VM? [y/N]")
+        if Pec.options[:force] || Thor.new.yes?("#{config.name}: Are you sure you want to destroy the '#{config.name}' VM? [y/N]")
           Yao::Server.destroy(server.id)
           Pec::Logger.info "#{config.name} is deleted!"
         end

data/lib/pec/command/halt.rb

@@ -1,6 +1,6 @@
 module Pec::Command
   class Halt < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       case
       when server.nil?
         Pec::Logger.notice "not be created #{config.name}"

data/lib/pec/command/init.rb

@@ -1,6 +1,6 @@
 module Pec::Command
   class Init < Base
-    def self.run(host_name, options)
+    def self.run
       Pec::Init.show_env_setting
       Pec::Init.create_template_dir
       Pec::Init.create_sample_config

data/lib/pec/command/list.rb

@@ -1,6 +1,6 @@
 module Pec::Command
   class List < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       puts sprintf(
         " %-35s",
         config.name

data/lib/pec/command/status.rb

@@ -1,13 +1,21 @@
 module Pec::Command
   class Status < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       if server
+        tenant_name = safe_delete(config.name, config.tenant, :tenant) do
+          Pec.fetch_tenant_by_id(server).name
+        end
+
+        flavor_name = safe_delete(config.name, config.flavor, :flavor) do
+          Pec.fetch_flavor(server).name
+        end
+
         puts sprintf(
           " %-35s %-10s %-10s %-10s %-10s %-10s %-35s %-48s",
           config.name,
           server.status,
-          Pec.fetch_tenant_by_id(server).name,
-          Pec.fetch_flavor(server).name,
+          tenant_name,
+          flavor_name,
           server.availability_zone,
           server.key_name,
           server.ext_srv_attr_host,
@@ -30,7 +38,22 @@ module Pec::Command
     end
 
     def self.before_do
-      Thor.new.say("Current machine status:", :yellow)
+      @_error = nil
+      Pec::Logger.warning "Current machine status:"
+    end
+
+    def self.after_do
+      Pec::Logger.warning @_error.join("\n") if @_error
+    end
+
+    def self.safe_delete(host_name, default ,resource_name, &blk)
+      begin
+        blk.call
+      rescue
+        @_error ||= []
+        @_error << "#{host_name}:#{resource_name} is unmatch id. may be id has changed"
+        default
+      end
     end
   end
 end

data/lib/pec/command/up.rb

@@ -1,23 +1,14 @@
 module Pec::Command
   class Up < Base
-    def self.task(host_name, options, server, config)
+    def self.task(server, config)
       case
       when server.nil?
         Pec::Logger.info "make start #{config.name}"
         attribute = {name: config.name}
 
         begin
-          Pec.processor_matching(config, Pec::Handler) do |klass|
-            if attr = klass.build(config)
-              attribute.deep_merge!(attr)
-            end
-          end
-
-          Pec.processor_matching(attribute, Pec::Handler) do |klass|
-            if attr = klass.post_build(config, attribute)
-              attribute.deep_merge!(attr)
-            end
-          end
+          attribute = build(config, attribute)
+          attribute = post_build(config, attribute)
 
           Yao::Server.create(attribute)
           Pec::Logger.info "create success! #{config.name}"
@@ -39,5 +30,28 @@ module Pec::Command
       end
     end
 
+    class << self
+      %i(
+        build
+        post_build
+      ).each do |name|
+        define_method(name) do |config,attribute|
+          source = config
+          input = [config]
+
+          if name == :post_build
+            source = attribute
+            input = [config, attribute]
+          end
+
+          Pec.processor_matching(source, Pec::Handler) do |klass|
+            if attr = klass.send(name, *input)
+              attribute.deep_merge!(attr)
+            end
+          end
+          attribute
+        end
+      end
+    end
   end
 end

data/lib/pec/handler/templates.rb

@@ -15,7 +15,7 @@ module Pec::Handler
           raise "#{template} not fond!" unless FileTest.exist?("user_data/#{template}")
           merge_template.deep_merge!(YAML.load_file("user_data/#{template}").to_hash)
         end if host.templates
-      end 
+      end
     end
   end
 end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor