knife 18.2.7 → 18.3.0

data/spec/unit/knife/supermarket_install_spec.rb

@@ -1,203 +1,203 @@
-#
-# Author:: Steven Danna (<steve@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/supermarket_install"
-require "mixlib/archive"
-
-describe Chef::Knife::SupermarketInstall do
-  let(:knife) { Chef::Knife::SupermarketInstall.new }
-  let(:stdout) { StringIO.new }
-  let(:stderr) { StringIO.new }
-  let(:downloader) { {} }
-  let(:archive) { double(Mixlib::Archive, extract: true) }
-  let(:repo) do
-    double(sanity_check: true, reset_to_default_state: true,
-           prepare_to_import: true, finalize_updates_to: true,
-           merge_updates_from: true)
-  end
-  let(:install_path) do
-    if ChefUtils.windows?
-      "C:/tmp/chef"
-    else
-      "/var/tmp/chef"
-    end
-  end
-
-  before(:each) do
-    require "chef/knife/core/cookbook_scm_repo"
-
-    allow(knife.ui).to receive(:stdout).and_return(stdout)
-    knife.config = {}
-    knife.config[:cookbook_path] = [ install_path ]
-
-    allow(knife).to receive(:stderr).and_return(stderr)
-    allow(knife).to receive(:stdout).and_return(stdout)
-
-    # Assume all external commands would have succeed. :(
-    allow(File).to receive(:unlink)
-    allow(File).to receive(:rmtree)
-    allow(knife).to receive(:shell_out!).and_return(true)
-    allow(Mixlib::Archive).to receive(:new).and_return(archive)
-
-    # SupermarketDownload Setup
-    allow(knife).to receive(:download_cookbook_to).and_return(downloader)
-    allow(downloader).to receive(:version) do
-      if knife.name_args.size == 2
-        knife.name_args[1]
-      else
-        "0.3.0"
-      end
-    end
-
-    # Stubs for CookbookSCMRepo
-    allow(Chef::Knife::CookbookSCMRepo).to receive(:new).and_return(repo)
-  end
-
-  describe "run" do
-    it "raises an error if a cookbook name is not provided" do
-      knife.name_args = []
-      expect(knife.ui).to receive(:error).with("Please specify a cookbook to download and install.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if more than two arguments are given" do
-      knife.name_args = %w{foo bar baz}
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is not a version" do
-      knife.name_args = %w{getting-started 1pass}
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is a four-digit version" do
-      knife.name_args = ["getting-started", "0.0.0.1"]
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "raises an error if the second argument is a one-digit version" do
-      knife.name_args = %w{getting-started 1}
-      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
-      expect { knife.run }.to raise_error(SystemExit)
-    end
-
-    it "installs the specified version if second argument is a three-digit version" do
-      knife.name_args = ["getting-started", "0.1.0"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1.0")
-      knife.run
-    end
-
-    it "installs the specified version if second argument is a two-digit version" do
-      knife.name_args = ["getting-started", "0.1"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1")
-      knife.run
-    end
-
-    it "installs the latest version if only a cookbook name is given" do
-      knife.name_args = ["getting-started"]
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
-      knife.run
-    end
-
-    it "does not create/reset git branches if use_current_branch is set" do
-      knife.name_args = ["getting-started"]
-      knife.config[:use_current_branch] = true
-      knife.config[:no_deps] = true
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(repo).not_to receive(:prepare_to_import)
-      expect(repo).not_to receive(:reset_to_default_state)
-      knife.run
-    end
-
-    it "does not raise an error if cookbook_path is a string" do
-      knife.config[:cookbook_path] = install_path
-      knife.config[:no_deps] = true
-      knife.name_args = ["getting-started"]
-      upstream_file = File.join(install_path, "getting-started.tar.gz")
-      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
-      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
-      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
-      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
-      expect { knife.run }.not_to raise_error
-    end
-  end # end of run
-
-  let(:metadata) { Chef::Cookbook::Metadata.new }
-  let(:rb_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.rb") }
-  let(:json_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.json") }
-
-  describe "preferred_metadata" do
-    before do
-      allow(Chef::Cookbook::Metadata).to receive(:new).and_return(metadata)
-      allow(File).to receive(:exist?).and_return(false)
-      knife.instance_variable_set(:@cookbook_name, "post-punk-kitchen")
-      knife.instance_variable_set(:@install_path, install_path)
-    end
-
-    it "returns a populated Metadata object if metadata.rb exists" do
-      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
-      expect(metadata).to receive(:from_file).with(rb_metadata_path)
-      knife.preferred_metadata
-    end
-
-    it "returns a populated Metadata object if metadata.json exists" do
-      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
-      # expect(IO).to receive(:read).with(json_metadata_path)
-      allow(IO).to receive(:read)
-      expect(metadata).to receive(:from_json)
-      knife.preferred_metadata
-    end
-
-    it "prefers metadata.rb over metadata.json" do
-      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
-      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
-      allow(IO).to receive(:read)
-      expect(metadata).to receive(:from_file).with(rb_metadata_path)
-      expect(metadata).not_to receive(:from_json)
-      knife.preferred_metadata
-    end
-
-    it "rasies an error if it finds no metadata file" do
-      expect { knife.preferred_metadata }.to raise_error { |error|
-        expect(error).to be_a(Chef::Exceptions::MetadataNotFound)
-        expect(error.cookbook_name).to eq("post-punk-kitchen")
-        expect(error.install_path).to eq(install_path)
-      }
-    end
-
-  end
-end
+#
+# Author:: Steven Danna (<steve@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/supermarket_install"
+require "mixlib/archive"
+
+describe Chef::Knife::SupermarketInstall do
+  let(:knife) { Chef::Knife::SupermarketInstall.new }
+  let(:stdout) { StringIO.new }
+  let(:stderr) { StringIO.new }
+  let(:downloader) { {} }
+  let(:archive) { double(Mixlib::Archive, extract: true) }
+  let(:repo) do
+    double(sanity_check: true, reset_to_default_state: true,
+           prepare_to_import: true, finalize_updates_to: true,
+           merge_updates_from: true)
+  end
+  let(:install_path) do
+    if ChefUtils.windows?
+      "C:/tmp/chef"
+    else
+      "/var/tmp/chef"
+    end
+  end
+
+  before(:each) do
+    require "chef/knife/core/cookbook_scm_repo"
+
+    allow(knife.ui).to receive(:stdout).and_return(stdout)
+    knife.config = {}
+    knife.config[:cookbook_path] = [ install_path ]
+
+    allow(knife).to receive(:stderr).and_return(stderr)
+    allow(knife).to receive(:stdout).and_return(stdout)
+
+    # Assume all external commands would have succeed. :(
+    allow(File).to receive(:unlink)
+    allow(File).to receive(:rmtree)
+    allow(knife).to receive(:shell_out!).and_return(true)
+    allow(Mixlib::Archive).to receive(:new).and_return(archive)
+
+    # SupermarketDownload Setup
+    allow(knife).to receive(:download_cookbook_to).and_return(downloader)
+    allow(downloader).to receive(:version) do
+      if knife.name_args.size == 2
+        knife.name_args[1]
+      else
+        "0.3.0"
+      end
+    end
+
+    # Stubs for CookbookSCMRepo
+    allow(Chef::Knife::CookbookSCMRepo).to receive(:new).and_return(repo)
+  end
+
+  describe "run" do
+    it "raises an error if a cookbook name is not provided" do
+      knife.name_args = []
+      expect(knife.ui).to receive(:error).with("Please specify a cookbook to download and install.")
+      expect { knife.run }.to raise_error(SystemExit)
+    end
+
+    it "raises an error if more than two arguments are given" do
+      knife.name_args = %w{foo bar baz}
+      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      expect { knife.run }.to raise_error(SystemExit)
+    end
+
+    it "raises an error if the second argument is not a version" do
+      knife.name_args = %w{getting-started 1pass}
+      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      expect { knife.run }.to raise_error(SystemExit)
+    end
+
+    it "raises an error if the second argument is a four-digit version" do
+      knife.name_args = ["getting-started", "0.0.0.1"]
+      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      expect { knife.run }.to raise_error(SystemExit)
+    end
+
+    it "raises an error if the second argument is a one-digit version" do
+      knife.name_args = %w{getting-started 1}
+      expect(knife.ui).to receive(:error).with("Installing multiple cookbooks at once is not supported.")
+      expect { knife.run }.to raise_error(SystemExit)
+    end
+
+    it "installs the specified version if second argument is a three-digit version" do
+      knife.name_args = ["getting-started", "0.1.0"]
+      knife.config[:no_deps] = true
+      upstream_file = File.join(install_path, "getting-started.tar.gz")
+      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
+      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1.0")
+      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
+      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1.0")
+      knife.run
+    end
+
+    it "installs the specified version if second argument is a two-digit version" do
+      knife.name_args = ["getting-started", "0.1"]
+      knife.config[:no_deps] = true
+      upstream_file = File.join(install_path, "getting-started.tar.gz")
+      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
+      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.1")
+      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
+      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.1")
+      knife.run
+    end
+
+    it "installs the latest version if only a cookbook name is given" do
+      knife.name_args = ["getting-started"]
+      knife.config[:no_deps] = true
+      upstream_file = File.join(install_path, "getting-started.tar.gz")
+      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
+      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
+      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
+      knife.run
+    end
+
+    it "does not create/reset git branches if use_current_branch is set" do
+      knife.name_args = ["getting-started"]
+      knife.config[:use_current_branch] = true
+      knife.config[:no_deps] = true
+      upstream_file = File.join(install_path, "getting-started.tar.gz")
+      expect(repo).not_to receive(:prepare_to_import)
+      expect(repo).not_to receive(:reset_to_default_state)
+      knife.run
+    end
+
+    it "does not raise an error if cookbook_path is a string" do
+      knife.config[:cookbook_path] = install_path
+      knife.config[:no_deps] = true
+      knife.name_args = ["getting-started"]
+      upstream_file = File.join(install_path, "getting-started.tar.gz")
+      expect(knife).to receive(:download_cookbook_to).with(upstream_file)
+      expect(knife).to receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      expect(knife).to receive(:clear_existing_files).with(File.join(install_path, "getting-started"))
+      expect(repo).to receive(:merge_updates_from).with("getting-started", "0.3.0")
+      expect { knife.run }.not_to raise_error
+    end
+  end # end of run
+
+  let(:metadata) { Chef::Cookbook::Metadata.new }
+  let(:rb_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.rb") }
+  let(:json_metadata_path) { File.join(install_path, "post-punk-kitchen", "metadata.json") }
+
+  describe "preferred_metadata" do
+    before do
+      allow(Chef::Cookbook::Metadata).to receive(:new).and_return(metadata)
+      allow(File).to receive(:exist?).and_return(false)
+      knife.instance_variable_set(:@cookbook_name, "post-punk-kitchen")
+      knife.instance_variable_set(:@install_path, install_path)
+    end
+
+    it "returns a populated Metadata object if metadata.rb exists" do
+      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
+      expect(metadata).to receive(:from_file).with(rb_metadata_path)
+      knife.preferred_metadata
+    end
+
+    it "returns a populated Metadata object if metadata.json exists" do
+      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
+      # expect(IO).to receive(:read).with(json_metadata_path)
+      allow(IO).to receive(:read)
+      expect(metadata).to receive(:from_json)
+      knife.preferred_metadata
+    end
+
+    it "prefers metadata.rb over metadata.json" do
+      allow(File).to receive(:exist?).with(rb_metadata_path).and_return(true)
+      allow(File).to receive(:exist?).with(json_metadata_path).and_return(true)
+      allow(IO).to receive(:read)
+      expect(metadata).to receive(:from_file).with(rb_metadata_path)
+      expect(metadata).not_to receive(:from_json)
+      knife.preferred_metadata
+    end
+
+    it "rasies an error if it finds no metadata file" do
+      expect { knife.preferred_metadata }.to raise_error { |error|
+        expect(error).to be_a(Chef::Exceptions::MetadataNotFound)
+        expect(error.cookbook_name).to eq("post-punk-kitchen")
+        expect(error.install_path).to eq(install_path)
+      }
+    end
+
+  end
+end

data/spec/unit/knife/supermarket_list_spec.rb

@@ -1,70 +1,70 @@
-#
-# Author:: Vivek Singh (<vivek.singh@msystechnologies.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 "chef/knife/supermarket_list"
-require "knife_spec_helper"
-
-describe Chef::Knife::SupermarketList do
-  let(:knife) { described_class.new }
-  let(:noauth_rest) { double("no auth rest") }
-  let(:stdout) { StringIO.new }
-  let(:cookbooks_data) {
-    [
-    { "cookbook_name" => "1password", "cookbook_maintainer" => "jtimberman", "cookbook_description" => "Installs 1password", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/1password" },
-    { "cookbook_name" => "301", "cookbook_maintainer" => "markhuge", "cookbook_description" => "Installs/Configures 301", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/301" },
-    { "cookbook_name" => "3cx", "cookbook_maintainer" => "obay", "cookbook_description" => "Installs/Configures 3cx", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/3cx" },
-    { "cookbook_name" => "7dtd", "cookbook_maintainer" => "gregf", "cookbook_description" => "Installs/Configures the 7 Days To Die server", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7dtd" },
-    { "cookbook_name" => "7-zip", "cookbook_maintainer" => "sneal", "cookbook_description" => "Installs/Configures the 7-zip file archiver", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7-zip" },
-  ]
-  }
-
-  let(:response_text) {
-    {
-      "start" => 0,
-      "total" => 5,
-      "items" => cookbooks_data,
-    }
-  }
-
-  describe "run" do
-    before do
-      allow(knife.ui).to receive(:stdout).and_return(stdout)
-      allow(knife).to receive(:noauth_rest).and_return(noauth_rest)
-      expect(noauth_rest).to receive(:get).and_return(response_text)
-      knife.configure_chef
-    end
-
-    it "should display all supermarket cookbooks" do
-      knife.run
-      cookbooks_data.each do |item|
-        expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
-      end
-    end
-
-    describe "with -w or --with-uri" do
-      it "should display the cookbook uris" do
-        knife.config[:with_uri] = true
-        knife.run
-        cookbooks_data.each do |item|
-          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
-          expect(stdout.string).to match(/#{item["cookbook"]}\s/)
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Vivek Singh (<vivek.singh@msystechnologies.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 "chef/knife/supermarket_list"
+require "knife_spec_helper"
+
+describe Chef::Knife::SupermarketList do
+  let(:knife) { described_class.new }
+  let(:noauth_rest) { double("no auth rest") }
+  let(:stdout) { StringIO.new }
+  let(:cookbooks_data) {
+    [
+    { "cookbook_name" => "1password", "cookbook_maintainer" => "jtimberman", "cookbook_description" => "Installs 1password", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/1password" },
+    { "cookbook_name" => "301", "cookbook_maintainer" => "markhuge", "cookbook_description" => "Installs/Configures 301", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/301" },
+    { "cookbook_name" => "3cx", "cookbook_maintainer" => "obay", "cookbook_description" => "Installs/Configures 3cx", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/3cx" },
+    { "cookbook_name" => "7dtd", "cookbook_maintainer" => "gregf", "cookbook_description" => "Installs/Configures the 7 Days To Die server", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7dtd" },
+    { "cookbook_name" => "7-zip", "cookbook_maintainer" => "sneal", "cookbook_description" => "Installs/Configures the 7-zip file archiver", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7-zip" },
+  ]
+  }
+
+  let(:response_text) {
+    {
+      "start" => 0,
+      "total" => 5,
+      "items" => cookbooks_data,
+    }
+  }
+
+  describe "run" do
+    before do
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife).to receive(:noauth_rest).and_return(noauth_rest)
+      expect(noauth_rest).to receive(:get).and_return(response_text)
+      knife.configure_chef
+    end
+
+    it "should display all supermarket cookbooks" do
+      knife.run
+      cookbooks_data.each do |item|
+        expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
+      end
+    end
+
+    describe "with -w or --with-uri" do
+      it "should display the cookbook uris" do
+        knife.config[:with_uri] = true
+        knife.run
+        cookbooks_data.each do |item|
+          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
+          expect(stdout.string).to match(/#{item["cookbook"]}\s/)
+        end
+      end
+    end
+  end
+end