cheffish 14.0.13 → 16.0.8

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

@@ -1,7 +1,7 @@
 require "chef_zero/rspec"
 require "chef/server_api"
 require_relative "repository_support"
-require "uri"
+require "uri" unless defined?(URI)
 require_relative "../chef_run"
 require_relative "recipe_run_wrapper"
 require_relative "matchers"
@@ -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

@@ -1,5 +1,5 @@
 require_relative "../chef_run"
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 
 module Cheffish
   module RSpec
@@ -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 = "14.0.13".freeze
+  VERSION = "16.0.8".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(
@@ -191,7 +191,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         it 'Converging chef_acl "nodes/y" throws a 404' do
           expect_converge do
             chef_acl "nodes/y"
-          end.to raise_error(Net::HTTPServerException)
+          end.to raise_error(Net::HTTPClientException)
         end
       end
 
@@ -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(

data/spec/integration/chef_group_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Resource::ChefGroup do
             action :delete
           end
         end.to not_have_updated("chef_group[x]", :delete).and not_have_updated("chef_group[x]", :create)
-        expect { get("groups/x") }.to raise_error(Net::HTTPServerException)
+        expect { get("groups/x") }.to raise_error(Net::HTTPClientException)
       end
 
       it 'Converging chef_group "x" creates the group with the given members' do
@@ -101,7 +101,7 @@ describe Chef::Resource::ChefGroup do
             action :delete
           end
         end.to have_updated("chef_group[x]", :delete)
-        expect { get("groups/x") }.to raise_error(Net::HTTPServerException)
+        expect { get("groups/x") }.to raise_error(Net::HTTPClientException)
       end
 
       it 'Converging chef_group "x" with existing users changes nothing' do

data/spec/integration/chef_node_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Resource::ChefNode do
               with_chef_server "http://127.0.0.1:8899"
               chef_node "blah"
             end.to have_updated "chef_node[blah]", :create
-            expect { get("nodes/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("nodes/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/nodes/blah")["name"]).to eq("blah")
           end
         end
@@ -53,7 +53,7 @@ describe Chef::Resource::ChefNode do
                 chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_node[blah]", :create
-            expect { get("nodes/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("nodes/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/nodes/blah")["name"]).to eq("blah")
           end
         end

data/spec/integration/chef_role_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Resource::ChefRole do
               with_chef_server "http://127.0.0.1:8899"
               chef_role "blah"
             end.to have_updated "chef_role[blah]", :create
-            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("roles/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end
@@ -53,7 +53,7 @@ describe Chef::Resource::ChefRole do
                 chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_role[blah]", :create
-            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("roles/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 14.0.13
+  version: 16.0.8
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '14.0'
 - !ruby/object:Gem::Dependency
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A set of Chef resources for configuring Chef.
+description: A set of Chef resources for configuring Chef Infra.
 email: oss@chef.io
 executables: []
 extensions: []
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,5 +130,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A set of Chef resources for configuring Chef.
+summary: A set of Chef resources for configuring Chef Infra.
 test_files: []