knife 18.2.7 → 18.3.0

data/spec/unit/knife/node_edit_spec.rb

@@ -1,116 +1,116 @@
-#
-# 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"
-Chef::Knife::NodeEdit.load_deps
-
-describe Chef::Knife::NodeEdit do
-
-  # helper to convert the view from Chef objects into Ruby objects representing JSON
-  def deserialized_json_view
-    Chef::JSONCompat.from_json(Chef::JSONCompat.to_json_pretty(@knife.node_editor.send(:view)))
-  end
-
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeEdit.new
-    @knife.config = {
-      editor: "cat",
-      attribute: nil,
-      print_after: nil,
-    }
-    @knife.name_args = [ "adam" ]
-    @node = Chef::Node.new
-  end
-
-  it "should load the node" do
-    expect(Chef::Node).to receive(:load).with("adam").and_return(@node)
-    @knife.node
-  end
-
-  describe "after loading the node" do
-    before 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.chef_environment("prod")
-      @node.run_list("recipe[foo]")
-    end
-
-    it "creates a view of the node without attributes from roles or ohai" do
-      actual = deserialized_json_view
-      expect(actual).not_to have_key("automatic")
-      expect(actual).not_to have_key("override")
-      expect(actual).not_to have_key("default")
-      expect(actual["normal"]).to eq({ "do_show" => "these" })
-      expect(actual["run_list"]).to eq(["recipe[foo]"])
-      expect(actual["chef_environment"]).to eq("prod")
-    end
-
-    it "shows the extra attributes when given the --all option" do
-      @knife.config[:all_attributes] = true
-
-      actual = deserialized_json_view
-      expect(actual["automatic"]).to eq({ "go" => "away" })
-      expect(actual["override"]).to eq({ "dont" => "show" })
-      expect(actual["default"]).to eq({ "hide" => "me" })
-      expect(actual["normal"]).to eq({ "do_show" => "these" })
-      expect(actual["run_list"]).to eq(["recipe[foo]"])
-      expect(actual["chef_environment"]).to eq("prod")
-    end
-
-    it "does not consider unedited data updated" do
-      view = deserialized_json_view
-      @knife.node_editor.send(:apply_updates, view)
-      expect(@knife.node_editor).not_to be_updated
-    end
-
-    it "considers edited data updated" do
-      view = deserialized_json_view
-      view["run_list"] << "role[fuuu]"
-      @knife.node_editor.send(:apply_updates, view)
-      expect(@knife.node_editor).to be_updated
-    end
-
-  end
-
-  describe "edit_node" do
-
-    before do
-      allow(@knife).to receive(:node).and_return(@node)
-    end
-
-    let(:subject) { @knife.node_editor.edit_node }
-
-    it "raises an exception when editing is disabled" do
-      @knife.config[:disable_editing] = true
-      expect { subject }.to raise_error(SystemExit)
-    end
-
-    it "raises an exception when the editor is not set" do
-      @knife.config[:editor] = nil
-      expect { subject }.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"
+Chef::Knife::NodeEdit.load_deps
+
+describe Chef::Knife::NodeEdit do
+
+  # helper to convert the view from Chef objects into Ruby objects representing JSON
+  def deserialized_json_view
+    Chef::JSONCompat.from_json(Chef::JSONCompat.to_json_pretty(@knife.node_editor.send(:view)))
+  end
+
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeEdit.new
+    @knife.config = {
+      editor: "cat",
+      attribute: nil,
+      print_after: nil,
+    }
+    @knife.name_args = [ "adam" ]
+    @node = Chef::Node.new
+  end
+
+  it "should load the node" do
+    expect(Chef::Node).to receive(:load).with("adam").and_return(@node)
+    @knife.node
+  end
+
+  describe "after loading the node" do
+    before 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.chef_environment("prod")
+      @node.run_list("recipe[foo]")
+    end
+
+    it "creates a view of the node without attributes from roles or ohai" do
+      actual = deserialized_json_view
+      expect(actual).not_to have_key("automatic")
+      expect(actual).not_to have_key("override")
+      expect(actual).not_to have_key("default")
+      expect(actual["normal"]).to eq({ "do_show" => "these" })
+      expect(actual["run_list"]).to eq(["recipe[foo]"])
+      expect(actual["chef_environment"]).to eq("prod")
+    end
+
+    it "shows the extra attributes when given the --all option" do
+      @knife.config[:all_attributes] = true
+
+      actual = deserialized_json_view
+      expect(actual["automatic"]).to eq({ "go" => "away" })
+      expect(actual["override"]).to eq({ "dont" => "show" })
+      expect(actual["default"]).to eq({ "hide" => "me" })
+      expect(actual["normal"]).to eq({ "do_show" => "these" })
+      expect(actual["run_list"]).to eq(["recipe[foo]"])
+      expect(actual["chef_environment"]).to eq("prod")
+    end
+
+    it "does not consider unedited data updated" do
+      view = deserialized_json_view
+      @knife.node_editor.send(:apply_updates, view)
+      expect(@knife.node_editor).not_to be_updated
+    end
+
+    it "considers edited data updated" do
+      view = deserialized_json_view
+      view["run_list"] << "role[fuuu]"
+      @knife.node_editor.send(:apply_updates, view)
+      expect(@knife.node_editor).to be_updated
+    end
+
+  end
+
+  describe "edit_node" do
+
+    before do
+      allow(@knife).to receive(:node).and_return(@node)
+    end
+
+    let(:subject) { @knife.node_editor.edit_node }
+
+    it "raises an exception when editing is disabled" do
+      @knife.config[:disable_editing] = true
+      expect { subject }.to raise_error(SystemExit)
+    end
+
+    it "raises an exception when the editor is not set" do
+      @knife.config[:editor] = nil
+      expect { subject }.to raise_error(SystemExit)
+    end
+
+  end
+
+end

data/spec/unit/knife/node_environment_set_spec.rb

@@ -1,61 +1,61 @@
-#
-# Author:: Jimmy McCrory (<jimmy.mccrory@gmail.com>)
-# Copyright:: Copyright 2014-2016, Jimmy McCrory
-# 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::NodeEnvironmentSet do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeEnvironmentSet.new
-    @knife.name_args = %w{adam bar}
-    allow(@knife).to receive(:output).and_return(true)
-    @node = Chef::Node.new
-    @node.name("knifetest-node")
-    @node.chef_environment << "foo"
-    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 update the environment" do
-      @knife.run
-      expect(@node.chef_environment).to eq("bar")
-    end
-
-    it "should save the node" do
-      expect(@node).to receive(:save)
-      @knife.run
-    end
-
-    it "sets the environment to config for display" do
-      @knife.run
-      expect(@knife.config[:environment]).to eq("bar")
-    end
-
-    it "should print the environment" do
-      expect(@knife).to receive(:output).and_return(true)
-      @knife.run
-    end
-
-  end
-end
+#
+# Author:: Jimmy McCrory (<jimmy.mccrory@gmail.com>)
+# Copyright:: Copyright 2014-2016, Jimmy McCrory
+# 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::NodeEnvironmentSet do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeEnvironmentSet.new
+    @knife.name_args = %w{adam bar}
+    allow(@knife).to receive(:output).and_return(true)
+    @node = Chef::Node.new
+    @node.name("knifetest-node")
+    @node.chef_environment << "foo"
+    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 update the environment" do
+      @knife.run
+      expect(@node.chef_environment).to eq("bar")
+    end
+
+    it "should save the node" do
+      expect(@node).to receive(:save)
+      @knife.run
+    end
+
+    it "sets the environment to config for display" do
+      @knife.run
+      expect(@knife.config[:environment]).to eq("bar")
+    end
+
+    it "should print the environment" do
+      expect(@knife).to receive(:output).and_return(true)
+      @knife.run
+    end
+
+  end
+end

data/spec/unit/knife/node_from_file_spec.rb

@@ -1,59 +1,59 @@
-#
-# 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"
-
-Chef::Knife::NodeFromFile.load_deps
-
-describe Chef::Knife::NodeFromFile do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    @knife = Chef::Knife::NodeFromFile.new
-    @knife.config = {
-      print_after: nil,
-    }
-    @knife.name_args = [ "adam.rb" ]
-    allow(@knife).to receive(:output).and_return(true)
-    allow(@knife).to receive(:confirm).and_return(true)
-    @node = Chef::Node.new
-    allow(@node).to receive(:save)
-    allow(@knife.loader).to receive(:load_from).and_return(@node)
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-  end
-
-  describe "run" do
-    it "should load from a file" do
-      expect(@knife.loader).to receive(:load_from).with("nodes", "adam.rb").and_return(@node)
-      @knife.run
-    end
-
-    it "should not print the Node" do
-      expect(@knife).not_to receive(:output)
-      @knife.run
-    end
-
-    describe "with -p or --print-after" do
-      it "should print the Node" do
-        @knife.config[:print_after] = true
-        expect(@knife).to receive(:output)
-        @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"
+
+Chef::Knife::NodeFromFile.load_deps
+
+describe Chef::Knife::NodeFromFile do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    @knife = Chef::Knife::NodeFromFile.new
+    @knife.config = {
+      print_after: nil,
+    }
+    @knife.name_args = [ "adam.rb" ]
+    allow(@knife).to receive(:output).and_return(true)
+    allow(@knife).to receive(:confirm).and_return(true)
+    @node = Chef::Node.new
+    allow(@node).to receive(:save)
+    allow(@knife.loader).to receive(:load_from).and_return(@node)
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+  end
+
+  describe "run" do
+    it "should load from a file" do
+      expect(@knife.loader).to receive(:load_from).with("nodes", "adam.rb").and_return(@node)
+      @knife.run
+    end
+
+    it "should not print the Node" do
+      expect(@knife).not_to receive(:output)
+      @knife.run
+    end
+
+    describe "with -p or --print-after" do
+      it "should print the Node" do
+        @knife.config[:print_after] = true
+        expect(@knife).to receive(:output)
+        @knife.run
+      end
+    end
+  end
+end

data/spec/unit/knife/node_list_spec.rb

@@ -1,62 +1,62 @@
-#
-# 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::NodeList do
-  before(:each) do
-    Chef::Config[:node_name] = "webmonkey.example.com"
-    Chef::Config[:environment] = nil # reset this value each time, as it is not reloaded
-    @knife = Chef::Knife::NodeList.new
-    allow(@knife).to receive(:output).and_return(true)
-    @list = {
-      "foo" => "http://example.com/foo",
-      "bar" => "http://example.com/foo",
-    }
-    allow(Chef::Node).to receive(:list).and_return(@list)
-    allow(Chef::Node).to receive(:list_by_environment).and_return(@list)
-  end
-
-  describe "run" do
-    it "should list all of the nodes if -E is not specified" do
-      expect(Chef::Node).to receive(:list).and_return(@list)
-      @knife.run
-    end
-
-    it "should pretty print the list" do
-      expect(Chef::Node).to receive(:list).and_return(@list)
-      expect(@knife).to receive(:output).with(%w{bar foo})
-      @knife.run
-    end
-
-    it "should list nodes in the specific environment if -E ENVIRONMENT is specified" do
-      Chef::Config[:environment] = "prod"
-      expect(Chef::Node).to receive(:list_by_environment).with("prod").and_return(@list)
-      @knife.run
-    end
-
-    describe "with -w or --with-uri" do
-      it "should pretty print the hash" do
-        @knife.config[:with_uri] = true
-        expect(Chef::Node).to receive(:list).and_return(@list)
-        expect(@knife).to receive(:output).with(@list)
-        @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::NodeList do
+  before(:each) do
+    Chef::Config[:node_name] = "webmonkey.example.com"
+    Chef::Config[:environment] = nil # reset this value each time, as it is not reloaded
+    @knife = Chef::Knife::NodeList.new
+    allow(@knife).to receive(:output).and_return(true)
+    @list = {
+      "foo" => "http://example.com/foo",
+      "bar" => "http://example.com/foo",
+    }
+    allow(Chef::Node).to receive(:list).and_return(@list)
+    allow(Chef::Node).to receive(:list_by_environment).and_return(@list)
+  end
+
+  describe "run" do
+    it "should list all of the nodes if -E is not specified" do
+      expect(Chef::Node).to receive(:list).and_return(@list)
+      @knife.run
+    end
+
+    it "should pretty print the list" do
+      expect(Chef::Node).to receive(:list).and_return(@list)
+      expect(@knife).to receive(:output).with(%w{bar foo})
+      @knife.run
+    end
+
+    it "should list nodes in the specific environment if -E ENVIRONMENT is specified" do
+      Chef::Config[:environment] = "prod"
+      expect(Chef::Node).to receive(:list_by_environment).with("prod").and_return(@list)
+      @knife.run
+    end
+
+    describe "with -w or --with-uri" do
+      it "should pretty print the hash" do
+        @knife.config[:with_uri] = true
+        expect(Chef::Node).to receive(:list).and_return(@list)
+        expect(@knife).to receive(:output).with(@list)
+        @knife.run
+      end
+    end
+  end
+end