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

data/spec/unit/knife/data_bag_create_spec.rb

@@ -60,7 +60,7 @@ describe Chef::Knife::DataBagCreate do
   context "when data_bag doesn't exist" do
     before do
       # Data bag doesn't exist by default so we mock the GET request to return 404
-      exception = double("404 error", :code => "404")
+      exception = double("404 error", code: "404")
       allow(rest).to receive(:get)
         .with("data/#{bag_name}")
         .and_raise(Net::HTTPServerException.new("404", exception))
@@ -82,7 +82,7 @@ describe Chef::Knife::DataBagCreate do
 
     context "when part of the name is a reserved name" do
       before do
-        exception = double("404 error", :code => "404")
+        exception = double("404 error", code: "404")
         %w{node role client environment}.each do |name|
           allow(rest).to receive(:get)
             .with("data/sudoing_#{name}_admins")

data/spec/unit/knife/data_bag_edit_spec.rb

@@ -74,7 +74,7 @@ describe Chef::Knife::DataBagEdit do
   end
 
   context "when config[:print_after] is set" do
-    let(:config) { { :print_after => true } }
+    let(:config) { { print_after: true } }
     before do
       expect(knife.ui).to receive(:output).with(raw_edited_hash)
     end

data/spec/unit/knife/data_bag_secret_options_spec.rb

@@ -73,13 +73,13 @@ describe Chef::Knife::DataBagSecretOptions do
 
     it "returns the secret first" do
       Chef::Config[:knife][:cl_secret] = secret
-      expect(example_db).to receive(:config).and_return({ :secret => secret })
+      expect(example_db).to receive(:config).and_return({ secret: secret })
       expect(example_db.read_secret).to eq(secret)
     end
 
     it "returns the secret_file only if secret does not exist" do
       Chef::Config[:knife][:cl_secret_file] = secret_file.path
-      expect(example_db).to receive(:config).and_return({ :secret_file => secret_file.path })
+      expect(example_db).to receive(:config).and_return({ secret_file: secret_file.path })
       expect(Chef::EncryptedDataBagItem).to receive(:load_secret).with(secret_file.path).and_return("secret file contents")
       expect(example_db.read_secret).to eq("secret file contents")
     end
@@ -111,19 +111,19 @@ describe Chef::Knife::DataBagSecretOptions do
     end
 
     it "returns true if --encrypt is passed on the CL and :secret is in config" do
-      expect(example_db).to receive(:config).and_return({ :encrypt => true })
+      expect(example_db).to receive(:config).and_return({ encrypt: true })
       Chef::Config[:knife][:secret] = secret
       expect(example_db.encryption_secret_provided?).to eq(true)
     end
 
     it "returns true if --encrypt is passed on the CL and :secret_file is in config" do
-      expect(example_db).to receive(:config).and_return({ :encrypt => true })
+      expect(example_db).to receive(:config).and_return({ encrypt: true })
       Chef::Config[:knife][:secret_file] = secret_file.path
       expect(example_db.encryption_secret_provided?).to eq(true)
     end
 
     it "throws an error if --encrypt is passed and there is not :secret or :secret_file in the config" do
-      expect(example_db).to receive(:config).and_return({ :encrypt => true })
+      expect(example_db).to receive(:config).and_return({ encrypt: true })
       expect(example_db).to receive(:exit).with(1)
       expect(example_db.ui).to receive(:fatal).with("No secret or secret_file specified in config, unable to encrypt item.")
       example_db.encryption_secret_provided?

data/spec/unit/knife/environment_from_file_spec.rb

@@ -61,7 +61,7 @@ describe Chef::Knife::EnvironmentFromFile do
         allow(File).to receive(:expand_path).with("./environments/").and_return("/tmp/environments")
         allow(Dir).to receive(:glob).with("/tmp/environments/*.{json,rb}").and_return(["spec.rb", "apple.rb"])
         @knife.name_args = []
-        allow(@knife).to receive(:config).and_return({ :all => true })
+        allow(@knife).to receive(:config).and_return({ all: true })
         expect(@environment).to receive(:save).twice
         @knife.run
       end

data/spec/unit/knife/key_create_spec.rb

@@ -44,9 +44,9 @@ describe "key create commands that inherit knife" do
 
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyCreate with the correct args" do
-          expect(Chef::Knife::KeyCreate).to receive(:new).
-            with("charmander", command.actor_field_name, command.ui, command.config).
-            and_return(service_object)
+          expect(Chef::Knife::KeyCreate).to receive(:new)
+            .with("charmander", command.actor_field_name, command.ui, command.config)
+            .and_return(service_object)
           command.service_object
         end
       end # when the service object is called
@@ -207,7 +207,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
         end
       end # when the server returns a private key
     end # when the command is run
-  end #key create run command"
+  end # key create run command"
 
   context "when actor_field_name is 'user'" do
     it_should_behave_like "key create run command" do

data/spec/unit/knife/key_delete_spec.rb

@@ -44,9 +44,9 @@ describe "key delete commands that inherit knife" do
 
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyDelete with the correct args" do
-          expect(Chef::Knife::KeyDelete).to receive(:new).
-            with("charmander-key", "charmander", command.actor_field_name, command.ui).
-            and_return(service_object)
+          expect(Chef::Knife::KeyDelete).to receive(:new)
+            .with("charmander-key", "charmander", command.actor_field_name, command.ui)
+            .and_return(service_object)
           command.service_object
         end
       end # when the service object is called

data/spec/unit/knife/key_edit_spec.rb

@@ -44,9 +44,9 @@ describe "key edit commands that inherit knife" do
 
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyEdit with the correct args" do
-          expect(Chef::Knife::KeyEdit).to receive(:new).
-            with("charmander-key", "charmander", command.actor_field_name, command.ui, command.config).
-            and_return(service_object)
+          expect(Chef::Knife::KeyEdit).to receive(:new)
+            .with("charmander-key", "charmander", command.actor_field_name, command.ui, command.config)
+            .and_return(service_object)
           command.service_object
         end
       end # when the service object is called

data/spec/unit/knife/key_list_spec.rb

@@ -44,9 +44,9 @@ describe "key list commands that inherit knife" do
 
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyList with the correct args" do
-          expect(Chef::Knife::KeyList).to receive(:new).
-            with("charmander", command.list_method, command.ui, command.config).
-            and_return(service_object)
+          expect(Chef::Knife::KeyList).to receive(:new)
+            .with("charmander", command.list_method, command.ui, command.config)
+            .and_return(service_object)
           command.service_object
         end
       end # when the service object is called

data/spec/unit/knife/key_show_spec.rb

@@ -44,9 +44,9 @@ describe "key show commands that inherit knife" do
 
       context "when the service object is called" do
         it "creates a new instance of Chef::Knife::KeyShow with the correct args" do
-          expect(Chef::Knife::KeyShow).to receive(:new).
-            with("charmander-key", "charmander", command.load_method, command.ui).
-            and_return(service_object)
+          expect(Chef::Knife::KeyShow).to receive(:new)
+            .with("charmander-key", "charmander", command.load_method, command.ui)
+            .and_return(service_object)
           command.service_object
         end
       end # when the service object is called

data/spec/unit/knife/node_delete_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::NodeDelete do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::NodeDelete.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = %w{ adam ben }
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/node_edit_spec.rb

@@ -30,9 +30,9 @@ describe Chef::Knife::NodeEdit do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::NodeEdit.new
     @knife.config = {
-      :editor => "cat",
-      :attribute => nil,
-      :print_after => nil,
+      editor: "cat",
+      attribute: nil,
+      print_after: nil,
     }
     @knife.name_args = [ "adam" ]
     @node = Chef::Node.new()
@@ -48,10 +48,10 @@ describe Chef::Knife::NodeEdit do
       @knife.config[:all_attributes] = false
 
       allow(@knife).to receive(:node).and_return(@node)
-      @node.automatic_attrs = { :go => :away }
-      @node.default_attrs = { :hide => :me }
-      @node.override_attrs = { :dont => :show }
-      @node.normal_attrs = { :do_show => :these }
+      @node.automatic_attrs = { go: :away }
+      @node.default_attrs = { hide: :me }
+      @node.override_attrs = { dont: :show }
+      @node.normal_attrs = { do_show: :these }
       @node.chef_environment("prod")
       @node.run_list("recipe[foo]")
     end

data/spec/unit/knife/node_from_file_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::NodeFromFile do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::NodeFromFile.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "adam.rb" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/node_run_list_add_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::NodeRunListAdd do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::NodeRunListAdd.new
     @knife.config = {
-      :after => nil,
+      after: nil,
     }
     @knife.name_args = [ "adam", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/osc_user_edit_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Knife::OscUserEdit do
   end
 
   it "loads and edits the user" do
-    data = { :name => "my_user" }
+    data = { name: "my_user" }
     allow(Chef::User).to receive(:load).with("my_user").and_return(data)
     expect(@knife).to receive(:edit_hash).with(data).and_return(data)
     @knife.run

data/spec/unit/knife/osc_user_reregister_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::OscUserReregister do
     Chef::Knife::OscUserReregister.load_deps
     @knife = Chef::Knife::OscUserReregister.new
     @knife.name_args = [ "a_user" ]
-    @user_mock = double("user_mock", :private_key => "private_key")
+    @user_mock = double("user_mock", private_key: "private_key")
     allow(Chef::User).to receive(:load).and_return(@user_mock)
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)

data/spec/unit/knife/role_bulk_delete_spec.rb

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

data/spec/unit/knife/role_create_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::RoleCreate do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::RoleCreate.new
     @knife.config = {
-      :description => nil,
+      description: nil,
     }
     @knife.name_args = [ "adam" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_delete_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::RoleDelete do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::RoleDelete.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "adam" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_env_run_list_add_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::RoleEnvRunListAdd do
 #    Chef::Config[:env_name]  = "QA"
     @knife = Chef::Knife::RoleEnvRunListAdd.new
     @knife.config = {
-      :after => nil,
+      after: nil,
     }
     @knife.name_args = [ "will", "QA", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
@@ -85,17 +85,17 @@ describe Chef::Knife::RoleEnvRunListAdd do
       end
 
       it "should add to the run list after the specified entries in the QA run list" do
-        #Setup
+        # Setup
         @role.run_list_for("_default") << "role[acorns]"
         @role.run_list_for("_default") << "role[barn]"
         @knife.run
         @role.run_list_for("QA") << "role[pencil]"
         @role.run_list_for("QA") << "role[pen]"
-        #Configuration we are testing
+        # Configuration we are testing
         @knife.config[:after] = "role[pencil]"
         @knife.name_args = [ "will", "QA", "role[pad]", "role[whackadoo]" ]
         @knife.run
-        #The actual tests
+        # The actual tests
         expect(@role.run_list_for("QA")[0]).to eq("role[monkey]")
         expect(@role.run_list_for("QA")[1]).to eq("role[pencil]")
         expect(@role.run_list_for("QA")[2]).to eq("role[pad]")

data/spec/unit/knife/role_env_run_list_clear_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::RoleEnvRunListClear do
 
     @knife = Chef::Knife::RoleEnvRunListClear.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = %w{will QA}
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_env_run_list_remove_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::RoleEnvRunListRemove do
 
     @knife = Chef::Knife::RoleEnvRunListRemove.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "QA", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_env_run_list_replace_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::RoleEnvRunListReplace do
 
     @knife = Chef::Knife::RoleEnvRunListReplace.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "QA", "role[dude]", "role[person]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_env_run_list_set_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::RoleEnvRunListSet do
 
     @knife = Chef::Knife::RoleEnvRunListSet.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "QA", "role[owen]", "role[mauntel]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_from_file_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::RoleFromFile do
     Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::RoleFromFile.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "adam.rb" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_run_list_add_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::RoleRunListAdd do
 #    Chef::Config[:env_name]  = "QA"
     @knife = Chef::Knife::RoleRunListAdd.new
     @knife.config = {
-      :after => nil,
+      after: nil,
     }
     @knife.name_args = [ "will", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
@@ -74,14 +74,14 @@ describe Chef::Knife::RoleRunListAdd do
       end
 
       it "should add to the run list after the specified entries in the default run list" do
-        #Setup
+        # Setup
         @role.run_list_for("_default") << "role[acorns]"
         @role.run_list_for("_default") << "role[barn]"
-        #Configuration we are testing
+        # Configuration we are testing
         @knife.config[:after] = "role[acorns]"
         @knife.name_args = [ "will", "role[pad]", "role[whackadoo]" ]
         @knife.run
-        #The actual tests
+        # The actual tests
         expect(@role.run_list[0]).to eq("role[acorns]")
         expect(@role.run_list[1]).to eq("role[pad]")
         expect(@role.run_list[2]).to eq("role[whackadoo]")

data/spec/unit/knife/role_run_list_clear_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::RoleRunListClear do
 
     @knife = Chef::Knife::RoleRunListClear.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_run_list_remove_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::RoleRunListRemove do
 
     @knife = Chef::Knife::RoleRunListRemove.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_run_list_replace_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::RoleRunListReplace do
 
     @knife = Chef::Knife::RoleRunListReplace.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "role[dude]", "role[person]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/role_run_list_set_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::RoleRunListSet do
 
     @knife = Chef::Knife::RoleRunListSet.new
     @knife.config = {
-      :print_after => nil,
+      print_after: nil,
     }
     @knife.name_args = [ "will", "role[owen]", "role[mauntel]" ]
     allow(@knife).to receive(:output).and_return(true)

data/spec/unit/knife/ssh_spec.rb

@@ -224,7 +224,7 @@ describe Chef::Knife::Ssh do
   describe "#session_from_list" do
     before :each do
       @knife.instance_variable_set(:@longest, 0)
-      ssh_config = { :timeout => 50, :user => "locutus", :port => 23, :keepalive => true, :keepalive_interval => 60 }
+      ssh_config = { timeout: 50, user: "locutus", port: 23, keepalive: true, keepalive_interval: 60 }
       allow(Net::SSH).to receive(:configuration_for).with("the.b.org", true).and_return(ssh_config)
     end
 
@@ -279,39 +279,39 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#ssh_command" do
-    let(:execution_channel) { double(:execution_channel, :on_data => nil) }
-    let(:session_channel) { double(:session_channel, :request_pty => nil) }
+    let(:execution_channel) { double(:execution_channel, on_data: nil) }
+    let(:session_channel) { double(:session_channel, request_pty: nil) }
 
-    let(:execution_channel2) { double(:execution_channel, :on_data => nil) }
-    let(:session_channel2) { double(:session_channel, :request_pty => nil) }
+    let(:execution_channel2) { double(:execution_channel, on_data: nil) }
+    let(:session_channel2) { double(:session_channel, request_pty: nil) }
 
-    let(:session) { double(:session, :loop => nil) }
+    let(:session) { double(:session, loop: nil) }
 
     let(:command) { "false" }
 
     before do
-      expect(execution_channel).
-        to receive(:on_request).
-        and_yield(nil, double(:data_stream, :read_long => exit_status))
+      expect(execution_channel)
+        .to receive(:on_request)
+        .and_yield(nil, double(:data_stream, read_long: exit_status))
 
-      expect(session_channel).
-        to receive(:exec).
-        with(command).
-        and_yield(execution_channel, true)
+      expect(session_channel)
+        .to receive(:exec)
+        .with(command)
+        .and_yield(execution_channel, true)
 
-      expect(execution_channel2).
-        to receive(:on_request).
-        and_yield(nil, double(:data_stream, :read_long => exit_status2))
+      expect(execution_channel2)
+        .to receive(:on_request)
+        .and_yield(nil, double(:data_stream, read_long: exit_status2))
 
-      expect(session_channel2).
-        to receive(:exec).
-        with(command).
-        and_yield(execution_channel2, true)
+      expect(session_channel2)
+        .to receive(:exec)
+        .with(command)
+        .and_yield(execution_channel2, true)
 
-      expect(session).
-        to receive(:open_channel).
-        and_yield(session_channel).
-        and_yield(session_channel2)
+      expect(session)
+        .to receive(:open_channel)
+        .and_yield(session_channel)
+        .and_yield(session_channel2)
     end
 
     context "both connections return 0" do
@@ -344,7 +344,7 @@ describe Chef::Knife::Ssh do
 
   describe "#tmux" do
     before do
-      ssh_config = { :timeout => 50, :user => "locutus", :port => 23, :keepalive => true, :keepalive_interval => 60 }
+      ssh_config = { timeout: 50, user: "locutus", port: 23, keepalive: true, keepalive_interval: 60 }
       allow(Net::SSH).to receive(:configuration_for).with("foo.example.org", true).and_return(ssh_config)
       @query = Chef::Search::Query.new
       expect(@query).to receive(:search).and_yield(@node_foo)