pec 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8eba0965d155a9f519d921295e942b6b106775
-  data.tar.gz: fa6a457c9dd23058705d20369890c3b772a251ee
+  metadata.gz: de4afe55b26feafd85e2735f85bfd4bcf7cfd765
+  data.tar.gz: c0bc229e8eb45d455d0a724aab16d0b360258a2d
 SHA512:
-  metadata.gz: 2f3e85aa04e43cc5f40f8dda96e5b7aa00455741ab24ebcd19a5c04c9861b952e6162cdd2ed37e49f29077cf2d24209a477d1408d270abcfe51c8b3722eff3ff
-  data.tar.gz: 0ba33459b7b1528d83f9cb10320240cc62eb8e91b940965d134596ec0a7f8bf6a14d53a69b4d193ce07c4a0347bce83be21894ae4aeea8861f692c2ba3a48046
+  metadata.gz: 397bde231b31ac5ea69cddacb767b4dfd05cfc9d6532ea58e98ce42b7c0b25d29ef55f854715fbd1ce018958f05e6d603528b0d6127b7b5e6fcd9adef67fb65d
+  data.tar.gz: 18c9cd6461af6ed0f80841bf8e07bb5165479c52a0c8098ab57326a81c7c9a4f2ac1f49e37982a6cd9fe32b9131f45ec19619b767b0209d0aded1fc73c103a15

data/README.md

@@ -29,11 +29,14 @@ create - /user_data/web_server.yaml.sample
 ### Configure
 #### Pec.yaml
 ```
+# merge of yaml
 _default_: &def
   tenant: your_tenant
   image: centos-7.1_chef-12.3_puppet-3.7
   flavor: m1.small
   availability_zone: nova
+
+# vm config
 pyama-test001:
   <<: *def
   networks:
@@ -61,6 +64,11 @@ pyama-test002:
   <<: *def
 ・・・
 
+# include config
+inludes:
+  - path/to/a.yaml
+  - path/to/b.yaml
+
 ```
 ##### Detail
 
@@ -89,5 +97,18 @@ pyama-test002:
 ※ bootproto=static is required
 Items other than the above are output to the configuration file with `KEY = value` format
 
+#### Includes
+```yaml
+# example
+inludes:
+  - path/to/a.yaml
+  - path/to/b.yaml
+```
+
+Read order is this as
+1.Pec.yaml
+2.path/to/a.yaml
+3.path/to/b.yaml
+
 ## Author
 * pyama86

data/lib/pec.rb

@@ -14,7 +14,6 @@ require "pec/sample"
 require "pec/init"
 require "pec/cli"
 
-
 module Pec
   def self.init_yao(_tenant_name=nil)
     check_env
@@ -26,24 +25,33 @@ module Pec
     end
   end
 
-  def self.load_config(file_name=nil)
-    file_name ||= 'Pec.yaml'
-    @_configure = []
-    YAML.load_file(file_name).to_hash.reject {|c| c[0].to_s.match(/^_/)}.each do |host|
+  def self.load_config(config_name=nil)
+    @_configure ||= []
+    config_name ||= 'Pec.yaml'
+    merge_config(config_name).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
+  end
+
   def self.configure
     load_config unless @_configure
     @_configure
   end
 
-  def self.servers(hosts)
+  def self.servers(hosts, options, fetch=false)
     self.configure.each do |config|
-      next if hosts && hosts.none? {|name| config.name.match(/^#{name}/)}
+      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}
+      server = Yao::Server.list_detail.find {|s|s.name == config.name} if fetch
       yield(server, config)
     end
   end
@@ -70,3 +78,4 @@ class ::Hash
     self.merge!(deep_merge(second))
   end
 end
+

data/lib/pec/cli.rb

@@ -7,18 +7,18 @@ module Pec
       _sub_command(nil, options)
     end
 
-    desc 'up', 'create vm by Pec.yaml'
+    desc 'up [HOSTNAME1, HOSTNAME2, ...]', 'create vm by Pec.yaml'
     def up(*hosts)
       _sub_command(hosts, options)
     end
 
     option :force , type: :boolean, aliases: "-f"
-    desc "destroy", "delete vm"
+    desc "destroy [HOSTNAME1, HOSTNAME2, ...]", "delete vm"
     def destroy(*hosts)
       _sub_command(hosts, options)
     end
 
-    desc "status", "vm status"
+    desc "status [HOSTNAME1, HOSTNAME2, ...]", "vm status"
     def status(*hosts)
       _sub_command(hosts, options)
     end
@@ -28,7 +28,7 @@ module Pec
       _sub_command(nil, options)
     end
 
-    desc "config", "show configure"
+    desc "config [HOSTNAME1, HOSTNAME2, ...]", "show configure"
     def config(*hosts)
       _sub_command(hosts, options)
     end

data/lib/pec/command/base.rb

@@ -1,7 +1,9 @@
 module Pec::Command
   class Base
+    @fetch = false
     def self.run(host_name, options)
-      Pec.servers(host_name) do |server,config|
+      before_do
+      Pec.servers(host_name, options, @fetch) do |server,config|
         task(host_name, options, server, config)
       end
       rescue => e
@@ -14,5 +16,6 @@ module Pec::Command
     end
 
     def self.task(host_name, options, server, config); end
+    def self.before_do; end
   end
 end

data/lib/pec/command/config.rb

@@ -1,13 +1,7 @@
 module Pec::Command
   class Config < Base
-    def self.run(hosts, options)
-      puts YAML.dump(
-        YAML.load_file("Pec.yaml").to_hash.reject {|c|
-          c[0].to_s.match(/^_/) || (hosts && hosts.none? {|name| c.match(/^#{name}/)})
-        }
-      )
-      rescue => e
-        print_exception(e)
+    def self.task(host_name, options, server, config)
+      puts YAML.dump(config.inspect[0] => config.inspect[1])
     end
   end
 end

data/lib/pec/command/destroy.rb

@@ -1,5 +1,6 @@
 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/list.rb

@@ -1,13 +1,14 @@
 module Pec::Command
   class List < Base
-    def self.run(host_name, options)
+    def self.task(host_name, options, server, config)
+      puts sprintf(
+        " %-35s",
+        config.name
+      )
+    end
+
+    def self.before_do
       Thor.new.say("vm list:", :yellow)
-      Pec.configure.each do |host|
-        puts sprintf(
-          " %-35s",
-          host.name,
-        )
-      end
     end
   end
 end

data/lib/pec/command/status.rb

@@ -1,7 +1,7 @@
 module Pec::Command
   class Status < Base
+    @fetch = true
     def self.task(host_name, options, server, config)
-      Thor.new.say("Current machine status:", :yellow)
       if server
         puts sprintf(
           " %-35s %-10s %-10s %-10s %-10s %-10s %-35s %-48s",
@@ -37,5 +37,9 @@ module Pec::Command
         end
       end.flatten.join(",")
     end
+
+    def self.before_do
+      Thor.new.say("Current machine status:", :yellow)
+    end
   end
 end

data/lib/pec/command/up.rb

@@ -1,5 +1,6 @@
 module Pec::Command
   class Up < Base
+    @fetch = true
     def self.task(host_name, options, server, config)
       unless server
         Pec::Logger.info "make start #{config.name}"

data/lib/pec/configure.rb

@@ -7,6 +7,10 @@ module Pec
       @_config = config
     end
 
+    def inspect
+      @_config
+    end
+
     def name
       @_config[0]
     end

data/lib/pec/handler/templates.rb

@@ -2,7 +2,7 @@ module Pec::Handler
   class Templates < Base
     self.kind = 'templates'
     class << self
-      def build(host) 
+      def build(host)
         { user_data: load_template(host) }
       end
 

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

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