knife-zero 0.2.0 → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32a5fe620a54193b033256128e075e5f9cf6489
-  data.tar.gz: c899819b89589847f709f029d8a7999671ad6a26
+  metadata.gz: 78eea0a45dc96971a8ca19c4ad4adca6c958d749
+  data.tar.gz: 2ca8b1ddc35e0030c18f28944759027030622e5b
 SHA512:
-  metadata.gz: b717a39a9403d4fd5635c5d325aaaab190f1f2b5abae8c1bb591d17ceef75d5f77212d6768fd620cecedba1d371c97cb1ceab8803dd10bc9de79b65ca6da4732
-  data.tar.gz: c5c277db98f52fab444aab6adf26d90f26cc5648b3328da113c5d2dda1bff1bf8e76b599ba16955857856915ccb17acd7c4bbfdd53d11cf5244f9033618b6d79
+  metadata.gz: a6de703db7970fb788c970886555256d2c8b9ade52f1754b7d43e31c7dc0dcdd8364f8f05324c158e737cdd6615314b2014d8cab1834f8fe9185bfdd1ac1b0de
+  data.tar.gz: be6bcb9912982792b319a31169be2713c64006173f25ffaf84f8413f309f436ec5137d08ceb1f6a4b76851981038e71e8655f4a4ae4afe2b92b0572bdcac6c44

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog of knife-zero
 
+## v0.3.0.pre
+
+- Feature: chef_client run parallel.
+
 ## v0.2.0
 
 - Feature: Support Why-run.

data/README.md

@@ -45,6 +45,11 @@ Install Chef to remote node and run chef-client under chef-zero via tcp-forward.
 
 Supported options are mostly the same as `knife bootstrap`.
 
+#### Specific options(s)
+
+```
+-W, --why-run                    Enable whyrun mode on chef-client run at remote node.
+```
 
 #### Example
 
@@ -116,6 +121,13 @@ Search nodes from local chef-repo directory, and run command at remote node.
 
 Supported options are mostly the same as `knife ssh`.
 
+#### Specific options(s)
+
+```
+-W, --why-run                    Enable whyrun mode on chef-client run at remote node.
+-C, --concurrency NUMBER         (0.3.0 or later) Number of concurrency. (default: 1) ; not avaiable on some platforms like Windows and NetBSD 4.
+```
+
 #### Example
 
 ```

data/lib/chef/knife/chef_client.rb

@@ -1,10 +1,13 @@
 require 'chef/knife'
 require 'chef/knife/zero_base'
+require 'knife-zero/helper'
 
 class Chef
   class Knife
     class ZeroChefClient < Chef::Knife::Ssh
       include Chef::Knife::ZeroBase
+      include ::Knife::Zero::Helper
+
       deps do
         require 'chef/node'
         require 'chef/environment'
@@ -27,6 +30,13 @@ class Chef
         :description => "execute the chef-client via sudo",
         :boolean => true
 
+      option :concurrency,
+        :short => "-C NUMBER",
+        :long => "--concurrency NUMBER",
+        :description => "Number of concurrency. (default: 1) ; not avaiable on some platforms like Windows and NetBSD 4.",
+        :proc => lambda { |s| s.to_i },
+        :default => 1
+
       def run
         configure_attribute
         configure_user
@@ -34,12 +44,29 @@ class Chef
         configure_identity_file
         list = search_nodes
 
+        pids = []
         list.each do |n|
-          Chef::Log.debug("Start session for #{n}")
-          session = knife_ssh
-          session.configure_session(n)
-          session.ssh_command(start_chef_client)
+          # Note: fork(2) is not avaiable on some platforms like Windows and NetBSD 4. 
+          if (Process.respond_to?(:fork) && !Chef::Platform.windows?)
+            pids << Process.fork {
+              Chef::Log.debug("Start session for #{n}")
+              session = knife_ssh
+              session.configure_session(n)
+              session.ssh_command(start_chef_client)
+            }
+            until count_alive_pids(pids) < @config[:concurrency]
+              sleep 1
+            end
+          else
+            Chef::Log.debug("Start session for #{n}")
+            session = knife_ssh
+            session.configure_session(n)
+            session.ssh_command(start_chef_client)
+          end
         end
+
+        result = Process.waitall
+        ## NOTE: should report if includes fail...?
       end
 
       def start_chef_client

data/lib/knife-zero/helper.rb

@@ -0,0 +1,18 @@
+module Knife
+  module Zero
+    module Helper
+      def count_alive_pids(pids)
+        alive = 0
+        pids.each do |pid|
+          begin
+            Process.getpgid pid
+            alive +=1
+          rescue
+            next
+          end
+        end
+        alive
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "0.2.0"
+    VERSION = "0.3.0.pre"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - sawanoboly
@@ -72,8 +72,8 @@ files:
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/knife-zero/bootstrap_ssh.rb
-- lib/knife-zero/common.rb
 - lib/knife-zero/core/bootstrap_context.rb
+- lib/knife-zero/helper.rb
 - lib/knife-zero/version.rb
 homepage: ''
 licenses:
@@ -90,9 +90,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/lib/knife-zero/common.rb

@@ -1,7 +0,0 @@
-module Knife
-  module Zero
-    module Helper
-      ## Some Helper..
-    end
-  end
-end