knife 18.2.7 → 18.3.0

data/spec/unit/knife/key_show_spec.rb

@@ -1,126 +1,126 @@
-#
-# Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "knife_spec_helper"
-require "chef/knife/user_key_show"
-require "chef/knife/client_key_show"
-require "chef/knife/key_show"
-require "chef/key"
-
-describe "key show commands that inherit knife" do
-  shared_examples_for "a key show command" do
-    let(:stderr) { StringIO.new }
-    let(:params) { [] }
-    let(:service_object) { instance_double(Chef::Knife::KeyShow) }
-    let(:command) do
-      c = described_class.new([])
-      c.ui.config[:disable_editing] = true
-      allow(c.ui).to receive(:stderr).and_return(stderr)
-      allow(c.ui).to receive(:stdout).and_return(stderr)
-      allow(c).to receive(:show_usage)
-      c
-    end
-
-    context "after apply_params! is called with valid args" do
-      let(:params) { %w{charmander charmander-key} }
-      before do
-        command.apply_params!(params)
-      end
-
-      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)
-          command.service_object
-        end
-      end # when the service object is called
-    end # after apply_params! is called with valid args
-  end # a key show command
-
-  describe Chef::Knife::UserKeyShow do
-    it_should_behave_like "a key show command"
-    # defined in key_helpers.rb
-    it_should_behave_like "a knife key command with a keyname as the second arg"
-    it_should_behave_like "a knife key command" do
-      let(:service_object) { instance_double(Chef::Knife::KeyShow) }
-      let(:params) { %w{charmander charmander-key} }
-    end
-  end
-
-  describe Chef::Knife::ClientKeyShow do
-    it_should_behave_like "a key show command"
-    # defined in key_helpers.rb
-    it_should_behave_like "a knife key command with a keyname as the second arg"
-    it_should_behave_like "a knife key command" do
-      let(:service_object) { instance_double(Chef::Knife::KeyShow) }
-      let(:params) { %w{charmander charmander-key} }
-    end
-  end
-end
-
-describe Chef::Knife::KeyShow do
-  let(:actor) { "charmander" }
-  let(:keyname) { "charmander" }
-  let(:ui) { instance_double("Chef::Knife::UI") }
-  let(:expected_hash) do
-    {
-      actor_field_name => "charmander",
-      "name" => "charmander-key",
-      "public_key" => "some-public-key",
-      "expiration_date" => "infinity",
-    }
-  end
-
-  shared_examples_for "key show run command" do
-    let(:key_show_object) do
-      described_class.new(keyname, actor, load_method, ui)
-    end
-
-    before do
-      allow(key_show_object).to receive(:display_output)
-      allow(Chef::Key).to receive(load_method).and_return(Chef::Key.from_hash(expected_hash))
-    end
-
-    context "when the command is run" do
-      it "loads the key using the proper method and args" do
-        expect(Chef::Key).to receive(load_method).with(actor, keyname)
-        key_show_object.run
-      end
-
-      it "displays the key" do
-        expect(key_show_object).to receive(:display_output)
-        key_show_object.run
-      end
-    end
-  end
-
-  context "when load_method is :load_by_user" do
-    it_should_behave_like "key show run command" do
-      let(:load_method) { :load_by_user }
-      let(:actor_field_name) { "user" }
-    end
-  end
-
-  context "when load_method is :load_by_client" do
-    it_should_behave_like "key show run command" do
-      let(:load_method) { :load_by_client }
-      let(:actor_field_name) { "user" }
-    end
-  end
-end
+#
+# Author:: Tyler Cloke (<tyler@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "knife_spec_helper"
+require "chef/knife/user_key_show"
+require "chef/knife/client_key_show"
+require "chef/knife/key_show"
+require "chef/key"
+
+describe "key show commands that inherit knife" do
+  shared_examples_for "a key show command" do
+    let(:stderr) { StringIO.new }
+    let(:params) { [] }
+    let(:service_object) { instance_double(Chef::Knife::KeyShow) }
+    let(:command) do
+      c = described_class.new([])
+      c.ui.config[:disable_editing] = true
+      allow(c.ui).to receive(:stderr).and_return(stderr)
+      allow(c.ui).to receive(:stdout).and_return(stderr)
+      allow(c).to receive(:show_usage)
+      c
+    end
+
+    context "after apply_params! is called with valid args" do
+      let(:params) { %w{charmander charmander-key} }
+      before do
+        command.apply_params!(params)
+      end
+
+      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)
+          command.service_object
+        end
+      end # when the service object is called
+    end # after apply_params! is called with valid args
+  end # a key show command
+
+  describe Chef::Knife::UserKeyShow do
+    it_should_behave_like "a key show command"
+    # defined in key_helpers.rb
+    it_should_behave_like "a knife key command with a keyname as the second arg"
+    it_should_behave_like "a knife key command" do
+      let(:service_object) { instance_double(Chef::Knife::KeyShow) }
+      let(:params) { %w{charmander charmander-key} }
+    end
+  end
+
+  describe Chef::Knife::ClientKeyShow do
+    it_should_behave_like "a key show command"
+    # defined in key_helpers.rb
+    it_should_behave_like "a knife key command with a keyname as the second arg"
+    it_should_behave_like "a knife key command" do
+      let(:service_object) { instance_double(Chef::Knife::KeyShow) }
+      let(:params) { %w{charmander charmander-key} }
+    end
+  end
+end
+
+describe Chef::Knife::KeyShow do
+  let(:actor) { "charmander" }
+  let(:keyname) { "charmander" }
+  let(:ui) { instance_double("Chef::Knife::UI") }
+  let(:expected_hash) do
+    {
+      actor_field_name => "charmander",
+      "name" => "charmander-key",
+      "public_key" => "some-public-key",
+      "expiration_date" => "infinity",
+    }
+  end
+
+  shared_examples_for "key show run command" do
+    let(:key_show_object) do
+      described_class.new(keyname, actor, load_method, ui)
+    end
+
+    before do
+      allow(key_show_object).to receive(:display_output)
+      allow(Chef::Key).to receive(load_method).and_return(Chef::Key.from_hash(expected_hash))
+    end
+
+    context "when the command is run" do
+      it "loads the key using the proper method and args" do
+        expect(Chef::Key).to receive(load_method).with(actor, keyname)
+        key_show_object.run
+      end
+
+      it "displays the key" do
+        expect(key_show_object).to receive(:display_output)
+        key_show_object.run
+      end
+    end
+  end
+
+  context "when load_method is :load_by_user" do
+    it_should_behave_like "key show run command" do
+      let(:load_method) { :load_by_user }
+      let(:actor_field_name) { "user" }
+    end
+  end
+
+  context "when load_method is :load_by_client" do
+    it_should_behave_like "key show run command" do
+      let(:load_method) { :load_by_client }
+      let(:actor_field_name) { "user" }
+    end
+  end
+end

data/spec/unit/knife/node_bulk_delete_spec.rb

@@ -1,94 +1,94 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "knife_spec_helper"
-
-describe Chef::Knife::NodeBulkDelete do
-  before(:each) do
-    Chef::Log.logger = Logger.new(StringIO.new)
-
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeBulkDelete.new
-    @knife.name_args = ["."]
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-    allow(@knife.ui).to receive(:confirm).and_return(true)
-    @nodes = {}
-    %w{adam brent jacob}.each do |node_name|
-      @nodes[node_name] = "http://localhost:4000/nodes/#{node_name}"
-    end
-  end
-
-  describe "when creating the list of nodes" do
-    it "fetches the node list" do
-      expected = @nodes.inject({}) do |inflatedish, (name, uri)|
-        inflatedish[name] = Chef::Node.new.tap { |n| n.name(name) }
-        inflatedish
-      end
-      expect(Chef::Node).to receive(:list).and_return(@nodes)
-      # I hate not having == defined for anything :(
-      actual = @knife.all_nodes
-      expect(actual.keys).to match_array(expected.keys)
-      expect(actual.values.map(&:name)).to match_array(%w{adam brent jacob})
-    end
-  end
-
-  describe "run" do
-    before do
-      @inflatedish_list = @nodes.keys.inject({}) do |nodes_by_name, name|
-        node = Chef::Node.new
-        node.name(name)
-        allow(node).to receive(:destroy).and_return(true)
-        nodes_by_name[name] = node
-        nodes_by_name
-      end
-      allow(@knife).to receive(:all_nodes).and_return(@inflatedish_list)
-    end
-
-    it "should print the nodes you are about to delete" do
-      @knife.run
-      expect(@stdout.string).to match(/#{@knife.ui.list(@nodes.keys.sort, :columns_down)}/)
-    end
-
-    it "should confirm you really want to delete them" do
-      expect(@knife.ui).to receive(:confirm)
-      @knife.run
-    end
-
-    it "should delete each node" do
-      @inflatedish_list.each_value do |n|
-        expect(n).to receive(:destroy)
-      end
-      @knife.run
-    end
-
-    it "should only delete nodes that match the regex" do
-      @knife.name_args = ["adam"]
-      expect(@inflatedish_list["adam"]).to receive(:destroy)
-      expect(@inflatedish_list["brent"]).not_to receive(:destroy)
-      expect(@inflatedish_list["jacob"]).not_to receive(:destroy)
-      @knife.run
-    end
-
-    it "should exit if the regex is not provided" do
-      @knife.name_args = []
-      expect { @knife.run }.to raise_error(SystemExit)
-    end
-
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "knife_spec_helper"
+
+describe Chef::Knife::NodeBulkDelete do
+  before(:each) do
+    Chef::Log.logger = Logger.new(StringIO.new)
+
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeBulkDelete.new
+    @knife.name_args = ["."]
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    allow(@knife.ui).to receive(:confirm).and_return(true)
+    @nodes = {}
+    %w{adam brent jacob}.each do |node_name|
+      @nodes[node_name] = "http://localhost:4000/nodes/#{node_name}"
+    end
+  end
+
+  describe "when creating the list of nodes" do
+    it "fetches the node list" do
+      expected = @nodes.inject({}) do |inflatedish, (name, uri)|
+        inflatedish[name] = Chef::Node.new.tap { |n| n.name(name) }
+        inflatedish
+      end
+      expect(Chef::Node).to receive(:list).and_return(@nodes)
+      # I hate not having == defined for anything :(
+      actual = @knife.all_nodes
+      expect(actual.keys).to match_array(expected.keys)
+      expect(actual.values.map(&:name)).to match_array(%w{adam brent jacob})
+    end
+  end
+
+  describe "run" do
+    before do
+      @inflatedish_list = @nodes.keys.inject({}) do |nodes_by_name, name|
+        node = Chef::Node.new
+        node.name(name)
+        allow(node).to receive(:destroy).and_return(true)
+        nodes_by_name[name] = node
+        nodes_by_name
+      end
+      allow(@knife).to receive(:all_nodes).and_return(@inflatedish_list)
+    end
+
+    it "should print the nodes you are about to delete" do
+      @knife.run
+      expect(@stdout.string).to match(/#{@knife.ui.list(@nodes.keys.sort, :columns_down)}/)
+    end
+
+    it "should confirm you really want to delete them" do
+      expect(@knife.ui).to receive(:confirm)
+      @knife.run
+    end
+
+    it "should delete each node" do
+      @inflatedish_list.each_value do |n|
+        expect(n).to receive(:destroy)
+      end
+      @knife.run
+    end
+
+    it "should only delete nodes that match the regex" do
+      @knife.name_args = ["adam"]
+      expect(@inflatedish_list["adam"]).to receive(:destroy)
+      expect(@inflatedish_list["brent"]).not_to receive(:destroy)
+      expect(@inflatedish_list["jacob"]).not_to receive(:destroy)
+      @knife.run
+    end
+
+    it "should exit if the regex is not provided" do
+      @knife.name_args = []
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+
+  end
+end

data/spec/unit/knife/node_delete_spec.rb

@@ -1,77 +1,77 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "knife_spec_helper"
-
-describe Chef::Knife::NodeDelete do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeDelete.new
-    @knife.config = {
-      print_after: nil,
-    }
-    @knife.name_args = %w{ adam ben }
-    allow(@knife).to receive(:output).and_return(true)
-    allow(@knife).to receive(:confirm).and_return(true)
-
-    @adam_node = Chef::Node.new
-    @ben_node = Chef::Node.new
-    allow(@ben_node).to receive(:destroy).and_return(true)
-    allow(@adam_node).to receive(:destroy).and_return(true)
-    allow(Chef::Node).to receive(:load).with("adam").and_return(@adam_node)
-    allow(Chef::Node).to receive(:load).with("ben").and_return(@ben_node)
-
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-  end
-
-  describe "run" do
-    it "should confirm that you want to delete" do
-      expect(@knife).to receive(:confirm)
-      @knife.run
-    end
-
-    it "should load the nodes" do
-      expect(Chef::Node).to receive(:load).with("adam").and_return(@adam_node)
-      expect(Chef::Node).to receive(:load).with("ben").and_return(@ben_node)
-      @knife.run
-    end
-
-    it "should delete the nodes" do
-      expect(@adam_node).to receive(:destroy).and_return(@adam_node)
-      expect(@ben_node).to receive(:destroy).and_return(@ben_node)
-      @knife.run
-    end
-
-    it "should not print the node" do
-      expect(@knife).not_to receive(:output).with("poop")
-      @knife.run
-    end
-
-    describe "with -p or --print-after" do
-      it "should pretty print the node, formatted for display" do
-        @knife.config[:print_after] = true
-        expect(@knife).to receive(:format_for_display).with(@adam_node).and_return("adam")
-        expect(@knife).to receive(:format_for_display).with(@ben_node).and_return("ben")
-        expect(@knife).to receive(:output).with("adam")
-        expect(@knife).to receive(:output).with("ben")
-        @knife.run
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "knife_spec_helper"
+
+describe Chef::Knife::NodeDelete do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeDelete.new
+    @knife.config = {
+      print_after: nil,
+    }
+    @knife.name_args = %w{ adam ben }
+    allow(@knife).to receive(:output).and_return(true)
+    allow(@knife).to receive(:confirm).and_return(true)
+
+    @adam_node = Chef::Node.new
+    @ben_node = Chef::Node.new
+    allow(@ben_node).to receive(:destroy).and_return(true)
+    allow(@adam_node).to receive(:destroy).and_return(true)
+    allow(Chef::Node).to receive(:load).with("adam").and_return(@adam_node)
+    allow(Chef::Node).to receive(:load).with("ben").and_return(@ben_node)
+
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+  end
+
+  describe "run" do
+    it "should confirm that you want to delete" do
+      expect(@knife).to receive(:confirm)
+      @knife.run
+    end
+
+    it "should load the nodes" do
+      expect(Chef::Node).to receive(:load).with("adam").and_return(@adam_node)
+      expect(Chef::Node).to receive(:load).with("ben").and_return(@ben_node)
+      @knife.run
+    end
+
+    it "should delete the nodes" do
+      expect(@adam_node).to receive(:destroy).and_return(@adam_node)
+      expect(@ben_node).to receive(:destroy).and_return(@ben_node)
+      @knife.run
+    end
+
+    it "should not print the node" do
+      expect(@knife).not_to receive(:output).with("poop")
+      @knife.run
+    end
+
+    describe "with -p or --print-after" do
+      it "should pretty print the node, formatted for display" do
+        @knife.config[:print_after] = true
+        expect(@knife).to receive(:format_for_display).with(@adam_node).and_return("adam")
+        expect(@knife).to receive(:format_for_display).with(@ben_node).and_return("ben")
+        expect(@knife).to receive(:output).with("adam")
+        expect(@knife).to receive(:output).with("ben")
+        @knife.run
+      end
+    end
+  end
+end