knife-zero 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4383c976a2e1f917aaec4d23f7684e13bc72fb2
-  data.tar.gz: 43698c8ac6150af68f0744215d8a66fbcd54d8da
+  metadata.gz: faceb4268fabca7f9ce0d461762633eee1e462c7
+  data.tar.gz: 9fa1e9d3057549778c1aecbcd9610bb8b4e78194
 SHA512:
-  metadata.gz: eacd35b62835fd3879179b19060f1d8682962c08fddd84e3a0f80b9d01164298c58f62ee1bb1818c0351f775c4c3ab586d32d239125b68b1e850f4e4496ef29d
-  data.tar.gz: bf56cd573120019588155d0302139cc990fca572707702809087d41db75daa460d9ed86208a9dccd473359c23131a360cc459c6447c61a30e0bd600ee50b998a
+  metadata.gz: 33bab13eec4bb5b1d9630ecdf740bb61acd08b5d7d435b9a743c048faba61b8ddf8f8a3a13e2cd4190c99fe86b45ea629840421fb26c3beb71e368dba900ff5b
+  data.tar.gz: 18a186631c76e4a9e996f87becc6dde87c834fdc9a6fd306fffe9a20ecb92f4fe9ad32ac732a86bca8656fd3012f8f5b79652ae30a3b1f781d37835f720810a6

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.7.0
+
+- Bug: ignored knife[:use_sudo] by converge, #22 #42
+- Feature: Append white_list to client.rb at bootstrap. #43
+- Feature: Add --without-chef-run to zero bootstrap #44
+
 ## v1.6.0
 
 - Feature: #32 create alias converge to chef_client, and recommended it by README.

data/lib/chef/knife/zero_base.rb

@@ -7,7 +7,7 @@ class Chef
         includer.class_eval do
           deps do
             Chef::Config[:local_mode] = true
-            Chef::Config[:knife_zero] = true
+            Chef::Config[:knife_zero] = Hash.new
             Chef::Knife::Ssh.load_deps
           end
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -19,6 +19,11 @@ class Chef
       self.options.delete :node_ssl_verify_mode
       self.options.delete :node_verify_api_cert
 
+      option :without_chef_run,
+        :long => "--without-chef-run",
+        :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
+        :boolean => false
+
       def knife_ssh
         begin
         ssh = Chef::Knife::BootstrapSsh.new

data/lib/chef/knife/zero_chef_client.rb

@@ -15,9 +15,17 @@ class Chef
       banner "knife zero chef_client QUERY (options) | It's same as converge"
 
       self.options = Ssh.options.merge(self.options)
-      self.options[:use_sudo] = Bootstrap.options[:use_sudo]
       self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
 
+
+      option :use_sudo,
+        :long => "--[no-]sudo",
+        :description => "Execute the chef-client via sudo (true by default)",
+        :boolean => true,
+        :default => true,
+        :proc => lambda { |v| Chef::Config[:knife][:use_sudo] = v }
+
+
       option :override_runlist,
         :short        => "-o RunlistItem,RunlistItem...",
         :long         => "--override-runlist RunlistItem,RunlistItem...",
@@ -28,17 +36,19 @@ class Chef
 
       def initialize(argv=[])
         super
+        self.configure_chef
         @name_args = [@name_args[0], start_chef_client]
       end
 
       def start_chef_client
-        client_path = @config[:use_sudo] ? 'sudo ' : ''
+        client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
         client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
         s = "#{client_path}"
         s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
         s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
         s << " -o #{@config[:override_runlist]}" if @config[:override_runlist]
         s << " -W" if @config[:why_run]
+        Chef::Log.info "Remote command: " + s
         s
       end
     end

data/lib/knife-zero/core/bootstrap_context.rb

@@ -15,9 +15,24 @@ class Chef
              end
            end
 
+           alias :orig_config_content config_content
+           def config_content
+             client_rb = orig_config_content
+             %w{ automatic_attribute_whitelist default_attribute_whitelist normal_attribute_whitelist override_attribute_whitelist }.each do |white_list|
+               if Chef::Config[:knife][white_list.to_sym] && Chef::Config[:knife][white_list.to_sym].is_a?(Array)
+                 client_rb << [
+                   white_list,
+                   Chef::Config[:knife][white_list.to_sym].to_s
+                 ].join(" ")
+               end
+             end
+             client_rb
+           end
+
            alias :orig_start_chef start_chef
            def start_chef
              if @chef_config[:knife_zero]
+               unless @config[:without_chef_run]
                client_path = @chef_config[:chef_client_path] || 'chef-client'
                s = "#{client_path} -j /etc/chef/first-boot.json"
                s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
@@ -25,6 +40,9 @@ class Chef
                s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
                s << " -W" if @config[:why_run]
                s
+               else
+                 "echo Execution of Chef-Client has been canceled due to --without-chef-run."
+               end
              else
                orig_start_chef
              end

data/lib/knife-zero/version.rb

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

data/test/chef/knife/test_zero_bootstrap.rb

@@ -10,7 +10,7 @@ class TC_ZeroBootstrap < Test::Unit::TestCase
     end
 
     test "returns true from Chef::Config[:knife_zero]" do
-      assert_true(Chef::Config[:knife_zero])
+      assert_equal({}, Chef::Config[:knife_zero])
     end
 
     test "returns expected bootstrap template(for notice changes of core to me)" do

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.6.0", Knife::Zero::VERSION)
+    assert_equal("1.7.0", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler