knife-zero 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb90219e7049a7d2dd1d168fb5ff0f3860d897345069f066d89446969e505e8
-  data.tar.gz: afa5bfd790797872bb3c7d0a8d489404323e33ddabfb02ec9fd6acd4f8dd156d
+  metadata.gz: 21b9f4e46fa35f2a396bd05638e1a2577e9e52a6802654de1e777794b90be418
+  data.tar.gz: 4413d9cff6fe0276790b9aad1942493d018dc513206d2c03de83e73bb03696d6
 SHA512:
-  metadata.gz: e7572d96c52138a67d0615c6bb9f21021a14b173a5a66d76464ae89b5c4cd116e5695fd50e837c0909534633f49aacb7617b14250839fd7e7db69d674867439e
-  data.tar.gz: 007a81e48624135cdb6c35e96ae6a661a10fa3554e0664e8c0bb517e729d8653c32368dcf9be91b3750d7953321d5bd5f31046fc882f5009dba321400907a0a1
+  metadata.gz: 35aac693fabbbae93af287068c74abd0d555a9262a190b35e2e01652102099f7121ba03a785b17f2b10707fea3712da64e23111acde42c6519dd144addca962e
+  data.tar.gz: ac9c669a2b71d28e0b3fd2e07451fff65329bb4515942b11e7fc0b1d2373726adb3aee8d45ed9195c3448b94f1e7cdb07900e0c7e4acede2ee4575eed06905b2

data/CHANGELOG.md

@@ -4,6 +4,19 @@
 
 none.
 
+## v2.5.0
+
+- CINC client bootstrap fix [#168](https://github.com/higanworks/knife-zero/pull/168) HT [@Spirtulus](https://github.com/Spirtulus)
+- drop support chef-client < 16.6
+
+## v2.4.2
+
+- compatibility: Check knife version instead of chef version before overriding knife method [#162](https://github.com/higanworks/knife-zero/pull/162) HT [@cgunther](https://github.com/cgunther)
+
+## v2.4.1
+
+- bugfix: alter_project does not work correctly at bootstraping. [#159](https://github.com/higanworks/knife-zero/issues/159) HT [@pyama86](https://github.com/pyama86)
+
 ## v2.4.0
 
 - follow core changes.

data/knife-zero.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit-notify'
   spec.add_development_dependency 'test-unit-rr'
 
-  spec.add_runtime_dependency 'chef', '>= 15.0'
+  spec.add_runtime_dependency 'chef', '>= 16.6'
   spec.add_runtime_dependency 'knife', '>= 17.0'
 end

data/lib/chef/knife/zero_base.rb

@@ -41,7 +41,7 @@ class Chef
                  long: '--node-config PATH_TO_CONFIG',
                  proc: proc { |u| Chef::Config[:node_config_file] = u },
                  description: 'The configuration file to use on remote node',
-                 default: '/etc/chef/client.rb'
+                 default: '/etc/' + ChefUtils::Dist::Infra::DIR_SUFFIX + '/client.rb'
         end
       end
 

data/lib/knife-zero/bootstrap_ssh.rb

@@ -1,5 +1,5 @@
 require 'chef/knife/ssh'
-require 'chef/version'
+require 'chef/knife/version'
 
 class Chef
   class Knife
@@ -10,7 +10,7 @@ class Chef
         require 'knife-zero/helper'
       end
 
-    if Gem::Version.new(Chef::VERSION) < Gem::Version.new("17.3.27")
+    if Gem::Version.new(Chef::Knife::VERSION) < Gem::Version.new("17.3.27")
       def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         if config[:client_version]
           case config[:alter_project]

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

@@ -52,8 +52,8 @@ class Chef
           def start_chef # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
             if @chef_config[:knife_zero]
               if @config[:bootstrap_converge]
-                client_path = @chef_config[:chef_client_path] || 'chef-client'
-                s = String.new("#{client_path} -j /etc/chef/first-boot.json")
+                client_path = @chef_config[:chef_client_path] || ChefUtils::Dist::Infra::CLIENT
+                s = String.new("#{client_path} -j /etc/" + ChefUtils::Dist::Infra::DIR_SUFFIX + "/first-boot.json")
                 s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
                 s << " --config #{@config[:node_config_file]}"
                 s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.4.1'.freeze
+    VERSION = '2.5.0'.freeze
     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: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.6'
 - !ruby/object:Gem::Dependency
   name: knife
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH