knife-zero 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd0f61fa28cf5503c87d00457cdbd3f0ca61fc2
-  data.tar.gz: e5c765743125b15b55e529df1cfda77dc4a4f855
+  metadata.gz: acd069912d8b815db4d447a3d19dc88af0d6bdcc
+  data.tar.gz: 455e737d9d4554952467e27d9bbc746fbdece401
 SHA512:
-  metadata.gz: 62e4ffbb9964256340c3bb1c8e9eddfdbc093cd020fa3725d5ad9192dc7e44997195c4598fb0a03c258c1fdc2b28f171f3c55e66983253129c63ddadcf17cbb0
-  data.tar.gz: e2fff31c58c0e232396e76ad6a7f7937d777707f540b3b9ba634ca5f6f75975175ad9f9ee063f382ff36dbf33df8aff43334604f0920150554ef196c5eddae73
+  metadata.gz: 11a07ff246595ed09b7888e9dd00005c33c491f83bd79429803554afeaff1e295d8aff5ac5434dcb3ef353f55187495642e1fb4ada68b802856324e98119780c
+  data.tar.gz: e3279e6fb9437b96eb9238f749e2ce6edab7a0c49917794ecb6c2ad63ffd9da61a87b90983560cadc466a4b46fae45527bdd27abba45065b5825e4662826b975

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.11.1
+
+- Feature: add before_hook
+    - before_bootstrap
+    - before_converge
+
 ## v1.11.0
 
 - Add dependency chef "~> 12.6.0"

data/README.md

@@ -32,7 +32,7 @@ Relocated: [Installation | Knife-Zero Document](http://knife-zero.github.io/10_i
 
 ```
 ** ZERO COMMANDS **
-knife zero bootstrap FQDN (options)
+knife zero bootstrap [SSH_USER@]FQDN (options)
 knife zero chef_client QUERY (options) | It's same as converge
 knife zero converge QUERY (options)
 knife zero diagnose # show configuration from file

data/lib/chef/knife/zero_bootstrap.rb

@@ -32,6 +32,11 @@ class Chef
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
       def run
+        ## Command hook before_bootstrap (After launched Chef-Zero)
+        if Chef::Config[:knife][:before_bootstrap]
+          ::Knife::Zero::Helper.hook_shell_out!("before_bootstrap", ui, Chef::Config[:knife][:before_bootstrap])
+        end
+
         if @config[:first_boot_attributes_from_file]
           @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
         else

data/lib/chef/knife/zero_converge.rb

@@ -50,6 +50,12 @@ class Chef
       def initialize(argv=[])
         super
         self.configure_chef
+
+        ## Command hook before_converge (Before launched Chef-Zero)
+        if Chef::Config[:knife][:before_converge]
+          ::Knife::Zero::Helper.hook_shell_out!("before_converge", ui, Chef::Config[:knife][:before_converge])
+        end
+
         @name_args = [@name_args[0], start_chef_client]
       end
 

data/lib/knife-zero/helper.rb

@@ -3,6 +3,9 @@ require 'open-uri'
 module Knife
   module Zero
     module Helper
+
+      extend Chef::Mixin::ShellOut
+
       def self.zero_remote_port
         return ::Chef::Config[:remote_chef_zero_port] if ::Chef::Config[:remote_chef_zero_port]
         chef_zero_port = ::Chef::Config[:chef_zero_port] ||
@@ -23,6 +26,16 @@ module Knife
           exit
         end
       end
+
+      def self.hook_shell_out!(event, ui, *command_args)
+        ui.info ui.color("Execute command hook in #{event}.", :green)
+        begin
+          ui.info shell_out!(*command_args).stdout
+        rescue => e
+          ui.error e.inspect
+          raise e
+        end
+      end
     end
   end
 end

data/lib/knife-zero/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,3 +197,4 @@ specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
   port fowarding.
 test_files: []
+has_rdoc: