chef 12.13.37-universal-mingw32 → 12.14.60-universal-mingw32

data/spec/integration/knife/upload_spec.rb

@@ -1064,7 +1064,7 @@ EOM
 
       when_the_repository "has a modified, extra and missing file for the cookbook" do
         before do
-          file "cookbooks/x-1.0.0/metadata.rb", cb_metadata("x", "1.0.0", '#modified')
+          file "cookbooks/x-1.0.0/metadata.rb", cb_metadata("x", "1.0.0", "#modified")
           file "cookbooks/x-1.0.0/y.rb", "hi"
         end
 

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -38,9 +38,9 @@ describe "LWRPs with inline resources" do
 
     it "this is totally a bug, but for backcompat purposes, it adds the resources to the main resource collection and does not get marked updated" do
       r = nil
-      expect_recipe {
+      expect_recipe do
         r = lwrp_inline_resources_test "hi"
-      }.to have_updated("ruby_block[run a]", :run)
+      end.to have_updated("ruby_block[run a]", :run)
       expect(r.ran_a).to eq "ran a"
     end
   end
@@ -64,11 +64,11 @@ describe "LWRPs with inline resources" do
     # https://github.com/chef/chef/issues/4334
     it "does not warn spuriously" do
       expect(Chef::Log).to_not receive(:warn).with(/is declared in both/)
-      expect_recipe {
+      expect_recipe do
         lwrp_shadowed_property_test "fnord" do
           action :fiddle
         end
-      }
+      end
     end
   end
 
@@ -104,11 +104,11 @@ describe "LWRPs with inline resources" do
 
     it "resources declared in b are executed immediately inline" do
       r = nil
-      expect_recipe {
+      expect_recipe do
         r = lwrp_inline_resources_test2 "hi" do
           action :b
         end
-      }.to have_updated("lwrp_inline_resources_test2[hi]", :b).
+      end.to have_updated("lwrp_inline_resources_test2[hi]", :b).
         and have_updated("ruby_block[run a]", :run).
         and have_updated("ruby_block[run b]", :run)
       expect(r.ran_b).to eq "ran b: ran_a value was \"ran a\""

data/spec/integration/recipes/noop_resource_spec.rb

@@ -4,20 +4,20 @@ describe "Resources with a no-op provider" do
   include IntegrationSupport
 
   context "with noop provider providing foo" do
-    before(:context) {
+    before(:context) do
       class NoOpFoo < Chef::Resource
         resource_name "hi_there"
         default_action :update
       end
       Chef::Provider::Noop.provides :hi_there
-    }
+    end
 
     it "does not blow up a run with a noop'd resource" do
-      recipe = converge {
+      recipe = converge do
         hi_there "blah" do
           action :update
         end
-      }
+      end
       expect(recipe.logged_warnings).to eq ""
     end
   end

data/spec/integration/recipes/provider_choice.rb

@@ -26,9 +26,9 @@ describe "Recipe DSL methods" do
       end
 
       it "provider_thingy 'blah' runs the provider and warns" do
-        recipe = converge {
-          provider_thingy "blah" do; end
-        }
+        recipe = converge do
+          provider_thingy("blah") {}
+        end
         expect(recipe.logged_warnings).to match /hello from Chef::Provider::ProviderThingy/
         expect(recipe.logged_warnings).to match /you must use 'provides' to provide DSL/i
       end

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -12,7 +12,7 @@ describe "Recipe DSL methods" do
   before { Namer.current_index += 1 }
 
   context "with resource 'base_thingy' declared as BaseThingy" do
-    before(:context) {
+    before(:context) do
 
       class BaseThingy < Chef::Resource
         resource_name "base_thingy"
@@ -43,7 +43,7 @@ describe "Recipe DSL methods" do
       module RecipeDSLSpecNamespace; end
       module RecipeDSLSpecNamespace::Bar; end
 
-    }
+    end
 
     before :each do
       BaseThingy.created_resource = nil
@@ -51,26 +51,26 @@ describe "Recipe DSL methods" do
     end
 
     it "creates base_thingy when you call base_thingy in a recipe" do
-      recipe = converge {
-        base_thingy "blah" do; end
-      }
+      recipe = converge do
+        base_thingy("blah") {}
+      end
       expect(recipe.logged_warnings).to eq ""
       expect(BaseThingy.created_name).to eq "blah"
       expect(BaseThingy.created_resource).to eq BaseThingy
     end
 
     it "errors out when you call base_thingy do ... end in a recipe" do
-      expect_converge {
-        base_thingy do; end
-      }.to raise_error(ArgumentError, "You must supply a name when declaring a base_thingy resource")
+      expect_converge do
+        base_thingy { ; }
+      end.to raise_error(ArgumentError, "You must supply a name when declaring a base_thingy resource")
     end
 
     it "emits a warning when you call base_thingy 'foo', 'bar' do ... end in a recipe" do
       Chef::Config[:treat_deprecation_warnings_as_errors] = false
-      recipe = converge {
+      recipe = converge do
         base_thingy "foo", "bar" do
         end
-      }
+      end
       expect(recipe.logged_warnings).to match(/Cannot create resource base_thingy with more than one argument. All arguments except the name \("foo"\) will be ignored. This will cause an error in Chef 13. Arguments: \["foo", "bar"\]/)
       expect(BaseThingy.created_name).to eq "foo"
       expect(BaseThingy.created_resource).to eq BaseThingy
@@ -82,7 +82,7 @@ describe "Recipe DSL methods" do
       end
 
       context "with a resource 'backcompat_thingy' declared in Chef::Resource and Chef::Provider" do
-        before(:context) {
+        before(:context) do
 
           class Chef::Resource::BackcompatThingy < Chef::Resource
             default_action :create
@@ -97,30 +97,30 @@ describe "Recipe DSL methods" do
             end
           end
 
-        }
+        end
 
         it "backcompat_thingy creates a Chef::Resource::BackcompatThingy" do
-          recipe = converge {
-            backcompat_thingy "blah" do; end
-          }
+          recipe = converge do
+            backcompat_thingy("blah") {}
+          end
           expect(BaseThingy.created_resource).to eq Chef::Resource::BackcompatThingy
           expect(BaseThingy.created_provider).to eq Chef::Provider::BackcompatThingy
         end
 
         context "and another resource 'backcompat_thingy' in BackcompatThingy with 'provides'" do
-          before(:context) {
+          before(:context) do
 
             class RecipeDSLSpecNamespace::BackcompatThingy < BaseThingy
               provides :backcompat_thingy
               resource_name :backcompat_thingy
             end
 
-          }
+          end
 
           it "backcompat_thingy creates a BackcompatThingy" do
-            recipe = converge {
-              backcompat_thingy "blah" do; end
-            }
+            recipe = converge do
+              backcompat_thingy("blah") {}
+            end
             expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'provides :backcompat_thingy'./)
             expect(BaseThingy.created_resource).not_to be_nil
           end
@@ -128,86 +128,86 @@ describe "Recipe DSL methods" do
       end
 
       context "with a resource named RecipeDSLSpecNamespace::Bar::BarThingy" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::Bar::BarThingy < BaseThingy
           end
 
-        }
+        end
 
         it "bar_thingy does not work" do
-          expect_converge {
-            bar_thingy "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            bar_thingy("blah") {}
+          end.to raise_error(NoMethodError)
         end
       end
 
       context "with a resource named Chef::Resource::NoNameThingy with resource_name nil" do
-        before(:context) {
+        before(:context) do
 
           class Chef::Resource::NoNameThingy < BaseThingy
             resource_name nil
           end
 
-        }
+        end
 
         it "no_name_thingy does not work" do
-          expect_converge {
-            no_name_thingy "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            no_name_thingy("blah") {}
+          end.to raise_error(NoMethodError)
         end
       end
 
       context "with a resource named AnotherNoNameThingy with resource_name :another_thingy_name" do
-        before(:context) {
+        before(:context) do
 
           class AnotherNoNameThingy < BaseThingy
             resource_name :another_thingy_name
           end
 
-        }
+        end
 
         it "another_no_name_thingy does not work" do
-          expect_converge {
-            another_no_name_thingy "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            another_no_name_thingy("blah") {}
+          end.to raise_error(NoMethodError)
         end
 
         it "another_thingy_name works" do
-          recipe = converge {
-            another_thingy_name "blah" do; end
-          }
+          recipe = converge do
+            another_thingy_name("blah") {}
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq(AnotherNoNameThingy)
         end
       end
 
       context "with a resource named AnotherNoNameThingy2 with resource_name :another_thingy_name2; resource_name :another_thingy_name3" do
-        before(:context) {
+        before(:context) do
 
           class AnotherNoNameThingy2 < BaseThingy
             resource_name :another_thingy_name2
             resource_name :another_thingy_name3
           end
 
-        }
+        end
 
         it "another_no_name_thingy does not work" do
-          expect_converge {
-            another_no_name_thingy2 "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            another_no_name_thingy2("blah") {}
+          end.to raise_error(NoMethodError)
         end
 
         it "another_thingy_name2 does not work" do
-          expect_converge {
-            another_thingy_name2 "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            another_thingy_name2("blah") {}
+          end.to raise_error(NoMethodError)
         end
 
         it "yet_another_thingy_name3 works" do
-          recipe = converge {
-            another_thingy_name3 "blah" do; end
-          }
+          recipe = converge do
+            another_thingy_name3("blah") {}
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq(AnotherNoNameThingy2)
         end
@@ -215,36 +215,36 @@ describe "Recipe DSL methods" do
 
       context "provides overriding resource_name" do
         context "with a resource named AnotherNoNameThingy3 with provides :another_no_name_thingy3, os: 'blarghle'" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy3 < BaseThingy
               resource_name :another_no_name_thingy_3
               provides :another_no_name_thingy3, os: "blarghle"
             end
 
-          }
+          end
 
           it "and os = linux, another_no_name_thingy3 does not work" do
-            expect_converge {
+            expect_converge do
               # TODO this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_no_name_thingy3 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_no_name_thingy3("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_no_name_thingy3 works" do
-            recipe = converge {
+            recipe = converge do
               # TODO this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_no_name_thingy3 "blah" do; end
-            }
+              another_no_name_thingy3("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy3)
           end
         end
 
         context "with a resource named AnotherNoNameThingy4 with two provides" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy4 < BaseThingy
               resource_name :another_no_name_thingy_4
@@ -252,183 +252,183 @@ describe "Recipe DSL methods" do
               provides :another_no_name_thingy4, platform_family: "foo"
             end
 
-          }
+          end
 
           it "and os = linux, another_no_name_thingy4 does not work" do
-            expect_converge {
+            expect_converge do
               # TODO this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_no_name_thingy4 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_no_name_thingy4("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_no_name_thingy4 works" do
-            recipe = converge {
+            recipe = converge do
               # TODO this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_no_name_thingy4 "blah" do; end
-            }
+              another_no_name_thingy4("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy4)
           end
 
           it "and platform_family = foo, another_no_name_thingy4 works" do
-            recipe = converge {
+            recipe = converge do
               # TODO this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:platform_family] = "foo"
-              another_no_name_thingy4 "blah" do; end
-            }
+              another_no_name_thingy4("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy4)
           end
         end
 
         context "with a resource named AnotherNoNameThingy5, a different resource_name, and a provides with the original resource_name" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy5 < BaseThingy
               resource_name :another_thingy_name_for_another_no_name_thingy5
               provides :another_no_name_thingy5, os: "blarghle"
             end
 
-          }
+          end
 
           it "and os = linux, another_no_name_thingy5 does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_no_name_thingy5 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_no_name_thingy5("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_no_name_thingy5 works" do
-            recipe = converge {
+            recipe = converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_no_name_thingy5 "blah" do; end
-            }
+              another_no_name_thingy5("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy5)
           end
 
           it "the new resource name can be used in a recipe" do
-            recipe = converge {
-              another_thingy_name_for_another_no_name_thingy5 "blah" do; end
-            }
+            recipe = converge do
+              another_thingy_name_for_another_no_name_thingy5("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy5)
           end
         end
 
         context "with a resource named AnotherNoNameThingy6, a provides with the original resource name, and a different resource_name" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy6 < BaseThingy
               provides :another_no_name_thingy6, os: "blarghle"
               resource_name :another_thingy_name_for_another_no_name_thingy6
             end
 
-          }
+          end
 
           it "and os = linux, another_no_name_thingy6 does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_no_name_thingy6 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_no_name_thingy6("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_no_name_thingy6 works" do
-            recipe = converge {
+            recipe = converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_no_name_thingy6 "blah" do; end
-            }
+              another_no_name_thingy6("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy6)
           end
 
           it "the new resource name can be used in a recipe" do
-            recipe = converge {
-              another_thingy_name_for_another_no_name_thingy6 "blah" do; end
-            }
+            recipe = converge do
+              another_thingy_name_for_another_no_name_thingy6("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy6)
           end
         end
 
         context "with a resource named AnotherNoNameThingy7, a new resource_name, and provides with that new resource name" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy7 < BaseThingy
               resource_name :another_thingy_name_for_another_no_name_thingy7
               provides :another_thingy_name_for_another_no_name_thingy7, os: "blarghle"
             end
 
-          }
+          end
 
           it "and os = linux, another_thingy_name_for_another_no_name_thingy7 does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_thingy_name_for_another_no_name_thingy7 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_thingy_name_for_another_no_name_thingy7("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_thingy_name_for_another_no_name_thingy7 works" do
-            recipe = converge {
+            recipe = converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_thingy_name_for_another_no_name_thingy7 "blah" do; end
-            }
+              another_thingy_name_for_another_no_name_thingy7("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy7)
           end
 
           it "the old resource name does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_no_name_thingy_7 "blah" do; end
-            }.to raise_error(NoMethodError)
+              another_no_name_thingy_7("blah") {}
+            end.to raise_error(NoMethodError)
           end
         end
 
         # opposite order from the previous test (provides, then resource_name)
         context "with a resource named AnotherNoNameThingy8, a provides with a new resource name, and resource_name with that new resource name" do
-          before(:context) {
+          before(:context) do
 
             class AnotherNoNameThingy8 < BaseThingy
               provides :another_thingy_name_for_another_no_name_thingy8, os: "blarghle"
               resource_name :another_thingy_name_for_another_no_name_thingy8
             end
 
-          }
+          end
 
           it "and os = linux, another_thingy_name_for_another_no_name_thingy8 does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_thingy_name_for_another_no_name_thingy8 "blah" do; end
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+              another_thingy_name_for_another_no_name_thingy8("blah") {}
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
           end
 
           it "and os = blarghle, another_thingy_name_for_another_no_name_thingy8 works" do
-            recipe = converge {
+            recipe = converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "blarghle"
-              another_thingy_name_for_another_no_name_thingy8 "blah" do; end
-            }
+              another_thingy_name_for_another_no_name_thingy8("blah") {}
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy8)
           end
 
           it "the old resource name does not work" do
-            expect_converge {
+            expect_converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
-              another_thingy_name8 "blah" do; end
-            }.to raise_error(NoMethodError)
+              another_thingy_name8("blah") {}
+            end.to raise_error(NoMethodError)
           end
         end
       end
@@ -436,64 +436,64 @@ describe "Recipe DSL methods" do
 
     context "provides" do
       context "when MySupplier provides :hemlock" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::MySupplier < BaseThingy
             resource_name :hemlock
           end
 
-        }
+        end
 
         it "my_supplier does not work in a recipe" do
-          expect_converge {
-            my_supplier "blah" do; end
-          }.to raise_error(NoMethodError)
+          expect_converge do
+            my_supplier("blah") {}
+          end.to raise_error(NoMethodError)
         end
 
         it "hemlock works in a recipe" do
-          expect_recipe {
-            hemlock "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            hemlock("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::MySupplier
         end
       end
 
       context "when Thingy3 has resource_name :thingy3" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::Thingy3 < BaseThingy
             resource_name :thingy3
           end
 
-        }
+        end
 
         it "thingy3 works in a recipe" do
-          expect_recipe {
-            thingy3 "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            thingy3("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
         end
 
         context "and Thingy4 has resource_name :thingy3" do
-          before(:context) {
+          before(:context) do
 
             class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
               resource_name :thingy3
             end
 
-          }
+          end
 
           it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
-            recipe = converge {
-              thingy3 "blah" do; end
-            }
+            recipe = converge do
+              thingy3("blah") {}
+            end
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
           end
 
           it "thingy4 does not work in a recipe" do
-            expect_converge {
-              thingy4 "blah" do; end
-            }.to raise_error(NoMethodError)
+            expect_converge do
+              thingy4("blah") {}
+            end.to raise_error(NoMethodError)
           end
 
           it "resource_matching_short_name returns Thingy4" do
@@ -503,7 +503,7 @@ describe "Recipe DSL methods" do
       end
 
       context "when Thingy5 has resource_name :thingy5 and provides :thingy5reverse, :thingy5_2 and :thingy5_2reverse" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::Thingy5 < BaseThingy
             resource_name :thingy5
@@ -512,36 +512,36 @@ describe "Recipe DSL methods" do
             provides :thingy5_2reverse
           end
 
-        }
+        end
 
         it "thingy5 works in a recipe" do
-          expect_recipe {
-            thingy5 "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            thingy5("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
         end
 
         context "and Thingy6 provides :thingy5" do
-          before(:context) {
+          before(:context) do
 
             class RecipeDSLSpecNamespace::Thingy6 < BaseThingy
               resource_name :thingy6
               provides :thingy5
             end
 
-          }
+          end
 
           it "thingy6 works in a recipe and yields Thingy6" do
-            recipe = converge {
-              thingy6 "blah" do; end
-            }
+            recipe = converge do
+              thingy6("blah") {}
+            end
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy6
           end
 
           it "thingy5 works in a recipe and yields Foo::Thingy5 (the alphabetical one)" do
-            recipe = converge {
-              thingy5 "blah" do; end
-            }
+            recipe = converge do
+              thingy5("blah") {}
+            end
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
           end
 
@@ -550,24 +550,24 @@ describe "Recipe DSL methods" do
           end
 
           context "and AThingy5 provides :thingy5reverse" do
-            before(:context) {
+            before(:context) do
 
               class RecipeDSLSpecNamespace::AThingy5 < BaseThingy
                 resource_name :thingy5reverse
               end
 
-            }
+            end
 
             it "thingy5reverse works in a recipe and yields AThingy5 (the alphabetical one)" do
-              recipe = converge {
-                thingy5reverse "blah" do; end
-              }
+              recipe = converge do
+                thingy5reverse("blah") {}
+              end
               expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::AThingy5
             end
           end
 
           context "and ZRecipeDSLSpecNamespace::Thingy5 provides :thingy5_2" do
-            before(:context) {
+            before(:context) do
 
               module ZRecipeDSLSpecNamespace
                 class Thingy5 < BaseThingy
@@ -575,18 +575,18 @@ describe "Recipe DSL methods" do
                 end
               end
 
-            }
+            end
 
             it "thingy5_2 works in a recipe and yields the RecipeDSLSpaceNamespace one (the alphabetical one)" do
-              recipe = converge {
-                thingy5_2 "blah" do; end
-              }
+              recipe = converge do
+                thingy5_2("blah") {}
+              end
               expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy5
             end
           end
 
           context "and ARecipeDSLSpecNamespace::Thingy5 provides :thingy5_2" do
-            before(:context) {
+            before(:context) do
 
               module ARecipeDSLSpecNamespace
                 class Thingy5 < BaseThingy
@@ -594,53 +594,53 @@ describe "Recipe DSL methods" do
                 end
               end
 
-            }
+            end
 
             it "thingy5_2reverse works in a recipe and yields the ARecipeDSLSpaceNamespace one (the alphabetical one)" do
-              recipe = converge {
-                thingy5_2reverse "blah" do; end
-              }
+              recipe = converge do
+                thingy5_2reverse("blah") {}
+              end
               expect(BaseThingy.created_resource).to eq ARecipeDSLSpecNamespace::Thingy5
             end
           end
         end
 
         context "when Thingy3 has resource_name :thingy3" do
-          before(:context) {
+          before(:context) do
 
             class RecipeDSLSpecNamespace::Thingy3 < BaseThingy
               resource_name :thingy3
             end
 
-          }
+          end
 
           it "thingy3 works in a recipe" do
-            expect_recipe {
-              thingy3 "blah" do; end
-            }.to emit_no_warnings_or_errors
+            expect_recipe do
+              thingy3("blah") {}
+            end.to emit_no_warnings_or_errors
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
           end
 
           context "and Thingy4 has resource_name :thingy3" do
-            before(:context) {
+            before(:context) do
 
               class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
                 resource_name :thingy3
               end
 
-            }
+            end
 
             it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
-              recipe = converge {
-                thingy3 "blah" do; end
-              }
+              recipe = converge do
+                thingy3("blah") {}
+              end
               expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
             end
 
             it "thingy4 does not work in a recipe" do
-              expect_converge {
-                thingy4 "blah" do; end
-              }.to raise_error(NoMethodError)
+              expect_converge do
+                thingy4("blah") {}
+              end.to raise_error(NoMethodError)
             end
 
             it "resource_matching_short_name returns Thingy4" do
@@ -649,25 +649,25 @@ describe "Recipe DSL methods" do
           end
 
           context "and Thingy4 has resource_name :thingy3" do
-            before(:context) {
+            before(:context) do
 
               class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
                 resource_name :thingy3
               end
 
-            }
+            end
 
             it "thingy3 works in a recipe and yields Thingy3 (the alphabetical one)" do
-              recipe = converge {
-                thingy3 "blah" do; end
-              }
+              recipe = converge do
+                thingy3("blah") {}
+              end
               expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy3
             end
 
             it "thingy4 does not work in a recipe" do
-              expect_converge {
-                thingy4 "blah" do; end
-              }.to raise_error(NoMethodError)
+              expect_converge do
+                thingy4("blah") {}
+              end.to raise_error(NoMethodError)
             end
 
             it "resource_matching_short_name returns Thingy4" do
@@ -679,35 +679,35 @@ describe "Recipe DSL methods" do
       end
 
       context "when Thingy7 provides :thingy8" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::Thingy7 < BaseThingy
             resource_name :thingy7
             provides :thingy8
           end
 
-        }
+        end
 
         context "and Thingy8 has resource_name :thingy8" do
-          before(:context) {
+          before(:context) do
 
             class RecipeDSLSpecNamespace::Thingy8 < BaseThingy
               resource_name :thingy8
             end
 
-          }
+          end
 
           it "thingy7 works in a recipe and yields Thingy7" do
-            recipe = converge {
-              thingy7 "blah" do; end
-            }
+            recipe = converge do
+              thingy7("blah") {}
+            end
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy7
           end
 
           it "thingy8 works in a recipe and yields Thingy7 (alphabetical)" do
-            recipe = converge {
-              thingy8 "blah" do; end
-            }
+            recipe = converge do
+              thingy8("blah") {}
+            end
             expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy7
           end
 
@@ -718,7 +718,7 @@ describe "Recipe DSL methods" do
       end
 
       context "when Thingy12 provides :thingy12, :twizzle and :twizzle2" do
-        before(:context) {
+        before(:context) do
 
           class RecipeDSLSpecNamespace::Thingy12 < BaseThingy
             resource_name :thingy12
@@ -726,32 +726,32 @@ describe "Recipe DSL methods" do
             provides :twizzle2
           end
 
-        }
+        end
 
         it "thingy12 works in a recipe and yields Thingy12" do
-          expect_recipe {
-            thingy12 "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            thingy12("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
 
         it "twizzle works in a recipe and yields Thingy12" do
-          expect_recipe {
-            twizzle "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            twizzle("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
 
         it "twizzle2 works in a recipe and yields Thingy12" do
-          expect_recipe {
-            twizzle2 "blah" do; end
-          }.to emit_no_warnings_or_errors
+          expect_recipe do
+            twizzle2("blah") {}
+          end.to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq RecipeDSLSpecNamespace::Thingy12
         end
       end
 
       context "with platform-specific resources 'my_super_thingy_foo' and 'my_super_thingy_bar'" do
-        before(:context) {
+        before(:context) do
           class MySuperThingyFoo < BaseThingy
             resource_name :my_super_thingy_foo
             provides :my_super_thingy, platform: "foo"
@@ -761,14 +761,14 @@ describe "Recipe DSL methods" do
             resource_name :my_super_thingy_bar
             provides :my_super_thingy, platform: "bar"
           end
-        }
+        end
 
         it "A run with platform 'foo' uses MySuperThingyFoo" do
           r = Cheffish::ChefRun.new(chef_config)
           r.client.run_context.node.automatic["platform"] = "foo"
-          r.compile_recipe {
-            my_super_thingy "blah" do; end
-          }
+          r.compile_recipe do
+            my_super_thingy("blah") {}
+          end
           r.converge
           expect(r).to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq MySuperThingyFoo
@@ -777,9 +777,9 @@ describe "Recipe DSL methods" do
         it "A run with platform 'bar' uses MySuperThingyBar" do
           r = Cheffish::ChefRun.new(chef_config)
           r.client.run_context.node.automatic["platform"] = "bar"
-          r.compile_recipe {
-            my_super_thingy "blah" do; end
-          }
+          r.compile_recipe do
+            my_super_thingy("blah") {}
+          end
           r.converge
           expect(r).to emit_no_warnings_or_errors
           expect(BaseThingy.created_resource).to eq MySuperThingyBar
@@ -788,20 +788,20 @@ describe "Recipe DSL methods" do
         it "A run with platform 'x' reports that my_super_thingy is not supported" do
           r = Cheffish::ChefRun.new(chef_config)
           r.client.run_context.node.automatic["platform"] = "x"
-          expect {
-            r.compile_recipe {
-              my_super_thingy "blah" do; end
-            }
-          }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+          expect do
+            r.compile_recipe do
+              my_super_thingy("blah") {}
+            end
+          end.to raise_error(Chef::Exceptions::NoSuchResourceType)
         end
       end
 
       context "when Thingy10 provides :thingy10" do
-        before(:context) {
+        before(:context) do
           class RecipeDSLSpecNamespace::Thingy10 < BaseThingy
             resource_name :thingy10
           end
-        }
+        end
 
         it "declaring a resource providing the same :thingy10 with override: true does not produce a warning" do
           expect(Chef::Log).not_to receive(:warn)
@@ -812,11 +812,11 @@ describe "Recipe DSL methods" do
       end
 
       context "when Thingy11 provides :thingy11" do
-        before(:context) {
+        before(:context) do
           class RecipeDSLSpecNamespace::Thingy11 < BaseThingy
             resource_name :thingy10
           end
-        }
+        end
 
         it "declaring a resource providing the same :thingy11 with os: 'linux' does not produce a warning" do
           expect(Chef::Log).not_to receive(:warn)
@@ -829,7 +829,7 @@ describe "Recipe DSL methods" do
 
     context "with a resource named 'B' with resource name :two_classes_one_dsl" do
       let(:two_classes_one_dsl) { :"two_classes_one_dsl#{Namer.current_index}" }
-      let(:resource_class) {
+      let(:resource_class) do
         result = Class.new(BaseThingy) do
           def self.name
             "B"
@@ -841,11 +841,11 @@ describe "Recipe DSL methods" do
         end
         result.resource_name two_classes_one_dsl
         result
-      }
+      end
       before { resource_class } # pull on it so it gets defined before the recipe runs
 
       context "and another resource named 'A' with resource_name :two_classes_one_dsl" do
-        let(:resource_class_a) {
+        let(:resource_class_a) do
           result = Class.new(BaseThingy) do
             def self.name
               "A"
@@ -857,14 +857,14 @@ describe "Recipe DSL methods" do
           end
           result.resource_name two_classes_one_dsl
           result
-        }
+        end
         before { resource_class_a } # pull on it so it gets defined before the recipe runs
 
         it "two_classes_one_dsl resolves to A (alphabetically earliest)" do
           two_classes_one_dsl = self.two_classes_one_dsl
-          recipe = converge {
+          recipe = converge do
             instance_eval("#{two_classes_one_dsl} 'blah'")
-          }
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class_a
         end
@@ -875,7 +875,7 @@ describe "Recipe DSL methods" do
       end
 
       context "and another resource named 'Z' with resource_name :two_classes_one_dsl" do
-        let(:resource_class_z) {
+        let(:resource_class_z) do
           result = Class.new(BaseThingy) do
             def self.name
               "Z"
@@ -887,14 +887,14 @@ describe "Recipe DSL methods" do
           end
           result.resource_name two_classes_one_dsl
           result
-        }
+        end
         before { resource_class_z } # pull on it so it gets defined before the recipe runs
 
         it "two_classes_one_dsl resolves to B (alphabetically earliest)" do
           two_classes_one_dsl = self.two_classes_one_dsl
-          recipe = converge {
+          recipe = converge do
             instance_eval("#{two_classes_one_dsl} 'blah'")
-          }
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class
         end
@@ -910,9 +910,9 @@ describe "Recipe DSL methods" do
 
           it "two_classes_one_dsl resolves to Z (respects the priority array)" do
             two_classes_one_dsl = self.two_classes_one_dsl
-            recipe = converge {
+            recipe = converge do
               instance_eval("#{two_classes_one_dsl} 'blah'")
-            }
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq resource_class_z
           end
@@ -928,9 +928,9 @@ describe "Recipe DSL methods" do
 
             it "two_classes_one_dsl resolves to B (picks the next thing in the priority array)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
             end
@@ -949,9 +949,9 @@ describe "Recipe DSL methods" do
 
           it "two_classes_one_dsl resolves to Z (respects the most recent priority array)" do
             two_classes_one_dsl = self.two_classes_one_dsl
-            recipe = converge {
+            recipe = converge do
               instance_eval("#{two_classes_one_dsl} 'blah'")
-            }
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq resource_class_z
           end
@@ -967,9 +967,9 @@ describe "Recipe DSL methods" do
 
             it "two_classes_one_dsl resolves to B (picks the first match from the other priority array)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
             end
@@ -992,9 +992,9 @@ describe "Recipe DSL methods" do
 
             it "two_classes_one_dsl resolves to B (picks the first match outside the priority array)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
             end
@@ -1012,7 +1012,7 @@ describe "Recipe DSL methods" do
           resource_class.send(:define_method, :provider) { nil }
         end
 
-        let(:provider_class) {
+        let(:provider_class) do
           result = Class.new(BaseThingy::Provider) do
             def self.name
               "B"
@@ -1024,11 +1024,11 @@ describe "Recipe DSL methods" do
           end
           result.provides two_classes_one_dsl
           result
-        }
+        end
         before { provider_class } # pull on it so it gets defined before the recipe runs
 
         context "and another provider named 'A'" do
-          let(:provider_class_a) {
+          let(:provider_class_a) do
             result = Class.new(BaseThingy::Provider) do
               def self.name
                 "A"
@@ -1039,15 +1039,15 @@ describe "Recipe DSL methods" do
               def self.inspect; name.inspect; end
             end
             result
-          }
+          end
           context "which provides :two_classes_one_dsl" do
             before { provider_class_a.provides two_classes_one_dsl }
 
             it "two_classes_one_dsl resolves to A (alphabetically earliest)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class_a
             end
@@ -1057,9 +1057,9 @@ describe "Recipe DSL methods" do
 
             it "two_classes_one_dsl resolves to B (since A declined)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class
             end
@@ -1067,7 +1067,7 @@ describe "Recipe DSL methods" do
         end
 
         context "and another provider named 'Z'" do
-          let(:provider_class_z) {
+          let(:provider_class_z) do
             result = Class.new(BaseThingy::Provider) do
               def self.name
                 "Z"
@@ -1078,7 +1078,7 @@ describe "Recipe DSL methods" do
               def self.inspect; name.inspect; end
             end
             result
-          }
+          end
           before { provider_class_z } # pull on it so it gets defined before the recipe runs
 
           context "which provides :two_classes_one_dsl" do
@@ -1086,9 +1086,9 @@ describe "Recipe DSL methods" do
 
             it "two_classes_one_dsl resolves to B (alphabetically earliest)" do
               two_classes_one_dsl = self.two_classes_one_dsl
-              recipe = converge {
+              recipe = converge do
                 instance_eval("#{two_classes_one_dsl} 'blah'")
-              }
+              end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class
             end
@@ -1098,9 +1098,9 @@ describe "Recipe DSL methods" do
 
               it "two_classes_one_dsl resolves to Z (respects the priority map)" do
                 two_classes_one_dsl = self.two_classes_one_dsl
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{two_classes_one_dsl} 'blah'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class_z
               end
@@ -1115,9 +1115,9 @@ describe "Recipe DSL methods" do
 
               it "two_classes_one_dsl resolves to B (the next one in the priority map)" do
                 two_classes_one_dsl = self.two_classes_one_dsl
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{two_classes_one_dsl} 'blah'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
               end
@@ -1129,9 +1129,9 @@ describe "Recipe DSL methods" do
 
               it "two_classes_one_dsl resolves to B (the one in the next priority map)" do
                 two_classes_one_dsl = self.two_classes_one_dsl
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{two_classes_one_dsl} 'blah'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
               end
@@ -1141,7 +1141,7 @@ describe "Recipe DSL methods" do
       end
 
       context "and another resource Blarghle with provides :two_classes_one_dsl, os: 'blarghle'" do
-        let(:resource_class_blarghle) {
+        let(:resource_class_blarghle) do
           result = Class.new(BaseThingy) do
             def self.name
               "Blarghle"
@@ -1154,27 +1154,27 @@ describe "Recipe DSL methods" do
           result.resource_name two_classes_one_dsl
           result.provides two_classes_one_dsl, os: "blarghle"
           result
-        }
+        end
         before { resource_class_blarghle } # pull on it so it gets defined before the recipe runs
 
         it "on os = blarghle, two_classes_one_dsl resolves to Blarghle" do
           two_classes_one_dsl = self.two_classes_one_dsl
-          recipe = converge {
+          recipe = converge do
             # this is an ugly way to test, make Cheffish expose node attrs
             run_context.node.automatic[:os] = "blarghle"
             instance_eval("#{two_classes_one_dsl} 'blah' do; end")
-          }
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class_blarghle
         end
 
         it "on os = linux, two_classes_one_dsl resolves to B" do
           two_classes_one_dsl = self.two_classes_one_dsl
-          recipe = converge {
+          recipe = converge do
             # this is an ugly way to test, make Cheffish expose node attrs
             run_context.node.automatic[:os] = "linux"
             instance_eval("#{two_classes_one_dsl} 'blah' do; end")
-          }
+          end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class
         end
@@ -1182,37 +1182,38 @@ describe "Recipe DSL methods" do
     end
 
     context "with a resource MyResource" do
-      let(:resource_class) { Class.new(BaseThingy) do
-        def self.called_provides
-          @called_provides
-        end
+      let(:resource_class) do
+        Class.new(BaseThingy) do
+          def self.called_provides
+            @called_provides
+          end
 
-        def to_s
-          "MyResource"
-        end
-      end }
+          def to_s
+            "MyResource"
+          end
+        end end
       let(:my_resource) { :"my_resource#{Namer.current_index}" }
       let(:blarghle_blarghle_little_star) { :"blarghle_blarghle_little_star#{Namer.current_index}" }
 
       context "with resource_name :my_resource" do
-        before {
+        before do
           resource_class.resource_name my_resource
-        }
+        end
 
         context "with provides? returning true to my_resource" do
-          before {
+          before do
             my_resource = self.my_resource
             resource_class.define_singleton_method(:provides?) do |node, resource_name|
               @called_provides = true
               resource_name == my_resource
             end
-          }
+          end
 
           it "my_resource returns the resource and calls provides?, but does not emit a warning" do
             dsl_name = self.my_resource
-            recipe = converge {
+            recipe = converge do
               instance_eval("#{dsl_name} 'foo'")
-            }
+            end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq resource_class
             expect(resource_class.called_provides).to be_truthy
@@ -1230,18 +1231,18 @@ describe "Recipe DSL methods" do
 
           it "my_resource does not return the resource" do
             dsl_name = self.my_resource
-            expect_converge {
+            expect_converge do
               instance_eval("#{dsl_name} 'foo'")
-            }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
             expect(resource_class.called_provides).to be_truthy
           end
 
           it "blarghle_blarghle_little_star 'foo' returns the resource and emits a warning" do
             Chef::Config[:treat_deprecation_warnings_as_errors] = false
             dsl_name = self.blarghle_blarghle_little_star
-            recipe = converge {
+            recipe = converge do
               instance_eval("#{dsl_name} 'foo'")
-            }
+            end
             expect(recipe.logged_warnings).to include "WARN: #{resource_class}.provides? returned true when asked if it provides DSL #{dsl_name}, but provides :#{dsl_name} was never called!"
             expect(BaseThingy.created_resource).to eq resource_class
             expect(resource_class.called_provides).to be_truthy
@@ -1281,9 +1282,9 @@ describe "Recipe DSL methods" do
 
               it "my_resource runs the provider and does not emit a warning" do
                 my_resource = self.my_resource
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{my_resource} 'foo'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
               end
@@ -1311,9 +1312,9 @@ describe "Recipe DSL methods" do
 
                 it "my_resource runs the first provider" do
                   my_resource = self.my_resource
-                  recipe = converge {
+                  recipe = converge do
                     instance_eval("#{my_resource} 'foo'")
-                  }
+                  end
                   expect(recipe.logged_warnings).to eq ""
                   expect(BaseThingy.created_provider).to eq provider_class
                 end
@@ -1328,9 +1329,9 @@ describe "Recipe DSL methods" do
               # TODO no warning? ick
               it "my_resource runs the provider anyway" do
                 my_resource = self.my_resource
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{my_resource} 'foo'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
               end
@@ -1360,9 +1361,9 @@ describe "Recipe DSL methods" do
 
                 it "my_resource runs the other provider" do
                   my_resource = self.my_resource
-                  recipe = converge {
+                  recipe = converge do
                     instance_eval("#{my_resource} 'foo'")
-                  }
+                  end
                   expect(recipe.logged_warnings).to eq ""
                   expect(BaseThingy.created_provider).to eq provider_class2
                 end
@@ -1371,24 +1372,24 @@ describe "Recipe DSL methods" do
           end
 
           context "with provides? returning true" do
-            before {
+            before do
               my_resource = self.my_resource
               provider_class.define_singleton_method(:provides?) do |node, resource|
                 @called_provides = true
                 resource.declared_type == my_resource
               end
-            }
+            end
 
             context "that provides :my_resource" do
-              before {
+              before do
                 provider_class.provides my_resource
-              }
+              end
 
               it "my_resource calls the provider (and calls provides?), but does not emit a warning" do
                 my_resource = self.my_resource
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{my_resource} 'foo'")
-                }
+                end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
                 expect(provider_class.called_provides).to be_truthy
@@ -1399,9 +1400,9 @@ describe "Recipe DSL methods" do
               it "my_resource calls the provider (and calls provides?), and emits a warning" do
                 Chef::Config[:treat_deprecation_warnings_as_errors] = false
                 my_resource = self.my_resource
-                recipe = converge {
+                recipe = converge do
                   instance_eval("#{my_resource} 'foo'")
-                }
+                end
                 expect(recipe.logged_warnings).to include("WARN: #{provider_class}.provides? returned true when asked if it provides DSL #{my_resource}, but provides :#{my_resource} was never called!")
                 expect(BaseThingy.created_provider).to eq provider_class
                 expect(provider_class.called_provides).to be_truthy
@@ -1410,24 +1411,24 @@ describe "Recipe DSL methods" do
           end
 
           context "with provides? returning false to my_resource" do
-            before {
+            before do
               my_resource = self.my_resource
               provider_class.define_singleton_method(:provides?) do |node, resource|
                 @called_provides = true
                 false
               end
-            }
+            end
 
             context "that provides :my_resource" do
-              before {
+              before do
                 provider_class.provides my_resource
-              }
+              end
 
               it "my_resource fails to find a provider (and calls provides)" do
                 my_resource = self.my_resource
-                expect_converge {
+                expect_converge do
                   instance_eval("#{my_resource} 'foo'")
-                }.to raise_error(Chef::Exceptions::ProviderNotFound)
+                end.to raise_error(Chef::Exceptions::ProviderNotFound)
                 expect(provider_class.called_provides).to be_truthy
               end
             end
@@ -1435,9 +1436,9 @@ describe "Recipe DSL methods" do
             context "that does not provide :my_resource" do
               it "my_resource fails to find a provider (and calls provides)" do
                 my_resource = self.my_resource
-                expect_converge {
+                expect_converge do
                   instance_eval("#{my_resource} 'foo'")
-                }.to raise_error(Chef::Exceptions::ProviderNotFound)
+                end.to raise_error(Chef::Exceptions::ProviderNotFound)
                 expect(provider_class.called_provides).to be_truthy
               end
             end
@@ -1451,15 +1452,15 @@ describe "Recipe DSL methods" do
   before { Namer.current_index += 1 }
 
   context "with an LWRP that declares actions" do
-    let(:resource_class) {
+    let(:resource_class) do
       Class.new(Chef::Resource::LWRPBase) do
         provides :"recipe_dsl_spec#{Namer.current_index}"
         actions :create
       end
-    }
-    let(:resource) {
+    end
+    let(:resource) do
       resource_class.new("blah", run_context)
-    }
+    end
     it "The actions are part of actions along with :nothing" do
       expect(resource_class.actions).to eq [ :nothing, :create ]
     end
@@ -1468,15 +1469,15 @@ describe "Recipe DSL methods" do
     end
 
     context "and a subclass that declares more actions" do
-      let(:subresource_class) {
+      let(:subresource_class) do
         Class.new(Chef::Resource::LWRPBase) do
           provides :"recipe_dsl_spec_sub#{Namer.current_index}"
           actions :delete
         end
-      }
-      let(:subresource) {
+      end
+      let(:subresource) do
         subresource_class.new("subblah", run_context)
-      }
+      end
 
       it "The parent class actions are not part of actions" do
         expect(subresource_class.actions).to eq [ :nothing, :delete ]
@@ -1510,9 +1511,9 @@ describe "Recipe DSL methods" do
 
     it "looks up the provider in Chef::Provider converting the resource name from snake case to camel case" do
       resource = nil
-      recipe = converge {
-        resource = lw_resource_with_hw_provider_test_case "blah" do; end
-      }
+      recipe = converge do
+        resource = lw_resource_with_hw_provider_test_case("blah") {}
+      end
       expect(resource.created_provider).to eq(Chef::Provider::LwResourceWithHwProviderTestCase)
     end
   end