chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

data/spec/integration/knife/cookbook_bulk_delete_spec.rb

@@ -36,26 +36,26 @@ describe "knife cookbook bulk delete", :workstation do
 
     # rubocop:disable Layout/TrailingWhitespace
     it "knife cookbook bulk delete deletes all matching cookbooks" do
-      stdout = <<EOM
-All versions of the following cookbooks will be deleted:
-
-foo  fox
-
-Do you really want to delete these cookbooks? (Y/N) 
+      stdout = <<~EOM
+        All versions of the following cookbooks will be deleted:
+        
+        foo  fox
+        
+        Do you really want to delete these cookbooks? (Y/N) 
 EOM
 
-      stderr = <<EOM
-Deleted cookbook  foo                       [1.0.0]
-Deleted cookbook  foo                       [0.6.5]
-Deleted cookbook  fox                       [0.6.5]
-Deleted cookbook  fox                       [0.6.0]
+      stderr = <<~EOM
+        Deleted cookbook  foo                       [1.0.0]
+        Deleted cookbook  foo                       [0.6.5]
+        Deleted cookbook  fox                       [0.6.5]
+        Deleted cookbook  fox                       [0.6.0]
 EOM
 
       knife("cookbook bulk delete ^fo.*", input: "Y").should_succeed(stderr: stderr, stdout: stdout)
 
-      knife("cookbook list -a").should_succeed <<EOM
-fax   0.6.0
-zfa   0.6.5
+      knife("cookbook list -a").should_succeed <<~EOM
+        fax   0.6.0
+        zfa   0.6.5
 EOM
     end
     # rubocop:enable Layout/TrailingWhitespace

data/spec/integration/knife/cookbook_download_spec.rb

@@ -33,18 +33,18 @@ describe "knife cookbook download", :workstation do
     end
 
     it "knife cookbook download downloads the latest version" do
-      knife("cookbook download -d #{tmpdir} x").should_succeed stderr: <<EOM
-Downloading x cookbook version 1.0.1
-Downloading root_files
-Cookbook downloaded to #{tmpdir}/x-1.0.1
+      knife("cookbook download -d #{tmpdir} x").should_succeed stderr: <<~EOM
+        Downloading x cookbook version 1.0.1
+        Downloading root_files
+        Cookbook downloaded to #{tmpdir}/x-1.0.1
 EOM
     end
 
     it "knife cookbook download with a version downloads the specified version" do
-      knife("cookbook download -d #{tmpdir} x 1.0.1").should_succeed stderr: <<EOM
-Downloading x cookbook version 1.0.1
-Downloading root_files
-Cookbook downloaded to #{tmpdir}/x-1.0.1
+      knife("cookbook download -d #{tmpdir} x 1.0.1").should_succeed stderr: <<~EOM
+        Downloading x cookbook version 1.0.1
+        Downloading root_files
+        Cookbook downloaded to #{tmpdir}/x-1.0.1
 EOM
     end
 
@@ -60,10 +60,10 @@ EOM
     end
 
     it "knife cookbook download with no version prompts" do
-      knife("cookbook download -d #{tmpdir} x", input: "2\n").should_succeed(stderr: <<EOM, stdout: "Which version do you want to download?\n1. x 1.0.0\n2. x 1.0.1\n\n"
-Downloading x cookbook version 1.0.1
-Downloading root_files
-Cookbook downloaded to #{tmpdir}/x-1.0.1
+      knife("cookbook download -d #{tmpdir} x", input: "2\n").should_succeed(stderr: <<~EOM, stdout: "Which version do you want to download?\n1. x 1.0.0\n2. x 1.0.1\n\n"
+        Downloading x cookbook version 1.0.1
+        Downloading root_files
+        Cookbook downloaded to #{tmpdir}/x-1.0.1
 EOM
 )
     end

data/spec/integration/knife/cookbook_list_spec.rb

@@ -35,18 +35,18 @@ describe "knife cookbook list", :workstation do
     end
 
     it "knife cookbook list shows all the cookbooks" do
-      knife("cookbook list").should_succeed <<EOM
-x   1.0.0
-y   0.6.5
-z   0.6.5
+      knife("cookbook list").should_succeed <<~EOM
+        x   1.0.0
+        y   0.6.5
+        z   0.6.5
 EOM
     end
 
     it "knife cookbook list -a shows all the versions of all the cookbooks" do
-      knife("cookbook list -a").should_succeed <<EOM
-x   1.0.0  0.6.5  0.6.0
-y   0.6.5  0.6.0
-z   0.6.5
+      knife("cookbook list -a").should_succeed <<~EOM
+        x   1.0.0  0.6.5  0.6.0
+        y   0.6.5  0.6.0
+        z   0.6.5
 EOM
     end
 

data/spec/integration/knife/cookbook_show_spec.rb

@@ -36,95 +36,95 @@ describe "knife cookbook show", :workstation do
 
     # rubocop:disable Layout/TrailingWhitespace
     it "knife cookbook show x 1.0.0 shows the correct version" do
-      knife("cookbook show x 1.0.0").should_succeed <<EOM
-cookbook_name: x
-frozen?:       false
-metadata:
-  attributes:
-  chef_versions:
-  dependencies:
-  description:      
-  gems:
-  issues_url:       
-  license:          All rights reserved
-  long_description: 
-  maintainer:       
-  maintainer_email: 
-  name:             x
-  ohai_versions:
-  platforms:
-  privacy:          false
-  providing:
-    x:    >= 0.0.0
-    x::x: >= 0.0.0
-  recipes:
-    x:    
-    x::x: 
-  source_url:       
-  version:          1.0.0
-name:          x-1.0.0
-recipes:
-  checksum:    4631b34cf58de10c5ef1304889941b2e
-  name:        recipes/default.rb
-  path:        recipes/default.rb
-  specificity: default
-  url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
-  
-  checksum:    d41d8cd98f00b204e9800998ecf8427e
-  name:        recipes/x.rb
-  path:        recipes/x.rb
-  specificity: default
-  url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
-root_files:
-  checksum:    8226671f751ba102dea6a6b6bd32fa8d
-  name:        metadata.rb
-  path:        metadata.rb
-  specificity: default
-  url:         http://127.0.0.1:8900/file_store/checksums/8226671f751ba102dea6a6b6bd32fa8d
-version:       1.0.0
+      knife("cookbook show x 1.0.0").should_succeed <<~EOM
+        cookbook_name: x
+        frozen?:       false
+        metadata:
+          attributes:
+          chef_versions:
+          dependencies:
+          description:      
+          gems:
+          issues_url:       
+          license:          All rights reserved
+          long_description: 
+          maintainer:       
+          maintainer_email: 
+          name:             x
+          ohai_versions:
+          platforms:
+          privacy:          false
+          providing:
+            x:    >= 0.0.0
+            x::x: >= 0.0.0
+          recipes:
+            x:    
+            x::x: 
+          source_url:       
+          version:          1.0.0
+        name:          x-1.0.0
+        recipes:
+          checksum:    4631b34cf58de10c5ef1304889941b2e
+          name:        recipes/default.rb
+          path:        recipes/default.rb
+          specificity: default
+          url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
+          
+          checksum:    d41d8cd98f00b204e9800998ecf8427e
+          name:        recipes/x.rb
+          path:        recipes/x.rb
+          specificity: default
+          url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
+        root_files:
+          checksum:    8226671f751ba102dea6a6b6bd32fa8d
+          name:        metadata.rb
+          path:        metadata.rb
+          specificity: default
+          url:         http://127.0.0.1:8900/file_store/checksums/8226671f751ba102dea6a6b6bd32fa8d
+        version:       1.0.0
 EOM
     end
 
     it "knife cookbook show x 1.0.0 metadata shows the metadata" do
-      knife("cookbook show x 1.0.0 metadata").should_succeed <<EOM
-attributes:
-chef_versions:
-dependencies:
-description:      
-gems:
-issues_url:       
-license:          All rights reserved
-long_description: 
-maintainer:       
-maintainer_email: 
-name:             x
-ohai_versions:
-platforms:
-privacy:          false
-providing:
-  x:    >= 0.0.0
-  x::x: >= 0.0.0
-recipes:
-  x:    
-  x::x: 
-source_url:       
-version:          1.0.0
+      knife("cookbook show x 1.0.0 metadata").should_succeed <<~EOM
+        attributes:
+        chef_versions:
+        dependencies:
+        description:      
+        gems:
+        issues_url:       
+        license:          All rights reserved
+        long_description: 
+        maintainer:       
+        maintainer_email: 
+        name:             x
+        ohai_versions:
+        platforms:
+        privacy:          false
+        providing:
+          x:    >= 0.0.0
+          x::x: >= 0.0.0
+        recipes:
+          x:    
+          x::x: 
+        source_url:       
+        version:          1.0.0
 EOM
     end
 
     it "knife cookbook show x 1.0.0 recipes shows all the recipes" do
-      knife("cookbook show x 1.0.0 recipes").should_succeed <<EOM
-checksum:    4631b34cf58de10c5ef1304889941b2e
-name:        recipes/default.rb
-path:        recipes/default.rb
-specificity: default
-url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
-
-checksum:    d41d8cd98f00b204e9800998ecf8427e
-name:        recipes/x.rb
-path:        recipes/x.rb
-specificity: default
-url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
+      knife("cookbook show x 1.0.0 recipes").should_succeed <<~EOM
+        checksum:    4631b34cf58de10c5ef1304889941b2e
+        name:        recipes/default.rb
+        path:        recipes/default.rb
+        specificity: default
+        url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
+        
+        checksum:    d41d8cd98f00b204e9800998ecf8427e
+        name:        recipes/x.rb
+        path:        recipes/x.rb
+        specificity: default
+        url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
 EOM
     end
     # rubocop:enable Layout/TrailingWhitespace

data/spec/integration/knife/cookbook_upload_spec.rb

@@ -33,24 +33,24 @@ describe "knife cookbook upload", :workstation do
       end
 
       it "knife cookbook upload uploads the cookbook" do
-        knife("cookbook upload x -o #{cb_dir}").should_succeed stderr: <<EOM
-Uploading x            [1.0.0]
-Uploaded 1 cookbook.
+        knife("cookbook upload x -o #{cb_dir}").should_succeed stderr: <<~EOM
+          Uploading x            [1.0.0]
+          Uploaded 1 cookbook.
 EOM
       end
 
       it "knife cookbook upload --freeze uploads and freezes the cookbook" do
-        knife("cookbook upload x -o #{cb_dir} --freeze").should_succeed stderr: <<EOM
-Uploading x            [1.0.0]
-Uploaded 1 cookbook.
+        knife("cookbook upload x -o #{cb_dir} --freeze").should_succeed stderr: <<~EOM
+          Uploading x            [1.0.0]
+          Uploaded 1 cookbook.
 EOM
         # Modify the file, attempt to reupload
         file "cookbooks/x/metadata.rb", 'name "x"; version "1.0.0"#different'
-        knife("cookbook upload x -o #{cb_dir} --freeze").should_fail stderr: <<EOM
-Uploading x              [1.0.0]
-ERROR: Version 1.0.0 of cookbook x is frozen. Use --force to override.
-WARNING: Not updating version constraints for x in the environment as the cookbook is frozen.
-ERROR: Failed to upload 1 cookbook.
+        knife("cookbook upload x -o #{cb_dir} --freeze").should_fail stderr: <<~EOM
+          Uploading x              [1.0.0]
+          ERROR: Version 1.0.0 of cookbook x is frozen. Use --force to override.
+          WARNING: Not updating version constraints for x in the environment as the cookbook is frozen.
+          ERROR: Failed to upload 1 cookbook.
 EOM
       end
     end
@@ -62,27 +62,27 @@ EOM
       end
 
       it "knife cookbook upload --include-dependencies uploads both cookbooks" do
-        knife("cookbook upload --include-dependencies x -o #{cb_dir}").should_succeed stderr: <<EOM
-Uploading x            [1.0.0]
-Uploading y            [1.0.0]
-Uploaded 2 cookbooks.
+        knife("cookbook upload --include-dependencies x -o #{cb_dir}").should_succeed stderr: <<~EOM
+          Uploading x            [1.0.0]
+          Uploading y            [1.0.0]
+          Uploaded 2 cookbooks.
 EOM
       end
 
       it "knife cookbook upload fails due to missing dependencies" do
-        knife("cookbook upload x -o #{cb_dir}").should_fail stderr: <<EOM
-Uploading x            [1.0.0]
-ERROR: Cookbook x depends on cookbooks which are not currently
-ERROR: being uploaded and cannot be found on the server.
-ERROR: The missing cookbook(s) are: 'y' version '>= 0.0.0'
+        knife("cookbook upload x -o #{cb_dir}").should_fail stderr: <<~EOM
+          Uploading x            [1.0.0]
+          ERROR: Cookbook x depends on cookbooks which are not currently
+          ERROR: being uploaded and cannot be found on the server.
+          ERROR: The missing cookbook(s) are: 'y' version '>= 0.0.0'
 EOM
       end
 
       it "knife cookbook upload -a uploads both cookbooks" do
-        knife("cookbook upload -a -o #{cb_dir}").should_succeed stderr: <<EOM
-Uploading x            [1.0.0]
-Uploading y            [1.0.0]
-Uploaded all cookbooks.
+        knife("cookbook upload -a -o #{cb_dir}").should_succeed stderr: <<~EOM
+          Uploading x            [1.0.0]
+          Uploading y            [1.0.0]
+          Uploaded all cookbooks.
 EOM
       end
     end

data/spec/integration/knife/data_bag_delete_spec.rb

@@ -32,26 +32,26 @@ describe "knife data bag delete", :workstation do
     end
 
     it "with an empty data bag" do
-      knife("data bag delete canteloupe", input: "y").should_succeed <<EOM
-Do you really want to delete canteloupe? (Y/N) Deleted data_bag[canteloupe]
+      knife("data bag delete canteloupe", input: "y").should_succeed <<~EOM
+        Do you really want to delete canteloupe? (Y/N) Deleted data_bag[canteloupe]
 EOM
     end
 
     it "with a bag with some items" do
-      knife("data bag delete rocket", input: "y").should_succeed <<EOM
-Do you really want to delete rocket? (Y/N) Deleted data_bag[rocket]
+      knife("data bag delete rocket", input: "y").should_succeed <<~EOM
+        Do you really want to delete rocket? (Y/N) Deleted data_bag[rocket]
 EOM
     end
 
     it "with a single item" do
-      knife("data bag delete rocket falcon9", input: "y").should_succeed <<EOM
-Do you really want to delete falcon9? (Y/N) Deleted data_bag_item[falcon9]
+      knife("data bag delete rocket falcon9", input: "y").should_succeed <<~EOM
+        Do you really want to delete falcon9? (Y/N) Deleted data_bag_item[falcon9]
 EOM
     end
 
     it "choosing not to delete" do
-      knife("data bag delete rocket falcon9", input: "n").should_succeed <<EOM, exit_code: 3
-Do you really want to delete falcon9? (Y/N) You said no, so I'm done here.
+      knife("data bag delete rocket falcon9", input: "n").should_succeed <<~EOM, exit_code: 3
+        Do you really want to delete falcon9? (Y/N) You said no, so I'm done here.
 EOM
     end
   end

data/spec/integration/knife/data_bag_from_file_spec.rb

@@ -37,76 +37,76 @@ describe "knife data bag from file", :workstation do
         file "data_bags/foo/bzr.json", { "id" => "bzr", "foo" => "bar " }
         file "data_bags/foo/cat.json", { "id" => "cat", "foo" => "bar " }
         file "data_bags/foo/dog.json", { "id" => "dog", "foo" => "bar " }
-        file "data_bags/foo/encrypted.json", <<EOM
-{
-  "id": "encrypted",
-  "password": {
-    "encrypted_data": "H6ab5RY9a9JAkS8A0RCMspXtOJh0ai8cNeA4Q3gLO8s=\\n",
-    "iv": "uWKKKxrJgtELlGMCOLJdkA==\\n",
-    "version": 1,
-    "cipher": "aes-256-cbc"
-  }
-}
+        file "data_bags/foo/encrypted.json", <<~EOM
+          {
+            "id": "encrypted",
+            "password": {
+              "encrypted_data": "H6ab5RY9a9JAkS8A0RCMspXtOJh0ai8cNeA4Q3gLO8s=\\n",
+              "iv": "uWKKKxrJgtELlGMCOLJdkA==\\n",
+              "version": 1,
+              "cipher": "aes-256-cbc"
+            }
+          }
 EOM
-        file "data_bags/bar/round_trip.json", <<EOM
-{
-  "name": "data_bag_item_bar_round_trip",
-  "json_class": "Chef::DataBagItem",
-  "chef_type": "data_bag_item",
-  "data_bag": "bar",
-  "raw_data": {
-    "id": "round_trip",
-    "root_password": {
-      "encrypted_data": "noDOsTpsTAZlTU5sprhmYZzUDfr8du7hH/zRDOjRAmoTJHTZyfYoR221EOOW\\nXJ1D\\n",
-      "iv": "Bnqhfy6n0Hx1wCe9pxHLoA==\\n",
-      "version": 1,
-      "cipher": "aes-256-cbc"
-    },
-    "admin_password": {
-      "encrypted_data": "TcC7dU1gx6OnE5Ab4i/k42UEf0Nnr7cAyuTHId/LNjNOwpNf7XZc27DQSjuy\\nHPlt\\n",
-      "iv": "+TAWJuPWCI2+WB8lGJAyvw==\\n",
-      "version": 1,
-      "cipher": "aes-256-cbc"
-    }
-  }
-}
+        file "data_bags/bar/round_trip.json", <<~EOM
+          {
+            "name": "data_bag_item_bar_round_trip",
+            "json_class": "Chef::DataBagItem",
+            "chef_type": "data_bag_item",
+            "data_bag": "bar",
+            "raw_data": {
+              "id": "round_trip",
+              "root_password": {
+                "encrypted_data": "noDOsTpsTAZlTU5sprhmYZzUDfr8du7hH/zRDOjRAmoTJHTZyfYoR221EOOW\\nXJ1D\\n",
+                "iv": "Bnqhfy6n0Hx1wCe9pxHLoA==\\n",
+                "version": 1,
+                "cipher": "aes-256-cbc"
+              },
+              "admin_password": {
+                "encrypted_data": "TcC7dU1gx6OnE5Ab4i/k42UEf0Nnr7cAyuTHId/LNjNOwpNf7XZc27DQSjuy\\nHPlt\\n",
+                "iv": "+TAWJuPWCI2+WB8lGJAyvw==\\n",
+                "version": 1,
+                "cipher": "aes-256-cbc"
+              }
+            }
+          }
 EOM
       end
 
       it "uploads a single file" do
-        knife("data bag from file foo #{db_dir}/foo/bar.json").should_succeed stderr: <<EOM
-Updated data_bag_item[foo::bar]
+        knife("data bag from file foo #{db_dir}/foo/bar.json").should_succeed stderr: <<~EOM
+          Updated data_bag_item[foo::bar]
 EOM
       end
 
       it "uploads a single encrypted file" do
-        knife("data bag from file foo #{db_dir}/foo/encrypted.json").should_succeed stderr: <<EOM
-Updated data_bag_item[foo::encrypted]
+        knife("data bag from file foo #{db_dir}/foo/encrypted.json").should_succeed stderr: <<~EOM
+          Updated data_bag_item[foo::encrypted]
 EOM
       end
 
       it "uploads a file in chef's internal format" do
         pending "chef/chef#4815"
-        knife("data bag from file bar #{db_dir}/bar/round_trip.json").should_succeed stderr: <<EOM
-Updated data_bag_item[bar::round_trip]
+        knife("data bag from file bar #{db_dir}/bar/round_trip.json").should_succeed stderr: <<~EOM
+          Updated data_bag_item[bar::round_trip]
 EOM
       end
 
       it "uploads many files" do
-        knife("data bag from file foo #{db_dir}/foo/bar.json #{db_dir}/foo/bzr.json").should_succeed stderr: <<EOM
-Updated data_bag_item[foo::bar]
-Updated data_bag_item[foo::bzr]
+        knife("data bag from file foo #{db_dir}/foo/bar.json #{db_dir}/foo/bzr.json").should_succeed stderr: <<~EOM
+          Updated data_bag_item[foo::bar]
+          Updated data_bag_item[foo::bzr]
 EOM
       end
 
       it "uploads a whole directory" do
         knife("data bag from file foo #{db_dir}/foo")
-        knife("data bag show foo").should_succeed <<EOM
-bar
-bzr
-cat
-dog
-encrypted
+        knife("data bag show foo").should_succeed <<~EOM
+          bar
+          bzr
+          cat
+          dog
+          encrypted
 EOM
       end