knife-tidy 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35c35e40e4f4c982f86ab15be05fa79192c55a8c748b4fd0a4dacb4e2332fee
-  data.tar.gz: 7c1a6ac3c38567e5015520c66fb2431c161f1edc2c8af0335870b8d5f1afd183
+  metadata.gz: ebbadbfe49e6402c189f63e8e0290eeb93d409f89f4220ef9ad6bdc96b0b455f
+  data.tar.gz: ee7f3392eac804aeec3490c33c1e02d9d22d1bd038f3a1eb8222fd9d9c660dd9
 SHA512:
-  metadata.gz: 40d92b7427aff1df3a7c4fcc7cc1df7742285cc5332b64e66213413b6dbc0a6e2b80d96554b2f76f21d3173499a53533d33366986f3b4446d09b5e42f312fc5a
-  data.tar.gz: 1a34a9e016c5fcc1eb81bea371f7fae6a2ffa5faf48b7e83771aa2b354517c3b951970929dc58de230e2ade19ea6e0d8b1c77b74b5ad7e1d9ed256b4f38f45a9
+  metadata.gz: e78b266e0482121cd3d551a9d683cd79b85aae16bb31d53260c2c73a7ceae1080052cd582957b55a23099c7799ed8312e0a5fcde1b920640497af04872894ab7
+  data.tar.gz: b1e97749b9ed73fe512b76a45291541b070eb730ded2f86dc4de1f355258e319017338e183c53a0dd2b4671f98a513ba4a5ca69053e6dc834359f396e15257ee

data/lib/chef/knife/tidy_backup_clean.rb

@@ -10,9 +10,9 @@ class Chef
         require "chef/run_list"
         require_relative "../tidy_substitutions"
         require_relative "../tidy_acls"
-        require "ffi_yajl"
-        require "fileutils"
-        require "securerandom"
+        require "ffi_yajl" unless defined?(FFI_Yajl)
+        require "fileutils" unless defined?(FileUtils)
+        require "securerandom" unless defined?(SecureRandom)
       end
 
       banner "knife tidy backup clean (options)"
@@ -25,7 +25,7 @@ class Chef
 
       option :gsub_file,
         long: "--gsub-file path/to/gsub/file",
-        description: "The path to the file used for substitutions. If non-existant, a boiler plate one will be created."
+        description: "The path to the file used for substitutions. If non-existent, a boiler plate one will be created."
 
       option :gen_gsub,
         long: "--gen-gsub",
@@ -167,7 +167,7 @@ class Chef
           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)
+            broken_cookbooks_add(org, cookbook)
           end
         end
       rescue LoadError, Exceptions::MetadataNotValid => e
@@ -175,7 +175,7 @@ class Chef
         exit 1
       end
 
-      def broken_cookooks_add(org, cookbook_path)
+      def broken_cookbooks_add(org, cookbook_path)
         broken_path = ::File.join(tidy.org_path(org), "cookbooks.broken")
         FileUtils.mkdir(broken_path) unless ::File.directory?(broken_path)
         FileUtils.mv(cookbook_path, broken_path, verbose: true, force: true)
@@ -297,7 +297,7 @@ class Chef
 
       def substitutions_file
         sub_file_path = ::File.expand_path(config[:gsub_file])
-        ui.error "Subtitutions file #{sub_file_path} does not exist!" unless ::File.exist?(sub_file_path)
+        ui.error "Substitutions file #{sub_file_path} does not exist!" unless ::File.exist?(sub_file_path)
         @substitutions_file ||= sub_file_path
       end
 
@@ -397,9 +397,10 @@ class Chef
         if existing_group_data["clients"].length != tidy.client_names(org).length
           ui.stdout.puts "REPAIRING: Adding #{(existing_group_data["clients"].length - tidy.client_names(org).length).abs} missing clients into #{org}'s client group file #{clients_group_path}"
           existing_group_data["clients"] = (existing_group_data["clients"] + tidy.client_names(org)).uniq
-          ::File.open(clients_group_path, "w") do |f|
-            f.write(Chef::JSONCompat.to_json_pretty(existing_group_data))
-          end
+        end
+        existing_group_data["clients"] = existing_group_data["clients"].sort
+        ::File.open(clients_group_path, "w") do |f|
+          f.write(Chef::JSONCompat.to_json_pretty(existing_group_data))
         end
       end
 

data/lib/chef/knife/tidy_notify.rb

@@ -4,7 +4,7 @@ class Chef
   class Knife
     class TidyNotify < Knife
       deps do
-        require "ffi_yajl"
+        require "ffi_yajl" unless defined?(FFI_Yajl)
         require "net/smtp"
       end
 
@@ -14,39 +14,39 @@ class Chef
         short: "-s SERVER_NAME",
         long: "--smtp_server SERVER_NAME",
         default: "localhost",
-        description: "SMTP Server to be used for emailling reports to organization admins (defaults to localhost)"
+        description: "SMTP Server to be used for emailing reports to organization admins (defaults to localhost)"
 
       option :smtp_port,
         short: "-p SMTP_PORT",
         long: "--smtp_port SMTP_PORT",
         default: 25,
-        description: "SMTP port to be used for emailling reports to organization admins (defaults to 25)"
+        description: "SMTP port to be used for emailing reports to organization admins (defaults to 25)"
 
       option :smtp_helo,
         short: "-h SMTP_HELO",
         long: "--smtp_helo SMTP_HELO",
         default: "localhost",
-        description: "SMTP HELO to be used for emailling reports to organization admins (defaults to localhost)"
+        description: "SMTP HELO to be used for emailing reports to organization admins (defaults to localhost)"
 
       option :smtp_username,
         short: "-u SMTP_USERNAME",
         long: "--smtp_username SMTP_USERNAME",
-        description: "SMTP Username to be used for emailling reports to organization admins"
+        description: "SMTP Username to be used for emailing reports to organization admins"
 
       option :smtp_password,
         long: "--smtp_password SMTP_PASSWORD",
-        description: "SMTP Password to be used for emailling reports to organization admins"
+        description: "SMTP Password to be used for emailing reports to organization admins"
 
       option :smtp_from,
         long: "--smtp_from SMTP_FROM",
-        description: "SMTP From address to be used for emailling reports to organization admins"
+        description: "SMTP From address to be used for emailing reports to organization admins"
 
       option :smtp_use_tls,
         long: "--smtp_use_tls",
         short: "-t",
         default: false,
         boolean: true | false,
-        description: "Whether TLS should be used for emailling reports to organization admins (defaults to false if omitted)"
+        description: "Whether TLS should be used for emailing reports to organization admins (defaults to false if omitted)"
 
       include Knife::TidyBase
 

data/lib/chef/knife/tidy_server_clean.rb

@@ -6,7 +6,7 @@ class Chef
       include Knife::TidyBase
 
       deps do
-        require "ffi_yajl"
+        require "ffi_yajl" unless defined?(FFI_Yajl)
         require "chef/util/threaded_job_queue"
       end
 

data/lib/chef/knife/tidy_server_report.rb

@@ -7,7 +7,7 @@ class Chef
       include Knife::TidyBase
 
       deps do
-        require "ffi_yajl"
+        require "ffi_yajl" unless defined?(FFI_Yajl)
       end
 
       banner "knife tidy server report (options)"
@@ -108,7 +108,7 @@ class Chef
             action_needed(pre_12_3_message, server_warnings_file_path)
           end
           if unconverged_recent_nodes.length > 0
-            unconverged_recent_message = "#{unconverged_recent_nodes.length} nodes have been created in the last hour that have yet to converge in organization #{org}. These nodes WILL NOT be factored in the stale cookbook verisons report. Continuing with the server cleanup will delete cookbooks in-use by these nodes."
+            unconverged_recent_message = "#{unconverged_recent_nodes.length} nodes have been created in the last hour that have yet to converge in organization #{org}. These nodes WILL NOT be factored in the stale cookbook versions report. Continuing with the server cleanup will delete cookbooks in-use by these nodes."
             ui.warn(unconverged_recent_message)
             action_needed(unconverged_recent_message, server_warnings_file_path)
           end

data/lib/chef/tidy_acls.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "fileutils"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require "fileutils" unless defined?(FileUtils)
 require "chef/log"
 
 class Chef
@@ -111,7 +111,7 @@ class Chef
 
     def add_client_to_org(actor)
       # TODO
-      @tidy.ui.stdout.puts "ACTION NEEDED: Client referenced in acl non-existant: #{actor}"
+      @tidy.ui.stdout.puts "ACTION NEEDED: Client referenced in acl non-existent: #{actor}"
     end
 
     def add_actor_to_members(actor)

data/lib/chef/tidy_common.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "fileutils"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require "fileutils" unless defined?(FileUtils)
 require "chef/knife/core/ui"
 
 class Chef

data/lib/chef/tidy_substitutions.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "tempfile"
-require "fileutils"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require "tempfile" unless defined?(Tempfile)
+require "fileutils" unless defined?(FileUtils)
 require "chef/log"
 
 class Chef

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.2".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.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-08-21 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