knife 19.0.105 → 19.0.128

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd95c9dbe5fda112735648cc547204c0e8e22644f25eabd6f32eb4a77db0479
-  data.tar.gz: 2e90de239ce72661cec2541039571666300e22d5075dd3099baac2e810026198
+  metadata.gz: eeae2baecd778463ca309c0b348c3c531a2ff534603b7f1d3b5668a60cf460a6
+  data.tar.gz: 2ed971ba06ff2116df89ba4c20df43a93178eaf53bf80d74a9ddc4a400d49e59
 SHA512:
-  metadata.gz: a3d7932437feb38d272cbf31ea4559fab0a75f3b671b9135f668ad8c72ecbfcc5948266bded6d0e839190a271d47df3d46a9ffbfa54c445e9da1462cee52625a
-  data.tar.gz: 9a8b210c74e903634527b2e12e91927f57ecadad3273932be04a14dd607279f4c88c37db19ba3434f21ced93f1f0b1378d5026d001b4fac17e77b5aaadf414d1
+  metadata.gz: 7c323e72f2c9e1fbe0208ca8416f0ea139486c26ed986b0e81ac182ce9223635cc0d8b0f93d70eb9885e904ee830619027b0e2715690852af64413c82ac6017f
+  data.tar.gz: 339034783d91f0b83bf0ca27f990ab1b5b5d85acf7a4d7447756a509734017392eabe8f1de18ed77bbb654c3305e5c9c06632c417821e0ccf14984291c1ad40b

data/Gemfile

@@ -28,7 +28,7 @@ gem "mixlib-authentication", "=3.0.10" #Pinning this to a specific version to av
 group :development, :test do
   gem "cheffish", ">= 14"
   gem "webmock"
-  gem "crack", "< 0.4.6"
+  gem "crack", "< 1.0.2"
   gem "rake", ">= 12.3.3"
   gem "rspec"
   gem "abbrev"

data/Rakefile

@@ -32,25 +32,23 @@ rescue LoadError
   puts "rspec not available. bundle install first to make sure all dependencies are installed."
 end
 
-begin
-  require "cookstyle/chefstyle"
+desc "Check Linting and code style."
+task :style do
   require "rubocop/rake_task"
+  require "cookstyle/chefstyle"
 
-  namespace :style do
-    desc "Run cookstyle style checks"
-    RuboCop::RakeTask.new(:cookstyle) do |task|
-      task.options += ["--display-cop-names", "--no-color"]
-    end
+  if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+    # Windows-specific command, rubocop erroneously reports the CRLF in each file which is removed when your PR is uploaded to GitHub.
+    # This is a workaround to ignore the CRLF from the files before running cookstyle.
+    sh "cookstyle --chefstyle -c .rubocop.yml --except Layout/EndOfLine"
+  else
+    sh "cookstyle --chefstyle -c .rubocop.yml"
   end
-
-  # Alias for convenience
-  desc "Run cookstyle style checks"
-  task style: "style:cookstyle"
 rescue LoadError
-  puts "cookstyle/chefstyle is not available. (sudo) gem install cookstyle to do style checking."
+  puts "Rubocop or Cookstyle gems are not installed. bundle install first to make sure all dependencies are installed."
 end
 
 desc "Run all quality tasks"
-task quality: ["style:cookstyle"]
+task quality: [:style]
 
 task default: [:spec]

data/knife.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ffi", ">= 1.15", "< 1.18.0"
-  s.add_dependency "ffi-yajl", "~> 2.2"
+  s.add_dependency "ffi-yajl", ">= 2.2", "< 4.0"
   s.add_dependency "net-ssh", ">= 5.1", "< 8"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
   s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support
   s.add_dependency "ed25519", ">= 1.2", "< 2.0" # ed25519 ssh key support
   # disabling this until we get get it to compile on RHEL 7
   # s.add_dependency "x25519", ">= 1.0.9" # ed25519 KEX module. 1.0.9+ required to resolve sigill failures
-  s.add_dependency "highline", ">= 1.6.9", "< 3" # Used in UI to present a list, no other usage.
+  s.add_dependency "highline", ">= 1.6.9", "< 4" # Used in UI to present a list, no other usage.
   s.add_dependency "abbrev"
 
   s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt

data/lib/chef/knife/core/ui.rb

@@ -234,7 +234,7 @@ class Chef
             tf.sync = true
             tf.puts output
             tf.close
-            raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details." unless system("#{config[:editor]} #{tf.path}")
+            raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/26/tools/knife/set_up/#set-a-text-editor for details." unless system("#{config[:editor]} #{tf.path}")
 
             output = File.read(tf.path)
           end

data/lib/chef/knife/edit.rb

@@ -74,7 +74,7 @@ class Chef
 
             # Let the user edit the temporary file
             unless system("#{config[:editor]} #{file.path}")
-              raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details."
+              raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/26/tools/knife/set_up/#set-a-text-editor for details."
             end
 
             result_text = File.read(file.path)

data/lib/chef/knife/user_edit.rb

@@ -81,7 +81,7 @@ class Chef
             f.sync = true
             f.puts output
             f.close
-            raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details." unless system("#{config[:editor]} #{f.path}")
+            raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/26/tools/knife/set_up/#set-a-text-editor for details." unless system("#{config[:editor]} #{f.path}")
 
             edited_user = JSON.parse(File.read(f.path))
           end

data/lib/chef/knife/version.rb

@@ -17,6 +17,6 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "19.0.105".freeze
+    VERSION = "19.0.128".freeze
   end
 end

data/lib/chef/knife.rb

@@ -102,17 +102,33 @@ class Chef
     def self.inherited(subclass)
       super
       unless subclass.unnamed?
+        caller_path = if subclass.superclass.to_s == "Chef::ChefFS::Knife"
+                        # ChefFS-based commands have a superclass that defines an
+                        # inherited method which calls super. This means that the
+                        # top of the call stack is not the class definition for
+                        # our subcommand.  Try the second entry in the call stack.
+                        path_from_caller(caller[1])
+                      else
+                        path_from_caller(caller[0])
+                      end
+
+        # Skip classes defined inside a subdirectory of the lib/chef/knife/ tree
+        # (e.g. lib/chef/knife/cloud/server/create_command.rb). By convention,
+        # real knife subcommands live directly at lib/chef/knife/<name>.rb —
+        # the same flat pattern that GemGlobLoader uses when discovering
+        # commands. Abstract base classes from plugins like knife-cloud are
+        # nested in subdirs and are only loaded transitively; registering them
+        # causes spurious categories (e.g. ** SERVER COMMANDS **) to appear in
+        # 'knife --help'.
+        #
+        # NOTE: The regex anchors to /lib/chef/knife/ to avoid false positives
+        # from Habitat package paths, where the package origin and name appear
+        # in the path (e.g. /hab/pkgs/chef/knife/19.0.99/…) and would otherwise
+        # match a looser pattern like /chef/knife/[^/]+/.
+        return if caller_path.match?(%r{/lib/chef/knife/[^/]+/})
+
         subcommands[subclass.snake_case_name] = subclass
-        subcommand_files[subclass.snake_case_name] +=
-          if subclass.superclass.to_s == "Chef::ChefFS::Knife"
-            # ChefFS-based commands have a superclass that defines an
-            # inherited method which calls super. This means that the
-            # top of the call stack is not the class definition for
-            # our subcommand.  Try the second entry in the call stack.
-            [path_from_caller(caller[1])]
-          else
-            [path_from_caller(caller[0])]
-          end
+        subcommand_files[subclass.snake_case_name] += [caller_path]
       end
     end
 

data/spec/unit/knife_spec.rb

@@ -158,6 +158,68 @@ describe Chef::Knife do
 
   end
 
+  describe "subdirectory subcommand filtering" do
+    before do
+      Chef::Knife.reset_subcommands!
+    end
+
+    after do
+      %i{CloudSubdirCommand FlatKnifeCommand HabitatKnifeCommand CheffsSubdirCommand}.each do |const|
+        KnifeSpecs.send(:remove_const, const) if KnifeSpecs.const_defined?(const)
+      end
+    end
+
+    it "does not register subcommands defined in a subdirectory of lib/chef/knife/" do
+      allow(Chef::Knife).to receive(:path_from_caller)
+        .and_return("/some/gem/lib/chef/knife/cloud/server/create_command.rb")
+
+      module KnifeSpecs
+        class CloudSubdirCommand < Chef::Knife; end
+      end
+
+      expect(Chef::Knife.subcommands).not_to have_key("cloud_subdir_command")
+      expect(Chef::Knife.subcommand_files).not_to have_key("cloud_subdir_command")
+    end
+
+    it "registers subcommands defined directly in lib/chef/knife/ (flat path)" do
+      allow(Chef::Knife).to receive(:path_from_caller)
+        .and_return("/some/gem/lib/chef/knife/flat_knife_command.rb")
+
+      module KnifeSpecs
+        class FlatKnifeCommand < Chef::Knife; end
+      end
+
+      expect(Chef::Knife.subcommands).to have_key("flat_knife_command")
+      expect(Chef::Knife.subcommand_files["flat_knife_command"]).to eq(["/some/gem/lib/chef/knife/flat_knife_command.rb"])
+    end
+
+    it "does not filter subcommands loaded from Habitat package paths" do
+      # Habitat paths contain /chef/knife/ as the package origin/name segment,
+      # e.g. /hab/pkgs/chef/knife/19.0.99/lib/chef/knife/foo.rb. The regex must
+      # anchor to /lib/chef/knife/ to avoid false positives on these paths.
+      allow(Chef::Knife).to receive(:path_from_caller)
+        .and_return("/hab/pkgs/chef/knife/19.0.99/lib/chef/knife/habitat_knife_command.rb")
+
+      module KnifeSpecs
+        class HabitatKnifeCommand < Chef::Knife; end
+      end
+
+      expect(Chef::Knife.subcommands).to have_key("habitat_knife_command")
+    end
+
+    it "does not register ChefFS-based subcommands defined in subdirectories of lib/chef/knife/" do
+      # ChefFS commands use caller[1] for path detection; filtering should still apply.
+      allow(Chef::Knife).to receive(:path_from_caller)
+        .and_return("/some/gem/lib/chef/knife/cloud/cheffs_subdir_command.rb")
+
+      module KnifeSpecs
+        class CheffsSubdirCommand < Chef::ChefFS::Knife; end
+      end
+
+      expect(Chef::Knife.subcommands).not_to have_key("cheffs_subdir_command")
+    end
+  end
+
   describe "the headers include X-Remote-Request-Id" do
 
     let(:headers) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 19.0.105
+  version: 19.0.128
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -128,16 +128,22 @@ dependencies:
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +227,7 @@ dependencies:
         version: 1.6.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -231,7 +237,7 @@ dependencies:
         version: 1.6.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: abbrev
   requirement: !ruby/object:Gem::Requirement