chef 15.17.4 → 16.0.257

data/spec/unit/provider/apt_update_spec.rb

@@ -18,23 +18,24 @@
 
 require "spec_helper"
 
-describe Chef::Provider::AptUpdate do
-  let(:new_resource) { Chef::Resource::AptUpdate.new("update") }
+describe "Chef::Provider::AptUpdate" do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:collection) { double("resource collection") }
+  let(:new_resource) { Chef::Resource::AptUpdate.new("update", run_context) }
+  let(:provider) { new_resource.provider_for_action(:update) }
 
   let(:config_dir) { Dir.mktmpdir("apt_update_apt_conf_d") }
   let(:config_file) { File.join(config_dir, "15update-stamp") }
   let(:stamp_dir) { Dir.mktmpdir("apt_update_periodic") }
 
   before do
-    stub_const("Chef::Provider::AptUpdate::APT_CONF_DIR", config_dir)
-    stub_const("Chef::Provider::AptUpdate::STAMP_DIR", stamp_dir)
-  end
-
-  let(:provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
-    Chef::Provider::AptUpdate.new(new_resource, run_context)
+    new_resource.class.send(:remove_const, :APT_CONF_DIR)
+    new_resource.class.send(:const_set, :APT_CONF_DIR, config_dir)
+    new_resource.class.send(:remove_const, :STAMP_DIR)
+    new_resource.class.send(:const_set, :STAMP_DIR, stamp_dir)
+    node.automatic["platform_family"] = "debian"
   end
 
   let(:apt_update_cmd) { %w{apt-get -q update} }

data/spec/unit/provider/cookbook_file_spec.rb

@@ -23,10 +23,10 @@ require "ostruct"
 require "support/shared/unit/provider/file"
 
 describe Chef::Provider::CookbookFile do
-  let(:node) { double("Chef::Node") }
-  let(:events) { double("Chef::Events").as_null_object } # mock all the methods
-  let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/cron_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright 2009-2016, Bryan McLellan
+# Copyright:: Copyright 2009-2020, Bryan McLellan
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -403,7 +403,7 @@ describe Chef::Provider::Cron do
 
     %i{minute hour day month weekday command mailto path shell home}.each do |property|
       it "should return true if #{property} doesn't match" do
-        @new_resource.send(property, "something_else")
+        @new_resource.send(property, "1") # we use 1 in order to pass resource validation. We're just using a value that's different.
         expect(@provider.cron_different?).to eql(true)
       end
     end

data/spec/unit/provider/directory_spec.rb

@@ -201,33 +201,22 @@ describe Chef::Provider::Directory do
       end
     end
 
-    describe "on OS X" do
+    describe "on macOS" do
       before do
-        allow(node).to receive(:[]).with("platform").and_return("mac_os_x")
+        allow(ChefUtils).to receive(:macos?).and_return(true)
         new_resource.path "/usr/bin/chef_test"
         new_resource.recursive false
         allow_any_instance_of(Chef::Provider::File).to receive(:do_selinux)
       end
 
-      it "os x 10.10 can write to sip locations" do
-        allow(node).to receive(:[]).with("platform_version").and_return("10.10")
-        allow(Dir).to receive(:mkdir).and_return([true], [])
-        allow(::File).to receive(:directory?).and_return(true)
-        allow(Chef::FileAccessControl).to receive(:writable?).and_return(true)
-        directory.run_action(:create)
-        expect(new_resource).to be_updated
-      end
-
-      it "os x 10.11 cannot write to sip locations" do
-        allow(node).to receive(:[]).with("platform_version").and_return("10.11")
+      it "macOS cannot write to sip locations" do
         allow(::File).to receive(:directory?).and_return(true)
         allow(Chef::FileAccessControl).to receive(:writable?).and_return(false)
         expect { directory.run_action(:create) }.to raise_error(Chef::Exceptions::InsufficientPermissions)
       end
 
-      it "os x 10.11 can write to sip exlcusions" do
+      it "macOS can write to sip exclusions" do
         new_resource.path "/usr/local/chef_test"
-        allow(node).to receive(:[]).with("platform_version").and_return("10.11")
         allow(::File).to receive(:directory?).and_return(true)
         allow(Dir).to receive(:mkdir).and_return([true], [])
         allow(Chef::FileAccessControl).to receive(:writable?).and_return(false)

data/spec/unit/provider/file_spec.rb

@@ -33,10 +33,10 @@ describe Chef::Provider::File do
     content = double("Chef::Provider::File::Content")
   end
 
-  let(:node) { double("Chef::Node") }
-  let(:events) { double("Chef::Events").as_null_object } # mock all the methods
-  let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/git_spec.rb

@@ -400,7 +400,8 @@ describe Chef::Provider::Git do
     @provider.clone
   end
 
-  it "runs a checkout command with default options" do
+  it "runs a checkout command when the local branch is set" do
+    @resource.checkout_branch "deploy"
     expect(@provider).to receive(:shell_out!).with("git branch -f deploy d35af14d41ae22b19da05d7d03a0bafc321b244c", cwd: "/my/deploy/dir",
                                                                                                                     log_tag: "git[web2.0 app]").ordered
     expect(@provider).to receive(:shell_out!).with("git checkout deploy", cwd: "/my/deploy/dir",
@@ -590,6 +591,45 @@ describe Chef::Provider::Git do
     end
   end
 
+  context "with why-run mode" do
+    before do
+      Chef::Config[:why_run] = true
+      @resource.user "test"
+    end
+
+    after do
+      Chef::Config[:why_run] = false
+    end
+
+    it "does not raise an error if user does not exist" do
+      allow(@provider).to receive(:get_homedir).with(@resource.user).and_return(nil)
+      expect { @provider.run_action(:sync) }.not_to raise_error
+    end
+
+    it "does not raise an error if user exists" do
+      allow(@provider).to receive(:get_homedir).with(@resource.user).and_return("/home/test")
+      expect { @provider.run_action(:sync) }.not_to raise_error
+    end
+  end
+
+  context "without why-run mode" do
+    before do
+      @resource.user "test"
+    end
+
+    it "raises an error if user does not exist" do
+      allow(@provider).to receive(:get_homedir).with(@resource.user).and_return(nil)
+      expect { @provider.run_action(:sync) }.to raise_error(Chef::Exceptions::User)
+    end
+
+    it "does not raise an error if user exists" do
+      allow(@provider).to receive(:action_sync) # stub the entire action
+      allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
+      allow(@provider).to receive(:get_homedir).with(@resource.user).and_return("/home/test")
+      expect { @provider.run_action(:sync) }.not_to raise_error
+    end
+  end
+
   it "raises an error if the git clone command would fail because the enclosing directory doesn't exist" do
     allow(@provider).to receive(:shell_out!)
     expect { @provider.run_action(:sync) }.to raise_error(Chef::Exceptions::MissingParentDirectory)
@@ -638,7 +678,7 @@ describe Chef::Provider::Git do
     expect(@provider).to receive(:enable_submodules)
     expect(@provider).to receive(:add_remotes)
     @provider.run_action(:checkout)
-    # @resource.should be_updated
+   # @resource.should be_updated
   end
 
   it "should not checkout if the destination exists or is a non empty directory" do
@@ -676,7 +716,7 @@ describe Chef::Provider::Git do
     expect(@provider).to receive(:enable_submodules)
     expect(@provider).to receive(:add_remotes)
     @provider.run_action(:sync)
-    # @resource.should be_updated
+   # @resource.should be_updated
   end
 
   it "does not fetch any updates if the remote revision matches the current revision" do
@@ -696,7 +736,7 @@ describe Chef::Provider::Git do
     expect(@provider).to receive(:action_checkout)
     expect(@provider).not_to receive(:shell_out!)
     @provider.run_action(:sync)
-    # @resource.should be_updated
+   # @resource.should be_updated
   end
 
   it "clones the repo instead of fetching updates if the deploy directory is empty" do

data/spec/unit/provider/link_spec.rb

@@ -358,7 +358,6 @@ describe Chef::Resource::Link do
         allow(Chef::Resource::Link).to receive(:new).with(
           provider.new_resource.name
         ).and_return(resource_link)
-        allow(resource_link).to receive(:verify_links_supported!)
         allow(ChefUtils).to receive(:windows?).and_return(true)
       end
 

data/spec/unit/provider/log_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe Chef::Provider::Log::ChefLog do
+describe Chef::Resource::Log do
 
   let(:log_str) { "this is my test string to log" }
 
@@ -28,9 +28,9 @@ describe Chef::Provider::Log::ChefLog do
 
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
 
-  let(:new_resource) { Chef::Resource::Log.new(log_str) }
+  let(:new_resource) { Chef::Resource::Log.new(log_str, run_context) }
 
-  let(:provider) { Chef::Provider::Log::ChefLog.new(new_resource, run_context) }
+  let(:provider) { new_resource.provider_for_action(:run) }
 
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
   before do

data/spec/unit/provider/mdadm_spec.rb

@@ -19,15 +19,15 @@
 require "spec_helper"
 require "ostruct"
 
-describe Chef::Provider::Mdadm do
+describe Chef::Resource::Mdadm do
 
   before(:each) do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Mdadm.new("/dev/md1")
+    @new_resource = Chef::Resource::Mdadm.new("/dev/md1", run_context)
     @new_resource.devices ["/dev/sdz1", "/dev/sdz2", "/dev/sdz3"]
-    @provider = Chef::Provider::Mdadm.new(@new_resource, @run_context)
+    @provider = @new_resource.provider_for_action(:create)
   end
 
   describe "when determining the current metadevice status" do

data/spec/unit/provider/osx_profile_spec.rb

@@ -61,8 +61,8 @@ describe Chef::Provider::OsxProfile do
           "ProfileVersion" => 1 }],
       }
     end
-    # If anything is changed within this profile, be sure to update the
-    # ProfileUUID in all_profiles to match the new config specific UUID
+      # If anything is changed within this profile, be sure to update the
+      # ProfileUUID in all_profiles to match the new config specific UUID
     let(:test_profile) do
       {
         "PayloadIdentifier" => "com.testprofile.screensaver",

data/spec/unit/provider/package/dnf/python_helper_spec.rb

@@ -22,8 +22,8 @@ require "spec_helper"
 describe Chef::Provider::Package::Dnf::PythonHelper do
   let(:helper) { Chef::Provider::Package::Dnf::PythonHelper.instance }
 
-  it "propagates stacktraces on stderr from the forked subprocess", :rhel do
+  it "propagates stacktraces on stderr from the forked subprocess" do
     allow(helper).to receive(:dnf_command).and_return("ruby -e 'raise \"your hands in the air\"'")
-    expect { helper.query(:whatprovides, "tcpdump") }.to raise_error(/your hands in the air/)
+    expect { helper.package_query(:whatprovides, "tcpdump") }.to raise_error(/your hands in the air/)
   end
 end

data/spec/unit/provider/package/freebsd/pkgng_spec.rb

@@ -66,7 +66,7 @@ describe Chef::Provider::Package::Freebsd::Port do
     end
 
     it "should query pkg database" do
-      expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "zsh", env: nil, returns: [0, 1, 70], timeout: 900).and_return(@pkg_info)
+      expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "zsh", env: nil, returns: [0, 70], timeout: 900).and_return(@pkg_info)
       expect(@provider.current_installed_version).to eq("3.1.7")
     end
   end

data/spec/unit/provider/package/homebrew_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Joshua Timberman (<joshua@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.
@@ -19,171 +20,289 @@ require "spec_helper"
 
 describe Chef::Provider::Package::Homebrew do
   let(:node) { Chef::Node.new }
-  let(:events) { double("Chef::Events").as_null_object }
-  let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
-  let(:new_resource) { Chef::Resource::HomebrewPackage.new("emacs") }
-  let(:current_resource) { Chef::Resource::HomebrewPackage.new("emacs") }
-
+  let(:new_resource) { Chef::Resource::HomebrewPackage.new(%w{emacs vim}) }
+  let(:current_resource) { Chef::Resource::HomebrewPackage.new("emacs, vim") }
   let(:provider) do
+    node = Chef::Node.new
+    events = Chef::EventDispatch::Dispatcher.new
+    run_context = Chef::RunContext.new(node, {}, events)
     Chef::Provider::Package::Homebrew.new(new_resource, run_context)
   end
 
   let(:homebrew_uid) { 1001 }
 
-  let(:uninstalled_brew_info) do
-    {
-      "name" => "emacs",
-      "homepage" => "http://www.gnu.org/software/emacs",
-      "versions" => {
-        "stable" => "24.3",
-        "bottle" => false,
-        "devel" => nil,
-        "head" => nil,
-      },
-      "revision" => 0,
-      "installed" => [],
-      "linked_keg" => nil,
-      "keg_only" => nil,
-      "dependencies" => [],
-      "conflicts_with" => [],
-      "caveats" => nil,
-      "options" => [],
-    }
-  end
-
-  let(:installed_brew_info) do
-    {
-      "name" => "emacs",
-      "homepage" => "http://www.gnu.org/software/emacs/",
-      "versions" => {
-        "stable" => "24.3",
-        "bottle" => false,
-        "devel" => nil,
-        "head" => "HEAD",
-      },
-      "revision" => 0,
-      "installed" => [{ "version" => "24.3" }],
-      "linked_keg" => "24.3",
-      "keg_only" => nil,
-      "dependencies" => [],
-      "conflicts_with" => [],
-      "caveats" => "",
-      "options" => [],
-    }
-  end
-
-  let(:keg_only_brew_info) do
-    {
-      "name" => "emacs-kegger",
-      "homepage" => "http://www.gnu.org/software/emacs/",
-      "versions" => {
-        "stable" => "24.3-keggy",
-        "bottle" => false,
-        "devel" => nil,
-        "head" => "HEAD",
-      },
-      "revision" => 0,
-      "installed" => [{ "version" => "24.3-keggy" }],
-      "linked_keg" => nil,
-      "keg_only" => true,
-      "dependencies" => [],
-      "conflicts_with" => [],
-      "caveats" => "",
-      "options" => [],
-    }
-  end
-
-  let(:keg_only_uninstalled_brew_info) do
-    {
-      "name" => "emacs-kegger",
-      "homepage" => "http://www.gnu.org/software/emacs/",
-      "versions" => {
-        "stable" => "24.3-keggy",
-        "bottle" => false,
-        "devel" => nil,
-        "head" => "HEAD",
-      },
-      "revision" => 0,
-      "installed" => [],
-      "linked_keg" => nil,
-      "keg_only" => true,
-      "dependencies" => [],
-      "conflicts_with" => [],
-      "caveats" => "",
-      "options" => [],
-    }
+  let(:brew_cmd_output_data) { '[{"name":"emacs","full_name":"emacs","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"GNU Emacs text editor","homepage":"https://www.gnu.org/software/emacs/","versions":{"stable":"26.3","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.catalina.bottle.tar.gz","sha256":"9ab33f4386ca5f7326a8c28da1324556ec990f682a7ca88641203da0b42dbdae"},"mojave":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.mojave.bottle.tar.gz","sha256":"8162a26246de7db44c53ea0d0ef0a806140318d19c69e8e5e33aa88ce7e823a8"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.high_sierra.bottle.tar.gz","sha256":"6a2629b6deddf99f81abb1990ecd6c87f0242a0eecbb6b6c2e4c3540e421d4c4"},"sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.sierra.bottle.tar.gz","sha256":"2a47477e71766d7dd6b16c29ad5ba71817ed80d06212e3261ef3c776e7e9f5a2"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":["pkg-config"],"dependencies":["gnutls"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["libxml2","ncurses"],"requirements":[],"conflicts_with":[],"caveats":null,"installed":[],"linked_keg":null,"pinned":false,"outdated":false},{"name":"vim","full_name":"vim","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"Vi \'workalike\' with many additional features","homepage":"https://www.vim.org/","versions":{"stable":"8.2.0550","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://github.com/vim/vim/archive/v8.2.0550.tar.gz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.catalina.bottle.tar.gz","sha256":"8f9252500775aa85d8f826af30ca9e1118a56145fc2f961c37abed48bf78cf6b"},"mojave":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.mojave.bottle.tar.gz","sha256":"7566c83b770f3e8c4d4b462a39e5eb26609b37a8f8db6690a2560a3e22ded6b6"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.high_sierra.bottle.tar.gz","sha256":"a76e517fc69bf67b6903cb82295bc085c5eb4b46b4659f034c694dd97d2ee2d9"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":[],"dependencies":["gettext","lua","perl","python","ruby"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["ncurses"],"requirements":[],"conflicts_with":["ex-vi","macvim"],"caveats":null,"installed":[{"version":"8.2.0550","used_options":[],"built_as_bottle":true,"poured_from_bottle":true,"runtime_dependencies":[{"full_name":"gettext","version":"0.20.1"},{"full_name":"lua","version":"5.3.5"},{"full_name":"perl","version":"5.30.2"},{"full_name":"gdbm","version":"1.18.1"},{"full_name":"openssl@1.1","version":"1.1.1f"},{"full_name":"readline","version":"8.0.4"},{"full_name":"sqlite","version":"3.31.1"},{"full_name":"xz","version":"5.2.5"},{"full_name":"python","version":"3.7.7"},{"full_name":"libyaml","version":"0.2.2"},{"full_name":"ruby","version":"2.7.1"}],"installed_as_dependency":false,"installed_on_request":true}],"linked_keg":"8.2.0550","pinned":false,"outdated":false}]' }
+
+  let(:brew_info_data) do
+    { "openssl@1.1" =>
+      { "name" => "openssl@1.1",
+       "full_name" => "openssl@1.1",
+       "oldname" => nil,
+       "aliases" => ["openssl"],
+       "versioned_formulae" => [],
+       "desc" => "Cryptography and SSL/TLS Toolkit",
+       "homepage" => "https://openssl.org/",
+       "versions" => { "stable" => "1.1.1f", "devel" => nil, "head" => nil, "bottle" => true },
+       "urls" => { "stable" => { "url" => "https://www.openssl.org/source/openssl-1.1.1f.tar.gz", "tag" => nil, "revision" => nil } },
+       "revision" => 0,
+       "version_scheme" => 1,
+       "bottle" =>
+        { "stable" =>
+          { "rebuild" => 0,
+           "cellar" => "/usr/local/Cellar",
+           "prefix" => "/usr/local",
+           "root_url" => "https://homebrew.bintray.com/bottles",
+           "files" =>
+            { "catalina" => { "url" => "https://homebrew.bintray.com/bottles/openssl@1.1-1.1.1f.catalina.bottle.tar.gz", "sha256" => "724cd97c269952cdc28e24798e350fcf520a32c5985aeb26053ce006a09d8179" },
+             "mojave" => { "url" => "https://homebrew.bintray.com/bottles/openssl@1.1-1.1.1f.mojave.bottle.tar.gz", "sha256" => "25ab844d2f14fc85c7f52958b4b89bdd2965bbd9c557445829eff6473f238744" },
+             "high_sierra" => { "url" => "https://homebrew.bintray.com/bottles/openssl@1.1-1.1.1f.high_sierra.bottle.tar.gz", "sha256" => "27f26e2442222ac0565193fe0b86d8719559d776bcdd070d6113c16bb13accf6" } } } },
+       "keg_only" => true,
+       "bottle_disabled" => false,
+       "options" => [],
+       "build_dependencies" => [],
+       "dependencies" => [],
+       "recommended_dependencies" => [],
+       "optional_dependencies" => [],
+       "uses_from_macos" => [],
+       "requirements" => [],
+       "conflicts_with" => [],
+       "caveats" =>
+        "A CA file has been bootstrapped using certificates from the system\nkeychain. To add additional certificates, place .pem files in\n  $(brew --prefix)/etc/openssl@1.1/certs\n\nand run\n  $(brew --prefix)/opt/openssl@1.1/bin/c_rehash\n",
+       "installed" => [{ "version" => "1.1.1a", "used_options" => [], "built_as_bottle" => true, "poured_from_bottle" => true, "runtime_dependencies" => [], "installed_as_dependency" => true, "installed_on_request" => false }],
+       "linked_keg" => nil,
+       "pinned" => false,
+       "outdated" => false },
+     "kubernetes-cli" =>
+      { "name" => "kubernetes-cli",
+       "full_name" => "kubernetes-cli",
+       "oldname" => nil,
+       "aliases" => ["kubectl"],
+       "versioned_formulae" => [],
+       "desc" => "Kubernetes command-line interface",
+       "homepage" => "https://kubernetes.io/",
+       "versions" => { "stable" => "1.18.1", "devel" => nil, "head" => "HEAD", "bottle" => true },
+      "urls" => { "stable" => { "url" => "https://github.com/kubernetes/kubernetes.git", "tag" => "v1.18.1", "revision" => "7879fc12a63337efff607952a323df90cdc7a335" } },
+       "revision" => 0,
+       "version_scheme" => 0,
+       "bottle" =>
+        { "stable" =>
+          { "rebuild" => 0,
+           "cellar" => ":any_skip_relocation",
+           "prefix" => "/usr/local",
+           "root_url" => "https://homebrew.bintray.com/bottles",
+           "files" =>
+            { "catalina" => { "url" => "https://homebrew.bintray.com/bottles/kubernetes-cli-1.18.1.catalina.bottle.tar.gz", "sha256" => "0b3d688ee458b70b914a37a4ba867e202c6e71190d0c40a27f84628aec744749" },
+             "mojave" => { "url" => "https://homebrew.bintray.com/bottles/kubernetes-cli-1.18.1.mojave.bottle.tar.gz", "sha256" => "21fddfc86ec6d3e4f7ea787310b0fafd845d368de37524569bbe45938b18ba09" },
+             "high_sierra" => { "url" => "https://homebrew.bintray.com/bottles/kubernetes-cli-1.18.1.high_sierra.bottle.tar.gz", "sha256" => "1e20dcd177fd16b862b2432950984807b048cca5879c27bec59e85590f40eece" } } } },
+       "keg_only" => false,
+       "bottle_disabled" => false,
+       "options" => [],
+       "build_dependencies" => ["go"],
+       "dependencies" => [],
+       "recommended_dependencies" => [],
+       "optional_dependencies" => [],
+       "uses_from_macos" => [],
+       "requirements" => [],
+       "conflicts_with" => [],
+       "caveats" => nil,
+       "installed" => [],
+       "linked_keg" => nil,
+       "pinned" => false,
+       "outdated" => false },
+     "vim" =>
+      { "name" => "vim",
+       "full_name" => "vim",
+       "oldname" => nil,
+       "aliases" => [],
+       "versioned_formulae" => [],
+       "desc" => "Vi 'workalike' with many additional features",
+       "homepage" => "https://www.vim.org/",
+       "versions" => { "stable" => "8.2.0550", "devel" => nil, "head" => "HEAD", "bottle" => true },
+       "urls" => { "stable" => { "url" => "https://github.com/vim/vim/archive/v8.2.0550.tar.gz", "tag" => nil, "revision" => nil } },
+       "revision" => 0,
+       "version_scheme" => 0,
+       "bottle" =>
+        { "stable" =>
+          { "rebuild" => 0,
+           "cellar" => "/usr/local/Cellar",
+           "prefix" => "/usr/local",
+           "root_url" => "https://homebrew.bintray.com/bottles",
+           "files" =>
+            { "catalina" => { "url" => "https://homebrew.bintray.com/bottles/vim-8.2.0550.catalina.bottle.tar.gz", "sha256" => "8f9252500775aa85d8f826af30ca9e1118a56145fc2f961c37abed48bf78cf6b" },
+                    "mojave" => { "url" => "https://homebrew.bintray.com/bottles/vim-8.2.0550.mojave.bottle.tar.gz", "sha256" => "7566c83b770f3e8c4d4b462a39e5eb26609b37a8f8db6690a2560a3e22ded6b6" },
+             "high_sierra" => { "url" => "https://homebrew.bintray.com/bottles/vim-8.2.0550.high_sierra.bottle.tar.gz", "sha256" => "a76e517fc69bf67b6903cb82295bc085c5eb4b46b4659f034c694dd97d2ee2d9" } } } },
+       "keg_only" => false,
+       "bottle_disabled" => false,
+       "options" => [],
+       "build_dependencies" => [],
+       "dependencies" => %w{gettext lua perl python ruby},
+       "recommended_dependencies" => [],
+       "optional_dependencies" => [],
+       "uses_from_macos" => ["ncurses"],
+       "requirements" => [],
+       "conflicts_with" => %w{ex-vi macvim},
+       "caveats" => nil,
+       "installed" =>
+        [{ "version" => "8.2.0550",
+          "used_options" => [],
+          "built_as_bottle" => true,
+          "poured_from_bottle" => true,
+          "runtime_dependencies" =>
+           [{ "full_name" => "gettext", "version" => "0.20.1" },
+            { "full_name" => "lua", "version" => "5.3.5" },
+            { "full_name" => "perl", "version" => "5.30.2" },
+            { "full_name" => "gdbm", "version" => "1.18.1" },
+            { "full_name" => "openssl@1.1", "version" => "1.1.1f" },
+            { "full_name" => "readline", "version" => "8.0.4" },
+            { "full_name" => "sqlite", "version" => "3.31.1" },
+            { "full_name" => "xz", "version" => "5.2.5" },
+            { "full_name" => "python", "version" => "3.7.7" },
+            { "full_name" => "libyaml", "version" => "0.2.2" },
+            { "full_name" => "ruby", "version" => "2.7.1" }],
+          "installed_as_dependency" => false,
+          "installed_on_request" => true }],
+       "linked_keg" => "8.2.0550",
+       "pinned" => false,
+       "outdated" => false },
+     "curl" =>
+      { "name" => "curl",
+       "full_name" => "curl",
+       "oldname" => nil,
+       "aliases" => [],
+       "versioned_formulae" => [],
+       "desc" => "Get a file from an HTTP, HTTPS or FTP server",
+       "homepage" => "https://curl.haxx.se/",
+       "versions" => { "stable" => "7.69.1", "devel" => nil, "head" => "HEAD", "bottle" => true },
+       "urls" => { "stable" => { "url" => "https://curl.haxx.se/download/curl-7.69.1.tar.bz2", "tag" => nil, "revision" => nil } },
+       "revision" => 0,
+       "version_scheme" => 0,
+       "bottle" =>
+         { "stable" =>
+          { "rebuild" => 0,
+           "cellar" => ":any",
+           "prefix" => "/usr/local",
+           "root_url" => "https://homebrew.bintray.com/bottles",
+           "files" =>
+            { "catalina" => { "url" => "https://homebrew.bintray.com/bottles/curl-7.69.1.catalina.bottle.tar.gz", "sha256" => "400500fede02f9335bd38c16786b2bbf5e601e358dfac8c21e363d2a8fdd8fac" },
+             "mojave" => { "url" => "https://homebrew.bintray.com/bottles/curl-7.69.1.mojave.bottle.tar.gz", "sha256" => "f082c275f9af1e8e93be12b63a1aff659ba6efa48c8528a97e26c9858a6f95b6" },
+             "high_sierra" => { "url" => "https://homebrew.bintray.com/bottles/curl-7.69.1.high_sierra.bottle.tar.gz", "sha256" => "ad023093c252799a4c60646a149bfe14ffa6984817cf463a6f0e98f6551057fe" } } } },
+       "keg_only" => true,
+       "bottle_disabled" => false,
+       "options" => [],
+       "build_dependencies" => ["pkg-config"],
+       "dependencies" => [],
+       "recommended_dependencies" => [],
+       "optional_dependencies" => [],
+       "uses_from_macos" => ["openssl@1.1", "zlib"],
+       "requirements" => [],
+       "conflicts_with" => [],
+       "caveats" => nil,
+       "installed" => [],
+       "linked_keg" => nil,
+       "pinned" => false,
+       "outdated" => false } }
   end
 
-  before(:each) do
-
-  end
-
-  describe "load_current_resource" do
+  describe "#load_current_resource" do
     before(:each) do
-      allow(provider).to receive(:current_installed_version).and_return(nil)
-      allow(provider).to receive(:candidate_version).and_return("24.3")
+      allow(provider).to receive(:installed_version).and_return(nil)
+      allow(provider).to receive(:available_version).and_return("1.0")
     end
 
     it "creates a current resource with the name of the new resource" do
       provider.load_current_resource
       expect(provider.current_resource).to be_a(Chef::Resource::Package)
-      expect(provider.current_resource.name).to eql("emacs")
+      expect(provider.current_resource.name).to eql("emacs, vim")
     end
 
     it "creates a current resource with the version if the package is installed" do
-      expect(provider).to receive(:current_installed_version).and_return("24.3")
+      expect(provider).to receive(:get_current_versions).and_return(["1.0", "2.0"])
       provider.load_current_resource
-      expect(provider.current_resource.version).to eql("24.3")
+      expect(provider.current_resource.version).to eql(["1.0", "2.0"])
     end
 
     it "creates a current resource with a nil version if the package is not installed" do
       provider.load_current_resource
-      expect(provider.current_resource.version).to be_nil
+      expect(provider.current_resource.version).to eq([nil, nil])
     end
 
     it "sets a candidate version if one exists" do
       provider.load_current_resource
-      expect(provider.candidate_version).to eql("24.3")
+      expect(provider.candidate_version).to eql(["1.0", "1.0"])
+    end
+  end
+
+  describe "#brew_info" do
+    it "returns a hash of data per package" do
+      allow(provider).to receive(:brew_cmd_output).and_return(brew_cmd_output_data)
+      expect(provider.brew_info).to have_key("vim")
+    end
+
+    it "returns empty hash for packages if they lack data" do
+      new_resource.package_name %w{bogus}
+      allow(provider).to receive(:brew_cmd_output).and_return("")
+      expect(provider.brew_info).to eq("bogus" => {})
     end
   end
 
-  describe "current_installed_version" do
+  describe "#installed_version" do
     it "returns the latest version from brew info if the package is keg only" do
-      allow(provider).to receive(:brew_info).and_return(keg_only_brew_info)
-      expect(provider.current_installed_version).to eql("24.3-keggy")
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.installed_version("openssl@1.1")).to eql("1.1.1a")
     end
 
     it "returns the linked keg version if the package is not keg only" do
-      allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-      expect(provider.current_installed_version).to eql("24.3")
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.installed_version("vim")).to eql("8.2.0550")
     end
 
     it "returns nil if the package is not installed" do
-      allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
-      expect(provider.current_installed_version).to be_nil
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.installed_version("kubernetes-cli")).to be_nil
     end
 
     it "returns nil if the package is keg only and not installed" do
-      allow(provider).to receive(:brew_info).and_return(keg_only_uninstalled_brew_info)
-      expect(provider.current_installed_version).to be_nil
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.installed_version("curl")).to be_nil
+    end
+
+    it "returns the version if a package alias is given" do
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.installed_version("openssl")).to eql("1.1.1a")
+    end
+  end
+
+  describe "#available_version" do
+    it "returns version of package when exact name given" do
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.available_version("openssl@1.1")).to eql("1.1.1f")
+    end
+
+    it "returns version of package when alias is given" do
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.available_version("openssl")).to eql("1.1.1f")
+    end
+
+    it "returns nil if the package is not installed" do
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
+      expect(provider.available_version("bogus")).to be_nil
     end
   end
 
-  describe "brew" do
+  describe "#brew_cmd_output" do
     before do
       expect(provider).to receive(:find_homebrew_uid).and_return(homebrew_uid)
       expect(Etc).to receive(:getpwuid).with(homebrew_uid).and_return(OpenStruct.new(name: "name", dir: "/"))
     end
 
-    it "passes a single to the brew command and return stdout" do
+    it "passes a single pkg to the brew command and return stdout" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
-      expect(provider.brew).to eql("zombo")
+      expect(provider.brew_cmd_output).to eql("zombo")
     end
 
     it "takes multiple arguments as an array" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "homestarrunner"))
-      expect(provider.brew("info", "opts", "bananas")).to eql("homestarrunner")
+      expect(provider.brew_cmd_output("info", "opts", "bananas")).to eql("homestarrunner")
     end
 
     context "when new_resource is Package" do
@@ -191,102 +310,89 @@ describe Chef::Provider::Package::Homebrew do
 
       it "does not try to read homebrew_user from Package, which does not have it" do
         allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
-        expect(provider.brew).to eql("zombo")
+        expect(provider.brew_cmd_output).to eql("zombo")
       end
     end
   end
 
-  context "when testing actions" do
+  describe "resource actions" do
     before(:each) do
       provider.current_resource = current_resource
+      allow(provider).to receive(:brew_info).and_return(brew_info_data)
     end
 
-    describe "install_package" do
-      before(:each) do
-        allow(provider).to receive(:candidate_version).and_return("24.3")
+    describe "install" do
+      it "calls brew_cmd_output to install only the necessary packages" do
+        new_resource.package_name %w{curl openssl}
+        expect(provider).to receive(:brew_cmd_output).with("install", nil, ["curl"])
+        provider.run_action(:install)
       end
 
-      it "installs the named package with brew install" do
-        allow(provider.new_resource).to receive(:version).and_return("24.3")
-        allow(provider.current_resource).to receive(:version).and_return(nil)
-        allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
-        expect(provider).to receive(:get_response_from_command).with("brew", "install", nil, "emacs")
-        provider.install_package("emacs", "24.3")
-      end
-
-      it "does not do anything if the package is installed" do
-        allow(provider.current_resource).to receive(:version).and_return("24.3")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-        expect(provider).not_to receive(:get_response_from_command)
-        provider.install_package("emacs", "24.3")
+      it "does not do anything if all the packages are already installed" do
+        new_resource.package_name %w{vim openssl}
+        expect(provider).not_to receive(:brew_cmd_output)
+        provider.run_action(:install)
       end
 
       it "uses options to the brew command if specified" do
+        new_resource.package_name "curl"
         new_resource.options "--cocoa"
-        allow(provider.current_resource).to receive(:version).and_return("24.3")
-        allow(provider).to receive(:get_response_from_command).with("brew", "install", "--cocoa", "emacs")
-        provider.install_package("emacs", "24.3")
+        expect(provider).to receive(:brew_cmd_output).with("install", ["--cocoa"], ["curl"])
+        provider.run_action(:install)
       end
     end
 
-    describe "upgrade_package" do
-      it "uses brew upgrade to upgrade the package if it is installed" do
-        allow(provider.current_resource).to receive(:version).and_return("24")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-        expect(provider).to receive(:get_response_from_command).with("brew", "upgrade", nil, "emacs")
-        provider.upgrade_package("emacs", "24.3")
-      end
-
-      it "does not do anything if the package version is already installed" do
-        allow(provider.current_resource).to receive(:version).and_return("24.3")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-        expect(provider).not_to receive(:get_response_from_command)
-        provider.install_package("emacs", "24.3")
+    describe "upgrade" do
+      it "calls #brew_cmd_output to upgrade the packages" do
+        new_resource.package_name %w{openssl}
+        allow(provider.current_resource).to receive(:version).and_return(["1.0.1a"])
+        expect(provider).to receive(:brew_cmd_output).with("upgrade", nil, ["openssl"])
+        provider.run_action(:upgrade)
       end
 
-      it "uses brew install to install the package if it is not installed" do
-        allow(provider.current_resource).to receive(:version).and_return(nil)
-        allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
-        expect(provider).to receive(:get_response_from_command).with("brew", "install", nil, "emacs")
-        provider.upgrade_package("emacs", "24.3")
+      it "calls #brew_cmd_output to both upgrade and install the packages as necessary" do
+        new_resource.package_name %w{openssl kubernetes-cli}
+        allow(provider.current_resource).to receive(:version).and_return(["1.0.1a", nil])
+        expect(provider).to receive(:brew_cmd_output).with("upgrade", nil, ["openssl"])
+        expect(provider).to receive(:brew_cmd_output).with("install", nil, ["kubernetes-cli"])
+        provider.run_action(:upgrade)
       end
 
       it "uses options to the brew command if specified" do
-        allow(provider.current_resource).to receive(:version).and_return("24")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
+        new_resource.package_name %w{openssl}
+        allow(provider.current_resource).to receive(:version).and_return(["1.0.1a"])
+        allow(provider).to receive(:brew_info).and_return(brew_info_data)
         new_resource.options "--cocoa"
-        expect(provider).to receive(:get_response_from_command).with("brew", "upgrade", [ "--cocoa" ], "emacs")
-        provider.upgrade_package("emacs", "24.3")
+        expect(provider).to receive(:brew_cmd_output).with("upgrade", [ "--cocoa" ], ["openssl"])
+        provider.run_action(:upgrade)
       end
     end
 
-    describe "remove_package" do
-      it "uninstalls the package with brew uninstall" do
-        allow(provider.current_resource).to receive(:version).and_return("24.3")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-        expect(provider).to receive(:get_response_from_command).with("brew", "uninstall", nil, "emacs")
-        provider.remove_package("emacs", "24.3")
+    describe "remove" do
+      it "calls #brew_cmd_output to uninstall the packages" do
+        new_resource.package_name %w{curl openssl}
+        expect(provider).to receive(:brew_cmd_output).with("uninstall", nil, %w{curl openssl})
+        provider.run_action(:remove)
       end
 
       it "does not do anything if the package is not installed" do
-        allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
-        expect(provider).not_to receive(:get_response_from_command)
-        provider.remove_package("emacs", "24.3")
+        new_resource.package_name %w{kubernetes-cli}
+        expect(provider).not_to receive(:brew_cmd_output)
+        provider.run_action(:remove)
       end
     end
 
-    describe "purge_package" do
-      it "uninstalls the package with brew uninstall --force" do
-        allow(provider.current_resource).to receive(:version).and_return("24.3")
-        allow(provider).to receive(:brew_info).and_return(installed_brew_info)
-        expect(provider).to receive(:get_response_from_command).with("brew", "uninstall", "--force", nil, "emacs")
-        provider.purge_package("emacs", "24.3")
+    describe "purge" do
+      it "call #brew_cmd_output to uninstall --force the packages" do
+        new_resource.package_name %w{curl openssl}
+        expect(provider).to receive(:brew_cmd_output).with("uninstall", "--force", nil, %w{curl openssl})
+        provider.run_action(:purge)
       end
 
       it "does not do anything if the package is not installed" do
-        allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
-        expect(provider).not_to receive(:get_response_from_command)
-        provider.purge_package("emacs", "24.3")
+        new_resource.package_name %w{kubernetes-cli}
+        expect(provider).not_to receive(:brew_cmd_output)
+        provider.run_action(:purge)
       end
     end
   end