chef 12.13.37 → 12.14.60

data/spec/unit/knife/client_edit_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::ClientEdit do
   end
 
   describe "run" do
-    let(:data) {
+    let(:data) do
       {
         "name" => "adam",
         "validator" => false,
@@ -35,7 +35,7 @@ describe Chef::Knife::ClientEdit do
         "chef_type" => "client",
         "create_key" => true,
       }
-    }
+    end
 
     it "should edit the client" do
       allow(Chef::ApiClientV1).to receive(:load).with("adam").and_return(data)

data/spec/unit/knife/configure_client_spec.rb

@@ -33,9 +33,9 @@ describe Chef::Knife::ConfigureClient do
     it "should print usage and exit when a directory is not provided" do
       expect(@knife).to receive(:show_usage)
       expect(@knife.ui).to receive(:fatal).with(/must provide the directory/)
-      expect {
+      expect do
         @knife.run
-      }.to raise_error SystemExit
+      end.to raise_error SystemExit
     end
 
     describe "when specifing a directory" do

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -128,9 +128,9 @@ describe Chef::Knife::CookbookMetadata do
       it "should print an error and exit when an #{description} syntax exception is encountered" do
         exception = klass.new("#{description} blah")
         allow(Chef::Cookbook::Metadata).to receive(:new).and_raise(exception)
-        expect {
+        expect do
           @knife.generate_metadata_from_file("foobar", "#{@cookbook_dir}/foobar/metadata.rb")
-        }.to raise_error(SystemExit)
+        end.to raise_error(SystemExit)
         expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
         expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.rb/im
         expect(@stderr.string).to match /#{description} blah/im
@@ -166,9 +166,9 @@ describe Chef::Knife::CookbookMetadata do
           and_return(@json_data)
         exception = klass.new("#{description} blah")
         allow(Chef::Cookbook::Metadata).to receive(:validate_json).and_raise(exception)
-        expect {
+        expect do
           @knife.validate_metadata_json(@cookbook_dir, "foobar")
-        }.to raise_error(SystemExit)
+        end.to raise_error(SystemExit)
         expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
         expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.json/im
         expect(@stderr.string).to match /#{description} blah/im

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -24,16 +24,17 @@ describe Chef::Knife::CookbookSiteInstall do
   let(:stderr) { StringIO.new }
   let(:downloader) { Hash.new }
   let(:archive) { double(Mixlib::Archive, extract: true) }
-  let(:repo) { double(:sanity_check => true, :reset_to_default_state => true,
-                      :prepare_to_import => true, :finalize_updates_to => true,
-                      :merge_updates_from => true) }
-  let(:install_path) {
+  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
+  let(:install_path) do
     if Chef::Platform.windows?
       "C:/tmp/chef"
     else
       "/var/tmp/chef"
     end
-  }
+  end
 
   before(:each) do
     require "chef/knife/core/cookbook_scm_repo"

data/spec/unit/knife/cookbook_site_share_spec.rb

@@ -199,8 +199,8 @@ describe Chef::Knife::CookbookSiteShare do
       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/core/hashed_command_loader_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
     allow(ChefConfig).to receive(:windows?) { false }
   end
 
-  let(:plugin_manifest) {
+  let(:plugin_manifest) do
     {
       "_autogenerated_command_paths" => {
         "plugins_paths" => {
@@ -39,11 +39,12 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
         },
       },
     }
-  }
+  end
 
-  let(:loader) { Chef::Knife::SubcommandLoader::HashedCommandLoader.new(
+  let(:loader) do
+    Chef::Knife::SubcommandLoader::HashedCommandLoader.new(
     File.join(CHEF_SPEC_DATA, "knife-site-subcommands"),
-    plugin_manifest)}
+    plugin_manifest) end
 
   describe "#list_commands" do
     before do

data/spec/unit/knife/core/node_editor_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::NodeEditor do
 
   subject { described_class.new(node, ui, config) }
 
-  describe '#view' do
+  describe "#view" do
     it "returns a Hash with only the name, chef_environment, normal, " +
       "policy_name, policy_group, and run_list properties" do
       expected = node_data.select do |key,|
@@ -61,7 +61,7 @@ describe Chef::Knife::NodeEditor do
     end
   end
 
-  describe '#apply_updates' do
+  describe "#apply_updates" do
     context "when the node name is changed" do
       before(:each) do
         allow(ui).to receive(:warn)
@@ -143,7 +143,7 @@ describe Chef::Knife::NodeEditor do
     end
   end
 
-  describe '#updated?' do
+  describe "#updated?" do
     context "before the node has been edited" do
       it "returns false" do
         expect(subject.updated?).to be false

data/spec/unit/knife/core/ui_spec.rb

@@ -500,9 +500,9 @@ EOM
 
     shared_examples_for "confirm with negative answer" do
       it "confirm should exit 3" do
-        expect {
+        expect do
           run_confirm
-        }.to raise_error(SystemExit) { |e| expect(e.status).to eq(3) }
+        end.to raise_error(SystemExit) { |e| expect(e.status).to eq(3) }
       end
 
       it "confirm_without_exit should return false" do

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Knife::DataBagFromFile do
     k
   end
 
-  let(:tmp_dir) { Dir.mktmpdir }
+  let(:tmp_dir) { make_canonical_temp_directory }
   let(:db_folder) { File.join(tmp_dir, data_bags_path, bag_name) }
   let(:db_file) { Tempfile.new(["data_bag_from_file_test", ".json"], db_folder) }
   let(:db_file2) { Tempfile.new(["data_bag_from_file_test2", ".json"], db_folder) }
@@ -72,11 +72,12 @@ describe Chef::Knife::DataBagFromFile do
   let(:loader) { double("Knife::Core::ObjectLoader") }
 
   let(:data_bags_path) { "data_bags" }
-  let(:plain_data) { {
+  let(:plain_data) do
+    {
       "id" => "item_name",
       "greeting" => "hello",
       "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true } },
-  } }
+  } end
   let(:enc_data) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(plain_data, secret) }
 
   let(:rest) { double("Chef::ServerAPI") }

data/spec/unit/knife/data_bag_show_spec.rb

@@ -45,8 +45,9 @@ describe Chef::Knife::DataBagShow do
   let(:bag_name) { "sudoing_admins" }
   let(:item_name) { "ME" }
 
-  let(:data_bag_contents) { { "id" => "id", "baz" => "http://localhost:4000/data/bag_o_data/baz",
-                              "qux" => "http://localhost:4000/data/bag_o_data/qux" } }
+  let(:data_bag_contents) do
+    { "id" => "id", "baz" => "http://localhost:4000/data/bag_o_data/baz",
+      "qux" => "http://localhost:4000/data/bag_o_data/qux" } end
   let(:enc_hash) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(data_bag_contents, secret) }
   let(:data_bag) { Chef::DataBagItem.from_hash(data_bag_contents) }
   let(:data_bag_with_encoded_hash) { Chef::DataBagItem.from_hash(enc_hash) }

data/spec/unit/knife/key_create_spec.rb

@@ -73,7 +73,7 @@ describe "key create commands that inherit knife" do
 end
 
 describe Chef::Knife::KeyCreate do
-  let(:public_key) {
+  let(:public_key) do
     "-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPo+oNPB7uuNkws0fC02
 KxSwdyqPLu0fhI1pOweNKAZeEIiEz2PkybathHWy8snSXGNxsITkf3eyvIIKa8OZ
@@ -83,15 +83,15 @@ IjSmiN/ihHtlhV/VSnBJ5PzT/lRknlrJ4kACoz7Pq9jv+aAx5ft/xE9yDa2DYs0q
 Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 0wIDAQAB
 -----END PUBLIC KEY-----"
-  }
+  end
   let(:config) { Hash.new }
   let(:actor) { "charmander" }
   let(:ui) { instance_double("Chef::Knife::UI") }
 
   shared_examples_for "key create run command" do
-    let(:key_create_object) {
+    let(:key_create_object) do
       described_class.new(actor, actor_field_name, ui, config)
-    }
+    end
 
     context "when public_key and key_name weren't passed" do
       it "raises a Chef::Exceptions::KeyCommandInputError with the proper error message" do
@@ -100,11 +100,11 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
     end
 
     context "when the command is run" do
-      let(:expected_hash) {
+      let(:expected_hash) do
         {
           actor_field_name => "charmander",
         }
-      }
+      end
 
       before do
         allow(File).to receive(:read).and_return(public_key)
@@ -120,14 +120,14 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       context "when a valid hash is passed" do
         let(:key_name) { "charmander-key" }
         let(:valid_expiration_date) { "2020-12-24T21:00:00Z" }
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
             "expiration_date" => valid_expiration_date,
             "key_name" => key_name,
           }
-        }
+        end
         before do
           key_create_object.config[:public_key] = "public_key_path"
           key_create_object.config[:expiration_Date] = valid_expiration_date,
@@ -141,12 +141,12 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when public_key is passed" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
           }
-        }
+        end
         before do
           key_create_object.config[:public_key] = "public_key_path"
         end
@@ -158,13 +158,13 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end # when public_key is passed
 
       context "when public_key isn't passed and key_name is" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "name" => "charmander-key",
             "create_key" => true,
           }
-        }
+        end
         before do
           key_create_object.config[:key_name] = "charmander-key"
         end
@@ -176,13 +176,13 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when the server returns a private key" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
             "private_key" => "super_private",
           }
-        }
+        end
 
         before do
           key_create_object.config[:public_key] = "public_key_path"

data/spec/unit/knife/key_delete_spec.rb

@@ -80,9 +80,9 @@ describe Chef::Knife::KeyDelete do
   let(:ui) { instance_double("Chef::Knife::UI") }
 
   shared_examples_for "key delete run command" do
-    let(:key_delete_object) {
+    let(:key_delete_object) do
       described_class.new(keyname, actor, actor_field_name, ui)
-    }
+    end
 
     before do
       allow_any_instance_of(Chef::Key).to receive(:destroy)

data/spec/unit/knife/key_edit_spec.rb

@@ -75,7 +75,7 @@ describe "key edit commands that inherit knife" do
 end
 
 describe Chef::Knife::KeyEdit do
-  let(:public_key) {
+  let(:public_key) do
     "-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPo+oNPB7uuNkws0fC02
 KxSwdyqPLu0fhI1pOweNKAZeEIiEz2PkybathHWy8snSXGNxsITkf3eyvIIKa8OZ
@@ -85,23 +85,23 @@ IjSmiN/ihHtlhV/VSnBJ5PzT/lRknlrJ4kACoz7Pq9jv+aAx5ft/xE9yDa2DYs0q
 Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 0wIDAQAB
 -----END PUBLIC KEY-----"
-  }
+  end
   let(:config) { Hash.new }
   let(:actor) { "charmander" }
   let(:keyname) { "charmander-key" }
   let(:ui) { instance_double("Chef::Knife::UI") }
 
   shared_examples_for "key edit run command" do
-    let(:key_edit_object) {
+    let(:key_edit_object) do
       described_class.new(keyname, actor, actor_field_name, ui, config)
-    }
+    end
 
     context "when the command is run" do
-      let(:expected_hash) {
+      let(:expected_hash) do
         {
           actor_field_name => "charmander",
         }
-      }
+      end
       let(:new_keyname) { "charizard-key" }
 
       before do
@@ -126,12 +126,12 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when key_name is passed" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "name" => new_keyname,
           }
-        }
+        end
         before do
           key_edit_object.config[:key_name] = new_keyname
           allow_any_instance_of(Chef::Key).to receive(:update)
@@ -155,14 +155,14 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when public_key, key_name, and expiration_date are passed" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
             "name" => new_keyname,
             "expiration_date" => "infinity",
           }
-        }
+        end
         before do
           key_edit_object.config[:public_key] = "this-public-key"
           key_edit_object.config[:key_name] = new_keyname
@@ -177,12 +177,12 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when create_key is passed" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "create_key" => true,
           }
-        }
+        end
 
         before do
           key_edit_object.config[:create_key] = true
@@ -196,12 +196,12 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end
 
       context "when public_key is passed" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
           }
-        }
+        end
         before do
           allow(key_edit_object).to receive(:update_key_from_hash).and_return(Chef::Key.from_hash(expected_hash))
           key_edit_object.config[:public_key] = "public_key_path"
@@ -214,13 +214,13 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       end # when public_key is passed
 
       context "when the server returns a private key" do
-        let(:expected_hash) {
+        let(:expected_hash) do
           {
             actor_field_name => "charmander",
             "public_key" => public_key,
             "private_key" => "super_private",
           }
-        }
+        end
 
         before do
           allow(key_edit_object).to receive(:update_key_from_hash).and_return(Chef::Key.from_hash(expected_hash))

data/spec/unit/knife/key_list_spec.rb

@@ -78,9 +78,9 @@ describe Chef::Knife::KeyList do
   let(:ui) { instance_double("Chef::Knife::UI") }
 
   shared_examples_for "key list run command" do
-    let(:key_list_object) {
+    let(:key_list_object) do
       described_class.new(actor, list_method, ui, config)
-    }
+    end
 
     before do
       allow(Chef::Key).to receive(list_method).and_return(http_response)
@@ -191,26 +191,26 @@ describe Chef::Knife::KeyList do
   context "when list_method is :list_by_user" do
     it_should_behave_like "key list run command" do
       let(:list_method) { :list_by_user }
-      let(:http_response) {
+      let(:http_response) do
         [
           { "uri" => "https://api.opscode.piab/users/charmander/keys/non-expired1", "name" => "non-expired1", "expired" => false },
           { "uri" => "https://api.opscode.piab/users/charmander/keys/non-expired2", "name" => "non-expired2", "expired" => false },
           { "uri" => "https://api.opscode.piab/users/mary/keys/out-of-date",        "name" => "out-of-date", "expired" => true },
         ]
-      }
+      end
     end
   end
 
   context "when list_method is :list_by_client" do
     it_should_behave_like "key list run command" do
       let(:list_method) { :list_by_client }
-      let(:http_response) {
+      let(:http_response) do
         [
           { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired1", "name" => "non-expired1", "expired" => false },
           { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired2", "name" => "non-expired2", "expired" => false },
           { "uri" => "https://api.opscode.piab/organizations/pokemon/clients/mary/keys/out-of-date",        "name" => "out-of-date", "expired" => true },
         ]
-      }
+      end
     end
   end
 end