knife-tidy 2.0.9 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a97cf801ae4409e19040e77f743f2169d1e068401baae60529ad6d89f40798
-  data.tar.gz: 84a994d03f9aa44208af4e227a97bc7beb230bb206421b02da166e23e87a479e
+  metadata.gz: 0e595827997c6dabb26499a048e0d2397ed46c44e3388e4249fbc5863e13d07e
+  data.tar.gz: efdadddefa1ec67b9e0c981c0acb558fb7d314859abca5689f211459c1575065
 SHA512:
-  metadata.gz: 98873e41d798dbcb80ce8e1640e170edc635772c010f85c6cf736bcdcf483271c42c6afde97f1db9e573cb44a2c72d719546493f74cfd3e9680dd332862fedfd
-  data.tar.gz: 3c179e8babe63a01eed66aa5a88c062a4540a7d885d1b978dcfdc60051f1e394925f8bf19c57ab39ccade673a7b323c558158644e68c136b696353cc1335cda5
+  metadata.gz: 2eec12d668fc17f93caf0db7329a3ebfca1717402a813d1ff43c6663f0b444ee26971a3ec6f0b8b54f72ea1b6896f4c688b7cda456db105f52c51f0862fd11fe
+  data.tar.gz: 375800be7993c24bccef71a5a27948ebe9d661b1ebddc5c640841fe8c0b339d9ccb98bdab470994fcea6e4386c9a64a0884a5970851ef2d2d45205d464586f1f

data/lib/chef/knife/tidy_backup_clean.rb

@@ -4,7 +4,7 @@ class Chef
   class Knife
     class TidyBackupClean < Knife
       deps do
-        require "chef/cookbook_loader"
+        require "chef/cookbook/cookbook_version_loader"
         require "chef/cookbook/metadata"
         require "chef/role"
         require "chef/run_list"
@@ -161,26 +161,24 @@ class Chef
       end
 
       def load_cookbooks(org)
-        cl = Chef::CookbookLoader.new(tidy.cookbooks_path(org))
-        for_each_cookbook_basename(org) do |cookbook|
+        for_each_cookbook_path(org) do |cookbook|
+          cl = Chef::Cookbook::CookbookVersionLoader.new(cookbook)
           ui.stdout.puts "INFO: Loading #{cookbook}"
-          ret = cl.load_cookbook(cookbook)
+          ret = cl.load!
           if ret.nil?
             action_needed("ACTION NEEDED: Something's wrong with the #{cookbook} cookbook in org #{org} - cannot load it! Moving to cookbooks.broken folder.")
             broken_cookooks_add(org, cookbook)
           end
         end
-      rescue LoadError => e
+      rescue LoadError, Exceptions::MetadataNotValid => e
         ui.error e
         exit 1
       end
 
-      def broken_cookooks_add(org, cookbook)
+      def broken_cookooks_add(org, cookbook_path)
         broken_path = ::File.join(tidy.org_path(org), "cookbooks.broken")
         FileUtils.mkdir(broken_path) unless ::File.directory?(broken_path)
-        Dir[::File.join(tidy.cookbooks_path(org), "#{cookbook}*")].each do |cb|
-          FileUtils.mv(cb, broken_path, verbose: true, force: true)
-        end
+        FileUtils.mv(cookbook_path, broken_path, verbose: true, force: true)
       end
 
       def generate_new_metadata(org)

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = "2.0.9".freeze
+  VERSION = "2.0.11".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.0.9
+  version: 2.0.11
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2020-04-19 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