pec 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39403ae482bef2606f9eac2fba8477c61772ed43
-  data.tar.gz: 81ae4ef40939d3b775def68c2892869246931cd8
+  metadata.gz: bff0038d6e2313f1e3b8b039dfae6a5c07766c7f
+  data.tar.gz: cc9ebdecf5f4d785c8bcbe296ee3b94c022201e4
 SHA512:
-  metadata.gz: 541e589d51496de9be957b031a78f0d9c62d794374e50ee39682d044e71ae738ebd40527f8175df65709fe0f0e68babc77ce50e83827374cf3e80fef1eefe291
-  data.tar.gz: c4aa962da6abe6d2a4d8cbba8b0c553dcfb2d6827bf3fb987b436e75118f667f0201563f3b89ada115ad15e5350b04c01623603c9a7f971dec710580ef7cbec6
+  metadata.gz: 9250a610cd7bc60cdf757b4ff067f78640b8954eba8d746de3ad36b18457770cadb86199099f6c017c7e207a611a6199faa129ea7579144b611a2e94a78ec5d1
+  data.tar.gz: 78dfab706b07339bbcc385593127141c2084af477233d9ca448c8c39aada1e9f349a660f2749d153b25ceca54e914aa4f22c79faa8345366838250ee83141102

data/exe/pec

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-
-require "pec"
+require 'pec'
+Pec::CLI.start

data/lib/pec/cli.rb

@@ -4,100 +4,28 @@ module Pec
 
     desc 'init', 'create sample config'
     def init
-      Pec::Init.show_env_setting
-      Pec::Init.create_template_dir
-      Pec::Init.create_sample_config
+      _sub_command(host_name, options)
     end
 
     desc 'up', 'create vm by Pec.yaml'
     def up(host_name = nil)
-      Pec.configure.each do |host|
-        next if host_name && host.name != host_name
-        Pec.init_yao(host.tenant)
-
-        server = Yao::Server.list_detail.find {|s|s.name == host.name}
-        if server
-          Pec::Logger.notice "already exists: #{host.name}"
-          next
-        end
-        Pec::Logger.info "make start #{host.name}"
-
-        attribute = { name: host.name}
-        host.keys.each do |k|
-          Pec::Handler.constants.each do |c|
-            if Object.const_get("Pec::Handler::#{c}").kind == k
-              attribute.deep_merge!(Object.const_get("Pec::Handler::#{c}").build(host))
-            end
-          end
-        end
-        attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
-
-        Yao::Server.create(attribute)
-        Pec::Logger.info "create success! #{host.name}"
-      end
-      rescue => e
-        print_exception(e)
+      _sub_command(host_name, options)
     end
 
     option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
     def destroy(host_name = nil)
-      Pec.configure.each do |host|
-        next if host_name && host.name != host_name
-        Pec.init_yao(host.tenant)
-
-        server = Yao::Server.list_detail.find {|s|s.name == host.name}
-        unless server
-          Pec::Logger.notice "not be created #{host.name}"
-          next
-        end
-
-        if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
-          Yao::Server.destroy(server.id)
-          Pec::Logger.info "#{host.name} is deleted!"
-        end
-      end
-
-      rescue => e
-        print_exception(e)
+      _sub_command(host_name, options)
     end
 
     desc "status", "vm status"
     def status(host_name = nil)
-      say("Current machine stasus:", :yellow)
-      Pec.configure.each do |host|
-        next if host_name && host.name != host_name
-        Pec.init_yao(host.tenant)
-        if server = Yao::Server.list_detail.find {|s|s.name == host.name}
-          puts sprintf(" %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
-            host.name,
-            server.status,
-            Yao::Tenant.list.find {|tenant| tenant.id == server.tenant_id}.name,
-            Yao::Flavor.get(server.flavor['id']).name,
-            server.availability_zone,
-            server.ext_srv_attr_host,
-            server.addresses.map do |ethers|
-              ethers[1].map do |ether|
-                ether["addr"]
-              end
-            end.flatten.join(",")
-          )
-        else
-          puts sprintf(" %-35s %-10s",
-            host.name,
-            "uncreated"
-          )
-        end
-      end
-    rescue => e
-      print_exception(e)
+      _sub_command(host_name, options)
     end
 
     desc "config", "show configure"
     def config
-      puts YAML.dump(
-        YAML.load_file("Pec.yaml").to_hash.reject {|c| c[0].to_s.match(/^_/)}
-      )
+      _sub_command(host_name, options)
     end
 
     map %w[--version -v] => :__print_version
@@ -106,12 +34,9 @@ module Pec
       puts Pec::VERSION
     end
 
-
     no_commands do
-
-      def print_exception(e)
-        Pec::Logger.critical(e)
-        Pec::Logger.info("\t" + e.backtrace.join("\n\t"))
+      def _sub_command(host_name, options)
+        Object.const_get("Pec::Command::#{caller[0][/`([^']*)'/, 1].capitalize}").run(host_name, options)
       end
     end
   end

data/lib/pec/command/base.rb

@@ -0,0 +1,18 @@
+module Pec::Command
+  class Base
+    def self.run(host_name, options)
+      Pec.servers(host_name) do |server,config|
+        task(host_name, options, server, config)
+      end
+      rescue => e
+        print_exception(e)
+    end
+
+    def self.print_exception(e)
+      Pec::Logger.critical(e)
+      Pec::Logger.info("\t" + e.backtrace.join("\n\t"))
+    end
+
+    def self.task(host_name, options, server, config); end
+  end
+end

data/lib/pec/command/config.rb

@@ -0,0 +1,11 @@
+module Pec::Command
+  class Config < Base
+    def self.run(host_name, options)
+      puts YAML.dump(
+        YAML.load_file("Pec.yaml").to_hash.reject {|c| c[0].to_s.match(/^_/)}
+      )
+      rescue => e
+        print_exception(e)
+    end
+  end
+end

data/lib/pec/command/destroy.rb

@@ -0,0 +1,14 @@
+module Pec::Command
+  class Destroy < Base
+    def self.task(host_name, options, 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]")
+          Yao::Server.destroy(server.id)
+          Pec::Logger.info "#{config.name} is deleted!"
+        end
+      end
+    end
+  end
+end

data/lib/pec/command/init.rb

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

data/lib/pec/command/status.rb

@@ -0,0 +1,40 @@
+module Pec::Command
+  class Status < Base
+    def self.task(host_name, options, server, config)
+      Thor.new.say("Current machine stasus:", :yellow)
+      if server
+        puts sprintf(
+          " %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
+          config.name,
+          server.status,
+          tenant_name(server),
+          flavor_name(server),
+          server.availability_zone,
+          server.ext_srv_attr_host,
+          ip_addresses(server)
+        )
+      else
+        puts sprintf(" %-35s %-10s",
+          config.name,
+          "uncreated"
+        )
+      end
+    end
+
+    def self.tenant_name(server)
+      Yao::Tenant.list.find {|tenant| tenant.id == server.tenant_id}.name
+    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|
+          ether["addr"]
+        end
+      end.flatten.join(",")
+    end
+  end
+end

data/lib/pec/command/up.rb

@@ -0,0 +1,24 @@
+module Pec::Command
+  class Up < Base
+    def self.task(host_name, options, server, config)
+      unless server
+        Pec::Logger.info "make start #{config.name}"
+
+        attribute = {name: config.name}
+        config.keys.each do |k|
+          Pec::Handler.constants.each do |c|
+            _handler = Object.const_get("Pec::Handler::#{c}")
+            attribute.deep_merge!(_handler.build(config)) if _handler.kind == k
+          end
+        end
+
+        attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
+
+        Yao::Server.create(attribute)
+        Pec::Logger.info "create success! #{config.name}"
+      else
+        Pec::Logger.notice "already server: #{config.name}"
+      end
+    end
+  end
+end

data/lib/pec/command.rb

@@ -0,0 +1,10 @@
+module Pec
+  module Command
+    autoload :Base,    "pec/command/base"
+    autoload :Up,      "pec/command/up"
+    autoload :Destroy, "pec/command/destroy"
+    autoload :Status,  "pec/command/status"
+    autoload :Config,  "pec/command/config"
+    autoload :Init,    "pec/command/init"
+  end
+end

data/lib/pec/config_error.rb

@@ -0,0 +1,2 @@
+class Pec::ConfigError < StandardError
+end

data/lib/pec/configure.rb

@@ -1,3 +1,5 @@
+require "pec/config_error"
+
 module Pec
   class Configure
     def initialize(config)

data/lib/pec/handler/keypair.rb

@@ -0,0 +1,19 @@
+module Pec::Handler
+  class Keypair < Base
+    self.kind = 'keypair'
+
+    def self.build(host)
+      return({}) unless host.keypair
+
+      Pec::Logger.notice "keypair is #{host.keypair}"
+      keypair = Yao::Keypair.list.find {|k| k.name == host.keypair }
+      if keypair
+        {
+          key_name: keypair.name,
+        }
+      else
+        raise Pec::ConfigError, "keypair name=#{host.keypair} does not exist"
+      end
+    end
+  end
+end

data/lib/pec/handler.rb

@@ -4,6 +4,7 @@ module Pec
     autoload :AvailabilityZone, "pec/handler/availability_zone"
     autoload :Image,            "pec/handler/image"
     autoload :Flavor,           "pec/handler/flavor"
+    autoload :Keypair,          "pec/handler/keypair"
     autoload :Networks,         "pec/handler/networks"
     autoload :UserData,         "pec/handler/user_data"
     autoload :Templates,        "pec/handler/templates"

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/pec.rb

@@ -9,6 +9,7 @@ require "pec/version"
 require "pec/logger"
 require "pec/configure"
 require "pec/handler"
+require "pec/command"
 require "pec/sample"
 require "pec/init"
 require "pec/cli"
@@ -38,6 +39,15 @@ module Pec
     @_configure
   end
 
+  def self.servers(host_name)
+    self.configure.each do |host|
+      next if host_name && host.name != host_name
+      Pec.init_yao(host.tenant)
+      server = Yao::Server.list_detail.find {|s|s.name == host.name}
+      yield(server, host)
+    end
+  end
+
   def self.check_env
     %w(
       OS_AUTH_URL
@@ -47,7 +57,6 @@ module Pec
       raise "please set env #{name}" unless ENV[name]
     end
   end
-
 end
 
 class ::Hash
@@ -60,4 +69,3 @@ class ::Hash
     self.merge!(deep_merge(second))
   end
 end
-

data/pec.gemspec

@@ -15,13 +15,14 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  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.5'
+  spec.add_dependency 'yao', '~> 0.0.6'
   spec.add_dependency 'ruby-ip', '~> 0.9.3'
   spec.add_dependency 'colorator', '~> 0.1'
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 3"
+  spec.add_development_dependency "rspec-mocks", ">= 3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: yao
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +126,7 @@ description: openstack vm booter.
 email:
 - pyama@pepabo.com
 executables:
-- console
 - pec
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -130,12 +142,21 @@ files:
 - exe/pec
 - lib/pec.rb
 - lib/pec/cli.rb
+- lib/pec/command.rb
+- lib/pec/command/base.rb
+- lib/pec/command/config.rb
+- lib/pec/command/destroy.rb
+- lib/pec/command/init.rb
+- lib/pec/command/status.rb
+- lib/pec/command/up.rb
+- lib/pec/config_error.rb
 - lib/pec/configure.rb
 - lib/pec/handler.rb
 - lib/pec/handler/availability_zone.rb
 - lib/pec/handler/base.rb
 - lib/pec/handler/flavor.rb
 - lib/pec/handler/image.rb
+- lib/pec/handler/keypair.rb
 - lib/pec/handler/networks.rb
 - lib/pec/handler/networks/allowed_address_pairs.rb
 - lib/pec/handler/networks/ip_address.rb
@@ -167,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: openstack vm booter.