knife-tidy 2.1.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df7a5c7edcbf10d78ed4f4702b68e231b3f016308280b979bdd84928af0362e
-  data.tar.gz: ae670780d34592914ddf4eba0ba67e3a4fd5a54fe49a0d8a4a9425e5c92aa1c0
+  metadata.gz: 6c2702f9782813c2c218f78232a3d174459c457d55c5384a52b10d23a0ac28bb
+  data.tar.gz: d0212907d1f8d6b8287e76f12ecac60bcecfb7dd9ca614a48a06b6d3322f0dca
 SHA512:
-  metadata.gz: 41fc026a4bb68574ee10ddceb69414868ae4b031f995b6a0e11b86574f579215576b7763c906739c63132d2bf62f886a645dc0b2791bd71683f3ed441d4f7932
-  data.tar.gz: 5e3e481f0e98d4bc141773ef92e6bf0c457678790fac6b7e36acf20e5d2da6365c8d0f8f23ce734fc118b217a73a6b994d7c3bfa79837b4540d8816e02d58227
+  metadata.gz: 5f31036894ee89b00964d0a6c94297935f6c8824414c90e09005d8ac9ab45399d56b430ca4f1b941cbeadd9b1b177d76963e2f85c81d2a288e3d611301479fb9
+  data.tar.gz: 7e93f0b7404db7453bac17ebd260a6e31e9ff72a1425353ad6331dc3bcbc3728226bc4ad9587d6c346b0036d36e416dc1f147105fa5e5dbf60eb1bd7b9a9ebed

data/lib/chef/knife/tidy_backup_clean.rb

@@ -130,10 +130,10 @@ class Chef
 
       def add_cookbook_name_to_metadata(cookbook_name, rb_path)
         ui.stdout.puts "REPAIRING: Correcting `name` in #{rb_path}"
-        content = IO.readlines(rb_path)
+        content = File.readlines(rb_path)
         new_content = content.reject { |line| line =~ /^name\s+/ }
         name_field = "name '#{cookbook_name}'\n"
-        IO.write rb_path, name_field + new_content.join("")
+        File.write(rb_path, name_field + new_content.join(""))
       end
 
       def fix_cookbook_names(org)
@@ -354,23 +354,19 @@ class Chef
         rl = Chef::RunList.new
         new_role["run_list"] = []
         the_role["run_list"].each do |item|
-          begin
-            rl << item
-            new_role["run_list"].push(item)
-          rescue ArgumentError
-            ui.stdout.puts "REPAIRING: Invalid Recipe Item: #{item} in run_list from #{role_path}"
-          end
+          rl << item
+          new_role["run_list"].push(item)
+        rescue ArgumentError
+          ui.stdout.puts "REPAIRING: Invalid Recipe Item: #{item} in run_list from #{role_path}"
         end
         if the_role.key?("env_run_lists")
           the_role["env_run_lists"].each_pair do |key, value|
             new_role["env_run_lists"][key] = []
             value.each do |item|
-              begin
-                rl << item
-                new_role["env_run_lists"][key].push(item)
-              rescue ArgumentError
-                ui.stdout.puts "REPAIRING: Invalid Recipe Item: #{item} in env_run_lists #{key} from #{role_path}"
-              end
+              rl << item
+              new_role["env_run_lists"][key].push(item)
+            rescue ArgumentError
+              ui.stdout.puts "REPAIRING: Invalid Recipe Item: #{item} in env_run_lists #{key} from #{role_path}"
             end
           end
         end

data/lib/chef/knife/tidy_notify.rb

@@ -84,15 +84,13 @@ class Chef
           ui.info("Fetching report data for organization #{org}")
           reports[org] = {}
           report_file_suffixes.each do |report|
-            begin
-              file_name = "#{reports_dir}/#{org}#{report}"
-              ui.info("  Parsing file #{file_name}")
-              json_string = File.read(file_name)
-              reports[org][report] = tidy.json_file_to_hash(json_string, symbolize_names: false)
-            rescue Errno::ENOENT
-              ui.info("    Skipping file #{file_name} - not found for organization #{org}")
-              reports[org][report] = {}
-            end
+            file_name = "#{reports_dir}/#{org}#{report}"
+            ui.info("  Parsing file #{file_name}")
+            json_string = File.read(file_name)
+            reports[org][report] = tidy.json_file_to_hash(json_string, symbolize_names: false)
+          rescue Errno::ENOENT
+            ui.info("    Skipping file #{file_name} - not found for organization #{org}")
+            reports[org][report] = {}
           end
 
           # Fetch a list of admin users for the current organization

data/lib/chef/tidy_common.rb

@@ -196,9 +196,9 @@ class Chef
       dirs = path.split(File::SEPARATOR)
 
       until dirs.empty?
-        version_match = dirs[-1].match(/\d+\.\d+\.\d+/)
-        if dirs[-2] == "cookbooks" && version_match # we found the cookbook version not something that looks like one inside a cookbook path
-          return version_match.to_s
+        version_match = dirs[-1][/\b\d{1,3}\.\d{1,3}\.\d{1,3}\b/]
+        if dirs.length >= 2 && dirs[-2] == "cookbooks" && version_match
+          return version_match
         else
           dirs.pop
         end

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = "2.1.6".freeze
+  VERSION = "2.3.0".freeze
   MAJOR, MINOR, TINY = VERSION.split(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2025-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Report on stale Chef Infra Server nodes and cookbooks and clean up data
   integrity issues in a knife-ec-backup object based backup
@@ -42,14 +42,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Report on stale Chef Infra Server nodes and cookbooks and clean up data integrity