chef 14.2.0 → 14.3.37

data/spec/unit/knife/configure_spec.rb

@@ -6,7 +6,7 @@ describe Chef::Knife::Configure do
 
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::Configure.new
-    @rest_client = double("null rest client", :post => { :result => :true })
+    @rest_client = double("null rest client", post: { result: :true })
     allow(@knife).to receive(:rest).and_return(@rest_client)
 
     @out = StringIO.new

data/spec/unit/knife/cookbook_bulk_delete_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Knife::CookbookBulkDelete do
 
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::CookbookBulkDelete.new
-    @knife.config = { :print_after => nil }
+    @knife.config = { print_after: nil }
     @knife.name_args = ["."]
     @stdout = StringIO.new
     @stderr = StringIO.new

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -62,8 +62,8 @@ describe Chef::Knife::CookbookDelete do
       describe "with -p or --purge" do
         it "should prompt to purge the files" do
           @knife.config[:purge] = true
-          expect(@knife).to receive(:confirm).
-            with(/.+Are you sure you want to purge files.+/)
+          expect(@knife).to receive(:confirm)
+            .with(/.+Are you sure you want to purge files.+/)
           expect(@knife).to receive(:delete_without_explicit_version)
           @knife.run
         end
@@ -146,8 +146,8 @@ describe Chef::Knife::CookbookDelete do
 
     describe "if the cookbook can't be found" do
       before(:each) do
-        expect(@rest_mock).to receive(:get).
-          and_raise(Net::HTTPServerException.new("404 Not Found", "404"))
+        expect(@rest_mock).to receive(:get)
+          .and_raise(Net::HTTPServerException.new("404 Not Found", "404"))
       end
 
       it "should print an error" do

data/spec/unit/knife/cookbook_download_spec.rb

@@ -47,13 +47,13 @@ describe Chef::Knife::CookbookDownload do
         @rest_mock = double("rest")
         allow(@knife).to receive(:rest).and_return(@rest_mock)
 
-        expect(Chef::CookbookVersion).to receive(:load).with("foobar", "1.0.0").
-          and_return(cookbook)
+        expect(Chef::CookbookVersion).to receive(:load).with("foobar", "1.0.0")
+          .and_return(cookbook)
       end
 
       let(:manifest_data) do
         {
-          :all_files => [
+          all_files: [
             {
               "path" => "recipes/foo.rb",
               "name" => "recipes/foo.rb",
@@ -119,18 +119,18 @@ describe Chef::Knife::CookbookDownload do
         describe "when downloading the cookbook" do
           before(:each) do
             @files.map { |f| File.dirname(f) }.flatten.uniq.each do |dir|
-              expect(FileUtils).to receive(:mkdir_p).with("/var/tmp/chef/foobar-1.0.0/#{dir}").
-                at_least(:once)
+              expect(FileUtils).to receive(:mkdir_p).with("/var/tmp/chef/foobar-1.0.0/#{dir}")
+                .at_least(:once)
             end
 
             @files_mocks.each_pair do |file, mock|
-              expect(@rest_mock).to receive(:streaming_request).with("http://example.org/files/#{file}").
-                and_return(mock)
+              expect(@rest_mock).to receive(:streaming_request).with("http://example.org/files/#{file}")
+                .and_return(mock)
             end
 
             @files.each do |f|
-              expect(FileUtils).to receive(:mv).
-                with("/var/tmp/#{File.basename(f)}", "/var/tmp/chef/foobar-1.0.0/#{f}")
+              expect(FileUtils).to receive(:mv)
+                .with("/var/tmp/#{File.basename(f)}", "/var/tmp/chef/foobar-1.0.0/#{f}")
             end
           end
 
@@ -182,8 +182,8 @@ describe Chef::Knife::CookbookDownload do
     describe "with -N or --latest" do
       it "should return and set the version to the latest version" do
         @knife.config[:latest] = true
-        expect(@knife).to receive(:available_versions).at_least(:once).
-          and_return(["1.0.0", "1.1.0", "2.0.0"])
+        expect(@knife).to receive(:available_versions).at_least(:once)
+          .and_return(["1.0.0", "1.1.0", "2.0.0"])
         @knife.determine_version
         expect(@knife.version.to_s).to eq("2.0.0")
       end
@@ -196,26 +196,26 @@ describe Chef::Knife::CookbookDownload do
     end
 
     it "should return nil if there are no versions" do
-      expect(Chef::CookbookVersion).to receive(:available_versions).
-        with("foobar").
-        and_return(nil)
+      expect(Chef::CookbookVersion).to receive(:available_versions)
+        .with("foobar")
+        .and_return(nil)
       expect(@knife.available_versions).to eq(nil)
     end
 
     it "should return the available versions" do
-      expect(Chef::CookbookVersion).to receive(:available_versions).
-        with("foobar").
-        and_return(["1.1.0", "2.0.0", "1.0.0"])
+      expect(Chef::CookbookVersion).to receive(:available_versions)
+        .with("foobar")
+        .and_return(["1.1.0", "2.0.0", "1.0.0"])
       expect(@knife.available_versions).to eq([Chef::Version.new("1.0.0"),
                                            Chef::Version.new("1.1.0"),
                                            Chef::Version.new("2.0.0")])
     end
 
     it "should avoid multiple API calls to the server" do
-      expect(Chef::CookbookVersion).to receive(:available_versions).
-        once.
-        with("foobar").
-        and_return(["1.1.0", "2.0.0", "1.0.0"])
+      expect(Chef::CookbookVersion).to receive(:available_versions)
+        .once
+        .with("foobar")
+        .and_return(["1.1.0", "2.0.0", "1.0.0"])
       @knife.available_versions
       @knife.available_versions
     end

data/spec/unit/knife/cookbook_list_spec.rb

@@ -37,8 +37,8 @@ describe Chef::Knife::CookbookList do
 
   describe "run" do
     it "should display the latest version of the cookbooks" do
-      expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=1").
-        and_return(@cookbook_data)
+      expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=1")
+        .and_return(@cookbook_data)
       @knife.run
       @cookbook_names.each do |item|
         expect(@stdout.string).to match /#{item}\s+1\.0\.1/
@@ -47,9 +47,9 @@ describe Chef::Knife::CookbookList do
 
     it "should query cookbooks for the configured environment" do
       @knife.config[:environment] = "production"
-      expect(@rest_mock).to receive(:get).
-        with("/environments/production/cookbooks?num_versions=1").
-        and_return(@cookbook_data)
+      expect(@rest_mock).to receive(:get)
+        .with("/environments/production/cookbooks?num_versions=1")
+        .and_return(@cookbook_data)
       @knife.run
     end
 
@@ -75,8 +75,8 @@ describe Chef::Knife::CookbookList do
 
       it "should display all versions of the cookbooks" do
         @knife.config[:all_versions] = true
-        expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=all").
-          and_return(@cookbook_data)
+        expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=all")
+          .and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
           expect(@stdout.string).to match /#{item}\s+1\.0\.1\s+1\.0\.0/

data/spec/unit/knife/cookbook_show_spec.rb

@@ -49,10 +49,10 @@ describe Chef::Knife::CookbookShow do
     {
       "all_files" => [
         {
-          :name => "recipes/default.rb",
-          :path => "recipes/default.rb",
-          :checksum => "1234",
-          :url => "http://example.org/files/default.rb",
+          name: "recipes/default.rb",
+          path: "recipes/default.rb",
+          checksum: "1234",
+          url: "http://example.org/files/default.rb",
         },
       ],
     }
@@ -172,32 +172,32 @@ describe Chef::Knife::CookbookShow do
         cb.manifest = {
           "all_files" => [
             {
-              :name => "files/afile.rb",
-              :path => "files/host-examplehost.example.org/afile.rb",
-              :checksum => "1111",
-              :specificity => "host-examplehost.example.org",
-              :url => "http://example.org/files/1111",
+              name: "files/afile.rb",
+              path: "files/host-examplehost.example.org/afile.rb",
+              checksum: "1111",
+              specificity: "host-examplehost.example.org",
+              url: "http://example.org/files/1111",
             },
             {
-              :name => "files/afile.rb",
-              :path => "files/ubuntu-9.10/afile.rb",
-              :checksum => "2222",
-              :specificity => "ubuntu-9.10",
-              :url => "http://example.org/files/2222",
+              name: "files/afile.rb",
+              path: "files/ubuntu-9.10/afile.rb",
+              checksum: "2222",
+              specificity: "ubuntu-9.10",
+              url: "http://example.org/files/2222",
             },
             {
-              :name => "files/afile.rb",
-              :path => "files/ubuntu/afile.rb",
-              :checksum => "3333",
-              :specificity => "ubuntu",
-              :url => "http://example.org/files/3333",
+              name: "files/afile.rb",
+              path: "files/ubuntu/afile.rb",
+              checksum: "3333",
+              specificity: "ubuntu",
+              url: "http://example.org/files/3333",
             },
             {
-              :name => "files/afile.rb",
-              :path => "files/default/afile.rb",
-              :checksum => "4444",
-              :specificity => "default",
-              :url => "http://example.org/files/4444",
+              name: "files/afile.rb",
+              path: "files/default/afile.rb",
+              checksum: "4444",
+              specificity: "default",
+              url: "http://example.org/files/4444",
             },
           ],
         }

data/spec/unit/knife/cookbook_site_download_spec.rb

@@ -35,9 +35,9 @@ describe Chef::Knife::CookbookSiteDownload do
 
       allow(@knife.ui).to receive(:stderr).and_return(@stderr)
       allow(@knife).to receive(:noauth_rest).and_return(@noauth_rest)
-      expect(@noauth_rest).to receive(:get).
-        with("#{@cookbook_api_url}/apache2").
-        and_return(@current_data)
+      expect(@noauth_rest).to receive(:get)
+        .with("#{@cookbook_api_url}/apache2")
+        .and_return(@current_data)
       @knife.configure_chef
     end
 
@@ -47,10 +47,10 @@ describe Chef::Knife::CookbookSiteDownload do
       end
 
       it "should warn with info about the replacement" do
-        expect(@knife.ui).to receive(:warn).
-          with(/.+deprecated.+replaced by other_apache2.+/i)
-        expect(@knife.ui).to receive(:warn).
-          with(/use --force.+download.+/i)
+        expect(@knife.ui).to receive(:warn)
+          .with(/.+deprecated.+replaced by other_apache2.+/i)
+        expect(@knife.ui).to receive(:warn)
+          .with(/use --force.+download.+/i)
         @knife.run
       end
     end
@@ -59,18 +59,18 @@ describe Chef::Knife::CookbookSiteDownload do
       before do
         @cookbook_data = { "version" => @version,
                            "file"    => "http://example.com/apache2_#{@version_us}.tgz" }
-        @temp_file     = double( :path => "/tmp/apache2_#{@version_us}.tgz" )
+        @temp_file     = double( path: "/tmp/apache2_#{@version_us}.tgz" )
         @file          = File.join(Dir.pwd, "apache2-#{@version}.tar.gz")
       end
 
       context "downloading the latest version" do
         before do
-          expect(@noauth_rest).to receive(:get).
-            with(@current_data["latest_version"]).
-            and_return(@cookbook_data)
-          expect(@noauth_rest).to receive(:streaming_request).
-            with(@cookbook_data["file"]).
-            and_return(@temp_file)
+          expect(@noauth_rest).to receive(:get)
+            .with(@current_data["latest_version"])
+            .and_return(@cookbook_data)
+          expect(@noauth_rest).to receive(:streaming_request)
+            .with(@cookbook_data["file"])
+            .and_return(@temp_file)
         end
 
         context "and it is deprecated and with --force" do
@@ -80,8 +80,8 @@ describe Chef::Knife::CookbookSiteDownload do
           end
 
           it "should download the latest version" do
-            expect(@knife.ui).to receive(:warn).
-              with(/.+deprecated.+replaced by other_apache2.+/i)
+            expect(@knife.ui).to receive(:warn)
+              .with(/.+deprecated.+replaced by other_apache2.+/i)
             expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
             @knife.run
             expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
@@ -124,18 +124,18 @@ describe Chef::Knife::CookbookSiteDownload do
           @version_us      = @version.tr ".", "_"
           @cookbook_data   = { "version" => @version,
                                "file"    => "http://example.com/apache2_#{@version_us}.tgz" }
-          @temp_file       = double(:path => "/tmp/apache2_#{@version_us}.tgz")
+          @temp_file       = double(path: "/tmp/apache2_#{@version_us}.tgz")
           @file            = File.join(Dir.pwd, "apache2-#{@version}.tar.gz")
           @knife.name_args << @version
         end
 
         it "should download the desired version" do
-          expect(@noauth_rest).to receive(:get).
-            with("#{@cookbook_api_url}/apache2/versions/#{@version_us}").
-            and_return(@cookbook_data)
-          expect(@noauth_rest).to receive(:streaming_request).
-            with(@cookbook_data["file"]).
-            and_return(@temp_file)
+          expect(@noauth_rest).to receive(:get)
+            .with("#{@cookbook_api_url}/apache2/versions/#{@version_us}")
+            .and_return(@cookbook_data)
+          expect(@noauth_rest).to receive(:streaming_request)
+            .with(@cookbook_data["file"])
+            .and_return(@temp_file)
           expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
           expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -25,9 +25,9 @@ describe Chef::Knife::CookbookSiteInstall do
   let(:downloader) { Hash.new }
   let(:archive) { double(Mixlib::Archive, extract: true) }
   let(:repo) do
-    double(:sanity_check => true, :reset_to_default_state => true,
-           :prepare_to_import => true, :finalize_updates_to => true,
-           :merge_updates_from => true) end
+    double(sanity_check: true, reset_to_default_state: true,
+           prepare_to_import: true, finalize_updates_to: true,
+           merge_updates_from: true) end
   let(:install_path) do
     if Chef::Platform.windows?
       "C:/tmp/chef"
@@ -173,7 +173,7 @@ describe Chef::Knife::CookbookSiteInstall do
 
     it "returns a populated Metadata object if metadata.json exists" do
       allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
-      #expect(IO).to receive(:read).with(json_metadata_path)
+      # expect(IO).to receive(:read).with(json_metadata_path)
       allow(IO).to receive(:read)
       expect(metadata).to receive(:from_json)
       knife.preferred_metadata

data/spec/unit/knife/cookbook_site_share_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Knife::CookbookSiteShare do
     @noauth_rest = double(Chef::ServerAPI)
     allow(@knife).to receive(:noauth_rest).and_return(@noauth_rest)
 
-    @cookbook_uploader = Chef::CookbookUploader.new("herpderp", :rest => "norest")
+    @cookbook_uploader = Chef::CookbookUploader.new("herpderp", rest: "norest")
     allow(Chef::CookbookUploader).to receive(:new).and_return(@cookbook_uploader)
     allow(@cookbook_uploader).to receive(:validate_cookbooks).and_return(true)
     allow(Chef::CookbookSiteStreamingUploader).to receive(:create_build_dir).and_return(Dir.mktmpdir)
@@ -139,14 +139,14 @@ describe Chef::Knife::CookbookSiteShare do
     context "when the --dry-run flag is specified" do
       before do
         allow(Chef::CookbookSiteStreamingUploader).to receive(:create_build_dir).and_return("/var/tmp/dummy")
-        @knife.config = { :dry_run => true }
+        @knife.config = { dry_run: true }
         allow(@knife).to receive_message_chain(:shell_out!, :stdout).and_return("file")
       end
 
       it "should list files in the tarball" do
         allow(@knife).to receive(:tar_cmd).and_return("footar")
-        expect(@knife).to receive(:shell_out!).with("footar -czf #{@cookbook.name}.tgz #{@cookbook.name}", { :cwd => "/var/tmp/dummy" })
-        expect(@knife).to receive(:shell_out!).with("footar -tzf #{@cookbook.name}.tgz", { :cwd => "/var/tmp/dummy" })
+        expect(@knife).to receive(:shell_out!).with("footar -czf #{@cookbook.name}.tgz #{@cookbook.name}", { cwd: "/var/tmp/dummy" })
+        expect(@knife).to receive(:shell_out!).with("footar -tzf #{@cookbook.name}.tgz", { cwd: "/var/tmp/dummy" })
         @knife.run
       end
 
@@ -172,7 +172,7 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it 'should post the cookbook to "https://supermarket.chef.io"' do
-      response_text = Chef::JSONCompat.to_json({ :uri => "https://supermarket.chef.io/cookbooks/cookbook_name" })
+      response_text = Chef::JSONCompat.to_json({ uri: "https://supermarket.chef.io/cookbooks/cookbook_name" })
       allow(@upload_response).to receive(:body).and_return(response_text)
       allow(@upload_response).to receive(:code).and_return(201)
       expect(Chef::CookbookSiteStreamingUploader).to receive(:post).with(/supermarket\.chef\.io/, anything(), anything(), anything())
@@ -180,7 +180,7 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it "should alert the user when a version already exists" do
-      response_text = Chef::JSONCompat.to_json({ :error_messages => ["Version already exists"] })
+      response_text = Chef::JSONCompat.to_json({ error_messages: ["Version already exists"] })
       allow(@upload_response).to receive(:body).and_return(response_text)
       allow(@upload_response).to receive(:code).and_return(409)
       expect { @knife.run }.to raise_error(SystemExit)
@@ -188,7 +188,7 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it "should pass any errors on to the user" do
-      response_text = Chef::JSONCompat.to_json({ :error_messages => ["You're holding it wrong"] })
+      response_text = Chef::JSONCompat.to_json({ error_messages: ["You're holding it wrong"] })
       allow(@upload_response).to receive(:body).and_return(response_text)
       allow(@upload_response).to receive(:code).and_return(403)
       expect { @knife.run }.to raise_error(SystemExit)
@@ -196,11 +196,11 @@ describe Chef::Knife::CookbookSiteShare do
     end
 
     it "should print the body if no errors are exposed on failure" do
-      response_text = Chef::JSONCompat.to_json({ :system_error => "Your call was dropped", :reason => "There's a map for that" })
+      response_text = Chef::JSONCompat.to_json({ system_error: "Your call was dropped", reason: "There's a map for that" })
       allow(@upload_response).to receive(:body).and_return(response_text)
       allow(@upload_response).to receive(:code).and_return(500)
-      expect(@knife.ui).to receive(:error).with(/#{Regexp.escape(response_text)}/) #.ordered
-      expect(@knife.ui).to receive(:error).with(/Unknown error/) #.ordered
+      expect(@knife.ui).to receive(:error).with(/#{Regexp.escape(response_text)}/) # .ordered
+      expect(@knife.ui).to receive(:error).with(/Unknown error/) # .ordered
       expect { @knife.run }.to raise_error(SystemExit)
     end
 

data/spec/unit/knife/cookbook_site_unshare_spec.rb

@@ -55,14 +55,14 @@ describe Chef::Knife::CookbookSiteUnshare do
     end
 
     it "should log an error and exit when forbidden" do
-      exception = double('403 "Forbidden"', :code => "403")
+      exception = double('403 "Forbidden"', code: "403")
       allow(@rest).to receive(:delete).and_raise(Net::HTTPServerException.new('403 "Forbidden"', exception))
       expect(@knife.ui).to receive(:error)
       expect { @knife.run }.to raise_error(SystemExit)
     end
 
     it "should re-raise any non-forbidden errors on delete" do
-      exception = double('500 "Application Error"', :code => "500")
+      exception = double('500 "Application Error"', code: "500")
       allow(@rest).to receive(:delete).and_raise(Net::HTTPServerException.new('500 "Application Error"', exception))
       expect { @knife.run }.to raise_error(Net::HTTPServerException)
     end

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Knife::CookbookUpload do
     cookbook_loader
   end
 
-  let(:cookbook_uploader) { double(:upload_cookbooks => nil) }
+  let(:cookbook_uploader) { double(upload_cookbooks: nil) }
 
   let(:output) { StringIO.new }
 
@@ -61,16 +61,16 @@ describe Chef::Knife::CookbookUpload do
       test_cookbook = Chef::CookbookVersion.new("test_cookbook", "/tmp/blah")
       allow(cookbook_loader).to receive(:each).and_yield("test_cookbook", test_cookbook)
       allow(cookbook_loader).to receive(:cookbook_names).and_return(["test_cookbook"])
-      expect(Chef::CookbookUploader).to receive(:new).
-        with( kind_of(Array), { :force => nil, :concurrency => 3 }).
-        and_return(double("Chef::CookbookUploader", :upload_cookbooks => true))
+      expect(Chef::CookbookUploader).to receive(:new)
+        .with( kind_of(Array), { force: nil, concurrency: 3 })
+        .and_return(double("Chef::CookbookUploader", upload_cookbooks: true))
       knife.run
     end
   end
 
   describe "run" do
     before(:each) do
-      allow(Chef::CookbookUploader).to receive_messages(:new => cookbook_uploader)
+      allow(Chef::CookbookUploader).to receive_messages(new: cookbook_uploader)
       allow(Chef::CookbookVersion).to receive(:list_all_versions).and_return({})
     end
 
@@ -106,22 +106,22 @@ describe Chef::Knife::CookbookUpload do
 
       before do
         allow(cookbook_loader).to receive(:merged_cookbooks).and_return(["test_cookbook"])
-        allow(cookbook_loader).to receive(:merged_cookbook_paths).
-          and_return({ "test_cookbook" => %w{/path/one/test_cookbook /path/two/test_cookbook} })
+        allow(cookbook_loader).to receive(:merged_cookbook_paths)
+          .and_return({ "test_cookbook" => %w{/path/one/test_cookbook /path/two/test_cookbook} })
       end
 
       it "emits a warning" do
         knife.run
-        expected_message = <<-E
-WARNING: The cookbooks: test_cookbook exist in multiple places in your cookbook_path.
-A composite version of these cookbooks has been compiled for uploading.
-
-IMPORTANT: In a future version of Chef, this behavior will be removed and you will no longer
-be able to have the same version of a cookbook in multiple places in your cookbook_path.
-WARNING: The affected cookbooks are located:
-test_cookbook:
-  /path/one/test_cookbook
-  /path/two/test_cookbook
+        expected_message = <<~E
+          WARNING: The cookbooks: test_cookbook exist in multiple places in your cookbook_path.
+          A composite version of these cookbooks has been compiled for uploading.
+
+          IMPORTANT: In a future version of Chef, this behavior will be removed and you will no longer
+          be able to have the same version of a cookbook in multiple places in your cookbook_path.
+          WARNING: The affected cookbooks are located:
+          test_cookbook:
+            /path/one/test_cookbook
+            /path/two/test_cookbook
 E
         expect(output.string).to include(expected_message)
       end
@@ -310,8 +310,8 @@ E
     describe "when a frozen cookbook exists on the server" do
       it "should fail to replace it" do
         exception = Chef::Exceptions::CookbookFrozen.new
-        expect(cookbook_uploader).to receive(:upload_cookbooks).
-          and_raise(exception)
+        expect(cookbook_uploader).to receive(:upload_cookbooks)
+          .and_raise(exception)
         allow(knife.ui).to receive(:error)
         expect(knife.ui).to receive(:error).with(exception)
         expect { knife.run }.to raise_error(SystemExit)