knife-zero 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f27c1dcc062d31c5a6f25fba362697e71267cb7
-  data.tar.gz: 5f374aff7f7934d31004e3736d35eff495b5b6ca
+  metadata.gz: 30765529147d0bfd82148ca0d57b8bc957e98392
+  data.tar.gz: 0aa9d5f14811840d8c46a8345ef5c763bd7322b8
 SHA512:
-  metadata.gz: 86053394416ccc0c1a3384d462e2d0f7e8331bdf047395551ba32533c457478b8ae71c88ceb2bd9aeddda14d7cf6673127b37d62704937d1421cb75bb5c9b1f2
-  data.tar.gz: 5618d59de9053264b46cd86010dd1cb49985d334ec4a96380ee1da1774ebd2aeddea99a4d3d804ad374c341a72d6e2d336eed9b169ed84f7e238ad7d0d51cff4
+  metadata.gz: 479914f23b6d8018c02403fe7441c72dc2dd2aebf9b00c64e6c50e577d7e71b1537f5655d55b2be300cce6a37998c06da016e8d5ef32279b8ceb665d19338aaa
+  data.tar.gz: b73672f8f5fff324a45f75fe88adecb0916c1ff88e098ed83331537c8de04bd45a42a2d962eee4f52bba90816ee621c317deef58b4fddfab6681b35bd25a1e12

data/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 Empty.
 
+## v1.15.2
+
+- [Feature] Add option --splay from splay
+- [Feature] Add option --skip-cookbook-sync from chef-client v12.8.1
+- [Cleanup] inherit named_run_list
+
 ## v1.15.1
 
 - Follow Upstream: Support option both identity_file and ssh_identity_file for zero bootstrap. #88

data/lib/chef/knife/zero_converge.rb

@@ -1,5 +1,6 @@
 require 'chef/knife'
 require 'chef/knife/zero_base'
+require 'chef/application/client'
 require 'knife-zero/bootstrap_ssh'
 require 'knife-zero/helper'
 
@@ -18,6 +19,18 @@ class Chef
       self.options = Ssh.options.merge(self.options)
       self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
 
+      ## Import Features from chef-client
+      ## > 12.5.1
+      self.options[:named_run_list] = Chef::Application::Client.options[:named_run_list]
+
+      if ::Knife::Zero::Helper.required_chef_version?('12.8.1')
+        self.options[:skip_cookbook_sync] = Chef::Application::Client.options[:skip_cookbook_sync]
+      end
+
+      option :splay,
+        :long => "--splay SECONDS",
+        :description => "The splay time for running at intervals, in seconds",
+        :proc => lambda { |s| s.to_i }
 
       option :use_sudo,
         :long => "--[no-]sudo",
@@ -34,12 +47,6 @@ class Chef
         :default => nil,
         :proc => lambda { |o| o.to_s }
 
-      ## For support policy_document_databag(old style)
-      option :named_run_list,
-        :short        => "-n NAMED_RUN_LIST",
-        :long         => "--named-run-list NAMED_RUN_LIST",
-        :description  => "Use a policyfile's named run list instead of the default run list"
-
       option :client_version,
         :long         => "--client-version [latest|VERSION]",
         :description  => "Up or downgrade omnibus chef-client before converge.",
@@ -74,7 +81,9 @@ class Chef
         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 << " --splay #{@config[:splay]}" if @config[:splay]
         s << " -n #{@config[:named_run_list]}" if @config[:named_run_list]
+        s << " --skip-cookbook-sync" if @config[:skip_cookbook_sync]
         s << " -W" if @config[:why_run]
         Chef::Log.info "Remote command: " + s
         s

data/lib/knife-zero/helper.rb

@@ -36,6 +36,10 @@ module Knife
           raise e
         end
       end
+
+      def self.required_chef_version?(ver)
+        Gem::Version.new(Chef::VERSION) >= Gem::Version.new(ver)
+      end
     end
   end
 end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.15.1"
+    VERSION = "1.15.2"
     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.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler