cheffish 15.0.0 → 15.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c170468185dfd63613f85a49fb0c2e02009aea96cf53ccb14d51ee31174503a4
-  data.tar.gz: 3e474109c5568ed8a87479dbd8c8823423ea0b860ecba60e840270ed59cf1a76
+  metadata.gz: 547830e01071a34cc583bbf5217ae5f55270c014c393e9a69301023a88717279
+  data.tar.gz: a29005438abb411a4b59bc7b1cf1782e36219e2bd951ec49c64273f9a7de6144
 SHA512:
-  metadata.gz: 69f0908686428159cbdd1947d955f226c5a0b740942f6bac36ee36ff9b30a4dc1e7b2e80f2e11aaa9c84ac3f99a8c4a8165d1005eb054df68b046b608bb111b5
-  data.tar.gz: 3556f24741959b36aa5fc4df41e8ad195e9d6a1dd162ddf418686a7208bb881cef4b61b3e0c3c696094f02c3b2cf448072bc07cd902fb448a8398ef04d376d48
+  metadata.gz: 6db5d7117bb249b37d894d3b3e776f7d3b5e8c87cb2895e156fbe4393031dbfdfdcff8a9133b4bb7e578f85440905a5acbd30426e7a8d81171ac3fd44f583936
+  data.tar.gz: 2216df827dc0635fdf0e3a340a80dbf267c8c51f58d7bde7c2a7deb28f0b3eeb24975bc88e3c44809c12189c05751a8624285d90a7472ace2bbb6b69dd99542d

data/Gemfile

@@ -14,8 +14,8 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    gem "chef", "~> 14"
-    gem "ohai", "~> 14"
+    gem "chef", "~> 15"
+    gem "ohai", "~> 15"
   end
 end
 

data/Rakefile

@@ -39,4 +39,4 @@ task :console do
   IRB.start
 end
 
-task default: [:style, :spec]
+task default: %i{style spec}

data/lib/chef/resource/chef_acl.rb

@@ -7,7 +7,7 @@ require "uri"
 class Chef
   class Resource
     class ChefAcl < Cheffish::BaseResource
-      resource_name :chef_acl
+      provides :chef_acl
 
       # Path of the thing being secured, e.g. nodes, nodes/*, nodes/mynode,
       # */*, **, roles/base, data/secrets, cookbooks/apache2, /users/*,
@@ -99,6 +99,7 @@ class Chef
                     # NOTE: if superusers exist, this should turn into a warning.
                     raise "chef_acl attempted to remove all actors from GRANT!  I'm sorry Dave, I can't let you remove access to an object with no hope of recovery."
                   end
+
                   modify[differences] ||= {}
                   modify[differences][permission] = desired_json
                 end
@@ -107,7 +108,7 @@ class Chef
               if modify.size > 0
                 changed = true
                 description = [ "update acl #{path} at #{rest_url(path)}" ] + modify.flat_map do |diffs, permissions|
-                  diffs.map { |diff| "  #{permissions.keys.join(', ')}:#{diff}" }
+                  diffs.map { |diff| "  #{permissions.keys.join(", ")}:#{diff}" }
                 end
                 converge_by description do
                   modify.values.each do |permissions|
@@ -127,11 +128,13 @@ class Chef
             children, _error = list(path, "*")
             Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
               next if child.split("/")[-1] == "containers"
+
               create_acl(child)
             end
             # containers mess up our descent, so we do them last
             Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
               next if child.split("/")[-1] != "containers"
+
               create_acl(child)
             end
 
@@ -141,7 +144,7 @@ class Chef
         # Get the current ACL for the given path
         def current_acl(acl_path)
           @current_acls ||= {}
-          if !@current_acls.key?(acl_path)
+          unless @current_acls.key?(acl_path)
             @current_acls[acl_path] = begin
               rest.get(rest_url(acl_path))
                                       rescue Net::HTTPServerException => e
@@ -252,8 +255,7 @@ class Chef
           end
         end
 
-        def load_current_resource
-        end
+        def load_current_resource; end
 
         #
         # Matches chef_acl paths like nodes, nodes/*.
@@ -270,7 +272,7 @@ class Chef
         def match_paths(path)
           # Turn multiple slashes into one
           # nodes//x -> nodes/x
-          path = path.gsub(/[\/]+/, "/")
+          path = path.gsub(%r{[/]+}, "/")
           # If it's absolute, start the matching with /.  If it's relative, start with '' (relative root).
           if path[0] == "/"
             matches = [ "/" ]
@@ -305,6 +307,7 @@ class Chef
                 if parts[0..index - 1].all? { |p| p != "*" }
                   raise error
                 end
+
                 []
               else
                 found
@@ -421,21 +424,21 @@ class Chef
             when 1
               # /organizations/*, /users/*, roles/*, nodes/*, etc.
               results, error = rest_list(path)
-              if !error
+              unless error
                 results = results.map { |result| ::File.join(path, result) }
               end
 
             when 2
               # /organizations/NAME/*
               results, error = rest_list(::File.join(path, "containers"))
-              if !error
+              unless error
                 results = results.map { |result| ::File.join(path, result) }
               end
 
             when 3
               # /organizations/NAME/TYPE/*
               results, error = rest_list(path)
-              if !error
+              unless error
                 results = results.map { |result| ::File.join(path, result) }
               end
             end
@@ -466,7 +469,7 @@ class Chef
         end
 
         def rest_list(path)
-            # All our rest lists are hashes where the keys are the names
+          # All our rest lists are hashes where the keys are the names
           [ rest.get(rest_url(path)).keys, nil ]
         rescue Net::HTTPServerException => e
           if e.response.code == "405" || e.response.code == "404"

data/lib/chef/resource/chef_client.rb

@@ -4,7 +4,7 @@ require_relative "../../cheffish/chef_actor_base"
 class Chef
   class Resource
     class ChefClient < Cheffish::ChefActorBase
-      resource_name :chef_client
+      provides :chef_client
 
       # Client attributes
       property :chef_client_name, Cheffish::NAME_REGEX, name_property: true
@@ -18,7 +18,7 @@ class Chef
 
       # Output public key (if so desired)
       property :output_key_path, String
-      property :output_key_format, Symbol, default: :openssh, equal_to: [ :pem, :der, :openssh ]
+      property :output_key_format, Symbol, default: :openssh, equal_to: %i{pem der openssh}
 
       # Proc that runs just before the resource executes.  Called with (resource)
       def before(&block)

data/lib/chef/resource/chef_container.rb

@@ -5,12 +5,12 @@ require "chef/chef_fs/data_handler/container_data_handler"
 class Chef
   class Resource
     class ChefContainer < Cheffish::BaseResource
-      resource_name :chef_container
+      provides :chef_container
 
       property :chef_container_name, Cheffish::NAME_REGEX, name_property: true
 
       action :create do
-        if !@current_exists
+        unless @current_exists
           converge_by "create container #{new_resource.chef_container_name} at #{rest.url}" do
             rest.post("containers", normalize_for_post(new_json))
           end

data/lib/chef/resource/chef_data_bag.rb

@@ -4,12 +4,12 @@ require_relative "../../cheffish/base_resource"
 class Chef
   class Resource
     class ChefDataBag < Cheffish::BaseResource
-      resource_name :chef_data_bag
+      provides :chef_data_bag
 
       property :data_bag_name, Cheffish::NAME_REGEX, name_property: true
 
       action :create do
-        if !current_resource_exists?
+        unless current_resource_exists?
           converge_by "create data bag #{new_resource.data_bag_name} at #{rest.url}" do
             rest.post("data", { "name" => new_resource.data_bag_name })
           end

data/lib/chef/resource/chef_data_bag_item.rb

@@ -7,7 +7,7 @@ require "chef/encrypted_data_bag_item"
 class Chef
   class Resource
     class ChefDataBagItem < Cheffish::BaseResource
-      resource_name :chef_data_bag_item
+      provides :chef_data_bag_item
 
       def initialize(*args)
         super
@@ -137,7 +137,7 @@ class Chef
 
               # If the current secret doesn't work, look through the specified old secrets
 
-              if !current_resource.secret
+              unless current_resource.secret
                 old_secrets = []
                 if new_resource.old_secret
                   old_secrets += Array(new_resource.old_secret)
@@ -148,17 +148,17 @@ class Chef
                   end
                 end
                 old_secrets.each do |secret|
-                  begin
-                    Chef::EncryptedDataBagItem::Decryptor.for(first_real_value, secret).for_decrypted_item
-                    current_resource.secret secret
-                  rescue Chef::EncryptedDataBagItem::DecryptionFailure
-                    decrypt_error = $!
-                  end
+
+                  Chef::EncryptedDataBagItem::Decryptor.for(first_real_value, secret).for_decrypted_item
+                  current_resource.secret secret
+                rescue Chef::EncryptedDataBagItem::DecryptionFailure
+                  decrypt_error = $!
+
                 end
 
                 # If we couldn't figure out the secret, emit a warning (this isn't a fatal flaw unless we
                 # need to reuse one of the values from the data bag)
-                if !current_resource.secret
+                unless current_resource.secret
                   if decrypt_error
                     Chef::Log.warn "Existing data bag is encrypted, but could not decrypt: #{decrypt_error.message}."
                   else
@@ -280,9 +280,10 @@ class Chef
             elsif current_resource.encrypt
               # Encryption is different and we can't read the old values.  Only allow the change
               # if we're overwriting the data bag item
-              if !new_resource.complete
+              unless new_resource.complete
                 raise "Cannot encrypt #{new_resource.name} due to failure to decrypt existing resource.  Set 'complete true' to overwrite or add the old secret as old_secret / old_secret_path."
               end
+
               _differences = [ "overwrite data bag item (cannot decrypt old data bag item)"]
               differences = (new_resource.raw_data.keys & current_resource.raw_data.keys).map { |key| "overwrite #{key}" }
               differences += (new_resource.raw_data.keys - current_resource.raw_data.keys).map { |key| "add #{key}" }

data/lib/chef/resource/chef_environment.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/environment_data_handler"
 class Chef
   class Resource
     class ChefEnvironment < Cheffish::BaseResource
-      resource_name :chef_environment
+      provides :chef_environment
 
       property :environment_name, Cheffish::NAME_REGEX, name_property: true
       property :description, String

data/lib/chef/resource/chef_group.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/group_data_handler"
 class Chef
   class Resource
     class ChefGroup < Cheffish::BaseResource
-      resource_name :chef_group
+      provides :chef_group
 
       property :group_name, Cheffish::NAME_REGEX, name_property: true
       property :users, ArrayType

data/lib/chef/resource/chef_mirror.rb

@@ -9,7 +9,7 @@ require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_di
 class Chef
   class Resource
     class ChefMirror < Cheffish::BaseResource
-      resource_name :chef_mirror
+      provides :chef_mirror
 
       # Path of the data to mirror, e.g. nodes, nodes/*, nodes/mynode,
       # */*, **, roles/base, data/secrets, cookbooks/apache2, etc.
@@ -95,6 +95,7 @@ class Chef
           if new_resource.concurrency <= 0
             raise "chef_mirror.concurrency must be above 0!  Was set to #{new_resource.concurrency}"
           end
+
           # Honor concurrency
           Chef::ChefFS::Parallelizer.threads = new_resource.concurrency - 1
 
@@ -103,13 +104,14 @@ class Chef
           if new_resource.path[0] == "/"
             raise "Absolute paths in chef_mirror not yet supported."
           end
+
           # Copy!
           path = Chef::ChefFS::FilePattern.new("/#{new_resource.path}")
           ui = CopyListener.new(self)
           error = Chef::ChefFS::FileSystem.copy_to(path, src_root, dest_root, nil, options, ui, proc { |p| p.path })
 
           if error
-            raise "Errors while copying:#{ui.errors.map { |e| "#{e}\n" }.join('')}"
+            raise "Errors while copying:#{ui.errors.map { |e| "#{e}\n" }.join("")}"
           end
         end
 
@@ -163,7 +165,7 @@ class Chef
         end
 
         def repo_mode
-          new_resource.chef_server[:chef_server_url] =~ /\/organizations\// ? "hosted_everything" : "everything"
+          new_resource.chef_server[:chef_server_url] =~ %r{/organizations/} ? "hosted_everything" : "everything"
         end
 
         def options
@@ -179,8 +181,7 @@ class Chef
           result
         end
 
-        def load_current_resource
-        end
+        def load_current_resource; end
 
         class CopyListener
           def initialize(mirror)

data/lib/chef/resource/chef_node.rb

@@ -6,7 +6,7 @@ require_relative "../../cheffish/node_properties"
 class Chef
   class Resource
     class ChefNode < Cheffish::BaseResource
-      resource_name :chef_node
+      provides :chef_node
 
       include Cheffish::NodeProperties
 

data/lib/chef/resource/chef_organization.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/data_handler_base"
 class Chef
   class Resource
     class ChefOrganization < Cheffish::BaseResource
-      resource_name :chef_organization
+      provides :chef_organization
 
       property :organization_name, Cheffish::NAME_REGEX, name_property: true
       property :full_name, String
@@ -68,7 +68,7 @@ class Chef
           end
         end
         new_resource.members.each do |user|
-          if !existing_members.include?(user)
+          unless existing_members.include?(user)
             converge_by "Add #{user} to organization #{new_resource.organization_name}" do
               rest.post("#{rest.root_url}/organizations/#{new_resource.organization_name}/users/", { "username" => user })
             end

data/lib/chef/resource/chef_resolved_cookbooks.rb

@@ -4,7 +4,7 @@ require "chef_zero"
 class Chef
   class Resource
     class ChefResolvedCookbooks < Cheffish::BaseResource
-      resource_name :chef_resolved_cookbooks
+      provides :chef_resolved_cookbooks
 
       def initialize(*args)
         super
@@ -43,7 +43,8 @@ class Chef
           new_resource.berksfile.upload(
             server_url: new_resource.chef_server[:chef_server_url],
             client_name: new_resource.chef_server[:options][:client_name],
-            client_key: new_resource.chef_server[:options][:signing_key_filename])
+            client_key: new_resource.chef_server[:options][:signing_key_filename]
+          )
         else
           file = Tempfile.new("privatekey")
           begin
@@ -53,7 +54,8 @@ class Chef
             new_resource.berksfile.upload(
               server_url: new_resource.chef_server[:chef_server_url],
               client_name: new_resource.chef_server[:options][:client_name] || "me",
-              client_key: file.path)
+              client_key: file.path
+            )
 
           ensure
             file.close

data/lib/chef/resource/chef_role.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/role_data_handler"
 class Chef
   class Resource
     class ChefRole < Cheffish::BaseResource
-      resource_name :chef_role
+      provides :chef_role
 
       property :role_name, Cheffish::NAME_REGEX, name_property: true
       property :description, String
@@ -62,6 +62,7 @@ class Chef
         if recipes.size == 0
           raise ArgumentError, "At least one recipe must be specified"
         end
+
         @run_list_modifiers ||= []
         @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
       end
@@ -70,6 +71,7 @@ class Chef
         if roles.size == 0
           raise ArgumentError, "At least one role must be specified"
         end
+
         @run_list_modifiers ||= []
         @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
       end
@@ -78,6 +80,7 @@ class Chef
         if recipes.size == 0
           raise ArgumentError, "At least one recipe must be specified"
         end
+
         @run_list_removers ||= []
         @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
       end
@@ -86,6 +89,7 @@ class Chef
         if roles.size == 0
           raise ArgumentError, "At least one role must be specified"
         end
+
         @run_list_removers ||= []
         @run_list_removers += roles.map { |recipe| Chef::RunList::RunListItem.new("role[#{role}]") }
       end

data/lib/chef/resource/chef_user.rb

@@ -4,7 +4,7 @@ require_relative "../../cheffish/chef_actor_base"
 class Chef
   class Resource
     class ChefUser < Cheffish::ChefActorBase
-      resource_name :chef_user
+      provides :chef_user
 
       # Client attributes
       property :user_name, Cheffish::NAME_REGEX, name_property: true
@@ -25,7 +25,7 @@ class Chef
 
       # Output public key (if so desired)
       property :output_key_path, String
-      property :output_key_format, [ :pem, :der, :openssh ], default: :openssh
+      property :output_key_format, %i{pem der openssh}, default: :openssh
 
       # Proc that runs just before the resource executes.  Called with (resource)
       def before(&block)

data/lib/chef/resource/private_key.rb

@@ -6,18 +6,18 @@ require_relative "../../cheffish/key_formatter"
 class Chef
   class Resource
     class PrivateKey < Cheffish::BaseResource
-      resource_name :private_key
+      provides :private_key
 
       allowed_actions :create, :delete, :regenerate, :nothing
       default_action :create
 
       # Path to private key.  Set to :none to create the key in memory and not on disk.
       property :path, [ String, :none ], name_property: true
-      property :format, [ :pem, :der ], default: :pem
-      property :type, [ :rsa, :dsa ], default: :rsa # TODO support :ec
+      property :format, %i{pem der}, default: :pem
+      property :type, %i{rsa dsa}, default: :rsa # TODO support :ec
       # These specify an optional public_key you can spit out if you want.
       property :public_key_path, String
-      property :public_key_format, [ :openssh, :pem, :der ], default: :openssh
+      property :public_key_format, %i{openssh pem der}, default: :openssh
       # Specify this if you want to copy another private key but give it a different format / password
       property :source_key
       property :source_key_path, String
@@ -31,7 +31,7 @@ class Chef
 
       # PEM-only
       property :pass_phrase, String
-      property :cipher, String, equal_to: OpenSSL::Cipher.ciphers.map { |x| x.downcase }, default: "des-ede3-cbc", coerce: proc { |x| x.downcase }
+      property :cipher, String, equal_to: OpenSSL::Cipher.ciphers.map(&:downcase), default: "des-ede3-cbc", coerce: proc { |x| x.downcase }
 
       # Set this to regenerate the key if it does not have the desired characteristics (like size, type, etc.)
       property :regenerate_if_different, [TrueClass, FalseClass]
@@ -202,22 +202,22 @@ class Chef
         def new_key_with_path
           path = new_resource.path
           if path.is_a?(Symbol)
-            return [ nil, path ]
+            [ nil, path ]
           elsif Pathname.new(path).relative?
             private_key, private_key_path = Cheffish.get_private_key_with_path(path, run_context.config)
             if private_key
-              return [ private_key, (private_key_path || :none) ]
+              [ private_key, (private_key_path || :none) ]
             elsif run_context.config[:private_key_write_path]
               @should_create_directory = true
               path = ::File.join(run_context.config[:private_key_write_path], path)
-              return [ nil, path ]
+              [ nil, path ]
             else
               raise "Could not find key #{path} and Chef::Config.private_key_write_path is not set."
             end
           elsif ::File.exist?(path)
-            return [ IO.read(path), path ]
+            [ IO.read(path), path ]
           else
-            return [ nil, path ]
+            [ nil, path ]
           end
         end
 

data/lib/chef/resource/public_key.rb

@@ -6,13 +6,13 @@ require_relative "../../cheffish/key_formatter"
 class Chef
   class Resource
     class PublicKey < Cheffish::BaseResource
-      resource_name :public_key
+      provides :public_key
 
       allowed_actions :create, :delete, :nothing
       default_action :create
 
       property :path, String, name_property: true
-      property :format, [ :pem, :der, :openssh ], default: :openssh
+      property :format, %i{pem der openssh}, default: :openssh
 
       property :source_key
       property :source_key_path, String
@@ -24,9 +24,10 @@ class Chef
       end
 
       action :create do
-        if !new_source_key
+        unless new_source_key
           raise "No source key specified"
         end
+
         desired_output = encode_public_key(new_source_key)
         if Array(current_resource.action) == [ :delete ] || desired_output != IO.read(new_resource.path)
           converge_by "write #{new_resource.format} public key #{new_resource.path} from #{new_source_key_publicity} key #{new_resource.source_key_path}" do

data/lib/cheffish.rb

@@ -98,6 +98,7 @@ module Cheffish
     elsif config[:private_key_paths]
       config[:private_key_paths].each do |private_key_path|
         next unless File.exist?(private_key_path)
+
         Dir.entries(private_key_path).sort.each do |key|
           ext = File.extname(key)
           if key == name || ext == "" || ext == ".pem"

data/lib/cheffish/base_resource.rb

@@ -91,7 +91,7 @@ module Cheffish
       end
 
       def json_differences_internal(old_json, new_json, print_values, name, result)
-        if old_json.kind_of?(Hash) && new_json.kind_of?(Hash)
+        if old_json.is_a?(Hash) && new_json.is_a?(Hash)
           removed_keys = old_json.keys.inject({}) { |hash, key| hash[key] = true; hash }
           new_json.each_pair do |new_key, new_value|
             if old_json.key?(new_key)
@@ -101,18 +101,18 @@ module Cheffish
               end
             else
               if print_values
-                result << "  add #{name == '' ? new_key : "#{name}.#{new_key}"} = #{new_value.inspect}"
+                result << "  add #{name == "" ? new_key : "#{name}.#{new_key}"} = #{new_value.inspect}"
               else
-                result << "  add #{name == '' ? new_key : "#{name}.#{new_key}"}"
+                result << "  add #{name == "" ? new_key : "#{name}.#{new_key}"}"
               end
             end
           end
           removed_keys.keys.each do |removed_key|
-            result << "  remove #{name == '' ? removed_key : "#{name}.#{removed_key}"}"
+            result << "  remove #{name == "" ? removed_key : "#{name}.#{removed_key}"}"
           end
         else
-          old_json = old_json.to_s if old_json.kind_of?(Symbol)
-          new_json = new_json.to_s if new_json.kind_of?(Symbol)
+          old_json = old_json.to_s if old_json.is_a?(Symbol)
+          new_json = new_json.to_s if new_json.is_a?(Symbol)
           if old_json != new_json
             if print_values
               result << "  update #{name} from #{old_json.inspect} to #{new_json.inspect}"
@@ -134,8 +134,8 @@ module Cheffish
         end
 
         modifiers.each do |path, value|
-          path = [path] if !path.kind_of?(Array)
-          path = path.map { |path_part| path_part.to_s }
+          path = [path] unless path.is_a?(Array)
+          path = path.map(&:to_s)
           parent = 0.upto(path.size - 2).inject(json) do |hash, index|
             if hash.nil?
               nil
@@ -148,6 +148,7 @@ module Cheffish
           if !parent.nil? && !parent.is_a?(Hash)
             raise "Attempt to set #{path} to #{value} when #{path[0..-2]} is not a hash"
           end
+
           existing_value = parent ? parent[path[-1]] : nil
 
           if value.is_a?(Proc)
@@ -158,7 +159,7 @@ module Cheffish
           else
             # Create parent if necessary, overwriting values
             parent = path[0..-2].inject(json) do |hash, path_part|
-              hash[path_part] = {} if !hash[path_part]
+              hash[path_part] = {} unless hash[path_part]
               hash[path_part]
             end
             if path.size > 0
@@ -173,6 +174,7 @@ module Cheffish
 
       def apply_run_list_modifiers(add_to_run_list, delete_from_run_list, run_list)
         return run_list if (!add_to_run_list || add_to_run_list.size == 0) && (!delete_from_run_list || !delete_from_run_list.size)
+
         delete_from_run_list ||= []
         add_to_run_list ||= []
 
@@ -191,7 +193,7 @@ module Cheffish
             # because found_desired will be less than add_to_run_list_index.  The result will
             # be X, A, B, Y, Z.
             if found_desired >= add_to_run_list_index
-              result += add_to_run_list[add_to_run_list_index..found_desired].map { |item| item.to_s }
+              result += add_to_run_list[add_to_run_list_index..found_desired].map(&:to_s)
               add_to_run_list_index = found_desired + 1
             end
           else
@@ -204,7 +206,7 @@ module Cheffish
         end
 
         # Copy any remaining desired items at the end
-        result += add_to_run_list[add_to_run_list_index..-1].map { |item| item.to_s }
+        result += add_to_run_list[add_to_run_list_index..-1].map(&:to_s)
         result
       end
 

data/lib/cheffish/basic_chef_client.rb

@@ -14,7 +14,7 @@ module Cheffish
     include Chef::DSL::Recipe
 
     def initialize(node = nil, events = nil, **chef_config)
-      if !node
+      unless node
         node = Chef::Node.new
         node.name "basic_chef_client"
         node.automatic[:platform] = "basic_chef_client"
@@ -31,7 +31,7 @@ module Cheffish
         case events
         when Array
           events.each { |e| dispatcher.register(e) } if events
-        when !nil
+        when !nil # rubocop: disable Lint/LiteralAsCondition
           dispatcher.register(events)
         end
         @run_context = Chef::RunContext.new(node, {}, dispatcher)

data/lib/cheffish/chef_actor_base.rb

@@ -24,9 +24,10 @@ module Cheffish
           end
         else
           # Create the actor if it's missing
-          if !new_public_key
+          unless new_public_key
             raise "You must specify a public key to create a #{actor_type}!  Use the private_key resource to create a key, and pass it in with source_key_path."
           end
+
           description = [ "create #{actor_type} #{new_resource.name} at #{actor_path}" ] + differences
           converge_by description do
             result = rest.post((actor_path).to_s, normalize_for_post(new_json))

data/lib/cheffish/chef_run.rb

@@ -34,15 +34,14 @@ module Cheffish
     def client
       @client ||= begin
         chef_config = self.chef_config.dup
-        chef_config[:log_level] ||= :debug if !chef_config.key?(:log_level)
-        chef_config[:verbose_logging] = false if !chef_config.key?(:verbose_logging)
+        chef_config[:log_level] ||= :debug unless chef_config.key?(:log_level)
+        chef_config[:verbose_logging] = false unless chef_config.key?(:verbose_logging)
         chef_config[:stdout] = StringIOTee.new(chef_config[:stdout])
         chef_config[:stderr] = StringIOTee.new(chef_config[:stderr])
         chef_config[:log_location] = StringIOTee.new(chef_config[:log_location])
         @client = ::Cheffish::BasicChefClient.new(nil,
           [ event_sink, Chef::Formatters.new(:doc, chef_config[:stdout], chef_config[:stderr]) ],
-          chef_config
-        )
+          chef_config)
       end
     end
 
@@ -125,14 +124,14 @@ module Cheffish
         message << "--- Chef Client Output ---\n"
         message << "---                    ---\n"
         message << stdout
-        message << "\n" if !stdout.end_with?("\n")
+        message << "\n" unless stdout.end_with?("\n")
       end
       if stderr && !stderr.empty?
         message << "---                          ---\n"
         message << "--- Chef Client Error Output ---\n"
         message << "---                          ---\n"
         message << stderr
-        message << "\n" if !stderr.end_with?("\n")
+        message << "\n" unless stderr.end_with?("\n")
       end
       if logs && !logs.empty?
         message << "---                  ---\n"

data/lib/cheffish/chef_run_listener.rb

@@ -21,9 +21,7 @@ module Cheffish
     def disconnect
       # Stop the servers
       if node.run_context
-        node.run_context.cheffish.local_servers.each do |server|
-          server.stop
-        end
+        node.run_context.cheffish.local_servers.each(&:stop)
       end
     end
   end

data/lib/cheffish/key_formatter.rb

@@ -55,15 +55,7 @@ module Cheffish
         hexes = Digest::MD5.hexdigest(data)
         hexes.scan(/../).join(":")
       when :pkcs8sha1fingerprint
-        if RUBY_VERSION.to_f >= 2.0
-          raise "PKCS8 SHA1 not supported in Ruby #{RUBY_VERSION}"
-        end
-        require "openssl_pkcs8"
-        pkcs8_pem = key.to_pem_pkcs8
-        pkcs8_base64 = pkcs8_pem.split("\n").reject { |l| l =~ /^-----/ }
-        pkcs8_data = Base64.decode64(pkcs8_base64.join)
-        hexes = Digest::SHA1.hexdigest(pkcs8_data)
-        hexes.scan(/../).join(":")
+        raise "PKCS8 SHA1 not supported by Ruby 2.0 and later"
       else
         raise "Unrecognized key format #{format}"
       end

data/lib/cheffish/merged_config.rb

@@ -27,7 +27,7 @@ module Cheffish
         result_configs = []
         configs.each do |config|
           value = config[name]
-          if !value.nil?
+          unless value.nil?
             if value.respond_to?(:keys)
               result_configs << value
             elsif result_configs.size > 0
@@ -63,7 +63,7 @@ module Cheffish
     alias_method :has_key?, :key?
 
     def keys
-      configs.flat_map { |c| c.keys }.uniq
+      configs.flat_map(&:keys).uniq
     end
 
     def values

data/lib/cheffish/node_properties.rb

@@ -39,7 +39,7 @@ module Cheffish
       attribute "tags" do |existing_tags|
         existing_tags ||= []
         tags.each do |tag|
-          if !existing_tags.include?(tag.to_s)
+          unless existing_tags.include?(tag.to_s)
             existing_tags << tag.to_s
           end
         end
@@ -64,8 +64,8 @@ module Cheffish
       if tags.size == 0
         attribute("tags")
       else
-        tags = tags[0] if tags.size == 1 && tags[0].kind_of?(Array)
-        attribute("tags", tags.map { |tag| tag.to_s })
+        tags = tags[0] if tags.size == 1 && tags[0].is_a?(Array)
+        attribute("tags", tags.map(&:to_s))
       end
     end
 
@@ -80,6 +80,7 @@ module Cheffish
       if recipes.size == 0
         raise ArgumentError, "At least one recipe must be specified"
       end
+
       @run_list_modifiers ||= []
       @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
     end
@@ -88,6 +89,7 @@ module Cheffish
       if roles.size == 0
         raise ArgumentError, "At least one role must be specified"
       end
+
       @run_list_modifiers ||= []
       @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
     end
@@ -96,6 +98,7 @@ module Cheffish
       if recipes.size == 0
         raise ArgumentError, "At least one recipe must be specified"
       end
+
       @run_list_removers ||= []
       @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
     end
@@ -104,6 +107,7 @@ module Cheffish
       if roles.size == 0
         raise ArgumentError, "At least one role must be specified"
       end
+
       @run_list_removers ||= []
       @run_list_removers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
     end

data/lib/cheffish/recipe_dsl.rb

@@ -52,7 +52,7 @@ class Chef
 
         # Create the data store chef-zero will use
         options[:data_store] ||= begin
-          if !options[:chef_repo_path]
+          unless options[:chef_repo_path]
             raise "chef_repo_path must be specified to with_chef_local_server"
           end
 
@@ -63,7 +63,7 @@ class Chef
             symbol_key = "#{type}_path".to_sym
 
             options[symbol_key] ||= begin
-              if options[:chef_repo_path].kind_of?(String)
+              if options[:chef_repo_path].is_a?(String)
                 Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
               else
                 options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s") }

data/lib/cheffish/rspec/chef_run_support.rb

@@ -58,7 +58,7 @@ module Cheffish
         end
 
         def recipe(str = nil, file = nil, line = nil, &recipe)
-          if !recipe
+          unless recipe
             if file && line
               recipe = proc { eval(str, nil, file, line) } # rubocop:disable Security/Eval
             else

data/lib/cheffish/rspec/matchers/have_updated.rb

@@ -5,16 +5,16 @@ RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
     @recipe = recipe
     actual = @recipe.event_sink.events
     actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }
-                               .map { |event, resource, action| action }
+      .map { |event, resource, action| action }
     expect(actual_actions).to eq(expected_actions)
   end
 
   failure_message do
     actual = @recipe.event_sink.events
     updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
+    result = "expected that the chef_run would #{expected_actions.join(",")} #{resource_name}."
     if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(', ')}"
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(", ")}"
     else
       result << " Nothing was updated."
     end
@@ -24,9 +24,9 @@ RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
   failure_message_when_negated do
     actual = @recipe.event_sink.events
     updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
+    result = "expected that the chef_run would not #{expected_actions.join(",")} #{resource_name}."
     if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(', ')}"
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(", ")}"
     else
       result << " Nothing was updated."
     end

data/lib/cheffish/rspec/recipe_run_wrapper.rb

@@ -14,7 +14,7 @@ module Cheffish
       attr_reader :example
 
       def client
-        if !@client
+        unless @client
           super
           example = self.example
 

data/lib/cheffish/rspec/repository_support.rb

@@ -12,6 +12,7 @@ module Cheffish
       ::RSpec.shared_context "with a chef repo" do
         before :each do
           raise "Can only create one directory per test" if @repository_dir
+
           @repository_dir = Dir.mktmpdir("chef_repo")
           Chef::Config.chef_repo_path = @repository_dir
           %w{client cookbook data_bag environment node role user}.each do |object_name|

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "15.0.0".freeze
+  VERSION = "15.0.3".freeze
 end

data/spec/functional/fingerprint_spec.rb

@@ -39,24 +39,26 @@ describe "Cheffish fingerprint key formatter" do
 
   context "when computing key fingperprints" do
 
-    it "computes the PKCS#8 SHA1 private key fingerprint correctly", pending: (RUBY_VERSION.to_f >= 2.0) do
-      expect(key_to_format(sample_private_key, :pkcs8sha1fingerprint)).to eq(
-        "88:7e:3a:bd:26:9f:b5:c5:d8:ae:52:f9:df:0b:64:a4:5c:17:0a:87")
+    it "raises when passing a PKCS#8 SHA1 private key fingerprint" do
+      expect { key_to_format(sample_private_key, :pkcs8sha1fingerprint) }.to raise_error
     end
 
     it "computes the PKCS#1 MD5 public key fingerprint correctly" do
       expect(key_to_format(sample_public_key, :pkcs1md5fingerprint)).to eq(
-        "1f:e8:da:c1:16:c3:72:7d:90:e2:b7:64:c4:b4:55:20")
+        "1f:e8:da:c1:16:c3:72:7d:90:e2:b7:64:c4:b4:55:20"
+      )
     end
 
     it "computes the RFC4716 MD5 public key fingerprint correctly" do
       expect(key_to_format(sample_public_key, :rfc4716md5fingerprint)).to eq(
-        "b0:13:4f:da:cf:8c:dc:a7:4a:1f:d2:3a:51:92:cf:6b")
+        "b0:13:4f:da:cf:8c:dc:a7:4a:1f:d2:3a:51:92:cf:6b"
+      )
     end
 
     it "defaults to the PKCS#1 MD5 public key fingerprint" do
       expect(key_to_format(sample_public_key, :fingerprint)).to eq(
-        key_to_format(sample_public_key, :pkcs1md5fingerprint))
+        key_to_format(sample_public_key, :pkcs1md5fingerprint)
+      )
     end
 
   end

data/spec/integration/chef_acl_spec.rb

@@ -160,7 +160,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           it 'Converging chef_acl "nodes/x" with rights [ :read, :create, :update, :delete, :grant ] modifies all rights' do
             expect_recipe do
               chef_acl "nodes/x" do
-                rights [ :create, :read, :update, :delete, :grant ], users: %w{u1 u2}, clients: %w{c1}, groups: %w{g1}
+                rights %i{create read update delete grant}, users: %w{u1 u2}, clients: %w{c1}, groups: %w{g1}
               end
             end.to be_updated
             expect(get("nodes/x/_acl")).to partially_match(
@@ -229,11 +229,11 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
             end
           end.to be_updated
           expect(get("nodes/x/_acl")).to partially_match(
-                           "create" => { "actors" => exclude("foo") },
-                           "read"   => { "actors" => exclude("foo") },
-                           "update" => { "actors" => exclude("foo") },
-                           "delete" => { "actors" => exclude("foo") },
-                           "grant"  => { "actors" => exclude("foo") }
+            "create" => { "actors" => exclude("foo") },
+            "read"   => { "actors" => exclude("foo") },
+            "update" => { "actors" => exclude("foo") },
+            "delete" => { "actors" => exclude("foo") },
+            "grant"  => { "actors" => exclude("foo") }
           )
         end
       end
@@ -361,7 +361,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
               end.to be_updated
               %w{clients containers cookbooks data environments groups nodes roles}.each do |type|
                 expect(get("/organizations/foo/#{type}/x/_acl")).to partially_match(
-                                 "read" => { "actors" => %w{u} })
+                  "read" => { "actors" => %w{u} }
+                )
               end
             end
           end
@@ -408,7 +409,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
               end.to be_updated
               %w{clients containers cookbooks data environments groups nodes roles sandboxes}.each do |type|
                 expect(get("/organizations/foo/#{type}/x/_acl")).to partially_match(
-                                 "read" => { "actors" => %w{u} })
+                  "read" => { "actors" => %w{u} }
+                )
               end
             end
 
@@ -420,7 +422,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
               end.to be_updated
               %w{clients containers cookbooks data environments groups nodes roles}.each do |type|
                 expect(get("/organizations/foo/#{type}/x/_acl")).to partially_match(
-                                 "read" => { "actors" => %w{u} })
+                  "read" => { "actors" => %w{u} }
+                )
               end
             end
 
@@ -447,7 +450,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                 chef_acl "/organizations/foo/cookbooks/x/1.0.0" do
                   rights :read, users: %w{u}
                 end
-              end.to raise_error(/ACLs cannot be set on children of \/organizations\/foo\/cookbooks\/x/)
+              end.to raise_error(%r{ACLs cannot be set on children of /organizations/foo/cookbooks/x})
             end
 
             it "chef_acl '/organizations/foo/cookbooks/*/*' raises an error" do
@@ -456,7 +459,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                 chef_acl "/organizations/foo/cookbooks/*/*" do
                   rights :read, users: %w{u}
                 end
-              end.to raise_error(/ACLs cannot be set on children of \/organizations\/foo\/cookbooks\/*/)
+              end.to raise_error(%r{ACLs cannot be set on children of /organizations/foo/cookbooks/*})
             end
 
             it 'chef_acl "/organizations/foo/data/x/y" raises an error' do
@@ -464,7 +467,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                 chef_acl "/organizations/foo/data/x/y" do
                   rights :read, users: %w{u}
                 end
-              end.to raise_error(/ACLs cannot be set on children of \/organizations\/foo\/data\/x/)
+              end.to raise_error(%r{ACLs cannot be set on children of /organizations/foo/data/x})
             end
 
             it 'chef_acl "/organizations/foo/data/*/*" raises an error' do
@@ -473,7 +476,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                 chef_acl "/organizations/foo/data/*/*" do
                   rights :read, users: %w{u}
                 end
-              end.to raise_error(/ACLs cannot be set on children of \/organizations\/foo\/data\/*/)
+              end.to raise_error(%r{ACLs cannot be set on children of /organizations/foo/data/*})
             end
 
             it 'chef_acl "/organizations/foo" changes the acl' do
@@ -609,7 +612,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           end.to be_updated
           %w{clients containers cookbooks data environments groups nodes roles sandboxes}.each do |type|
             expect(get("#{type}/x/_acl")).to partially_match(
-                             "read" => { "actors" => %w{u} })
+              "read" => { "actors" => %w{u} }
+            )
           end
         end
 
@@ -621,7 +625,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           end.to be_updated
           %w{clients containers cookbooks data environments groups nodes roles}.each do |type|
             expect(get("#{type}/x/_acl")).to partially_match(
-                             "read" => { "actors" => %w{u} })
+              "read" => { "actors" => %w{u} }
+            )
           end
         end
 
@@ -633,7 +638,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           end.to be_updated
           %w{admins billing-admins clients users x}.each do |n|
             expect(get("groups/#{n}/_acl")).to partially_match(
-                             "read" => { "actors" => %w{u} })
+              "read" => { "actors" => %w{u} }
+            )
           end
         end
 
@@ -713,7 +719,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           end.to be_updated
           %w{clients containers cookbooks data environments groups nodes roles sandboxes}.each do |type|
             expect(get("/organizations/foo/containers/#{type}/_acl")).to partially_match(
-                             "read" => { "actors" => %w{u} })
+              "read" => { "actors" => %w{u} }
+            )
           end
         end
 
@@ -768,7 +775,8 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           end.to be_updated
           %w{clients containers cookbooks data environments groups nodes roles sandboxes}.each do |type|
             expect(get("containers/#{type}/_acl")).to partially_match(
-                             "read" => { "actors" => %w{u} })
+              "read" => { "actors" => %w{u} }
+            )
           end
         end
       end
@@ -820,7 +828,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         it 'chef_acl with remove_rights [ :create, :read ], "u", "c", "g" removes all three' do
           expect_recipe do
             chef_acl "nodes/x" do
-              remove_rights [ :create, :read ], users: %w{u}, clients: %w{c}, groups: %w{g}
+              remove_rights %i{create read}, users: %w{u}, clients: %w{c}, groups: %w{g}
             end
           end.to be_updated
           expect(get("nodes/x/_acl")).to partially_match(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.0.3
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero