pec 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e289abbff98834305ea24c1bb20d3858d548fc9
-  data.tar.gz: 6a1187c24347f8783d03f84179c543a317a46b8c
+  metadata.gz: 4c127f2ce57f24e553a4a7a97e2e17a9b59e1d2f
+  data.tar.gz: 06ebdf5437d8f2bdb49525ce4b8adbec4863d830
 SHA512:
-  metadata.gz: 7e51d042af1b21821fd38a505d01ad2c82b9e970866b284dd0479f020bc54616b08656883788c0c38b97e2928e73169e4287830a80e6f1133e8ac35b30b3e31b
-  data.tar.gz: 9ae349b52e0cb7cc154cabb69c40dbda8a406f9ab2e44eb98a52bd9d65025e3a376c339b59999e97c46960818877a297344647f7940c792581c096d9cf26c688
+  metadata.gz: bc8b80525f965822e16a933ce72a4bc49db5cc0d382d0f232081f9083b383ba1fc051b974c287823412128bafd3c63e4b171b98c44694b5c49c89f4abda4a938
+  data.tar.gz: 66bfed05fd07cf6700ff9137545934c0288dfbc2e87769e5f34884b8c7e33de71ce47155b497b53ac86f6e83225a684508e113d7e9b235dd9da12aa83e0104ea

data/.gitignore

@@ -9,6 +9,7 @@
 /tmp/
 /vendor
 /*.yaml
+/*.erb
 *.sample
 /user_datas
 .ruby-version

data/README.md

@@ -31,7 +31,8 @@ create - /user_data/web_server.yaml.sample
     $ pec config <hostname_regex> <hostname_regex>...
 
 ### Configure
-#### Pec.yaml
+#### Pec.yaml or Pec.yaml.erb
+support format yaml,erb
 ```
 # merge of yaml
 _default_: &def
@@ -72,7 +73,7 @@ pyama-test002:
 # include config
 includes:
   - path/to/a.yaml
-  - path/to/b.yaml
+  - path/to/b.yaml.erb
 
 ```
 ##### Detail

data/lib/pec.rb

@@ -6,6 +6,7 @@ require 'thor'
 require 'ip'
 require 'colorator'
 require "pec/core"
+require "pec/config_file"
 require "pec/version"
 require "pec/logger"
 require "pec/configure"
@@ -31,21 +32,14 @@ module Pec
     @_last_tenant = _tenant_name if _tenant_name != @_last_tenant
   end
 
-  def self.load_config(config_name=nil)
+  def self.load_config(config_name="Pec.yaml")
     @_configure ||= []
-    config_name ||= 'Pec.yaml'
-    merge_config(config_name).to_hash.reject {|k,v| k[0].match(/\_/) || k.match(/^includes$/) }.each do |host|
+    ConfigFile.new(config_name).load.to_hash.reject {|k,v| k[0].match(/\_/) || k.match(/^includes$/) }.each do |host|
       @_configure << Pec::Configure.new(host)
     end
-  end
-
-  def self.merge_config(config_name)
-    base_config = YAML.load_file(config_name)
-    if include_files = base_config.to_hash.find{|k,v| k.match(/^includes$/) && !v.nil? }
-      YAML.load(File.read(config_name) + include_files[1].map {|f|File.read(f)}.join("\n"))
-    else
-      base_config
-    end
+  rescue => e
+    Pec::Logger.critical "configure error!"
+    raise e
   end
 
   def self.configure
@@ -53,11 +47,11 @@ module Pec
     @_configure
   end
 
-  def self.servers(hosts, options, fetch=false)
+  def self.servers(hosts, options, not_fetch)
     self.configure.each do |config|
       next if hosts.size > 0 && hosts.none? {|name| config.name.match(/^#{name}/)}
       Pec.init_yao(config.tenant)
-      server = fetch_server(config) if fetch
+      server = fetch_server(config) unless not_fetch
       yield(server, config)
     end
   end
@@ -102,6 +96,15 @@ module Pec
     end
   end
 
+  def self.processor_matching(source, klass)
+    source.keys.each do |k|
+      Object.const_get(klass.to_s).constants.each do |c|
+        object = Object.const_get("#{klass.to_s}::#{c}")
+        yield object if  k.to_s == object.kind.to_s
+      end
+    end
+  end
+
   def self.config_reset
     @_configure = nil
   end

data/lib/pec/command/base.rb

@@ -1,9 +1,8 @@
 module Pec::Command
   class Base
-    @fetch = false
     def self.run(host_name, options)
       before_do
-      Pec.servers(host_name, options, @fetch) do |server,config|
+      Pec.servers(host_name, options, not_fetch) do |server,config|
         task(host_name, options, server, config)
       end
       rescue => e
@@ -15,7 +14,9 @@ module Pec::Command
       Pec::Logger.info("\t" + e.backtrace.join("\n\t"))
     end
 
+    def self.not_fetch; end
     def self.task(host_name, options, server, config); end
     def self.before_do; end
+
   end
 end

data/lib/pec/command/config.rb

@@ -3,5 +3,9 @@ module Pec::Command
     def self.task(host_name, options, server, config)
       puts YAML.dump(config.inspect[0] => config.inspect[1])
     end
+
+    def self.not_fetch
+      true
+    end
   end
 end

data/lib/pec/command/destroy.rb

@@ -1,6 +1,5 @@
 module Pec::Command
   class Destroy < Base
-    @fetch = true
     def self.task(host_name, options, server, config)
       unless server
         Pec::Logger.notice "not be created #{config.name}"

data/lib/pec/command/halt.rb

@@ -1,6 +1,5 @@
 module Pec::Command
   class Halt < Base
-    @fetch = true
     def self.task(host_name, options, server, config)
       case
       when server.nil?

data/lib/pec/command/list.rb

@@ -10,5 +10,9 @@ module Pec::Command
     def self.before_do
       Thor.new.say("vm list:", :yellow)
     end
+
+    def self.not_fetch
+      true
+    end
   end
 end

data/lib/pec/command/status.rb

@@ -1,6 +1,5 @@
 module Pec::Command
   class Status < Base
-    @fetch = true
     def self.task(host_name, options, server, config)
       if server
         puts sprintf(

data/lib/pec/command/up.rb

@@ -1,6 +1,5 @@
 module Pec::Command
   class Up < Base
-    @fetch = true
     def self.task(host_name, options, server, config)
       case
       when server.nil?
@@ -8,12 +7,16 @@ module Pec::Command
         attribute = {name: config.name}
 
         begin
-          processor_matching(config, Pec::Handler) do |klass|
-            attribute.deep_merge!(klass.build(config))
+          Pec.processor_matching(config, Pec::Handler) do |klass|
+            if attr = klass.build(config)
+              attribute.deep_merge!(attr)
+            end
           end
 
-          processor_matching(attribute, Pec::Handler) do |klass|
-            attribute.deep_merge!(klass.post_build(config, attribute))
+          Pec.processor_matching(attribute, Pec::Handler) do |klass|
+            if attr = klass.post_build(config, attribute)
+              attribute.deep_merge!(attr)
+            end
           end
 
           Yao::Server.create(attribute)
@@ -22,8 +25,8 @@ module Pec::Command
           Pec::Logger.critical(e)
           Pec::Logger.warning "recovery start #{config.name}"
 
-          processor_matching(config, Pec::Handler) do |klass|
-            attribute.deep_merge!(klass.recover(attribute))
+          Pec.processor_matching(config, Pec::Handler) do |klass|
+            klass.recover(attribute)
           end
           Pec::Logger.warning "recovery success! #{config.name}"
         end
@@ -36,13 +39,5 @@ module Pec::Command
       end
     end
 
-    def self.processor_matching(source, klass)
-      source.keys.each do |k|
-        Object.const_get(klass.to_s).constants.each do |c|
-          object = Object.const_get("#{klass.to_s}::#{c}")
-          yield object if  k.to_s == object.kind.to_s
-        end
-      end
-    end
   end
 end

data/lib/pec/config_file.rb

@@ -0,0 +1,32 @@
+require 'erb'
+module Pec
+  class ConfigFile
+    attr_accessor :config_name
+    def initialize(config_name)
+      self.config_name = File.exist?("#{config_name}.erb") ? "#{config_name}.erb" : config_name
+    end
+
+    def load
+      base = read_file(config_name)
+      include_files = YAML.load(base).to_hash.find{|k,v| k.match(/^includes$/) && !v.nil? }
+      inc = include_files ? include_files[1].map {|f| read_file(f)}.join("\n") : ""
+      YAML.load(base + inc)
+    end
+
+    def read_file(file_name)
+      if File.exist?(file_name)
+        case
+          when file_name.match(/.erb$/)
+            erb = ERB.new(File.read(file_name), nil, '%-')
+            erb.result
+          when file_name.match(/.yaml$/) || file_name.match(/.yml$/)
+            File.read(file_name)
+          else
+            raise "not match file type must be yaml or erb"
+        end
+      else
+        raise "not file exiets! #{file_name}"
+      end
+    end
+  end
+end

data/lib/pec/handler/networks.rb

@@ -24,10 +24,14 @@ module Pec::Handler
       end
 
       def recover(attribute)
+        return unless attribute[:networks]
+
         Pec::Logger.notice "start port recovery"
         attribute[:networks].each do |port|
-          Yao::Port.destroy(port[:port])
-          Pec::Logger.notice "port delete id:#{port[:port]}"
+          if port[:port]
+            Yao::Port.destroy(port[:port])
+            Pec::Logger.notice "port delete id:#{port[:port]}"
+          end
         end
         Pec::Logger.notice "complete port recovery"
       end
@@ -58,13 +62,9 @@ module Pec::Handler
           security_group(host)
         ) if host.security_group
 
-        network[CONFIG].keys.each do |k|
-          Pec::Handler::Networks.constants.each do |c|
-            if Object.const_get("Pec::Handler::Networks::#{c}").kind == k &&
-                ops = Object.const_get("Pec::Handler::Networks::#{c}").build(network)
-              attribute.deep_merge!(ops)
-            end
-          end
+        Pec.processor_matching(network[CONFIG], Pec::Handler::Networks) do |klass|
+          ops = klass.build(network)
+          attribute.deep_merge!(ops) if ops
         end
 
         attribute

data/lib/pec/handler/user_data.rb

@@ -11,14 +11,8 @@ module Pec::Handler
     end
 
     def self.post_build(host, attribute)
-      attribute.keys.each do |k|
-        Pec::Handler::UserData.constants.each do |c|
-          klass = Object.const_get("Pec::Handler::UserData::#{c}")
-
-          if klass.kind.to_s == k.to_s
-            attribute = klass.post_build(host, attribute)
-          end
-        end
+      Pec.processor_matching(attribute, Pec::Handler::UserData) do |klass|
+        attribute = klass.post_build(host, attribute)
       end
       attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
       attribute

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

@@ -8,12 +8,11 @@ module Pec::Handler
 
     class << self
       def post_build(host, attribute)
-        _nic = Pec::Handler::UserData::Nic.constants.reject {|c|c.to_s.downcase == "base"}.find do |c|
-          host.os_type && Object.const_get("Pec::Handler::UserData::Nic::#{c}").os_type.include?(host.os_type)
-        end
-
-        nic = if _nic
-          Object.const_get("Pec::Handler::UserData::Nic::#{_nic}")
+        nic = if host.os_type
+          os = Pec::Handler::UserData::Nic.constants.find do |c|
+            Object.const_get("Pec::Handler::UserData::Nic::#{c}").os_type.include?(host.os_type)
+          end
+          Object.const_get("Pec::Handler::UserData::Nic::#{os}")
         else
           Pec::Handler::UserData::Nic::Rhel
         end

data/lib/pec/handler/user_data/nic/base.rb

@@ -35,5 +35,6 @@ module Pec::Handler
         raise "undfined method ifcfg_config"
       end
     end
+    self.os_type = []
   end
 end

data/lib/pec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -152,6 +152,7 @@ files:
 - lib/pec/command/status.rb
 - lib/pec/command/up.rb
 - lib/pec/config_error.rb
+- lib/pec/config_file.rb
 - lib/pec/configure.rb
 - lib/pec/core.rb
 - lib/pec/handler.rb