kondate 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da91e530d9040e3ffeeeaa4d21c6f7607594e106
-  data.tar.gz: 62bf80a32d837bd0bdc71f3964ee05141613c68d
+  metadata.gz: 38160e964f7ea99cbd0bc387cc9309c27c3a442e
+  data.tar.gz: 1ea9ea5b11e0e70d80f1894c682c0cd156dcbcba
 SHA512:
-  metadata.gz: 3924f100dbdcfccc78ca19ae4e62bbf5bcfafb5e57af8b5eb5dfc4377459f2da6307fb85e7acd06abc336426a4b44f22c2a88e6376e6c59b6d66cbbae5ccb8cc
-  data.tar.gz: 4d5a72fffa375a632c7a9b4b30cf25a880ad0cf194ec0b0dcde553b38ad281c7fa98c65936be5e8766d034a632f19b2535314c3aaedbab02ba780ad2a38600ca
+  metadata.gz: 3c1385a0f8868aea7ce912b88cb36576d23fefc3e8a7f6347fa66f0653a495b35f30d456b72a3b810ab397b3f6a19d57bf91084f674e593783bba89b0190015d
+  data.tar.gz: d7eadd64d34d4842561a4e5659a07048da0574740688a6d939d2d8efc6fa7e0066b9a70fd9b1558b568ca901245e17d7d99c1ef1dde2ccbae3de99a9a8c34794

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.3 (2016-11-20)
+
+Changes:
+
+* kondate init now requires a target_dir argument, not an option anymore
+
 # 0.3.2 (2016-11-18)
 
 Fixes:

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 Generate a template directory tree:
 
 ```
-$ bundle exec kondate init [target_dir .]
+$ bundle exec kondate init .
 ```
 
 Run itamae:
@@ -40,6 +40,18 @@ Run serverspec:
 $ bundle exec kondate serverspec <host>
 ```
 
+Run itamae for multiple hosts of a given role in parallel:
+
+```
+$ bundle exec kondate itamae-role <role>
+```
+
+Run serverspec for multiple hosts of a given role in parallel:
+
+```
+$ bundle exec kondate serverspec-role <role>
+```
+
 ## Configuration
 
 `kondate init` provides a template directory tree such as:
@@ -50,12 +62,12 @@ $ bundle exec kondate serverspec <host>
 ├── bootstrap.rb      # itamae bootstrap
 ├── hosts.yml         # manages hostnames and its roles
 ├── properties        # manages run_lists and attributes
-│   ├── nodes         # host specific properties (deprecated)
+│   ├── nodes         # host specific properties
 │   ├── roles         # role properties
 │   └── environments  # environment properties
 ├── secrets           # manages secrets attributes such as passwords
 │   └── properties
-│       ├── nodes (deprecated)
+│       ├── nodes
 │       ├── roles
 │       └── environments
 ├── recipes           # itamae recipes
@@ -76,13 +88,13 @@ The default .kondate.conf looks like below:
 
 ```
 middlware_recipes_dir: recipes/middleware
-roles_recipes_dir: recipes/roles (deprecated)
+roles_recipes_dir: recipes/roles
 middleware_recipes_serverspec_dir: spec/middleware
 roles_recipes_serverspec_dir: spec/roles
-nodes_properties_dir: properties/nodes (deprecated)
+nodes_properties_dir: properties/nodes
 roles_properties_dir: properties/roles
 environments_properties_dir: properties/environments
-secret_nodes_properties_dir: secrets/properties/nodes (deprecated)
+secret_nodes_properties_dir: secrets/properties/nodes
 secret_roles_properties_dir: secrets/properties/roles
 secret_environments_properties_dir: secrets/properties/environments
 plugin_dir: lib
@@ -174,7 +186,7 @@ Secret properties are places to write confidential attributes.
 ```
 ├── secrets         # manages secrets attributes such as passwords
 │   └── properties
-│       ├── nodes (deprecated)
+│       ├── nodes
 │       ├── roles
 │       └── environments
 ```
@@ -300,12 +312,12 @@ module Kondate
         raise ConfigError.new('file: path is not configured') unless config.path
         @path = config.path
 
-        @roles_of_hosts = YAML.load_file(@path)
-        @hosts_of_roles = {}
-        @roles_of_hosts.each do |host, roles|
+        @roles_of = YAML.load_file(@path)
+        @hosts_of = {}
+        @roles_of.each do |host, roles|
           roles.each do |role|
-            @hosts_of_roles[role] ||= []
-            @hosts_of_roles[role] << host
+            @hosts_of[role] ||= []
+            @hosts_of[role] << host
           end
         end
       end
@@ -319,7 +331,7 @@ module Kondate
       # @param [String] host hostname
       # @return [Array] array of roles
       def get_roles(host)
-        @roles_of_hosts[host]
+        @roles_of[host]
       end
 
       # @param [String] role role
@@ -327,7 +339,7 @@ module Kondate
       #
       # Available from kondate >= 0.3.0
       def get_hosts(role)
-        @hosts_of_roles[role]
+        @hosts_of[role]
       end
 
       # Optional
@@ -361,7 +373,7 @@ host_plugin:
 ## Development
 
 ```
-bundle exec exe/kondate init
+bundle exec exe/kondate init .
 vagrant up
 ```
 

data/lib/kondate/cli.rb

@@ -25,8 +25,8 @@ module Kondate
       Config.configure(@options)
     end
 
-    desc "init [target_dir = .]", "Initialize kondate directory tree"
-    def init(target_dir = '.')
+    desc "init [target_dir]", "Initialize kondate directory tree"
+    def init(target_dir)
       Config.kondate_directories.each do |_, dir|
         $stdout.puts "mkdir -p #{File.join(target_dir, dir)}"
         FileUtils.mkdir_p(File.join(target_dir, dir)) unless @options[:dry_run]
@@ -84,16 +84,16 @@ module Kondate
       end
       $stdout.puts "Target hosts are [#{hosts.join(", ")}]"
 
-      property_files_of_hosts, summarized_property_files, hosts_of_roles = build_property_files_of_hosts(hosts)
+      property_files_of, summarized_property_files, hosts_of = build_property_files_of(hosts)
       begin
-        if proceed?(summarized_property_files, hosts_of_roles)
+        if proceed?(summarized_property_files, hosts_of)
           successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
-            do_itamae(host, property_files_of_hosts[host])
+            do_itamae(host, property_files_of[host])
           end
           exit(-1) unless successes.all?
         end
       ensure
-        clean_property_files_of_hosts(property_files_of_hosts)
+        property_files_of.values.each {|property_files| clean_property_files(property_files) }
       end
     end
 
@@ -130,23 +130,24 @@ module Kondate
       end
       $stdout.puts "Target hosts are [#{hosts.join(", ")}]"
 
-      property_files_of_hosts, summarized_property_files, hosts_of_roles = build_property_files_of_hosts(hosts)
+      property_files_of, summarized_property_files, hosts_of = build_property_files_of(hosts)
       begin
-        if proceed?(summarized_property_files, hosts_of_roles)
+        if proceed?(summarized_property_files, hosts_of)
           successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
-            do_serverspec(host, property_files_of_hosts[host])
+            do_serverspec(host, property_files_of[host])
           end
           exit(-1) unless successes.all?
         end
       ensure
-        clean_property_files_of_hosts(property_files_of_hosts)
+        property_files_of.values.each {|files| clean_property_files(files) }
       end
     end
 
     private
 
     def do_itamae(host, property_files)
-      ENV['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/itamae/kondate"
+      env = {}
+      env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/itamae/kondate"
       property_files.each do |role, property_file|
         next if property_file.nil?
         command = "bundle exec itamae ssh"
@@ -169,15 +170,16 @@ module Kondate
         command << " --profile=#{@options[:profile]}" if @options[:profile]
         command << " --recipe-graph=#{@options[:recipe_graph]}" if @options[:recipe_graph]
         command << " bootstrap.rb"
-        $stdout.puts command
-        return false unless system(command)
+        $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
+        return false unless system(env, command)
       end
       true
     end
 
     def do_serverspec(host, property_files)
-      ENV['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/serverspec/kondate"
-      ENV['TARGET_VAGRANT'] = '1' if @options[:vagrant]
+      env = {}
+      env['TARGET_VAGRANT'] = '1' if @options[:vagrant]
+      env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/serverspec/kondate"
       property_files.each do |role, property_file|
         next if property_file.nil?
         recipes = YAML.load_file(property_file)['attributes'].keys.map {|recipe|
@@ -186,16 +188,17 @@ module Kondate
         recipes << File.join(Config.roles_recipes_serverspec_dir, role)
         spec_files = recipes.map {|recipe| "#{recipe}_spec.rb"}.select! {|spec| File.exist?(spec) }
 
-        command = "TARGET_HOST=#{host.shellescape} TARGET_NODE_FILE=#{property_file.shellescape} bundle exec rspec"
-        command << " #{spec_files.map{|f| f.shellescape }.join(' ')}"
-        $stdout.puts command
-        return false unless system(command)
+        env['TARGET_HOST'] = host
+        env['TARGET_NODE_FILE'] = property_file
+        command = "bundle exec rspec #{spec_files.map{|f| f.shellescape }.join(' ')}"
+        $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
+        return false unless system(env, command)
       end
       true
     end
 
-    def proceed?(property_files, hosts_of_roles = {})
-      print_property_files(property_files, hosts_of_roles)
+    def proceed?(property_files, hosts_of = {})
+      print_property_files(property_files, hosts_of)
       if property_files.values.compact.empty?
         $stderr.puts "Nothing to run"
         false
@@ -207,7 +210,7 @@ module Kondate
       end
     end
 
-    def print_property_files(property_files, hosts_of_roles = {})
+    def print_property_files(property_files, hosts_of = {})
       roles = property_files.keys
       if roles.nil? or roles.empty?
         $stderr.puts 'No role'
@@ -216,7 +219,7 @@ module Kondate
       $stdout.puts "Show property files for roles: [#{roles.join(", ")}]"
 
       property_files.each do |role, property_file|
-        hosts = hosts_of_roles[role]
+        hosts = hosts_of[role]
         if hosts.nil? # itamae
           $stdout.print "Show property file for role: #{role}"
         else # itamae_role
@@ -239,12 +242,6 @@ module Kondate
       end
     end
 
-    def clean_property_files_of_hosts(property_files_of_hosts)
-      property_files_of_hosts.values.each do |property_files|
-        clean_property_files(property_files)
-      end
-    end
-
     # @return [Hash] key value pairs whoses keys are roles and values are path (or nil)
     def build_property_files(host)
       builder = PropertyBuilder.new(host)
@@ -262,17 +259,17 @@ module Kondate
       property_files
     end
 
-    def build_property_files_of_hosts(hosts)
+    def build_property_files_of(hosts)
       summarized_property_files = {}
-      property_files_of_hosts = {}
-      hosts_of_roles = {}
+      property_files_of = {}
+      hosts_of = {}
       hosts.each do |host|
         property_files = build_property_files(host)
-        property_files_of_hosts[host] = property_files
+        property_files_of[host] = property_files
         property_files.each {|role, path| summarized_property_files[role] ||= path }
-        property_files.each {|role, path| (hosts_of_roles[role] ||= []) << host }
+        property_files.each {|role, path| (hosts_of[role] ||= []) << host }
       end
-      [property_files_of_hosts, summarized_property_files, hosts_of_roles]
+      [property_files_of, summarized_property_files, hosts_of]
     end
 
     def mask_secrets(str)

data/lib/kondate/host_plugin/file.rb

@@ -13,12 +13,12 @@ module Kondate
         raise ConfigError.new('file: path is not configured') unless config.path
         @path = config.path
 
-        @roles_of_hosts = YAML.load_file(@path)
-        @hosts_of_roles = {}
-        @roles_of_hosts.each do |host, roles|
+        @roles_of = YAML.load_file(@path)
+        @hosts_of = {}
+        @roles_of.each do |host, roles|
           roles.each do |role|
-            @hosts_of_roles[role] ||= []
-            @hosts_of_roles[role] << host
+            @hosts_of[role] ||= []
+            @hosts_of[role] << host
           end
         end
       end
@@ -32,7 +32,7 @@ module Kondate
       # @param [String] host hostname
       # @return [Array] array of roles
       def get_roles(host)
-        @roles_of_hosts[host]
+        @roles_of[host]
       end
 
       # @param [String] role role
@@ -40,7 +40,7 @@ module Kondate
       #
       # Available from kondate >= 0.3.0
       def get_hosts(role)
-        @hosts_of_roles[role]
+        @hosts_of[role]
       end
     end
   end

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae