cheffish 14.0.1 → 14.0.4

data/lib/cheffish/chef_run.rb

@@ -34,8 +34,8 @@ module Cheffish
     def client
       @client ||= begin
         chef_config = self.chef_config.dup
-        chef_config[:log_level] ||= :debug if !chef_config.has_key?(:log_level)
-        chef_config[:verbose_logging] = false if !chef_config.has_key?(:verbose_logging)
+        chef_config[:log_level] ||= :debug if !chef_config.key?(:log_level)
+        chef_config[:verbose_logging] = false if !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])

data/lib/cheffish/key_formatter.rb

@@ -50,7 +50,7 @@ module Cheffish
         # Put : between every pair of hexes
         hexes.scan(/../).join(":")
       when :rfc4716md5fingerprint
-        type, base64_data, etc = encode_openssh_key(key).split
+        _type, base64_data, _etc = encode_openssh_key(key).split
         data = Base64.decode64(base64_data)
         hexes = Digest::MD5.hexdigest(data)
         hexes.scan(/../).join(":")

data/lib/cheffish/merged_config.rb

@@ -57,7 +57,7 @@ module Cheffish
     end
 
     def key?(name)
-      configs.any? { |config| config.has_key?(name) }
+      configs.any? { |config| config.key?(name) }
     end
 
     alias_method :has_key?, :key?

data/lib/cheffish/node_properties.rb

@@ -65,7 +65,7 @@ module Cheffish
         attribute("tags")
       else
         tags = tags[0] if tags.size == 1 && tags[0].kind_of?(Array)
-        attribute "tags", tags.map { |tag| tag.to_s }
+        attribute("tags", tags.map { |tag| tag.to_s })
       end
     end
 

data/lib/cheffish/recipe_dsl.rb

@@ -41,7 +41,7 @@ class Chef
       end
 
       def with_chef_server(server_url, options = {}, &block)
-        run_context.cheffish.with_chef_server({ :chef_server_url => server_url, :options => options }, &block)
+        run_context.cheffish.with_chef_server({ chef_server_url: server_url, options: options }, &block)
       end
 
       def with_chef_local_server(options, &block)
@@ -119,7 +119,7 @@ class Chef
   Chef::Client.when_run_starts do |run_status|
     # Pulling on cheffish_run_data makes it initialize right now
     run_status.node.run_state[:chef_config] = config = Cheffish.profiled_config(Chef::Config)
-    run_status.node.run_state[:cheffish] = run_data = Cheffish::ChefRunData.new(config)
+    run_status.node.run_state[:cheffish] = Cheffish::ChefRunData.new(config)
     run_status.events.register(Cheffish::ChefRunListener.new(run_status.node))
   end
 

data/lib/cheffish/rspec/chef_run_support.rb

@@ -20,7 +20,7 @@ module Cheffish
 
       def when_the_chef_12_server(*args, **options, &block)
         if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
-          when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
+          when_the_chef_server(*args, osc_compat: false, single_org: false, **options, &block)
         end
       end
 
@@ -60,9 +60,9 @@ module Cheffish
         def recipe(str = nil, file = nil, line = nil, &recipe)
           if !recipe
             if file && line
-              recipe = proc { eval(str, nil, file, line) }
+              recipe = proc { eval(str, nil, file, line) } # rubocop:disable Security/Eval
             else
-              recipe = proc { eval(str) }
+              recipe = proc { eval(str) } # rubocop:disable Security/Eval
             end
           end
           RecipeRunWrapper.new(chef_config, &recipe)

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

@@ -4,8 +4,8 @@ RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
   match do |recipe|
     @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 }
+    actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }
+                               .map { |event, resource, action| action }
     expect(actual_actions).to eq(expected_actions)
   end
 

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "14.0.1"
+  VERSION = "14.0.4".freeze
 end

data/spec/functional/fingerprint_spec.rb

@@ -5,41 +5,41 @@ describe "Cheffish fingerprint key formatter" do
 
   # Sample key: 0x9a6fa4c43b328c3d04c1fbc0498539218b6728e41cd35f6d27d491ef705f0b2083dc1ac977da19f54ba82b044773f20667e9627c543abb3b41b6eb9e4318ca3c68f487bbd0f1c9eea9a3101b7d1d180983c5440ac4183e78e9e256fa687d8aac63b21617a4b02b35bf5e307a3b76961a16cd8493e923536b34cc2b2da8d45220d57ef2243b081b555b84f1da0ade0e896c2aa96911b41430b59eaf75dbffb7eaa7c5b3a686f2d47a24e3b7f1acb0844f84a2fedc63660ae366b800cd9448093d6b1d96503ebb7807b48257e16c3d8a7c9a8cc5dd63116aa673bd9e09754de09358486e743e34c6a3642eeb64b2208efc96df39151572557a75638bd059c21a55 = 0xd6e92677d4e1d2aa6d14f87b5f49ee6916c6b92411536254fae4a21e82eebb0a40600247c701c1c938b21ca9f25b7b330c35fded57b4de3a951e83329a80bdbf2ba138fe2f190bffce43967b5fa93b179367bcd15cb1db7f9e3ab62caca95dc9489b62bc0a10b53841b932455a43409f96eed90dc80abc8cce5593ead8f0a26d * 0xb7f68cd427045788d5e315375f71d3a416784ec2597776a60ed77c821294d9bd66e96658bdcb43072cee0c849d297bd9f94991738f1a0df313ceb51b093a9372f12a61987f40e7a03d773911deb270916a574962ae8ff4f2d8bfcedee1c885e9c3e54212471636a6330b05b78c3a7ddf96b013be389a08ab7971db2f68fb2689
 
-  sample_private_key = <<EOF
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAmm+kxDsyjD0EwfvASYU5IYtnKOQc019tJ9SR73BfCyCD3BrJd9oZ9UuoKwRH
-c/IGZ+lifFQ6uztBtuueQxjKPGj0h7vQ8cnuqaMQG30dGAmDxUQKxBg+eOniVvpofYqsY7IWF6Sw
-KzW/XjB6O3aWGhbNhJPpI1NrNMwrLajUUiDVfvIkOwgbVVuE8doK3g6JbCqpaRG0FDC1nq912/+3
-6qfFs6aG8tR6JOO38aywhE+Eov7cY2YK42a4AM2USAk9ax2WUD67eAe0glfhbD2KfJqMxd1jEWqm
-c72eCXVN4JNYSG50PjTGo2Qu62SyII78lt85FRVyVXp1Y4vQWcIaVQIDAQABAoIBABY+JC37FLGs
-DCZgOvab0HmrWUVDbX9oDBGjhQ1GUvoISdWGqiOv7vMsXWEssZnabt/CdmPPwdG7nCBbWSTyyhXf
-S/DMtTBN1CjsimJbJ7iRjj/4J9DMaRsDHI1IbYo/UcreGF55YsImcJSBSOmNj9rcE+eXYgmrdxJY
-oZNm8IWPaZ1/8KdPHSq6/HfTzRxXhcGOMGnf3lGfzkzIbV9Ee88Lv9sSV3bYrOsWMNabOe2TeTpC
-UTfFkC++0RkFjEDINSCnoCi+ybzHLUDnurANCwnRWLTVEAeffwNVmiDfgimuqFtzCInW5/5bOTPz
-rBmcC6QAFbyk2WKAlY8Zd4SBYqECgYEA1ukmd9Th0qptFPh7X0nuaRbGuSQRU2JU+uSiHoLuuwpA
-YAJHxwHByTiyHKnyW3szDDX97Ve03jqVHoMymoC9vyuhOP4vGQv/zkOWe1+pOxeTZ7zRXLHbf546
-tiysqV3JSJtivAoQtThBuTJFWkNAn5bu2Q3ICryMzlWT6tjwom0CgYEAt/aM1CcEV4jV4xU3X3HT
-pBZ4TsJZd3amDtd8ghKU2b1m6WZYvctDByzuDISdKXvZ+UmRc48aDfMTzrUbCTqTcvEqYZh/QOeg
-PXc5Ed6ycJFqV0liro/08ti/zt7hyIXpw+VCEkcWNqYzCwW3jDp935awE744mgireXHbL2j7JokC
-gYAOHErRTWHyYgw9dz8qd4E21y7/EvYsQmWP/5kBZdlk4HxvkVbDI0NlAdr39NSb2w/z+kuM3Nhc
-Sv5lfXnCGTfcKHIyesX+4AHQujFUMmi7H4YnJoecjXT7ARmbwn0ntae0o7cs34BPVb1C+qEBFy9U
-CyXtjHEY+15HYekPX2UVVQKBgBT8Nwxsdv5VSbDh1rM4lN//ADJb0UDjdAX1ZuqfnANKq9asKitc
-aIUFBxK+ff8hdbgOQF1iUaKNvBC0cCUZXYCbKi5/6uRIh+r7ErOLJ+fXbr4OTQeEvHiHaTn8Ct2J
-CSWjnWngWhRZ2TDEsi947Kr40ZUu+d34ZzcvWcWKwDuhAoGBAJzCRoGOu6YGy+rBPxaIg0vB+Grx
-rxs0NeNqGdrzmyAPN35OHXYclPwfp+DbtbJHgGMRc/9VFPqW9PeTKjIByeEsXyrcdreR35AR/fwR
-AUcSSKTvw+PobCpXhdkiw4TgJhFNuZnoC63FOjNqA5mu1ICZYBb4ZVlgUAgSmDQxSIgK
------END RSA PRIVATE KEY-----
+  sample_private_key = <<~EOF
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIEowIBAAKCAQEAmm+kxDsyjD0EwfvASYU5IYtnKOQc019tJ9SR73BfCyCD3BrJd9oZ9UuoKwRH
+    c/IGZ+lifFQ6uztBtuueQxjKPGj0h7vQ8cnuqaMQG30dGAmDxUQKxBg+eOniVvpofYqsY7IWF6Sw
+    KzW/XjB6O3aWGhbNhJPpI1NrNMwrLajUUiDVfvIkOwgbVVuE8doK3g6JbCqpaRG0FDC1nq912/+3
+    6qfFs6aG8tR6JOO38aywhE+Eov7cY2YK42a4AM2USAk9ax2WUD67eAe0glfhbD2KfJqMxd1jEWqm
+    c72eCXVN4JNYSG50PjTGo2Qu62SyII78lt85FRVyVXp1Y4vQWcIaVQIDAQABAoIBABY+JC37FLGs
+    DCZgOvab0HmrWUVDbX9oDBGjhQ1GUvoISdWGqiOv7vMsXWEssZnabt/CdmPPwdG7nCBbWSTyyhXf
+    S/DMtTBN1CjsimJbJ7iRjj/4J9DMaRsDHI1IbYo/UcreGF55YsImcJSBSOmNj9rcE+eXYgmrdxJY
+    oZNm8IWPaZ1/8KdPHSq6/HfTzRxXhcGOMGnf3lGfzkzIbV9Ee88Lv9sSV3bYrOsWMNabOe2TeTpC
+    UTfFkC++0RkFjEDINSCnoCi+ybzHLUDnurANCwnRWLTVEAeffwNVmiDfgimuqFtzCInW5/5bOTPz
+    rBmcC6QAFbyk2WKAlY8Zd4SBYqECgYEA1ukmd9Th0qptFPh7X0nuaRbGuSQRU2JU+uSiHoLuuwpA
+    YAJHxwHByTiyHKnyW3szDDX97Ve03jqVHoMymoC9vyuhOP4vGQv/zkOWe1+pOxeTZ7zRXLHbf546
+    tiysqV3JSJtivAoQtThBuTJFWkNAn5bu2Q3ICryMzlWT6tjwom0CgYEAt/aM1CcEV4jV4xU3X3HT
+    pBZ4TsJZd3amDtd8ghKU2b1m6WZYvctDByzuDISdKXvZ+UmRc48aDfMTzrUbCTqTcvEqYZh/QOeg
+    PXc5Ed6ycJFqV0liro/08ti/zt7hyIXpw+VCEkcWNqYzCwW3jDp935awE744mgireXHbL2j7JokC
+    gYAOHErRTWHyYgw9dz8qd4E21y7/EvYsQmWP/5kBZdlk4HxvkVbDI0NlAdr39NSb2w/z+kuM3Nhc
+    Sv5lfXnCGTfcKHIyesX+4AHQujFUMmi7H4YnJoecjXT7ARmbwn0ntae0o7cs34BPVb1C+qEBFy9U
+    CyXtjHEY+15HYekPX2UVVQKBgBT8Nwxsdv5VSbDh1rM4lN//ADJb0UDjdAX1ZuqfnANKq9asKitc
+    aIUFBxK+ff8hdbgOQF1iUaKNvBC0cCUZXYCbKi5/6uRIh+r7ErOLJ+fXbr4OTQeEvHiHaTn8Ct2J
+    CSWjnWngWhRZ2TDEsi947Kr40ZUu+d34ZzcvWcWKwDuhAoGBAJzCRoGOu6YGy+rBPxaIg0vB+Grx
+    rxs0NeNqGdrzmyAPN35OHXYclPwfp+DbtbJHgGMRc/9VFPqW9PeTKjIByeEsXyrcdreR35AR/fwR
+    AUcSSKTvw+PobCpXhdkiw4TgJhFNuZnoC63FOjNqA5mu1ICZYBb4ZVlgUAgSmDQxSIgK
+    -----END RSA PRIVATE KEY-----
 EOF
   sample_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6TEOzKMPQTB+8BJhTkhi2co5BzTX20n1JHvcF8LIIPcGsl32hn1S6grBEdz8gZn6WJ8VDq7O0G2655DGMo8aPSHu9Dxye6poxAbfR0YCYPFRArEGD546eJW+mh9iqxjshYXpLArNb9eMHo7dpYaFs2Ek+kjU2s0zCstqNRSINV+8iQ7CBtVW4Tx2greDolsKqlpEbQUMLWer3Xb/7fqp8Wzpoby1Hok47fxrLCET4Si/txjZgrjZrgAzZRICT1rHZZQPrt4B7SCV+FsPYp8mozF3WMRaqZzvZ4JdU3gk1hIbnQ+NMajZC7rZLIgjvyW3zkVFXJVenVji9BZwhpV"
 
   def key_to_format(key, format)
-    keyobj, f = Cheffish::KeyFormatter.decode(key)
-    Cheffish::KeyFormatter.encode(keyobj, { :format => format })
+    keyobj, _f = Cheffish::KeyFormatter.decode(key)
+    Cheffish::KeyFormatter.encode(keyobj, { format: format })
   end
 
   context "when computing key fingperprints" do
 
-    it "computes the PKCS#8 SHA1 private key fingerprint correctly", :pending => (RUBY_VERSION.to_f >= 2.0) 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")
     end

data/spec/functional/merged_config_spec.rb

@@ -3,7 +3,7 @@ require "cheffish/merged_config"
 describe "merged_config" do
 
   let(:config) do
-    Cheffish::MergedConfig.new({ :test => "val" })
+    Cheffish::MergedConfig.new({ test: "val" })
   end
 
   let(:collision) do
@@ -13,20 +13,20 @@ describe "merged_config" do
   end
 
   let(:config_mismatch) do
-    c1 = { :test => { :test => "val" } }
-    c2 = { :test => [2, 3, 4] }
+    c1 = { test: { test: "val" } }
+    c2 = { test: [2, 3, 4] }
     Cheffish::MergedConfig.new(c1, c2)
   end
 
   let(:config_hashes) do
-    c1 = { :test => { :test => "val" } }
-    c2 = { :test => { :test2 => "val2" } }
+    c1 = { test: { test: "val" } }
+    c2 = { test: { test2: "val2" } }
     Cheffish::MergedConfig.new(c1, c2)
   end
 
   let(:nested_config) do
-    c1 = { :test => { :test => "val" } }
-    c2 = { :test => { :test2 => "val2" } }
+    c1 = { test: { test: "val" } }
+    c2 = { test: { test2: "val2" } }
     mc = Cheffish::MergedConfig.new(c2)
     Cheffish::MergedConfig.new(c1, mc)
   end
@@ -36,11 +36,11 @@ describe "merged_config" do
   end
 
   it "raises a NoMethodError if calling an unknown method with arguments" do
-    expect { config.merge({ :some => "hash" }) }.to raise_error(NoMethodError)
+    expect { config.merge({ some: "hash" }) }.to raise_error(NoMethodError)
   end
 
   it "has an informative string representation" do
-    expect("#{config}").to eq("{\"test\"=>\"val\"}")
+    expect((config).to_s).to eq("{\"test\"=>\"val\"}")
   end
 
   it "has indifferent str/sym access" do

data/spec/functional/server_api_spec.rb

@@ -3,7 +3,7 @@ require "cheffish"
 describe "api version" do
 
   let(:server_api) do
-    Cheffish.chef_server_api({ :chef_server_url => "my.chef.server" })
+    Cheffish.chef_server_api({ chef_server_url: "my.chef.server" })
   end
 
   it "is pinned to 0" do

data/spec/integration/chef_acl_spec.rb

@@ -10,7 +10,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
     #        let(:chef_config) { super().merge(log_level: :debug, stdout: STDOUT, stderr: STDERR, log_location: STDOUT) }
 
     context "Rights attributes" do
-      when_the_chef_server "has a node named x", :osc_compat => false do
+      when_the_chef_server "has a node named x", osc_compat: false do
         node "x", {}
 
         it 'Converging chef_acl "nodes/x" changes nothing' do
@@ -195,7 +195,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         end
       end
 
-      when_the_chef_server "has a node named x with user blarghle in its acl", :osc_compat => false do
+      when_the_chef_server "has a node named x with user blarghle in its acl", osc_compat: false do
         user "blarghle", {}
         node "x", {} do
           acl "read" => { "actors" => %w{blarghle} }
@@ -211,7 +211,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         end
       end
 
-      when_the_chef_server "has a node named x with users foo and bar in all its acls", :osc_compat => false do
+      when_the_chef_server "has a node named x with users foo and bar in all its acls", osc_compat: false do
         user "foo", {}
         user "bar", {}
         node "x", {} do
@@ -241,7 +241,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
       ::RSpec::Matchers.define_negated_matcher :exclude, :include
 
       context "recursive" do
-        when_the_chef_server "has a nodes container with user blarghle in its acl", :osc_compat => false do
+        when_the_chef_server "has a nodes container with user blarghle in its acl", osc_compat: false do
           user "blarghle", {}
           acl_for "containers/nodes", "read" => { "actors" => %w{blarghle} }
           node "x", {} do
@@ -255,8 +255,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                   rights :read, users: %w{blarghle}
                 end
               end.to be_up_to_date
-            end.to not_change { get("containers/nodes/_acl") }.
-               and not_change { get("nodes/x/_acl") }
+            end.to((not_change { get("containers/nodes/_acl") }).and(not_change { get("nodes/x/_acl") }))
           end
 
           RSpec::Matchers.define_negated_matcher :not_change, :change
@@ -269,8 +268,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                   recursive :on_change
                 end
               end.to be_up_to_date
-            end.to not_change { get("containers/nodes/_acl") }.
-               and not_change { get("nodes/x/_acl") }
+            end.to((not_change { get("containers/nodes/_acl") }).and(not_change { get("nodes/x/_acl") }))
           end
 
           it 'Converging chef_acl "nodes" with recursive true changes nodes/x\'s acls' do
@@ -320,7 +318,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
     end
 
     context "ACLs on each type of thing" do
-      when_the_chef_server "has an organization named foo", :osc_compat => false, :single_org => false do
+      when_the_chef_server "has an organization named foo", osc_compat: false, single_org: false do
         organization "foo" do
           user "u", {}
           client "x", {}
@@ -568,7 +566,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         end
       end
 
-      when_the_chef_server 'has a user "u" in single org mode', :osc_compat => false do
+      when_the_chef_server 'has a user "u" in single org mode', osc_compat: false do
         user "u", {}
         client "x", {}
         container "x", {}
@@ -670,7 +668,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
     end
 
     context "ACLs on each container type" do
-      when_the_chef_server "has an organization named foo", :osc_compat => false, :single_org => false do
+      when_the_chef_server "has an organization named foo", osc_compat: false, single_org: false do
         organization "foo" do
           user "u", {}
           client "x", {}
@@ -738,7 +736,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         end
       end
 
-      when_the_chef_server 'has a user "u" in single org mode', :osc_compat => false do
+      when_the_chef_server 'has a user "u" in single org mode', osc_compat: false do
         user "u", {}
         client "x", {}
         container "x", {}
@@ -754,7 +752,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         %w{clients containers cookbooks data environments groups nodes roles sandboxes}.each do |type|
           it "chef_acl #{type}' changes the acl" do
             expect_recipe do
-              chef_acl "#{type}" do
+              chef_acl type.to_s do
                 rights :read, users: %w{u}
               end
             end.to be_updated
@@ -777,7 +775,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
     end
 
     context "remove_rights" do
-      when_the_chef_server 'has a node "x" with "u", "c" and "g" in its acl', :osc_compat => false do
+      when_the_chef_server 'has a node "x" with "u", "c" and "g" in its acl', osc_compat: false do
         user "u", {}
         user "u2", {}
         client "c", {}
@@ -838,12 +836,12 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
                 remove_rights :read, users: %w{u2}, clients: %w{c2}, groups: %w{g2}
               end
             end.to be_up_to_date
-          end.not_to change { get("nodes/x/_acl") }
+          end.not_to(change { get("nodes/x/_acl") })
         end
       end
     end
 
-    when_the_chef_server "has a node named data_bags", :osc_compat => false do
+    when_the_chef_server "has a node named data_bags", osc_compat: false do
       user "blarghle", {}
       node "data_bags", {}
 
@@ -857,7 +855,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
       end
     end
 
-    when_the_chef_server "has a node named data_bags in multi-org mode", :osc_compat => false, :single_org => false do
+    when_the_chef_server "has a node named data_bags in multi-org mode", osc_compat: false, single_org: false do
       user "blarghle", {}
       organization "foo" do
         node "data_bags", {}
@@ -873,7 +871,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
       end
     end
 
-    when_the_chef_server "has a user named data_bags in multi-org mode", :osc_compat => false, :single_org => false do
+    when_the_chef_server "has a user named data_bags in multi-org mode", osc_compat: false, single_org: false do
       user "data_bags", {}
       user "blarghle", {}
 

data/spec/integration/chef_client_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Resource::ChefClient do
             end.to have_updated "chef_client[blah]", :create
             client = get("clients/blah")
             expect(client["name"]).to eq("blah")
-            key, format = Cheffish::KeyFormatter.decode(client["public_key"])
+            key, _format = Cheffish::KeyFormatter.decode(client["public_key"])
             expect(key).to be_public_key_for("#{repo_path}/blah.pem")
           end
         end
@@ -67,7 +67,7 @@ describe Chef::Resource::ChefClient do
               end
             end.to have_updated "chef_client[foobar]", :create
             client = get("clients/foobar")
-            key, format = Cheffish::KeyFormatter.decode(client["public_key"])
+            key, _format = Cheffish::KeyFormatter.decode(client["public_key"])
             expect(key).to be_public_key_for("#{repo_path}/blah.pem")
 
             private_key = Cheffish::KeyFormatter.decode(Cheffish.get_private_key("blah"))
@@ -94,7 +94,7 @@ describe Chef::Resource::ChefClient do
             end.to have_updated "chef_client[blah]", :create
             client = get("clients/blah")
             expect(client["name"]).to eq("blah")
-            key, format = Cheffish::KeyFormatter.decode(client["public_key"])
+            key, _format = Cheffish::KeyFormatter.decode(client["public_key"])
             expect(key).to be_public_key_for("#{repo_path}/blah.pem")
           end
         end

data/spec/integration/chef_mirror_spec.rb

@@ -48,7 +48,7 @@ describe Chef::Resource::ChefMirror do
                 action :download
               end
             end
-          end.to raise_error /chef_mirror.concurrency must be above 0/
+          end.to raise_error(/chef_mirror.concurrency must be above 0/)
         end
       end
     end
@@ -158,8 +158,8 @@ describe Chef::Resource::ChefMirror do
           end.to have_updated("chef_mirror[]", :upload)
           expect { get("nodes/x") }.not_to raise_error
           expect { get("roles/x") }.not_to raise_error
-          expect { get("nodes/y") }.to raise_error /404/
-          expect { get("roles/y") }.to raise_error /404/
+          expect { get("nodes/y") }.to raise_error(/404/)
+          expect { get("roles/y") }.to raise_error(/404/)
         end
 
         it "Upload with chef_repo_path(:chef_repo_path) with multiple paths uploads everything" do
@@ -167,7 +167,7 @@ describe Chef::Resource::ChefMirror do
           repo2_path = path_to("repo2")
           expect_recipe do
             chef_mirror "" do
-              chef_repo_path :chef_repo_path => [ repo_path, repo2_path ]
+              chef_repo_path chef_repo_path: [ repo_path, repo2_path ]
               action :upload
             end
           end.to have_updated("chef_mirror[]", :upload)
@@ -183,15 +183,15 @@ describe Chef::Resource::ChefMirror do
 
           expect_recipe do
             chef_mirror "" do
-              chef_repo_path :chef_repo_path => "/blahblah",
-                             :node_path => "#{repo_path}/nodes",
-                             :role_path => "#{repo2_path}/roles"
+              chef_repo_path chef_repo_path: "/blahblah",
+                             node_path: "#{repo_path}/nodes",
+                             role_path: "#{repo2_path}/roles"
               action :upload
             end
           end.to have_updated("chef_mirror[]", :upload)
           expect { get("nodes/x") }.not_to raise_error
-          expect { get("roles/x") }.to raise_error /404/
-          expect { get("nodes/y") }.to raise_error /404/
+          expect { get("roles/x") }.to raise_error(/404/)
+          expect { get("nodes/y") }.to raise_error(/404/)
           expect { get("roles/y") }.not_to raise_error
         end
 
@@ -201,14 +201,14 @@ describe Chef::Resource::ChefMirror do
 
           expect_recipe do
             chef_mirror "" do
-              chef_repo_path :chef_repo_path => repo_path,
-                             :role_path => "#{repo2_path}/roles"
+              chef_repo_path chef_repo_path: repo_path,
+                             role_path: "#{repo2_path}/roles"
               action :upload
             end
           end.to have_updated("chef_mirror[]", :upload)
           expect { get("nodes/x") }.not_to raise_error
-          expect { get("roles/x") }.to raise_error /404/
-          expect { get("nodes/y") }.to raise_error /404/
+          expect { get("roles/x") }.to raise_error(/404/)
+          expect { get("nodes/y") }.to raise_error(/404/)
           expect { get("roles/y") }.not_to raise_error
         end
 
@@ -218,9 +218,9 @@ describe Chef::Resource::ChefMirror do
 
           expect_recipe do
             chef_mirror "" do
-              chef_repo_path :chef_repo_path => %w{foo bar},
-                             :node_path => [ "#{repo_path}/nodes", "#{repo2_path}/nodes" ],
-                             :role_path => [ "#{repo_path}/roles", "#{repo2_path}/roles" ]
+              chef_repo_path chef_repo_path: %w{foo bar},
+                             node_path: [ "#{repo_path}/nodes", "#{repo2_path}/nodes" ],
+                             role_path: [ "#{repo_path}/roles", "#{repo2_path}/roles" ]
               action :upload
             end
           end.to have_updated("chef_mirror[]", :upload)