base package provider fixes

* removes the mutation of the new_resource.version
* adds package_class_supports_arrays for multipackage providers
* cleans up the package resource initializer and sets the package_name
  correctly through the accessor method.

By mutating new_resource.version we were destroying the original intent
of what the user was requesting.  This is a bug that must be fixed.
Generally, subclasses will be able to get the correct information they
need through either the version argument they were passed in
install_package(name, version) instead, or through their
`#target_version_array` method.  If this breaks anything then those
providers need bugfixes as well (since this is a change to an internal
API accessible only to subclassing, and there are backwards compatible
and correct ways to get the information, this is *not* a SemVer
violating change).  See the fix I made to the OpenBSD provider to
preserve the same semantics, avoid using new_resource.version where it
was inappropriate, and make the code more symmetrical where before
substantially different looking code in install_package and
remove_package had exactly the same ultimate effect.

The package_class_supports_arrays 'DSL' for writing multipackage
providers coerces the arguments to the virtual methods (e.g.
install_package) into arrays, even if the user is only requesting a
single package install.  This removes most of the `is_a?(Array)`
checks from the implementation subclasses.

The cleanup of the initializer is similarly necessary so that we can
use Chef 12.5 coercions to make the package_name and version arguments
accept string, but always be Arrays.  This should eliminate the rest
of the need to write `is_a?(Array)` code all over the package provider
implementations.

6 files changed, 557 insertions, 413 deletions

diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 880104bff7..888b171fa4 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -86,11 +86,10 @@ class Chef
           end
         end
 
-        # XXX: mutating the new resource is generally bad
-        @new_resource.version(versions_for_new_resource)
-
         converge_by(install_description) do
-          install_package(package_names_for_targets, versions_for_targets)
+          multipackage_api_adapter(package_names_for_targets, versions_for_targets) do |name, version|
+            install_package(name, version)
+          end
           Chef::Log.info("#{@new_resource} installed #{package_names_for_targets} at #{versions_for_targets}")
         end
       end
@@ -113,11 +112,10 @@ class Chef
           return
         end
 
-        # XXX: mutating the new resource is generally bad
-        @new_resource.version(versions_for_new_resource)
-
         converge_by(upgrade_description) do
-          upgrade_package(package_names_for_targets, versions_for_targets)
+          multipackage_api_adapter(package_names_for_targets, versions_for_targets) do |name, version|
+            upgrade_package(name, version)
+          end
           log_allow_downgrade = allow_downgrade ? '(allow_downgrade)' : ''
           Chef::Log.info("#{@new_resource} upgraded#{log_allow_downgrade} #{package_names_for_targets} to #{versions_for_targets}")
         end
@@ -138,12 +136,13 @@ class Chef
 
       private :upgrade_description
 
-      # @todo: ability to remove an array of packages
       def action_remove
         if removing_package?
           description = @new_resource.version ? "version #{@new_resource.version} of " :  ""
           converge_by("remove #{description}package #{@current_resource.package_name}") do
-            remove_package(@current_resource.package_name, @new_resource.version)
+            multipackage_api_adapter(@current_resource.package_name, @new_resource.version) do |name, version|
+              remove_package(name, version)
+            end
             Chef::Log.info("#{@new_resource} removed")
           end
         else
@@ -172,18 +171,18 @@ class Chef
         end
       end
 
-      # @todo: ability to purge an array of packages
       def action_purge
         if removing_package?
           description = @new_resource.version ? "version #{@new_resource.version} of" : ""
           converge_by("purge #{description} package #{@current_resource.package_name}") do
-            purge_package(@current_resource.package_name, @new_resource.version)
+            multipackage_api_adapter(@current_resource.package_name, @new_resource.version) do |name, version|
+              purge_package(name, version)
+            end
             Chef::Log.info("#{@new_resource} purged")
           end
         end
       end
 
-      # @todo: ability to reconfigure an array of packages
       def action_reconfig
         if @current_resource.version == nil then
           Chef::Log.debug("#{@new_resource} is NOT installed - nothing to do")
@@ -198,7 +197,10 @@ class Chef
         if preseed_file = get_preseed_file(@new_resource.package_name, @current_resource.version)
           converge_by("reconfigure package #{@new_resource.package_name}") do
             preseed_package(preseed_file)
-            reconfig_package(@new_resource.package_name, @current_resource.version)
+            multipackage_api_adapter(@new_resource.package_name, @current_resource.version) do |name, version|
+              reconfig_package(name, version)
+
+            end
             Chef::Log.info("#{@new_resource} reconfigured")
           end
         else
@@ -207,6 +209,15 @@ class Chef
       end
 
       # @todo use composition rather than inheritance
+
+      def multipackage_api_adapter(name, version)
+        if supports_arrays?
+          yield [name].flatten, [version].flatten
+        else
+          yield name, version
+        end
+      end
+
       def install_package(name, version)
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :install"
       end
@@ -287,6 +298,24 @@ class Chef
         [ thing ].flatten
       end
 
+      class << self
+        attr_accessor :supports_arrays
+
+        def supports_arrays?
+          !!@supports_arrays
+        end
+
+        private
+
+        def use_multipackage_api
+          @supports_arrays = true
+        end
+      end
+
+      def supports_arrays?
+        self.class.supports_arrays?
+      end
+
       private
 
       # Returns the package names which need to be modified.  If the resource was called with an array of packages
@@ -322,18 +351,6 @@ class Chef
         multipackage? ? versions_for_targets : versions_for_targets[0]
       end
 
-      # We need to mutate @new_resource.version() for some reason and this is a helper so that we inject the right
-      # class (String or Array) into that attribute based on if we're handling an array of package names or not.
-      #
-      # @return [String, Array<String>] target_versions coerced into the correct type for back-compat
-      def versions_for_new_resource
-        if multipackage?
-          target_version_array
-        else
-          target_version_array[0]
-        end
-      end
-
       # Return an array indexed the same as *_version_array which contains either the target version to install/upgrade to
       # or else nil if the package is not being modified.
       #
@@ -491,8 +508,6 @@ class Chef
         end
       end
 
-      private
-
       def shell_out_with_timeout(*command_args)
         shell_out(*add_timeout_option(command_args))
       end
@@ -513,7 +528,6 @@ class Chef
         end
         args
       end
-
     end
   end
 end
diff --git a/lib/chef/provider/package/openbsd.rb b/lib/chef/provider/package/openbsd.rb
index 7a6582363e..00d9e5941d 100644
--- a/lib/chef/provider/package/openbsd.rb
+++ b/lib/chef/provider/package/openbsd.rb
@@ -72,18 +72,16 @@ class Chef
             if parts = name.match(/^(.+?)--(.+)/) # use double-dash for stems with flavors, see man page for pkg_add
               name = parts[1]
             end
-            shell_out_with_timeout!("pkg_add -r #{name}#{version_string}", :env => {"PKG_PATH" => pkg_path}).status
+            shell_out_with_timeout!("pkg_add -r #{name}#{version_string(version)}", :env => {"PKG_PATH" => pkg_path}).status
             Chef::Log.debug("#{new_resource.package_name} installed")
           end
         end
 
         def remove_package(name, version)
-          version_string  = ''
-          version_string += "-#{version}" if version
           if parts = name.match(/^(.+?)--(.+)/)
             name = parts[1]
           end
-          shell_out_with_timeout!("pkg_delete #{name}#{version_string}", :env => nil).status
+          shell_out_with_timeout!("pkg_delete #{name}#{version_string(version)}", :env => nil).status
         end
 
         private
@@ -103,7 +101,7 @@ class Chef
         def candidate_version
           @candidate_version ||= begin
             results = []
-            shell_out_with_timeout!("pkg_info -I \"#{new_resource.package_name}#{version_string}\"", :env => nil, :returns => [0,1]).stdout.each_line do |line|
+            shell_out_with_timeout!("pkg_info -I \"#{new_resource.package_name}#{version_string(new_resource.version)}\"", :env => nil, :returns => [0,1]).stdout.each_line do |line|
               if parts = new_resource.package_name.match(/^(.+?)--(.+)/)
                 results << line[/^#{Regexp.escape(parts[1])}-(.+?)\s/, 1]
               else
@@ -123,9 +121,9 @@ class Chef
           end
         end
 
-        def version_string
+        def version_string(version)
           ver  = ''
-          ver += "-#{new_resource.version}" if new_resource.version
+          ver += "-#{version}" if version
         end
 
         def pkg_path
diff --git a/lib/chef/resource/package.rb b/lib/chef/resource/package.rb
index 5be1c34b89..c73810a118 100644
--- a/lib/chef/resource/package.rb
+++ b/lib/chef/resource/package.rb
@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Tyler Cloke (<tyler@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,14 +31,13 @@ class Chef
 
       def initialize(name, run_context=nil)
         super
-        @candidate_version = nil
-        @options = nil
-        @package_name = name
-        @response_file = nil
-        @response_file_variables = Hash.new
-        @source = nil
-        @version = nil
-        @timeout = nil
+        options                 nil
+        package_name            name
+        response_file           nil
+        response_file_variables Hash.new
+        source                  nil
+        version                 nil
+        timeout                 nil
       end
 
       def package_name(arg=nil)
diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb
index a76765cc36..f11b7b8b3b 100644
--- a/lib/chef/resource/windows_package.rb
+++ b/lib/chef/resource/windows_package.rb
@@ -67,7 +67,7 @@ class Chef
       end
 
       def source(arg=nil)
-        if arg == nil && self.instance_variable_defined?(:@source) == true
+        if arg == nil
           @source
         else
           raise ArgumentError, "Bad type for WindowsPackage resource, use a String" unless arg.is_a?(String)
diff --git a/spec/unit/provider/package_spec.rb b/spec/unit/provider/package_spec.rb
index 432d968906..9e4384820a 100644
--- a/spec/unit/provider/package_spec.rb
+++ b/spec/unit/provider/package_spec.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,347 +19,351 @@
 require 'spec_helper'
 
 describe Chef::Provider::Package do
-  before do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Package.new('emacs')
-    @current_resource = Chef::Resource::Package.new('emacs')
-    @provider = Chef::Provider::Package.new(@new_resource, @run_context)
-    @provider.current_resource = @current_resource
-
-    @provider.candidate_version = "1.0"
+  let(:node) do
+    node = Chef::Node.new
+    node.automatic_attrs[:platform] = :just_testing
+    node.automatic_attrs[:platform_version] = :just_testing
+    node
+  end
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:new_resource) { Chef::Resource::Package.new('emacs') }
+  let(:current_resource) { Chef::Resource::Package.new('emacs') }
+  let(:candidate_version) { "1.0" }
+  let(:provider) do
+    provider = Chef::Provider::Package.new(new_resource, run_context)
+    provider.current_resource = current_resource
+    provider.candidate_version = candidate_version
+    provider
   end
 
   describe "when installing a package" do
     before(:each) do
-      @provider.current_resource = @current_resource
-      allow(@provider).to receive(:install_package).and_return(true)
+      provider.current_resource = current_resource
+      allow(provider).to receive(:install_package).and_return(true)
     end
 
     it "raises a Chef::Exceptions::InvalidResourceSpecification if both multipackage and source are provided" do
-      @new_resource.package_name(['a', 'b'])
-      @new_resource.source('foo')
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::InvalidResourceSpecification)
+      new_resource.package_name(['a', 'b'])
+      new_resource.source('foo')
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::InvalidResourceSpecification)
     end
 
     it "should raise a Chef::Exceptions::Package if no version is specified, and no candidate is available" do
-      @provider.candidate_version = nil
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      provider.candidate_version = nil
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should call preseed_package if a response_file is given" do
-      @new_resource.response_file("foo")
-      expect(@provider).to receive(:get_preseed_file).with(
-        @new_resource.name,
-        @provider.candidate_version
+      new_resource.response_file("foo")
+      expect(provider).to receive(:get_preseed_file).with(
+        new_resource.name,
+        provider.candidate_version
       ).and_return("/var/cache/preseed-test")
 
-      expect(@provider).to receive(:preseed_package).with(
+      expect(provider).to receive(:preseed_package).with(
         "/var/cache/preseed-test"
       ).and_return(true)
-      @provider.run_action(:install)
+      provider.run_action(:install)
     end
 
     it "should not call preseed_package if a response_file is not given" do
-      expect(@provider).not_to receive(:preseed_package)
-      @provider.run_action(:install)
+      expect(provider).not_to receive(:preseed_package)
+      provider.run_action(:install)
     end
 
     it "should install the package at the candidate_version if it is not already installed" do
-      expect(@provider).to receive(:install_package).with(
-        @new_resource.name,
-        @provider.candidate_version
+      expect(provider).to receive(:install_package).with(
+        new_resource.name,
+        provider.candidate_version
       ).and_return(true)
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:install)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should install the package at the version specified if it is not already installed" do
-      @new_resource.version("1.0")
-      expect(@provider).to receive(:install_package).with(
-        @new_resource.name,
-        @new_resource.version
+      new_resource.version("1.0")
+      expect(provider).to receive(:install_package).with(
+        new_resource.name,
+        new_resource.version
       ).and_return(true)
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:install)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should install the package at the version specified if a different version is installed" do
-      @new_resource.version("1.0")
-      allow(@current_resource).to receive(:version).and_return("0.99")
-      expect(@provider).to receive(:install_package).with(
-        @new_resource.name,
-        @new_resource.version
+      new_resource.version("1.0")
+      allow(current_resource).to receive(:version).and_return("0.99")
+      expect(provider).to receive(:install_package).with(
+        new_resource.name,
+        new_resource.version
       ).and_return(true)
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:install)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not install the package if it is already installed and no version is specified" do
-      @current_resource.version("1.0")
-      expect(@provider).not_to receive(:install_package)
-      @provider.run_action(:install)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version("1.0")
+      expect(provider).not_to receive(:install_package)
+      provider.run_action(:install)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should not install the package if it is already installed at the version specified" do
-      @current_resource.version("1.0")
-      @new_resource.version("1.0")
-      expect(@provider).not_to receive(:install_package)
-      @provider.run_action(:install)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version("1.0")
+      new_resource.version("1.0")
+      expect(provider).not_to receive(:install_package)
+      provider.run_action(:install)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should call the candidate_version accessor only once if the package is already installed and no version is specified" do
-      @current_resource.version("1.0")
-      allow(@provider).to receive(:candidate_version).and_return("1.0")
-      @provider.run_action(:install)
+      current_resource.version("1.0")
+      allow(provider).to receive(:candidate_version).and_return("1.0")
+      provider.run_action(:install)
     end
 
     it "should call the candidate_version accessor only once if the package is already installed at the version specified" do
-      @current_resource.version("1.0")
-      @new_resource.version("1.0")
-      @provider.run_action(:install)
+      current_resource.version("1.0")
+      new_resource.version("1.0")
+      provider.run_action(:install)
     end
 
     it "should set the resource to updated if it installs the package" do
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated
+      provider.run_action(:install)
+      expect(new_resource).to be_updated
     end
 
   end
 
   describe "when upgrading the package" do
     before(:each) do
-      allow(@provider).to receive(:upgrade_package).and_return(true)
+      allow(provider).to receive(:upgrade_package).and_return(true)
     end
 
     it "should upgrade the package if the current version is not the candidate version" do
-      expect(@provider).to receive(:upgrade_package).with(
-        @new_resource.name,
-        @provider.candidate_version
+      expect(provider).to receive(:upgrade_package).with(
+        new_resource.name,
+        provider.candidate_version
       ).and_return(true)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:upgrade)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should set the resource to updated if it installs the package" do
-      @provider.run_action(:upgrade)
-      expect(@new_resource).to be_updated
+      provider.run_action(:upgrade)
+      expect(new_resource).to be_updated
     end
 
     it "should not install the package if the current version is the candidate version" do
-      @current_resource.version "1.0"
-      expect(@provider).not_to receive(:upgrade_package)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version "1.0"
+      expect(provider).not_to receive(:upgrade_package)
+      provider.run_action(:upgrade)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should print the word 'uninstalled' if there was no original version" do
-      allow(@current_resource).to receive(:version).and_return(nil)
+      allow(current_resource).to receive(:version).and_return(nil)
       expect(Chef::Log).to receive(:info).with("package[emacs] upgraded emacs to 1.0")
-      @provider.run_action(:upgrade)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:upgrade)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should raise a Chef::Exceptions::Package if current version and candidate are nil" do
-      allow(@current_resource).to receive(:version).and_return(nil)
-      @provider.candidate_version = nil
-      expect { @provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
+      allow(current_resource).to receive(:version).and_return(nil)
+      provider.candidate_version = nil
+      expect { provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should not install the package if candidate version is nil" do
-      @current_resource.version "1.0"
-      @provider.candidate_version = nil
-      expect(@provider).not_to receive(:upgrade_package)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version "1.0"
+      provider.candidate_version = nil
+      expect(provider).not_to receive(:upgrade_package)
+      provider.run_action(:upgrade)
+      expect(new_resource).not_to be_updated_by_last_action
     end
   end
 
   describe "When removing the package" do
     before(:each) do
-      allow(@provider).to receive(:remove_package).and_return(true)
-      @current_resource.version '1.4.2'
+      allow(provider).to receive(:remove_package).and_return(true)
+      current_resource.version '1.4.2'
     end
 
     it "should remove the package if it is installed" do
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with('emacs', nil)
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with('emacs', nil)
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should remove the package at a specific version if it is installed at that version" do
-      @new_resource.version "1.4.2"
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with('emacs', '1.4.2')
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version "1.4.2"
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with('emacs', '1.4.2')
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not remove the package at a specific version if it is not installed at that version" do
-      @new_resource.version "1.0"
-      expect(@provider).not_to be_removing_package
-      expect(@provider).not_to receive(:remove_package)
-      @provider.run_action(:remove)
-      expect(@new_resource).not_to be_updated_by_last_action
+      new_resource.version "1.0"
+      expect(provider).not_to be_removing_package
+      expect(provider).not_to receive(:remove_package)
+      provider.run_action(:remove)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should not remove the package if it is not installed" do
-      expect(@provider).not_to receive(:remove_package)
-      allow(@current_resource).to receive(:version).and_return(nil)
-      @provider.run_action(:remove)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:remove_package)
+      allow(current_resource).to receive(:version).and_return(nil)
+      provider.run_action(:remove)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should set the resource to updated if it removes the package" do
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated
     end
 
   end
 
   describe "When purging the package" do
     before(:each) do
-      allow(@provider).to receive(:purge_package).and_return(true)
-      @current_resource.version '1.4.2'
+      allow(provider).to receive(:purge_package).and_return(true)
+      current_resource.version '1.4.2'
     end
 
     it "should purge the package if it is installed" do
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with('emacs', nil)
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with('emacs', nil)
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should purge the package at a specific version if it is installed at that version" do
-      @new_resource.version "1.4.2"
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with('emacs', '1.4.2')
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version "1.4.2"
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with('emacs', '1.4.2')
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not purge the package at a specific version if it is not installed at that version" do
-      @new_resource.version "1.0"
-      expect(@provider).not_to be_removing_package
-      expect(@provider).not_to receive(:purge_package)
-      @provider.run_action(:purge)
-      expect(@new_resource).not_to be_updated_by_last_action
+      new_resource.version "1.0"
+      expect(provider).not_to be_removing_package
+      expect(provider).not_to receive(:purge_package)
+      provider.run_action(:purge)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should not purge the package if it is not installed" do
-      @current_resource.instance_variable_set(:@version, nil)
-      expect(@provider).not_to be_removing_package
+      current_resource.instance_variable_set(:@version, nil)
+      expect(provider).not_to be_removing_package
 
-      expect(@provider).not_to receive(:purge_package)
-      @provider.run_action(:purge)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:purge_package)
+      provider.run_action(:purge)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should set the resource to updated if it purges the package" do
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated
     end
 
   end
 
   describe "when reconfiguring the package" do
     before(:each) do
-      allow(@provider).to receive(:reconfig_package).and_return(true)
+      allow(provider).to receive(:reconfig_package).and_return(true)
     end
 
     it "should info log, reconfigure the package and update the resource" do
-      allow(@current_resource).to receive(:version).and_return('1.0')
-      allow(@new_resource).to receive(:response_file).and_return(true)
-      expect(@provider).to receive(:get_preseed_file).and_return('/var/cache/preseed-test')
-      allow(@provider).to receive(:preseed_package).and_return(true)
-      allow(@provider).to receive(:reconfig_package).and_return(true)
+      allow(current_resource).to receive(:version).and_return('1.0')
+      allow(new_resource).to receive(:response_file).and_return(true)
+      expect(provider).to receive(:get_preseed_file).and_return('/var/cache/preseed-test')
+      allow(provider).to receive(:preseed_package).and_return(true)
+      allow(provider).to receive(:reconfig_package).and_return(true)
       expect(Chef::Log).to receive(:info).with("package[emacs] reconfigured")
-      expect(@provider).to receive(:reconfig_package)
-      @provider.run_action(:reconfig)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      expect(provider).to receive(:reconfig_package)
+      provider.run_action(:reconfig)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should debug log and not reconfigure the package if the package is not installed" do
-      allow(@current_resource).to receive(:version).and_return(nil)
+      allow(current_resource).to receive(:version).and_return(nil)
       expect(Chef::Log).to receive(:debug).with("package[emacs] is NOT installed - nothing to do")
-      expect(@provider).not_to receive(:reconfig_package)
-      @provider.run_action(:reconfig)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:reconfig_package)
+      provider.run_action(:reconfig)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should debug log and not reconfigure the package if no response_file is given" do
-      allow(@current_resource).to receive(:version).and_return('1.0')
-      allow(@new_resource).to receive(:response_file).and_return(nil)
+      allow(current_resource).to receive(:version).and_return('1.0')
+      allow(new_resource).to receive(:response_file).and_return(nil)
       expect(Chef::Log).to receive(:debug).with("package[emacs] no response_file provided - nothing to do")
-      expect(@provider).not_to receive(:reconfig_package)
-      @provider.run_action(:reconfig)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:reconfig_package)
+      provider.run_action(:reconfig)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should debug log and not reconfigure the package if the response_file has not changed" do
-      allow(@current_resource).to receive(:version).and_return('1.0')
-      allow(@new_resource).to receive(:response_file).and_return(true)
-      expect(@provider).to receive(:get_preseed_file).and_return(false)
-      allow(@provider).to receive(:preseed_package).and_return(false)
+      allow(current_resource).to receive(:version).and_return('1.0')
+      allow(new_resource).to receive(:response_file).and_return(true)
+      expect(provider).to receive(:get_preseed_file).and_return(false)
+      allow(provider).to receive(:preseed_package).and_return(false)
       expect(Chef::Log).to receive(:debug).with("package[emacs] preseeding has not changed - nothing to do")
-      expect(@provider).not_to receive(:reconfig_package)
-      @provider.run_action(:reconfig)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:reconfig_package)
+      provider.run_action(:reconfig)
+      expect(new_resource).not_to be_updated_by_last_action
     end
   end
 
   describe "when running commands to be implemented by subclasses" do
     it "should raises UnsupportedAction for install" do
-      expect { @provider.install_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.install_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should raises UnsupportedAction for upgrade" do
-      expect { @provider.upgrade_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.upgrade_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should raises UnsupportedAction for remove" do
-      expect { @provider.remove_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.remove_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should raises UnsupportedAction for purge" do
-      expect { @provider.purge_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.purge_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should raise UnsupportedAction for preseed_package" do
       preseed_file = "/tmp/sun-jdk-package-preseed-file.seed"
-      expect { @provider.preseed_package(preseed_file) }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.preseed_package(preseed_file) }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should raise UnsupportedAction for reconfig" do
-      expect { @provider.reconfig_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
+      expect { provider.reconfig_package('emacs', '1.4.2') }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end
   end
 
   describe "when given a response file" do
-    before(:each) do
-      @cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
-      Chef::Cookbook::FileVendor.fetch_from_disk(@cookbook_repo)
-
-      @node = Chef::Node.new
-      cl = Chef::CookbookLoader.new(@cookbook_repo)
-      cl.load_cookbooks
-      @cookbook_collection = Chef::CookbookCollection.new(cl)
-
-      @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
-      @provider.run_context = @run_context
-
-      @node.automatic_attrs[:platform] = 'PLATFORM: just testing'
-      @node.automatic_attrs[:platform_version] = 'PLATFORM VERSION: just testing'
-
-      @new_resource.response_file('java.response')
-      @new_resource.cookbook_name = 'java'
+    let(:cookbook_repo) { File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks")) }
+    let(:cookbook_loader) do
+      Chef::Cookbook::FileVendor.fetch_from_disk(cookbook_repo)
+      Chef::CookbookLoader.new(cookbook_repo)
+    end
+    let(:cookbook_collection) do
+      cookbook_loader.load_cookbooks
+      Chef::CookbookCollection.new(cookbook_loader)
+    end
+    let(:run_context) { Chef::RunContext.new(node, cookbook_collection, events) }
+    let(:new_resource) do
+      new_resource = Chef::Resource::Package.new('emacs')
+      new_resource.response_file('java.response')
+      new_resource.cookbook_name = 'java'
+      new_resource
     end
 
     describe "creating the cookbook file resource to fetch the response file" do
@@ -369,62 +373,60 @@ describe Chef::Provider::Package do
 
       it "sets the preseed resource's runcontext to its own run context" do
         allow(Chef::FileCache).to receive(:create_cache_path).and_return("/tmp/preseed/java")
-        expect(@provider.preseed_resource('java', '6').run_context).not_to be_nil
-        expect(@provider.preseed_resource('java', '6').run_context).to equal(@provider.run_context)
+        expect(provider.preseed_resource('java', '6').run_context).not_to be_nil
+        expect(provider.preseed_resource('java', '6').run_context).to equal(provider.run_context)
       end
 
       it "should set the cookbook name of the remote file to the new resources cookbook name" do
-        expect(@provider.preseed_resource('java', '6').cookbook_name).to eq('java')
+        expect(provider.preseed_resource('java', '6').cookbook_name).to eq('java')
       end
 
       it "should set remote files source to the new resources response file" do
-        expect(@provider.preseed_resource('java', '6').source).to eq('java.response')
+        expect(provider.preseed_resource('java', '6').source).to eq('java.response')
       end
 
       it "should never back up the cached response file" do
-        expect(@provider.preseed_resource('java', '6').backup).to be_falsey
+        expect(provider.preseed_resource('java', '6').backup).to be_falsey
       end
 
       it "sets the install path of the resource to $file_cache/$cookbook/$pkg_name-$pkg_version.seed" do
-        expect(@provider.preseed_resource('java', '6').path).to eq('/tmp/preseed/java/java-6.seed')
+        expect(provider.preseed_resource('java', '6').path).to eq('/tmp/preseed/java/java-6.seed')
       end
     end
 
     describe "when installing the preseed file to the cache location" do
-      before do
-        @node.automatic_attrs[:platform] = :just_testing
-        @node.automatic_attrs[:platform_version] = :just_testing
-
-        @response_file_destination = Dir.tmpdir + '/preseed--java--java-6.seed'
+      let(:response_file_destination) { Dir.tmpdir + '/preseed--java--java-6.seed' }
+      let(:response_file_resource) {
+        response_file_resource = Chef::Resource::CookbookFile.new(response_file_destination, run_context)
+        response_file_resource.cookbook_name = 'java'
+        response_file_resource.backup(false)
+        response_file_resource.source('java.response')
+        response_file_resource
+      }
 
-        @response_file_resource = Chef::Resource::CookbookFile.new(@response_file_destination, @run_context)
-        @response_file_resource.cookbook_name = 'java'
-        @response_file_resource.backup(false)
-        @response_file_resource.source('java.response')
-
-
-        expect(@provider).to receive(:preseed_resource).with('java', '6').and_return(@response_file_resource)
+      before do
+        expect(provider).to receive(:preseed_resource).with('java', '6').and_return(response_file_resource)
       end
 
       after do
-        FileUtils.rm(@response_file_destination) if ::File.exist?(@response_file_destination)
+        FileUtils.rm(response_file_destination) if ::File.exist?(response_file_destination)
       end
 
       it "creates the preseed file in the cache" do
-        expect(@response_file_resource).to receive(:run_action).with(:create)
-        @provider.get_preseed_file("java", "6")
+        expect(response_file_resource).to receive(:run_action).with(:create)
+        provider.get_preseed_file("java", "6")
       end
 
       it "returns the path to the response file if the response file was updated" do
-        expect(@provider.get_preseed_file("java", "6")).to eq(@response_file_destination)
+        expect(provider.get_preseed_file("java", "6")).to eq(response_file_destination)
       end
 
       it "should return false if the response file has not been updated" do
-        @response_file_resource.updated_by_last_action(false)
-        expect(@response_file_resource).not_to be_updated_by_last_action
+        response_file_resource.updated_by_last_action(false)
+        expect(response_file_resource).not_to be_updated_by_last_action
         # don't let the response_file_resource set updated to true
-        expect(@response_file_resource).to receive(:run_action).with(:create)
-        expect(@provider.get_preseed_file("java", "6")).to be(false)
+        expect(response_file_resource).to receive(:run_action).with(:create)
+        expect(provider.get_preseed_file("java", "6")).to be(false)
       end
 
     end
@@ -432,276 +434,407 @@ describe Chef::Provider::Package do
   end
 end
 
+describe "Subclass with use_multipackage_api" do
+  class MyPackageResource < Chef::Resource::Package
+  end
+
+  class MyPackageProvider < Chef::Provider::Package
+    use_multipackage_api
+  end
+
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:new_resource) { MyPackageResource.new("installs the packages") }
+  let(:current_resource) { MyPackageResource.new("installs the packages") }
+  let(:provider) do
+    provider = MyPackageProvider.new(new_resource, run_context)
+    provider.current_resource = current_resource
+    provider
+  end
+
+  it "should have supports_arrays class accessor" do
+    expect(MyPackageProvider.supports_arrays).to be true
+    MyPackageProvider.supports_arrays = false
+    expect(MyPackageProvider.supports_arrays).to be false
+    # class variables are global state, so better set it back...
+    MyPackageProvider.supports_arrays = true
+  end
+
+  it "has supports_arrays? methods on the class and instance" do
+    expect(MyPackageProvider.supports_arrays?).to be true
+    expect(provider.supports_arrays?).to be true
+  end
+
+  it "when user passes string to package_name, passes arrays to install_package" do
+    new_resource.package_name "vim"
+    new_resource.version nil
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:install_package).with(
+      [ "vim" ],
+      [ "1.0" ]
+    ).and_return(true)
+    provider.run_action(:install)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql(nil)
+  end
+
+  it "when user pases string to package_name and version, passes arrays to install_package" do
+    new_resource.package_name "vim"
+    new_resource.version "1.0"
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:install_package).with(
+      [ "vim" ],
+      [ "1.0" ]
+    ).and_return(true)
+    provider.run_action(:install)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql("1.0")
+  end
+
+  it "when user passes string to package_name, passes arrays to upgrade_package" do
+    new_resource.package_name "vim"
+    new_resource.version nil
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:upgrade_package).with(
+      [ "vim" ],
+      [ "1.0" ]
+    ).and_return(true)
+    provider.run_action(:upgrade)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql(nil)
+  end
+
+  it "when user pases string to package_name and version, passes arrays to upgrade_package" do
+    new_resource.package_name "vim"
+    new_resource.version "1.0"
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:upgrade_package).with(
+      [ "vim" ],
+      [ "1.0" ]
+    ).and_return(true)
+    provider.run_action(:upgrade)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql("1.0")
+  end
+
+  it "when user passes string to package_name, passes arrays to remove_package" do
+    new_resource.package_name "vim"
+    current_resource.package_name "vim"
+    current_resource.version [ "1.0" ]
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:remove_package).with(
+      [ "vim" ],
+      [ nil ]
+    ).and_return(true)
+    provider.run_action(:remove)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql(nil)
+  end
+
+  it "when user passes string to package_name, passes arrays to purge_package" do
+    new_resource.package_name "vim"
+    current_resource.package_name "vim"
+    current_resource.version [ "1.0" ]
+    provider.candidate_version = [ "1.0" ]
+    expect(provider).to receive(:purge_package).with(
+      [ "vim" ],
+      [ nil ]
+    ).and_return(true)
+    provider.run_action(:purge)
+    expect(new_resource).to be_updated_by_last_action
+    expect(new_resource.version).to eql(nil)
+  end
+
+  it "when user passes string to package_name, passes arrays to reconfig_package" do
+    new_resource.package_name "vim"
+    current_resource.package_name "vim"
+    current_resource.version [ "1.0" ]
+    allow(new_resource).to receive(:response_file).and_return(true)
+    expect(provider).to receive(:get_preseed_file).and_return('/var/cache/preseed-test')
+    allow(provider).to receive(:preseed_package).and_return(true)
+    allow(provider).to receive(:reconfig_package).and_return(true)
+    expect(provider).to receive(:reconfig_package).with(
+      [ "vim" ],
+      [ "1.0" ],
+    ).and_return(true)
+    provider.run_action(:reconfig)
+    expect(new_resource).to be_updated_by_last_action
+  end
+end
+
 describe "Chef::Provider::Package - Multi" do
-  before do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Package.new(['emacs', 'vi'])
-    @current_resource = Chef::Resource::Package.new(['emacs', 'vi'])
-    @provider = Chef::Provider::Package.new(@new_resource, @run_context)
-    @provider.current_resource = @current_resource
-    @provider.candidate_version = ['1.0', '6.2']
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:new_resource) { Chef::Resource::Package.new(['emacs', 'vi']) }
+  let(:current_resource) { Chef::Resource::Package.new(['emacs', 'vi']) }
+  let(:candidate_version) { [ "1.0", "6.2" ] }
+  let(:provider) do
+    provider = Chef::Provider::Package.new(new_resource, run_context)
+    provider.current_resource = current_resource
+    provider.candidate_version = candidate_version
+    provider
   end
 
   describe "when installing multiple packages" do
     before(:each) do
-      @provider.current_resource = @current_resource
-      allow(@provider).to receive(:install_package).and_return(true)
+      provider.current_resource = current_resource
+      allow(provider).to receive(:install_package).and_return(true)
     end
 
     it "installs the candidate versions when none are installed" do
-      expect(@provider).to receive(:install_package).with(
+      expect(provider).to receive(:install_package).with(
         ["emacs", "vi"],
         ["1.0", "6.2"]
       ).and_return(true)
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated
+      provider.run_action(:install)
+      expect(new_resource).to be_updated
     end
 
     it "installs the candidate versions when some are installed" do
-      expect(@provider).to receive(:install_package).with(
+      expect(provider).to receive(:install_package).with(
         [ 'vi' ],
         [ '6.2' ]
       ).and_return(true)
-      @current_resource.version(['1.0', nil])
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated
+      current_resource.version(['1.0', nil])
+      provider.run_action(:install)
+      expect(new_resource).to be_updated
     end
 
     it "installs the specified version when some are out of date" do
-      @current_resource.version(['1.0', '6.2'])
-      @new_resource.version(['1.0', '6.1'])
-      @provider.run_action(:install)
-      expect(@new_resource).to be_updated
+      current_resource.version(['1.0', '6.2'])
+      new_resource.version(['1.0', '6.1'])
+      provider.run_action(:install)
+      expect(new_resource).to be_updated
     end
 
     it "does not install any version if all are installed at the right version" do
-      @current_resource.version(['1.0', '6.2'])
-      @new_resource.version(['1.0', '6.2'])
-      @provider.run_action(:install)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version(['1.0', '6.2'])
+      new_resource.version(['1.0', '6.2'])
+      provider.run_action(:install)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "does not install any version if all are installed, and no version was specified" do
-      @current_resource.version(['1.0', '6.2'])
-      @provider.run_action(:install)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version(['1.0', '6.2'])
+      provider.run_action(:install)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "raises an exception if both are not installed and no caondidates are available" do
-      @current_resource.version([nil, nil])
-      @provider.candidate_version = [nil, nil]
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      current_resource.version([nil, nil])
+      provider.candidate_version = [nil, nil]
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "raises an exception if one is not installed and no candidates are available" do
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = ['1.0', nil]
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = ['1.0', nil]
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "does not raise an exception if the packages are installed or have a candidate" do
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = [nil, '6.2']
-      expect { @provider.run_action(:install) }.not_to raise_error
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = [nil, '6.2']
+      expect { provider.run_action(:install) }.not_to raise_error
     end
 
     it "raises an exception if an explicit version is asked for, an old version is installed, but no candidate" do
-      @new_resource.version ['1.0', '6.2']
-      @current_resource.version(['1.0', '6.1'])
-      @provider.candidate_version = ['1.0', nil]
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      new_resource.version ['1.0', '6.2']
+      current_resource.version(['1.0', '6.1'])
+      provider.candidate_version = ['1.0', nil]
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "does not raise an exception if an explicit version is asked for, and is installed, but no candidate" do
-      @new_resource.version ['1.0', '6.2']
-      @current_resource.version(['1.0', '6.2'])
-      @provider.candidate_version = ['1.0', nil]
-      expect { @provider.run_action(:install) }.not_to raise_error
+      new_resource.version ['1.0', '6.2']
+      current_resource.version(['1.0', '6.2'])
+      provider.candidate_version = ['1.0', nil]
+      expect { provider.run_action(:install) }.not_to raise_error
     end
 
     it "raise an exception if an explicit version is asked for, and is not installed, and no candidate" do
-      @new_resource.version ['1.0', '6.2']
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = ['1.0', nil]
-      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      new_resource.version ['1.0', '6.2']
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = ['1.0', nil]
+      expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "does not raise an exception if an explicit version is asked for, and is not installed, and there is a candidate" do
-      @new_resource.version ['1.0', '6.2']
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = ['1.0', '6.2']
-      expect { @provider.run_action(:install) }.not_to raise_error
+      new_resource.version ['1.0', '6.2']
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = ['1.0', '6.2']
+      expect { provider.run_action(:install) }.not_to raise_error
     end
   end
 
   describe "when upgrading multiple packages" do
     before(:each) do
-      @provider.current_resource = @current_resource
-      allow(@provider).to receive(:upgrade_package).and_return(true)
+      provider.current_resource = current_resource
+      allow(provider).to receive(:upgrade_package).and_return(true)
     end
 
     it "should upgrade the package if the current versions are not the candidate version" do
-      @current_resource.version ['0.9', '6.1']
-      expect(@provider).to receive(:upgrade_package).with(
-        @new_resource.package_name,
-        @provider.candidate_version
+      current_resource.version ['0.9', '6.1']
+      expect(provider).to receive(:upgrade_package).with(
+        new_resource.package_name,
+        provider.candidate_version
       ).and_return(true)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:upgrade)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should upgrade the package if some of current versions are not the candidate versions" do
-      @current_resource.version ['1.0', '6.1']
-      expect(@provider).to receive(:upgrade_package).with(
+      current_resource.version ['1.0', '6.1']
+      expect(provider).to receive(:upgrade_package).with(
         ["vi"],
         ["6.2"]
       ).and_return(true)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).to be_updated_by_last_action
+      provider.run_action(:upgrade)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not install the package if the current versions are the candidate version" do
-      @current_resource.version ['1.0', '6.2']
-      expect(@provider).not_to receive(:upgrade_package)
-      @provider.run_action(:upgrade)
-      expect(@new_resource).not_to be_updated_by_last_action
+      current_resource.version ['1.0', '6.2']
+      expect(provider).not_to receive(:upgrade_package)
+      provider.run_action(:upgrade)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should raise an exception if both are not installed and no caondidates are available" do
-      @current_resource.version([nil, nil])
-      @provider.candidate_version = [nil, nil]
-      expect { @provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
+      current_resource.version([nil, nil])
+      provider.candidate_version = [nil, nil]
+      expect { provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should raise an exception if one is not installed and no candidates are available" do
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = ['1.0', nil]
-      expect { @provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = ['1.0', nil]
+      expect { provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should not raise an exception if the packages are installed or have a candidate" do
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = [nil, '6.2']
-      expect { @provider.run_action(:upgrade) }.not_to raise_error
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = [nil, '6.2']
+      expect { provider.run_action(:upgrade) }.not_to raise_error
     end
 
     it "should not raise an exception if the packages are installed or have a candidate" do
-      @current_resource.version(['1.0', nil])
-      @provider.candidate_version = [nil, '6.2']
-      expect { @provider.run_action(:upgrade) }.not_to raise_error
+      current_resource.version(['1.0', nil])
+      provider.candidate_version = [nil, '6.2']
+      expect { provider.run_action(:upgrade) }.not_to raise_error
     end
   end
 
   describe "When removing multiple packages " do
     before(:each) do
-      allow(@provider).to receive(:remove_package).and_return(true)
-      @current_resource.version ['1.0', '6.2']
+      allow(provider).to receive(:remove_package).and_return(true)
+      current_resource.version ['1.0', '6.2']
     end
 
     it "should remove the packages if all are installed" do
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should remove the packages if some are installed" do
-      @current_resource.version ['1.0', nil]
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      current_resource.version ['1.0', nil]
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should remove the packages at a specific version if they are installed at that version" do
-      @new_resource.version ['1.0', '6.2']
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], ['1.0', '6.2'])
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version ['1.0', '6.2']
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with(['emacs', 'vi'], ['1.0', '6.2'])
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should remove the packages at a specific version any are is installed at that version" do
-      @new_resource.version ['0.5', '6.2']
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], ['0.5', '6.2'])
-      @provider.run_action(:remove)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version ['0.5', '6.2']
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:remove_package).with(['emacs', 'vi'], ['0.5', '6.2'])
+      provider.run_action(:remove)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not remove the packages at a specific version if they are not installed at that version" do
-      @new_resource.version ['0.5', '6.0']
-      expect(@provider).not_to be_removing_package
-      expect(@provider).not_to receive(:remove_package)
-      @provider.run_action(:remove)
-      expect(@new_resource).not_to be_updated_by_last_action
+      new_resource.version ['0.5', '6.0']
+      expect(provider).not_to be_removing_package
+      expect(provider).not_to receive(:remove_package)
+      provider.run_action(:remove)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should not remove the packages if they are not installed" do
-      expect(@provider).not_to receive(:remove_package)
-      allow(@current_resource).to receive(:version).and_return(nil)
-      @provider.run_action(:remove)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:remove_package)
+      allow(current_resource).to receive(:version).and_return(nil)
+      provider.run_action(:remove)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
   end
 
   describe "When purging multiple packages " do
     before(:each) do
-      allow(@provider).to receive(:purge_package).and_return(true)
-      @current_resource.version ['1.0', '6.2']
+      allow(provider).to receive(:purge_package).and_return(true)
+      current_resource.version ['1.0', '6.2']
     end
 
     it "should purge the packages if all are installed" do
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should purge the packages if some are installed" do
-      @current_resource.version ['1.0', nil]
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated
-      expect(@new_resource).to be_updated_by_last_action
+      current_resource.version ['1.0', nil]
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should purge the packages at a specific version if they are installed at that version" do
-      @new_resource.version ['1.0', '6.2']
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], ['1.0', '6.2'])
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version ['1.0', '6.2']
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with(['emacs', 'vi'], ['1.0', '6.2'])
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should purge the packages at a specific version any are is installed at that version" do
-      @new_resource.version ['0.5', '6.2']
-      expect(@provider).to be_removing_package
-      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], ['0.5', '6.2'])
-      @provider.run_action(:purge)
-      expect(@new_resource).to be_updated_by_last_action
+      new_resource.version ['0.5', '6.2']
+      expect(provider).to be_removing_package
+      expect(provider).to receive(:purge_package).with(['emacs', 'vi'], ['0.5', '6.2'])
+      provider.run_action(:purge)
+      expect(new_resource).to be_updated_by_last_action
     end
 
     it "should not purge the packages at a specific version if they are not installed at that version" do
-      @new_resource.version ['0.5', '6.0']
-      expect(@provider).not_to be_removing_package
-      expect(@provider).not_to receive(:purge_package)
-      @provider.run_action(:purge)
-      expect(@new_resource).not_to be_updated_by_last_action
+      new_resource.version ['0.5', '6.0']
+      expect(provider).not_to be_removing_package
+      expect(provider).not_to receive(:purge_package)
+      provider.run_action(:purge)
+      expect(new_resource).not_to be_updated_by_last_action
     end
 
     it "should not purge the packages if they are not installed" do
-      expect(@provider).not_to receive(:purge_package)
-      allow(@current_resource).to receive(:version).and_return(nil)
-      @provider.run_action(:purge)
-      expect(@new_resource).not_to be_updated_by_last_action
+      expect(provider).not_to receive(:purge_package)
+      allow(current_resource).to receive(:version).and_return(nil)
+      provider.run_action(:purge)
+      expect(new_resource).not_to be_updated_by_last_action
     end
   end
 
@@ -710,30 +843,30 @@ describe "Chef::Provider::Package - Multi" do
       stubbed_method = method == :shell_out_with_timeout! ? :shell_out! : :shell_out
       [ %w{command arg1 arg2}, "command arg1 arg2" ].each do |command|
         it "#{method} defaults to 900 seconds" do
-          expect(@provider).to receive(stubbed_method).with(*command, timeout: 900)
-          @provider.send(method, *command)
+          expect(provider).to receive(stubbed_method).with(*command, timeout: 900)
+          provider.send(method, *command)
         end
         it "#{method} overrides the default timeout with its options" do
-          expect(@provider).to receive(stubbed_method).with(*command, timeout: 1)
-          @provider.send(method, *command, timeout: 1)
+          expect(provider).to receive(stubbed_method).with(*command, timeout: 1)
+          provider.send(method, *command, timeout: 1)
         end
         it "#{method} overrides both timeouts with the new_resource.timeout" do
-          @new_resource.timeout(99)
-          expect(@provider).to receive(stubbed_method).with(*command, timeout: 99)
-          @provider.send(method, *command, timeout: 1)
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with(*command, timeout: 99)
+          provider.send(method, *command, timeout: 1)
         end
         it "#{method} defaults to 900 seconds and preserves options" do
-          expect(@provider).to receive(stubbed_method).with(*command, env: nil, timeout: 900)
-          @provider.send(method, *command, env: nil)
+          expect(provider).to receive(stubbed_method).with(*command, env: nil, timeout: 900)
+          provider.send(method, *command, env: nil)
         end
         it "#{method} overrides the default timeout with its options and preserves options" do
-          expect(@provider).to receive(stubbed_method).with(*command, timeout: 1, env: nil)
-          @provider.send(method, *command, timeout: 1, env: nil)
+          expect(provider).to receive(stubbed_method).with(*command, timeout: 1, env: nil)
+          provider.send(method, *command, timeout: 1, env: nil)
         end
         it "#{method} overrides both timeouts with the new_resource.timeout and preseves options" do
-          @new_resource.timeout(99)
-          expect(@provider).to receive(stubbed_method).with(*command, timeout: 99, env: nil)
-          @provider.send(method, *command, timeout: 1, env: nil)
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with(*command, timeout: 99, env: nil)
+          provider.send(method, *command, timeout: 1, env: nil)
         end
       end
     end
diff --git a/spec/unit/provider/package_spec.rbe b/spec/unit/provider/package_spec.rbe
deleted file mode 100644
index e69de29bb2..0000000000
--- a/spec/unit/provider/package_spec.rbe
+++ /dev/null