knife 18.2.7 → 18.3.0

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

@@ -1,81 +1,81 @@
-#
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Author:: Juanje Ojeda (<juanje.ojeda@gmail.com>)
-# 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/core/object_loader"
-
-describe Chef::Knife::Core::ObjectLoader do
-  before(:each) do
-    @knife = Chef::Knife.new
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-    Dir.chdir(File.join(CHEF_SPEC_DATA, "object_loader"))
-  end
-
-  shared_examples_for "Chef object" do |chef_class|
-    it "should create a #{chef_class} object" do
-      expect(@object).to be_a_kind_of(chef_class)
-    end
-
-    it "should has a attribute 'name'" do
-      expect(@object.name).to eql("test")
-    end
-  end
-
-  {
-    "nodes" => Chef::Node,
-    "roles" => Chef::Role,
-    "environments" => Chef::Environment,
-  }.each do |repo_location, chef_class|
-
-    describe "when the file is a #{chef_class}" do
-      before do
-        @loader = Chef::Knife::Core::ObjectLoader.new(chef_class, @knife.ui)
-      end
-
-      describe "when the file is a Ruby" do
-        before do
-          @object = @loader.load_from(repo_location, "test.rb")
-        end
-
-        it_behaves_like "Chef object", chef_class
-      end
-
-      # NOTE: This is check for the bug described at CHEF-2352
-      describe "when the file is a JSON" do
-        describe "and it has defined 'json_class'" do
-          before do
-            @object = @loader.load_from(repo_location, "test_json_class.json")
-          end
-
-          it_behaves_like "Chef object", chef_class
-        end
-
-        describe "and it has not defined 'json_class'" do
-          before do
-            @object = @loader.load_from(repo_location, "test.json")
-          end
-
-          it_behaves_like "Chef object", chef_class
-        end
-      end
-    end
-  end
-
-end
+#
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Author:: Juanje Ojeda (<juanje.ojeda@gmail.com>)
+# 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/core/object_loader"
+
+describe Chef::Knife::Core::ObjectLoader do
+  before(:each) do
+    @knife = Chef::Knife.new
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    Dir.chdir(File.join(CHEF_SPEC_DATA, "object_loader"))
+  end
+
+  shared_examples_for "Chef object" do |chef_class|
+    it "should create a #{chef_class} object" do
+      expect(@object).to be_a_kind_of(chef_class)
+    end
+
+    it "should has a attribute 'name'" do
+      expect(@object.name).to eql("test")
+    end
+  end
+
+  {
+    "nodes" => Chef::Node,
+    "roles" => Chef::Role,
+    "environments" => Chef::Environment,
+  }.each do |repo_location, chef_class|
+
+    describe "when the file is a #{chef_class}" do
+      before do
+        @loader = Chef::Knife::Core::ObjectLoader.new(chef_class, @knife.ui)
+      end
+
+      describe "when the file is a Ruby" do
+        before do
+          @object = @loader.load_from(repo_location, "test.rb")
+        end
+
+        it_behaves_like "Chef object", chef_class
+      end
+
+      # NOTE: This is check for the bug described at CHEF-2352
+      describe "when the file is a JSON" do
+        describe "and it has defined 'json_class'" do
+          before do
+            @object = @loader.load_from(repo_location, "test_json_class.json")
+          end
+
+          it_behaves_like "Chef object", chef_class
+        end
+
+        describe "and it has not defined 'json_class'" do
+          before do
+            @object = @loader.load_from(repo_location, "test.json")
+          end
+
+          it_behaves_like "Chef object", chef_class
+        end
+      end
+    end
+  end
+
+end

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

@@ -1,54 +1,54 @@
-# 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::Core::StatusPresenter do
-  describe "#summarize_json" do
-    let(:presenter) { Chef::Knife::Core::StatusPresenter.new(double(:ui), double(:config, :[] => "")) }
-
-    let(:node) do
-      Chef::Node.new.tap do |n|
-        n.automatic_attrs["name"] = "my_node"
-        n.automatic_attrs["ipaddress"] = "127.0.0.1"
-      end
-    end
-
-    let(:result) { JSON.parse(presenter.summarize_json([node])).first }
-
-    it "uses the first of public_ipv4_addrs when present" do
-      node.automatic_attrs["cloud"] = { "public_ipv4_addrs" => ["2.2.2.2"] }
-
-      expect(result["ip"]).to eq("2.2.2.2")
-    end
-
-    it "falls back to ipaddress when public_ipv4_addrs is empty" do
-      node.automatic_attrs["cloud"] = { "public_ipv4_addrs" => [] }
-
-      expect(result["ip"]).to eq("127.0.0.1")
-    end
-
-    it "falls back to ipaddress when cloud attributes are empty" do
-      node.automatic_attrs["cloud"] = {}
-
-      expect(result["ip"]).to eq("127.0.0.1")
-    end
-
-    it "falls back to ipaddress when cloud attributes is not present" do
-      expect(result["ip"]).to eq("127.0.0.1")
-    end
-  end
-end
+# 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::Core::StatusPresenter do
+  describe "#summarize_json" do
+    let(:presenter) { Chef::Knife::Core::StatusPresenter.new(double(:ui), double(:config, :[] => "")) }
+
+    let(:node) do
+      Chef::Node.new.tap do |n|
+        n.automatic_attrs["name"] = "my_node"
+        n.automatic_attrs["ipaddress"] = "127.0.0.1"
+      end
+    end
+
+    let(:result) { JSON.parse(presenter.summarize_json([node])).first }
+
+    it "uses the first of public_ipv4_addrs when present" do
+      node.automatic_attrs["cloud"] = { "public_ipv4_addrs" => ["2.2.2.2"] }
+
+      expect(result["ip"]).to eq("2.2.2.2")
+    end
+
+    it "falls back to ipaddress when public_ipv4_addrs is empty" do
+      node.automatic_attrs["cloud"] = { "public_ipv4_addrs" => [] }
+
+      expect(result["ip"]).to eq("127.0.0.1")
+    end
+
+    it "falls back to ipaddress when cloud attributes are empty" do
+      node.automatic_attrs["cloud"] = {}
+
+      expect(result["ip"]).to eq("127.0.0.1")
+    end
+
+    it "falls back to ipaddress when cloud attributes is not present" do
+      expect(result["ip"]).to eq("127.0.0.1")
+    end
+  end
+end

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

@@ -1,64 +1,64 @@
-#
-# 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::SubcommandLoader do
-  let(:loader) { Chef::Knife::SubcommandLoader.new(File.join(CHEF_SPEC_DATA, "knife-site-subcommands")) }
-  let(:home) { File.join(CHEF_SPEC_DATA, "knife-home") }
-  let(:plugin_dir) { File.join(home, ".chef", "plugins", "knife") }
-
-  before do
-    allow(ChefUtils).to receive(:windows?) { false }
-    Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
-  end
-
-  after do
-    Chef::Util::PathHelper.class_variable_set(:@@home_dir, nil)
-  end
-
-  let(:config_dir) { File.join(CHEF_SPEC_DATA, "knife-site-subcommands") }
-
-  describe "#for_config" do
-    context "when ~/.chef/plugin_manifest.json exists" do
-      before do
-        allow(File).to receive(:exist?).with(File.join(home, ".chef", "plugin_manifest.json")).and_return(true)
-      end
-
-      it "creates a HashedCommandLoader with the manifest has _autogenerated_command_paths" do
-        allow(File).to receive(:read).with(File.join(home, ".chef", "plugin_manifest.json")).and_return("{ \"_autogenerated_command_paths\": {}}")
-        expect(Chef::Knife::SubcommandLoader.for_config(config_dir)).to be_a Chef::Knife::SubcommandLoader::HashedCommandLoader
-      end
-    end
-
-    context "when ~/.chef/plugin_manifest.json does not exist" do
-      before do
-        allow(File).to receive(:exist?).with(File.join(home, ".chef", "plugin_manifest.json")).and_return(false)
-      end
-
-      it "creates a GemGlobLoader" do
-        expect(Chef::Knife::SubcommandLoader.for_config(config_dir)).to be_a Chef::Knife::SubcommandLoader::GemGlobLoader
-      end
-    end
-  end
-
-  describe "#gem_glob_loader" do
-    it "always creates a GemGlobLoader" do
-      expect(Chef::Knife::SubcommandLoader.gem_glob_loader(config_dir)).to be_a Chef::Knife::SubcommandLoader::GemGlobLoader
-    end
-  end
-end
+#
+# 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::SubcommandLoader do
+  let(:loader) { Chef::Knife::SubcommandLoader.new(File.join(CHEF_SPEC_DATA, "knife-site-subcommands")) }
+  let(:home) { File.join(CHEF_SPEC_DATA, "knife-home") }
+  let(:plugin_dir) { File.join(home, ".chef", "plugins", "knife") }
+
+  before do
+    allow(ChefUtils).to receive(:windows?) { false }
+    Chef::Util::PathHelper.class_variable_set(:@@home_dir, home)
+  end
+
+  after do
+    Chef::Util::PathHelper.class_variable_set(:@@home_dir, nil)
+  end
+
+  let(:config_dir) { File.join(CHEF_SPEC_DATA, "knife-site-subcommands") }
+
+  describe "#for_config" do
+    context "when ~/.chef/plugin_manifest.json exists" do
+      before do
+        allow(File).to receive(:exist?).with(File.join(home, ".chef", "plugin_manifest.json")).and_return(true)
+      end
+
+      it "creates a HashedCommandLoader with the manifest has _autogenerated_command_paths" do
+        allow(File).to receive(:read).with(File.join(home, ".chef", "plugin_manifest.json")).and_return("{ \"_autogenerated_command_paths\": {}}")
+        expect(Chef::Knife::SubcommandLoader.for_config(config_dir)).to be_a Chef::Knife::SubcommandLoader::HashedCommandLoader
+      end
+    end
+
+    context "when ~/.chef/plugin_manifest.json does not exist" do
+      before do
+        allow(File).to receive(:exist?).with(File.join(home, ".chef", "plugin_manifest.json")).and_return(false)
+      end
+
+      it "creates a GemGlobLoader" do
+        expect(Chef::Knife::SubcommandLoader.for_config(config_dir)).to be_a Chef::Knife::SubcommandLoader::GemGlobLoader
+      end
+    end
+  end
+
+  describe "#gem_glob_loader" do
+    it "always creates a GemGlobLoader" do
+      expect(Chef::Knife::SubcommandLoader.gem_glob_loader(config_dir)).to be_a Chef::Knife::SubcommandLoader::GemGlobLoader
+    end
+  end
+end