pec 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392f342e2b27871767f7fe5948146787f87980a0
-  data.tar.gz: baf04990a37528b744de4c363dab705d10148148
+  metadata.gz: dd6ea4a1fa6340313d44899c220566c6fa5e4cae
+  data.tar.gz: 16e51f3871ddb5afa37965e5ffb46e92fe3ecd59
 SHA512:
-  metadata.gz: eeb3951cf5e8aa8842f4a7c781b84146703c97b96f28ded998129ab7d3fbb1a5a916e2f8d0e13998d26aa8310c9d3a50f7e7906705fe68de8875102ae60decde
-  data.tar.gz: 0f1f0ab20596024f81aa30acb57c898ae8e6d2871e4221c63ea39b26630528bfb54414260a45ef1399a79ff1387b67a9ab54d4f8b0c2882792189a115de5e31d
+  metadata.gz: e1a5519d1c253561ad6a6fa9f78b759def366c4a77da4b90a38825c41897cf4816939521c5b9fa6fbf44019f57f6d50edbe7ec114621779b53c48d13d3dbaebb
+  data.tar.gz: fe38e105be95783a070f21d1718c09b1f07c59aaca42e8bd92a7b015e1870b03a64aee4edfd95c68bb355ebfede97d56f49fc383156f300c1da702b5d7240315

data/README.md

@@ -66,7 +66,7 @@ pyama-test002:
 ・・・
 
 # include config
-inludes:
+includes:
   - path/to/a.yaml
   - path/to/b.yaml
 
@@ -103,7 +103,7 @@ Items other than the above are output to the configuration file with `KEY = valu
 #### Includes
 ```yaml
 # example
-inludes:
+includes:
   - path/to/a.yaml
   - path/to/b.yaml
 ```

data/lib/pec.rb

@@ -5,6 +5,7 @@ require 'yaml'
 require 'thor'
 require 'ip'
 require 'colorator'
+require "pec/core"
 require "pec/version"
 require "pec/logger"
 require "pec/configure"
@@ -16,16 +17,21 @@ require "pec/init"
 require "pec/cli"
 
 module Pec
-  def self.init_yao(_tenant_name=nil)
+  def self.init_yao(_tenant_name)
+    return unless reload_yao?(_tenant_name)
     check_env
     Yao.configure do
       auth_url "#{ENV["OS_AUTH_URL"]}/tokens"
       username ENV["OS_USERNAME"]
       password ENV["OS_PASSWORD"]
-      tenant_name _tenant_name || ENV["OS_TENANT_NAME"]
+      tenant_name _tenant_name
     end
   end
 
+  def self.reload_yao?(_tenant_name)
+    @_last_tenant = _tenant_name if _tenant_name != @_last_tenant
+  end
+
   def self.load_config(config_name=nil)
     @_configure ||= []
     config_name ||= 'Pec.yaml'
@@ -52,7 +58,7 @@ 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.find {|s|s.name == config.name} if fetch
+      server = Yao::Server.list_detail("name" => config.name).first if fetch
       yield(server, config)
     end
   end

data/lib/pec/command/status.rb

@@ -23,7 +23,12 @@ module Pec::Command
     end
 
     def self.tenant_name(server)
-      Yao::Tenant.list.find {|tenant| tenant.id == server.tenant_id}.name
+      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)

data/lib/pec/configure.rb

@@ -30,7 +30,7 @@ module Pec
         flavor
         networks
       ).each do |k|
-        raise "host key #{k} is require" unless host[1][k]
+        raise "#{host[0]}:host key #{k} is require" unless host[1][k]
       end
     end
   end

data/lib/pec/coordinate.rb

@@ -1,6 +1,5 @@
 module Pec
   module Coordinate
-    autoload :Base,     "pec/coordinate/base"
     autoload :UserData, "pec/coordinate/user_data"
   end
 end

data/lib/pec/coordinate/user_data.rb

@@ -1,6 +1,6 @@
 module Pec::Coordinate
-  class UserData < Base
-    autoload :Base, "pec/coordinate/user_data/base"
+  class UserData
+    extend Pec::Core
     autoload :Nic,  "pec/coordinate/user_data/nic"
     self.kind = 'user_data'
 

data/lib/pec/coordinate/user_data/nic.rb

@@ -1,13 +1,12 @@
 module Pec::Coordinate
-  class UserData::Nic < Base
+  class UserData::Nic
+    extend Pec::Core
     autoload :Base,   "pec/coordinate/user_data/nic/base"
     autoload :Rhel,   "pec/coordinate/user_data/nic/rhel"
     autoload :Ubuntu, "pec/coordinate/user_data/nic/ubuntu"
     self.kind = 'networks'
 
     class << self
-      NAME = 0
-      CONFIG = 1
       def build(host, attribute)
         _nic = Pec::Coordinate::UserData::Nic.constants.reject {|c|c.to_s.downcase == "base"}.find do |c|
           host.os_type && Object.const_get("Pec::Coordinate::UserData::Nic::#{c}").os_type.include?(host.os_type)

data/lib/pec/core.rb

@@ -0,0 +1,7 @@
+module Pec
+  module Core
+  attr_accessor :kind
+  def build(*args)
+    raise "#{self.class.name} not defined method build"
+  end
+end

data/lib/pec/handler.rb

@@ -1,6 +1,5 @@
 module Pec
   module Handler
-    autoload :Base,             "pec/handler/base"
     autoload :AvailabilityZone, "pec/handler/availability_zone"
     autoload :Image,            "pec/handler/image"
     autoload :Flavor,           "pec/handler/flavor"

data/lib/pec/handler/availability_zone.rb

@@ -1,5 +1,6 @@
 module Pec::Handler
-  class AvailabilityZone < Base 
+  class AvailabilityZone
+    extend Pec::Core
     self.kind = 'availability_zone'
 
     def self.build(host)

data/lib/pec/handler/flavor.rb

@@ -1,12 +1,16 @@
 module Pec::Handler
-  class Flavor < Base 
+  class Flavor
+    extend Pec::Core
     self.kind = 'image'
 
     def self.build(host)
       Pec::Logger.notice "flavor is #{host.flavor}"
+      flavor_id = Yao::Flavor.list.find {|flavor| flavor.name == host.flavor}.id
       {
-        flavorRef:  Yao::Flavor.list.find {|flavor| flavor.name == host.flavor}.id
+        flavorRef:  flavor_id
       }
+    rescue
+      raise Pec::ConfigError, "flavor name=#{host.flavor} does not exist"
     end
   end
 end

data/lib/pec/handler/image.rb

@@ -1,12 +1,16 @@
 module Pec::Handler
-  class Image < Base 
+  class Image
+    extend Pec::Core
     self.kind = 'image'
 
     def self.build(host)
       Pec::Logger.notice "image is #{host.image}"
+      image_id = Yao::Image.list.find {|image| image.name == host.image}.id
       {
-        imageRef:  Yao::Image.list.find {|image| image.name == host.image}.id
+        imageRef:  image_id
       }
+    rescue
+      raise Pec::ConfigError, "image name=#{host.image} does not exist"
     end
   end
 end

data/lib/pec/handler/keypair.rb

@@ -1,5 +1,6 @@
 module Pec::Handler
-  class Keypair < Base
+  class Keypair
+    extend Pec::Core
     self.kind = 'keypair'
 
     def self.build(host)

data/lib/pec/handler/networks.rb

@@ -1,7 +1,7 @@
 module Pec::Handler
-  class Networks < Base
+  class Networks
+    extend Pec::Core
     self.kind = 'networks'
-    autoload :OptionBase,          "pec/handler/networks/option_base"
     autoload :IpAddress,           "pec/handler/networks/ip_address"
     autoload :AllowedAddressPairs, "pec/handler/networks/allowed_address_pairs"
 

data/lib/pec/handler/networks/allowed_address_pairs.rb

@@ -1,6 +1,7 @@
 module Pec::Handler
   class Networks
-    class AllowedAddressPairs< OptionBase
+    class AllowedAddressPairs
+      extend Pec::Core
       self.kind = 'allowed_address_pairs'
       class << self
         def build(network)

data/lib/pec/handler/networks/ip_address.rb

@@ -1,12 +1,12 @@
 module Pec::Handler
   class Networks
-    class IpAddress < OptionBase
+    class IpAddress
+      extend Pec::Core
       self.kind = 'ip_address'
       class << self
         def build(network)
           ip = IP.new(network[1]['ip_address'])
           subnet = Yao::Subnet.list.find {|s|s.cidr == ip.network.to_s}
-
           if ip.to_s != subnet.cidr
             {
               fixed_ips: [

data/lib/pec/handler/templates.rb

@@ -1,5 +1,6 @@
 module Pec::Handler
-  class Templates < Base
+  class Templates
+    extend Pec::Core
     self.kind = 'templates'
     class << self
       def build(host)

data/lib/pec/handler/user_data.rb

@@ -1,5 +1,6 @@
 module Pec::Handler
-  class UserData < Base
+  class UserData
+    extend Pec::Core
     self.kind = 'user_data'
     class << self
       def build(host) 

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.4"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -153,23 +153,20 @@ files:
 - lib/pec/config_error.rb
 - lib/pec/configure.rb
 - lib/pec/coordinate.rb
-- lib/pec/coordinate/base.rb
 - lib/pec/coordinate/user_data.rb
-- lib/pec/coordinate/user_data/base.rb
 - lib/pec/coordinate/user_data/nic.rb
 - lib/pec/coordinate/user_data/nic/base.rb
 - lib/pec/coordinate/user_data/nic/rhel.rb
 - lib/pec/coordinate/user_data/nic/ubuntu.rb
+- lib/pec/core.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
-- lib/pec/handler/networks/option_base.rb
 - lib/pec/handler/templates.rb
 - lib/pec/handler/user_data.rb
 - lib/pec/init.rb

data/lib/pec/coordinate/base.rb

@@ -1,10 +0,0 @@
-module Pec::Coordinate
-  class Base
-    class << self
-      attr_accessor :kind
-      def build(host, attribute)
-        raise "not defined method"
-      end
-    end
-  end
-end

data/lib/pec/coordinate/user_data/base.rb

@@ -1,10 +0,0 @@
-module Pec::Coordinate
-  class UserData::Base
-    class << self
-      attr_accessor :kind
-      def build
-        raise "undefine method build"
-      end
-    end
-  end
-end

data/lib/pec/handler/base.rb

@@ -1,10 +0,0 @@
-module Pec::Handler
-  class Base
-    class << self
-      attr_accessor :kind
-      def build
-        raise "not defined method"
-      end
-    end
-  end
-end

data/lib/pec/handler/networks/option_base.rb

@@ -1,9 +0,0 @@
-module Pec::Handler
-  class Networks
-    class OptionBase
-      class << self
-        attr_accessor :kind
-      end
-    end
-  end
-end