knife 18.2.7 → 18.3.0

data/spec/unit/knife/node_run_list_remove_spec.rb

@@ -1,106 +1,106 @@
-#
-# 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::NodeRunListRemove do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeRunListRemove.new
-    @knife.config[:print_after] = nil
-    @knife.name_args = [ "adam", "role[monkey]" ]
-    @node = Chef::Node.new
-    @node.name("knifetest-node")
-    @node.run_list << "role[monkey]"
-    allow(@node).to receive(:save).and_return(true)
-
-    allow(@knife.ui).to receive(:output).and_return(true)
-    allow(@knife.ui).to receive(:confirm).and_return(true)
-
-    allow(Chef::Node).to receive(:load).and_return(@node)
-  end
-
-  describe "run" do
-    it "should load the node" do
-      expect(Chef::Node).to receive(:load).with("adam").and_return(@node)
-      @knife.run
-    end
-
-    it "should remove the item from the run list" do
-      @knife.run
-      expect(@node.run_list[0]).not_to eq("role[monkey]")
-    end
-
-    it "should save the node" do
-      expect(@node).to receive(:save).and_return(true)
-      @knife.run
-    end
-
-    it "should print the run list" do
-      @knife.config[:print_after] = true
-      expect(@knife.ui).to receive(:output).with({ "knifetest-node" => { "run_list" => [] } })
-      @knife.run
-    end
-
-    describe "run with a list of roles and recipes" do
-      it "should remove the items from the run list" do
-        @node.run_list << "role[monkey]"
-        @node.run_list << "recipe[duck::type]"
-        @knife.name_args = [ "adam", "role[monkey],recipe[duck::type]" ]
-        @knife.run
-        expect(@node.run_list).not_to include("role[monkey]")
-        expect(@node.run_list).not_to include("recipe[duck::type]")
-      end
-
-      it "should remove the items from the run list when name args contains whitespace" do
-        @node.run_list << "role[monkey]"
-        @node.run_list << "recipe[duck::type]"
-        @knife.name_args = [ "adam", "role[monkey], recipe[duck::type]" ]
-        @knife.run
-        expect(@node.run_list).not_to include("role[monkey]")
-        expect(@node.run_list).not_to include("recipe[duck::type]")
-      end
-
-      it "should remove the items from the run list when name args contains multiple run lists" do
-        @node.run_list << "role[blah]"
-        @node.run_list << "recipe[duck::type]"
-        @knife.name_args = [ "adam", "role[monkey], recipe[duck::type]", "role[blah]" ]
-        @knife.run
-        expect(@node.run_list).not_to include("role[monkey]")
-        expect(@node.run_list).not_to include("recipe[duck::type]")
-      end
-
-      it "should warn when the thing to remove is not in the runlist" do
-        @node.run_list << "role[blah]"
-        @node.run_list << "recipe[duck::type]"
-        @knife.name_args = [ "adam", "role[blork]" ]
-        expect(@knife.ui).to receive(:warn).with("role[blork] is not in the run list")
-        @knife.run
-      end
-
-      it "should warn even more when the thing to remove is not in the runlist and unqualified" do
-        @node.run_list << "role[blah]"
-        @node.run_list << "recipe[duck::type]"
-        @knife.name_args = %w{adam blork}
-        expect(@knife.ui).to receive(:warn).with("blork is not in the run list")
-        expect(@knife.ui).to receive(:warn).with(/did you forget recipe\[\] or role\[\]/)
-        @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::NodeRunListRemove do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeRunListRemove.new
+    @knife.config[:print_after] = nil
+    @knife.name_args = [ "adam", "role[monkey]" ]
+    @node = Chef::Node.new
+    @node.name("knifetest-node")
+    @node.run_list << "role[monkey]"
+    allow(@node).to receive(:save).and_return(true)
+
+    allow(@knife.ui).to receive(:output).and_return(true)
+    allow(@knife.ui).to receive(:confirm).and_return(true)
+
+    allow(Chef::Node).to receive(:load).and_return(@node)
+  end
+
+  describe "run" do
+    it "should load the node" do
+      expect(Chef::Node).to receive(:load).with("adam").and_return(@node)
+      @knife.run
+    end
+
+    it "should remove the item from the run list" do
+      @knife.run
+      expect(@node.run_list[0]).not_to eq("role[monkey]")
+    end
+
+    it "should save the node" do
+      expect(@node).to receive(:save).and_return(true)
+      @knife.run
+    end
+
+    it "should print the run list" do
+      @knife.config[:print_after] = true
+      expect(@knife.ui).to receive(:output).with({ "knifetest-node" => { "run_list" => [] } })
+      @knife.run
+    end
+
+    describe "run with a list of roles and recipes" do
+      it "should remove the items from the run list" do
+        @node.run_list << "role[monkey]"
+        @node.run_list << "recipe[duck::type]"
+        @knife.name_args = [ "adam", "role[monkey],recipe[duck::type]" ]
+        @knife.run
+        expect(@node.run_list).not_to include("role[monkey]")
+        expect(@node.run_list).not_to include("recipe[duck::type]")
+      end
+
+      it "should remove the items from the run list when name args contains whitespace" do
+        @node.run_list << "role[monkey]"
+        @node.run_list << "recipe[duck::type]"
+        @knife.name_args = [ "adam", "role[monkey], recipe[duck::type]" ]
+        @knife.run
+        expect(@node.run_list).not_to include("role[monkey]")
+        expect(@node.run_list).not_to include("recipe[duck::type]")
+      end
+
+      it "should remove the items from the run list when name args contains multiple run lists" do
+        @node.run_list << "role[blah]"
+        @node.run_list << "recipe[duck::type]"
+        @knife.name_args = [ "adam", "role[monkey], recipe[duck::type]", "role[blah]" ]
+        @knife.run
+        expect(@node.run_list).not_to include("role[monkey]")
+        expect(@node.run_list).not_to include("recipe[duck::type]")
+      end
+
+      it "should warn when the thing to remove is not in the runlist" do
+        @node.run_list << "role[blah]"
+        @node.run_list << "recipe[duck::type]"
+        @knife.name_args = [ "adam", "role[blork]" ]
+        expect(@knife.ui).to receive(:warn).with("role[blork] is not in the run list")
+        @knife.run
+      end
+
+      it "should warn even more when the thing to remove is not in the runlist and unqualified" do
+        @node.run_list << "role[blah]"
+        @node.run_list << "recipe[duck::type]"
+        @knife.name_args = %w{adam blork}
+        expect(@knife.ui).to receive(:warn).with("blork is not in the run list")
+        expect(@knife.ui).to receive(:warn).with(/did you forget recipe\[\] or role\[\]/)
+        @knife.run
+      end
+    end
+  end
+end

data/spec/unit/knife/node_run_list_set_spec.rb

@@ -1,115 +1,115 @@
-#
-# Author:: Mike Fiedler (<miketheman@gmail.com>)
-# Copyright:: Copyright 2013-2016, Mike Fiedler
-# 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::NodeRunListSet do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeRunListSet.new
-    @knife.config = {}
-    @knife.name_args = [ "adam", "role[monkey]" ]
-    allow(@knife).to receive(:output).and_return(true)
-    @node = Chef::Node.new
-    allow(@node).to receive(:save).and_return(true)
-    allow(Chef::Node).to receive(:load).and_return(@node)
-  end
-
-  describe "run" do
-    it "should load the node" do
-      expect(Chef::Node).to receive(:load).with("adam")
-      @knife.run
-    end
-
-    it "should set the run list" do
-      @knife.run
-      expect(@node.run_list[0]).to eq("role[monkey]")
-    end
-
-    it "should save the node" do
-      expect(@node).to receive(:save)
-      @knife.run
-    end
-
-    it "should print the run list" do
-      expect(@knife).to receive(:output).and_return(true)
-      @knife.run
-    end
-
-    describe "with more than one role or recipe" do
-      it "should set the run list to all the entries" do
-        @knife.name_args = [ "adam", "role[monkey],role[duck]" ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-        expect(@node.run_list[1]).to eq("role[duck]")
-      end
-    end
-
-    describe "with more than one role or recipe with space between items" do
-      it "should set the run list to all the entries" do
-        @knife.name_args = [ "adam", "role[monkey], role[duck]" ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-        expect(@node.run_list[1]).to eq("role[duck]")
-      end
-    end
-
-    describe "with more than one role or recipe as different arguments" do
-      it "should set the run list to all the entries" do
-        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-        expect(@node.run_list[1]).to eq("role[duck]")
-      end
-    end
-
-    describe "with more than one role or recipe as different arguments and list separated by comas" do
-      it "should add to the run list all the entries" do
-        @knife.name_args = [ "adam", "role[monkey]", "role[duck],recipe[bird::fly]" ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-        expect(@node.run_list[1]).to eq("role[duck]")
-      end
-    end
-
-    describe "with one role or recipe but with an extraneous comma" do
-      it "should add to the run list one item" do
-        @knife.name_args = [ "adam", "role[monkey]," ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-      end
-    end
-
-    describe "with an existing run list" do
-      it "should overwrite any existing run list items" do
-        @node.run_list << "role[acorns]"
-        @node.run_list << "role[zebras]"
-        expect(@node.run_list[0]).to eq("role[acorns]")
-        expect(@node.run_list[1]).to eq("role[zebras]")
-        expect(@node.run_list.run_list_items.size).to eq(2)
-
-        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
-        @knife.run
-        expect(@node.run_list[0]).to eq("role[monkey]")
-        expect(@node.run_list[1]).to eq("role[duck]")
-        expect(@node.run_list.run_list_items.size).to eq(2)
-      end
-    end
-
-  end
-end
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Copyright:: Copyright 2013-2016, Mike Fiedler
+# 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::NodeRunListSet do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeRunListSet.new
+    @knife.config = {}
+    @knife.name_args = [ "adam", "role[monkey]" ]
+    allow(@knife).to receive(:output).and_return(true)
+    @node = Chef::Node.new
+    allow(@node).to receive(:save).and_return(true)
+    allow(Chef::Node).to receive(:load).and_return(@node)
+  end
+
+  describe "run" do
+    it "should load the node" do
+      expect(Chef::Node).to receive(:load).with("adam")
+      @knife.run
+    end
+
+    it "should set the run list" do
+      @knife.run
+      expect(@node.run_list[0]).to eq("role[monkey]")
+    end
+
+    it "should save the node" do
+      expect(@node).to receive(:save)
+      @knife.run
+    end
+
+    it "should print the run list" do
+      expect(@knife).to receive(:output).and_return(true)
+      @knife.run
+    end
+
+    describe "with more than one role or recipe" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey],role[duck]" ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+        expect(@node.run_list[1]).to eq("role[duck]")
+      end
+    end
+
+    describe "with more than one role or recipe with space between items" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey], role[duck]" ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+        expect(@node.run_list[1]).to eq("role[duck]")
+      end
+    end
+
+    describe "with more than one role or recipe as different arguments" do
+      it "should set the run list to all the entries" do
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+        expect(@node.run_list[1]).to eq("role[duck]")
+      end
+    end
+
+    describe "with more than one role or recipe as different arguments and list separated by comas" do
+      it "should add to the run list all the entries" do
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck],recipe[bird::fly]" ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+        expect(@node.run_list[1]).to eq("role[duck]")
+      end
+    end
+
+    describe "with one role or recipe but with an extraneous comma" do
+      it "should add to the run list one item" do
+        @knife.name_args = [ "adam", "role[monkey]," ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+      end
+    end
+
+    describe "with an existing run list" do
+      it "should overwrite any existing run list items" do
+        @node.run_list << "role[acorns]"
+        @node.run_list << "role[zebras]"
+        expect(@node.run_list[0]).to eq("role[acorns]")
+        expect(@node.run_list[1]).to eq("role[zebras]")
+        expect(@node.run_list.run_list_items.size).to eq(2)
+
+        @knife.name_args = [ "adam", "role[monkey]", "role[duck]" ]
+        @knife.run
+        expect(@node.run_list[0]).to eq("role[monkey]")
+        expect(@node.run_list[1]).to eq("role[duck]")
+        expect(@node.run_list.run_list_items.size).to eq(2)
+      end
+    end
+
+  end
+end

data/spec/unit/knife/node_show_spec.rb

@@ -1,65 +1,65 @@
-#
-# 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::NodeShow do
-
-  let(:node) do
-    node = Chef::Node.new
-    node.name("adam")
-    node.run_list = ["role[base]"]
-    node
-  end
-
-  let(:knife) do
-    knife = Chef::Knife::NodeShow.new
-    knife.name_args = [ "adam" ]
-    knife
-  end
-
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-  end
-
-  describe "run" do
-    it "should load the node" do
-      expect(Chef::Node).to receive(:load).with("adam").and_return(node)
-      allow(knife).to receive(:output).and_return(true)
-      knife.run
-    end
-
-    it "should pretty print the node, formatted for display" do
-      knife.config[:format] = nil
-      stdout = StringIO.new
-      allow(knife.ui).to receive(:stdout).and_return(stdout)
-      allow(Chef::Node).to receive(:load).and_return(node)
-      knife.run
-      expect(stdout.string).to eql("Node Name:   adam\nEnvironment: _default\nFQDN:        \nIP:          \nRun List:    \nRoles:       \nRecipes:     \nPlatform:     \nTags:        \n")
-    end
-
-    it "should pretty print json" do
-      knife.config[:format] = "json"
-      stdout = StringIO.new
-      allow(knife.ui).to receive(:stdout).and_return(stdout)
-      expect(Chef::Node).to receive(:load).with("adam").and_return(node)
-      knife.run
-      expect(stdout.string).to eql("{\n  \"name\": \"adam\",\n  \"chef_environment\": \"_default\",\n  \"run_list\": [\n\n]\n,\n  \"normal\": {\n\n  }\n}\n")
-    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::NodeShow do
+
+  let(:node) do
+    node = Chef::Node.new
+    node.name("adam")
+    node.run_list = ["role[base]"]
+    node
+  end
+
+  let(:knife) do
+    knife = Chef::Knife::NodeShow.new
+    knife.name_args = [ "adam" ]
+    knife
+  end
+
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+  end
+
+  describe "run" do
+    it "should load the node" do
+      expect(Chef::Node).to receive(:load).with("adam").and_return(node)
+      allow(knife).to receive(:output).and_return(true)
+      knife.run
+    end
+
+    it "should pretty print the node, formatted for display" do
+      knife.config[:format] = nil
+      stdout = StringIO.new
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      allow(Chef::Node).to receive(:load).and_return(node)
+      knife.run
+      expect(stdout.string).to eql("Node Name:   adam\nEnvironment: _default\nFQDN:        \nIP:          \nRun List:    \nRoles:       \nRecipes:     \nPlatform:     \nTags:        \n")
+    end
+
+    it "should pretty print json" do
+      knife.config[:format] = "json"
+      stdout = StringIO.new
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      expect(Chef::Node).to receive(:load).with("adam").and_return(node)
+      knife.run
+      expect(stdout.string).to eql("{\n  \"name\": \"adam\",\n  \"chef_environment\": \"_default\",\n  \"run_list\": [\n\n]\n,\n  \"normal\": {\n\n  }\n}\n")
+    end
+  end
+end