chef-dk 3.3.23 → 3.4.38

data/spec/unit/policyfile_evaluation_spec.rb

@@ -64,15 +64,15 @@ describe ChefDK::PolicyfileCompiler do
 
         it "has an error message with code context" do
           expect(policyfile.errors.size).to eq(1)
-          expected_message = <<-E
-Evaluation of policyfile 'TestPolicyfile.rb' raised an exception
-  Exception: RuntimeError "oops"
+          expected_message = <<~E
+            Evaluation of policyfile 'TestPolicyfile.rb' raised an exception
+              Exception: RuntimeError "oops"
 
-  Relevant Code:
-    1: raise 'oops'
+              Relevant Code:
+                1: raise 'oops'
 
-  Backtrace:
-    TestPolicyfile.rb:1:in `eval_policyfile'
+              Backtrace:
+                TestPolicyfile.rb:1:in `eval_policyfile'
 E
           expect(policyfile.errors.first).to eq(expected_message)
         end
@@ -466,9 +466,9 @@ E
           end
 
           it "emits an error" do
-            err = <<-MESSAGE
-Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.
-supermarket(https://supermarket.chef.io) and supermarket(https://mart.example) are both set as the preferred source for cookbook(s) 'foo'
+            err = <<~MESSAGE
+              Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.
+              supermarket(https://supermarket.chef.io) and supermarket(https://mart.example) are both set as the preferred source for cookbook(s) 'foo'
 MESSAGE
             expect(policyfile.errors).to eq([err])
           end
@@ -543,11 +543,11 @@ MESSAGE
       end
 
       it "has a conflicting sources error" do
-        expected = <<-EOH
-Cookbook 'foo' assigned to conflicting sources
+        expected = <<~EOH
+          Cookbook 'foo' assigned to conflicting sources
 
-Previous source: {:path=>"local_cookbooks/foo"}
-Conflicts with: {:chef_server=>"https://mychefserver.example.com"}
+          Previous source: {:path=>"local_cookbooks/foo"}
+          Conflicts with: {:chef_server=>"https://mychefserver.example.com"}
 EOH
         expect(policyfile.errors.size).to eq(1)
         expect(policyfile.errors.first).to eq(expected)

data/spec/unit/policyfile_includes_spec.rb

@@ -125,7 +125,7 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
     end
   end
 
-  let(:lock_source_options) { { :path => "somelocation" } }
+  let(:lock_source_options) { { path: "somelocation" } }
   let(:included_policy_lock_spec) do
     ChefDK::Policyfile::PolicyfileLocationSpecification.new(included_policy_lock_name, lock_source_options, nil).tap do |spec|
       allow(spec).to receive(:valid?).and_return(true)

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -118,7 +118,7 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from included policies" d
     end
   end
 
-  let(:lock_source_options) { { :path => "somelocation" } }
+  let(:lock_source_options) { { path: "somelocation" } }
 
   let(:included_policy_lock_name) { "included" }
 
@@ -141,8 +141,8 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from included policies" d
 
     allow(policyfile.dsl).to receive(:default_source).and_return([default_source_obj])
 
-    allow(default_source_obj).to receive(:universe_graph).
-      and_return(external_cookbook_universe)
+    allow(default_source_obj).to receive(:universe_graph)
+      .and_return(external_cookbook_universe)
 
     allow(default_source_obj).to receive(:null?).and_return(false)
     allow(default_source_obj).to receive(:preferred_cookbooks).and_return([])

data/spec/unit/policyfile_lock_build_spec.rb

@@ -202,12 +202,12 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:minimal_policyfile
-run-list-item:recipe[foo]
-cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:minimal_policyfile
+        run-list-item:recipe[foo]
+        cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -289,12 +289,12 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:minimal_policyfile
-run-list-item:recipe[foo]
-cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
-default_attributes:{"aaa":"aaa","bbb":null,"ccc":false,"ddd":true,"e":1.2,"f":5,"foo":"bar","g":1e+15,"nested":{"a":"b"}}
-override_attributes:{"foo2":"baz"}
+      <<~REVISION_STRING
+        name:minimal_policyfile
+        run-list-item:recipe[foo]
+        cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
+        default_attributes:{"aaa":"aaa","bbb":null,"ccc":false,"ddd":true,"e":1.2,"f":5,"foo":"bar","g":1e+15,"nested":{"a":"b"}}
+        override_attributes:{"foo2":"baz"}
 REVISION_STRING
     end
 
@@ -380,12 +380,12 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:dev_cookbook
-run-list-item:recipe[bar]
-cookbook:bar;id:#{cookbook_bar_cksum}
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:dev_cookbook
+        run-list-item:recipe[bar]
+        cookbook:bar;id:#{cookbook_bar_cksum}
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -480,13 +480,13 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:custom_identifier
-run-list-item:recipe[foo]
-cookbook:bar;id:0.1.0
-cookbook:foo;id:1.0.0
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:custom_identifier
+        run-list-item:recipe[foo]
+        cookbook:bar;id:0.1.0
+        cookbook:foo;id:1.0.0
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -603,17 +603,17 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:basic_example
-run-list-item:recipe[foo]
-run-list-item:recipe[bar]
-run-list-item:recipe[baz::non_default]
-cookbook:bar;id:#{cookbook_bar_cksum}
-cookbook:baz;id:#{cookbook_baz_cksum}
-cookbook:dep_of_bar;id:#{cookbook_dep_of_bar_cksum}
-cookbook:foo;id:#{cookbook_foo_cksum}
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:basic_example
+        run-list-item:recipe[foo]
+        run-list-item:recipe[bar]
+        run-list-item:recipe[baz::non_default]
+        cookbook:bar;id:#{cookbook_bar_cksum}
+        cookbook:baz;id:#{cookbook_baz_cksum}
+        cookbook:dep_of_bar;id:#{cookbook_dep_of_bar_cksum}
+        cookbook:foo;id:#{cookbook_foo_cksum}
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -735,12 +735,12 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:minimal_policyfile
-run-list-item:recipe[foo]
-cookbook:foo;id:#{cookbook_foo_cksum}
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:minimal_policyfile
+        run-list-item:recipe[foo]
+        cookbook:foo;id:#{cookbook_foo_cksum}
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -805,13 +805,13 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:minimal_policyfile
-run-list-item:recipe[foo]
-named-run-list:rl2;run-list-item:recipe[foo::bar]
-cookbook:foo;id:#{cookbook_foo_cksum}
-default_attributes:{}
-override_attributes:{}
+      <<~REVISION_STRING
+        name:minimal_policyfile
+        run-list-item:recipe[foo]
+        named-run-list:rl2;run-list-item:recipe[foo::bar]
+        cookbook:foo;id:#{cookbook_foo_cksum}
+        default_attributes:{}
+        override_attributes:{}
 REVISION_STRING
     end
 
@@ -949,15 +949,15 @@ REVISION_STRING
     end
 
     let(:expected_canonical_revision_string) do
-      <<-REVISION_STRING
-name:my-policyfile
-run-list-item:recipe[foo::default]
-run-list-item:recipe[bar::default]
-named-run-list:rl2;run-list-item:recipe[bar::default]
-cookbook:bar;id:#{cookbook_bar_cksum}
-cookbook:foo;id:#{cookbook_foo_cksum}
-default_attributes:#{canonicalized_default_attrs}
-override_attributes:#{canonicalized_override_attrs}
+      <<~REVISION_STRING
+        name:my-policyfile
+        run-list-item:recipe[foo::default]
+        run-list-item:recipe[bar::default]
+        named-run-list:rl2;run-list-item:recipe[bar::default]
+        cookbook:bar;id:#{cookbook_bar_cksum}
+        cookbook:foo;id:#{cookbook_foo_cksum}
+        default_attributes:#{canonicalized_default_attrs}
+        override_attributes:#{canonicalized_override_attrs}
 REVISION_STRING
     end
 

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -114,14 +114,14 @@ describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
     # Validate the metadata is correct, so we know the test setup code
     # hasn't done something wrong.
     def ensure_metadata_as_expected!
-      expected_metadata_rb = <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+      expected_metadata_rb = <<~E
+        name             'local-cookbook'
+        maintainer       ''
+        maintainer_email ''
+        license          ''
+        description      'Installs/Configures local-cookbook'
+        long_description 'Installs/Configures local-cookbook'
+        version          '2.3.4'
 
 E
       expect(IO.read(metadata_path)).to eq(expected_metadata_rb)
@@ -145,14 +145,14 @@ E
     context "when the cookbook has an incorrect name" do
 
       let(:new_metadata) do
-        <<-E
-name             'WRONG'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+        <<~E
+          name             'WRONG'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.4'
 
 E
       end
@@ -174,14 +174,14 @@ E
     context "when the cookbook has an updated version that violates no dependency constraints" do
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.5' # changed from 2.3.4
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.5' # changed from 2.3.4
 
 E
       end
@@ -221,14 +221,14 @@ E
       end
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '3.0.0' # changed from 2.3.4, violates `~> 2.0` constraint
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '3.0.0' # changed from 2.3.4, violates `~> 2.0` constraint
 
 E
       end
@@ -250,9 +250,9 @@ E
       let(:recipe_path) { File.join(local_cookbook_path, "recipes/default.rb") }
 
       let(:new_recipe) do
-        <<-E
-# This is totally new code,
-# it is different than the old code
+        <<~E
+          # This is totally new code,
+          # it is different than the old code
 
 E
       end
@@ -281,16 +281,16 @@ E
     context "when a :path source cookbook has added a dependency satisfied by the current cookbook set" do
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.4'
 
-depends "foo", "=1.0.0"
+          depends "foo", "=1.0.0"
 
 E
       end
@@ -328,16 +328,16 @@ E
     context "when a :path source cookbook has added a dependency not satisfied by the current cookbook set" do
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.4'
 
-depends "not-a-thing"
+          depends "not-a-thing"
 
 E
       end
@@ -368,16 +368,16 @@ E
       end
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.4'
 
-depends "foo", ">= 1.0.0"
+          depends "foo", ">= 1.0.0"
 
 E
       end
@@ -402,16 +402,16 @@ E
     context "when a :path source cookbook has modified a dep constraint and the new constraint is not satisfied" do
 
       let(:new_metadata) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '2.3.4'
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '2.3.4'
 
-depends "foo", "~> 2.0"
+          depends "foo", "~> 2.0"
 
 E
       end
@@ -475,30 +475,30 @@ E
       end
 
       let(:new_metadata_local_cookbook) do
-        <<-E
-name             'local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures local-cookbook'
-long_description 'Installs/Configures local-cookbook'
-version          '3.0.0' # changed from 2.3.4
+        <<~E
+          name             'local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures local-cookbook'
+          long_description 'Installs/Configures local-cookbook'
+          version          '3.0.0' # changed from 2.3.4
 
 E
       end
 
       let(:new_metadata_another_local_cookbook) do
-        <<-E
-name             'another-local-cookbook'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures another-local-cookbook'
-long_description 'Installs/Configures another-local-cookbook'
-version          '0.1.0'
-
-# This dep now requires the updated version of 'local-cookbook'
-depends 'local-cookbook', '= 3.0.0'
+        <<~E
+          name             'another-local-cookbook'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures another-local-cookbook'
+          long_description 'Installs/Configures another-local-cookbook'
+          version          '0.1.0'
+
+          # This dep now requires the updated version of 'local-cookbook'
+          depends 'local-cookbook', '= 3.0.0'
 E
       end
 
@@ -541,14 +541,14 @@ E
     # Validate the metadata is correct, so we know the test setup code
     # hasn't done something wrong.
     def ensure_metadata_as_expected!
-      expected_metadata_rb = <<-E
-name             'foo'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures foo'
-long_description 'Installs/Configures foo'
-version          '1.0.0'
+      expected_metadata_rb = <<~E
+        name             'foo'
+        maintainer       ''
+        maintainer_email ''
+        license          ''
+        description      'Installs/Configures foo'
+        long_description 'Installs/Configures foo'
+        version          '1.0.0'
 
 E
       expect(IO.read(metadata_path)).to eq(expected_metadata_rb)
@@ -580,16 +580,16 @@ E
       # function to let the user recover.
 
       let(:new_metadata) do
-        <<-E
-# This is a cached copy of an upstream cookbook, I should not be editing it but
-# YOLO
-name             'foo'
-maintainer       ''
-maintainer_email ''
-license          ''
-description      'Installs/Configures foo'
-long_description 'Installs/Configures foo'
-version          '1.0.0'
+        <<~E
+          # This is a cached copy of an upstream cookbook, I should not be editing it but
+          # YOLO
+          name             'foo'
+          maintainer       ''
+          maintainer_email ''
+          license          ''
+          description      'Installs/Configures foo'
+          long_description 'Installs/Configures foo'
+          version          '1.0.0'
 E
       end