knife-tidy 2.1.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbadbfe49e6402c189f63e8e0290eeb93d409f89f4220ef9ad6bdc96b0b455f
-  data.tar.gz: ee7f3392eac804aeec3490c33c1e02d9d22d1bd038f3a1eb8222fd9d9c660dd9
+  metadata.gz: 6c2702f9782813c2c218f78232a3d174459c457d55c5384a52b10d23a0ac28bb
+  data.tar.gz: d0212907d1f8d6b8287e76f12ecac60bcecfb7dd9ca614a48a06b6d3322f0dca
 SHA512:
-  metadata.gz: e78b266e0482121cd3d551a9d683cd79b85aae16bb31d53260c2c73a7ceae1080052cd582957b55a23099c7799ed8312e0a5fcde1b920640497af04872894ab7
-  data.tar.gz: b1e97749b9ed73fe512b76a45291541b070eb730ded2f86dc4de1f355258e319017338e183c53a0dd2b4671f98a513ba4a5ca69053e6dc834359f396e15257ee
+  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/knife/tidy_server_report.rb

@@ -19,8 +19,8 @@ class Chef
 
       option :keep_versions,
         long: "--keep-versions MIN",
-        default: 0,
-        description: "Keep a minimum of this many versions of each cookbook (default: 0)"
+        default: 1,
+        description: "Keep a minimum of this many versions of each cookbook (default: 1)"
 
       def run
         ensure_reports_dir!
@@ -82,8 +82,6 @@ class Chef
             end
           end
 
-          used_cookbooks = keep_cookbook_versions(cb_list, keep_versions)
-
           Chef::Log.debug("Used cookbook list before checking environments: #{used_cookbooks}")
           pins = environment_constraints(org)
           used_cookbooks = check_environment_pins(used_cookbooks, pins, cb_list)
@@ -98,7 +96,7 @@ class Chef
           stale_nodes_hash = { 'threshold_days': node_threshold, 'org_total_node_count': nodes.count, 'count': stale_nodes.count, 'list': stale_nodes }
           stale_orgs.push(org) if stale_nodes.count == nodes.count
 
-          tidy.write_new_file(unused_cookbooks(used_cookbooks, cb_list), ::File.join(tidy.reports_dir, "#{org}_unused_cookbooks.json"), backup = false)
+          tidy.write_new_file(unused_cookbooks(used_cookbooks, cb_list, keep_versions), ::File.join(tidy.reports_dir, "#{org}_unused_cookbooks.json"), backup = false)
           tidy.write_new_file(version_count, ::File.join(tidy.reports_dir, "#{org}_cookbook_count.json"), backup = false)
           tidy.write_new_file(stale_nodes_hash, ::File.join(tidy.reports_dir, "#{org}_stale_nodes.json"), backup = false)
 
@@ -162,15 +160,6 @@ class Chef
         cb_list
       end
 
-      def keep_cookbook_versions(cb_list, min)
-        retain = {}
-        cb_list.each do |name, versions|
-          keep = versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last(min)
-          retain[name] = keep
-        end
-        retain
-      end
-
       def cookbook_count(cb_list)
         cb_count_list = {}
         cb_list.each do |name, versions|
@@ -179,14 +168,14 @@ class Chef
         cb_count_list
       end
 
-      def unused_cookbooks(used_list, cb_list)
+      def unused_cookbooks(used_list, cb_list, keep_versions)
         unused_list = {}
         cb_list.each do |name, versions|
           versions.sort! { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
           if used_list[name].nil? # Not in the used list at all (Remove all versions)
             unused_list[name] = versions
           elsif used_list[name].sort != versions # Is in the used cookbook list, but version arrays do not match (Find unused versions)
-            unused = versions - used_list[name] - [versions.last] # Don't delete the most recent version as it might not be in a run_list yet.
+            unused = versions - used_list[name] - versions.last(keep_versions) # Don't delete the X most recent version as it might not be in a run_list yet.
             unused_list[name] = unused unless unused.empty?
           end
         end

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.2".freeze
+  VERSION = "2.3.0".freeze
   MAJOR, MINOR, TINY = VERSION.split(".")
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.3.0
 platform: ruby
 authors:
-- Jeremy Miller
+- Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2025-08-16 00:00:00.000000000 Z
 dependencies: []
-description: Report on stale Chef Server nodes and cookbooks and clean up data integrity
-  issues in a knife-ec-backup object based backup
+description: Report on stale Chef Infra Server nodes and cookbooks and clean up data
+  integrity issues in a knife-ec-backup object based backup
 email:
-- jmiller@chef.io
+- oss@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -30,7 +30,7 @@ files:
 - lib/chef/tidy_server.rb
 - lib/chef/tidy_substitutions.rb
 - lib/knife-tidy/version.rb
-homepage: https://github.com/chef-customers/knife-tidy
+homepage: https://github.com/chef/knife-tidy
 licenses:
 - Apache-2.0
 metadata: {}
@@ -42,16 +42,16 @@ 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.0.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
-summary: Report on stale Chef Server nodes and cookbooks and clean up data integrity
+summary: Report on stale Chef Infra Server nodes and cookbooks and clean up data integrity
   issues in a knife-ec-backup object based backup
 test_files: []