chef 12.0.3 → 12.1.0.rc.0

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

@@ -0,0 +1,66 @@
+#
+# Author:: Scott Bonds (scott@ggr.com)
+# Copyright:: Copyright (c) 2014 Scott Bonds
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'ostruct'
+
+describe Chef::Provider::Package::Openbsd do
+
+  before(:each) do
+    @node = Chef::Node.new
+    @node.default['kernel'] = {'name' => 'OpenBSD', 'release' => '5.5', 'machine' => 'amd64'}
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    ENV['PKG_PATH'] = nil
+  end
+
+  describe "install a package" do
+    before do
+      @name = 'ihavetoes'
+      @new_resource     = Chef::Resource::Package.new(@name)
+      @current_resource = Chef::Resource::Package.new(@name)
+      @provider = Chef::Provider::Package::Openbsd.new(@new_resource, @run_context)
+      @provider.current_resource = @current_resource
+    end
+    it "should run the installation command" do
+      expect(@provider).to receive(:shell_out!).with(
+        "pkg_add -r #{@name}",
+        {:env => {"PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/"}}
+      ) {OpenStruct.new :status => true}
+      @provider.install_package(@name, nil)
+    end
+  end
+
+  describe "delete a package" do
+    before do
+      @name = 'ihavetoes'
+      @new_resource     = Chef::Resource::Package.new(@name)
+      @current_resource = Chef::Resource::Package.new(@name)
+      @provider = Chef::Provider::Package::Openbsd.new(@new_resource, @run_context)
+      @provider.current_resource = @current_resource
+    end
+    it "should run the command to delete the installed package" do
+      expect(@provider).to receive(:shell_out!).with(
+        "pkg_delete #{@name}", :env=>nil
+      ) {OpenStruct.new :status => true}
+      @provider.remove_package(@name, nil)
+    end
+  end
+
+end
+

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

@@ -26,10 +26,11 @@ describe Chef::Provider::Package::Pacman do
     @new_resource = Chef::Resource::Package.new("nano")
     @current_resource = Chef::Resource::Package.new("nano")
 
-    @status = double("Status", :exitstatus => 0)
+    @status = double(:stdout => "", :exitstatus => 0)
     @provider = Chef::Provider::Package::Pacman.new(@new_resource, @run_context)
     allow(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
-    allow(@provider).to receive(:popen4).and_return(@status)
+
+    allow(@provider).to receive(:shell_out).and_return(@status)
     @stdin = StringIO.new
     @stdout = StringIO.new(<<-ERR)
 error: package "nano" not found
@@ -50,24 +51,23 @@ ERR
     end
 
     it "should run pacman query with the package name" do
-      expect(@provider).to receive(:popen4).with("pacman -Qi #{@new_resource.package_name}").and_return(@status)
+      expect(@provider).to receive(:shell_out).with("pacman -Qi #{@new_resource.package_name}").and_return(@status)
       @provider.load_current_resource
     end
 
     it "should read stdout on pacman" do
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      expect(@stdout).to receive(:each).and_return(true)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       @provider.load_current_resource
     end
 
     it "should set the installed version to nil on the current resource if pacman installed version not exists" do
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       expect(@current_resource).to receive(:version).with(nil).and_return(true)
       @provider.load_current_resource
     end
 
     it "should set the installed version if pacman has one" do
-      @stdout = StringIO.new(<<-PACMAN)
+      stdout = <<-PACMAN
 Name           : nano
 Version        : 2.2.2-1
 URL            : http://www.nano-editor.org
@@ -88,14 +88,16 @@ Install Reason : Explicitly installed
 Install Script : Yes
 Description    : Pico editor clone with enhancements
 PACMAN
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+
+      status = double(:stdout => stdout, :exitstatus => 0)
+      allow(@provider).to receive(:shell_out).and_return(status)
       @provider.load_current_resource
       expect(@current_resource.version).to eq("2.2.2-1")
     end
 
     it "should set the candidate version if pacman has one" do
-      allow(@stdout).to receive(:each).and_yield("core nano 2.2.3-1")
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      status = double(:stdout => "core nano 2.2.3-1", :exitstatus => 0)
+      allow(@provider).to receive(:shell_out).and_return(status)
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("2.2.3-1")
     end
@@ -119,10 +121,10 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
 
+      status = double(:stdout => "customrepo nano 1.2.3-4", :exitstatus => 0)
       allow(::File).to receive(:exists?).with("/etc/pacman.conf").and_return(true)
       allow(::File).to receive(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
-      allow(@stdout).to receive(:each).and_yield("customrepo nano 1.2.3-4")
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      allow(@provider).to receive(:shell_out).and_return(status)
 
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("1.2.3-4")
@@ -139,8 +141,7 @@ PACMAN_CONF
     end
 
     it "should raise an exception if pacman does not return a candidate version" do
-      allow(@stdout).to receive(:each).and_yield("")
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
     end
 

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

@@ -102,13 +102,13 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
     describe Chef::Provider::Package::Portage, "candidate_version" do
       it "should return the candidate_version variable if already set" do
         @provider.candidate_version = "1.0.0"
-        expect(@provider).not_to receive(:popen4)
+        expect(@provider).not_to receive(:shell_out)
         @provider.candidate_version
       end
 
       it "should throw an exception if the exitstatus is not 0" do
-        @status = double("Status", :exitstatus => 1)
-        allow(@provider).to receive(:popen4).and_return(@status)
+        status = double(:stdout => "", :exitstatus => 1)
+        allow(@provider).to receive(:shell_out).and_return(status)
         expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
       end
 
@@ -143,8 +143,8 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = double("Status", :exitstatus => 0)
-        expect(@provider).to receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
+        status = double(:stdout => output, :exitstatus => 0)
+        expect(@provider).to receive(:shell_out).and_return(status)
         expect(@provider.candidate_version).to eq("1.6.0.6")
       end
 
@@ -179,9 +179,9 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = double("Status", :exitstatus => 0)
+        status = double(:stdout => output, :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
-        expect(@provider).to receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
+        expect(@provider).to receive(:shell_out).and_return(status)
         expect(@provider.candidate_version).to eq("1.6.0.6")
       end
 
@@ -224,9 +224,9 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = double("Status", :exitstatus => 0)
+        status = double(:stdout => output, :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
-        expect(@provider).to receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
+        expect(@provider).to receive(:shell_out).and_return(status)
         expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
       end
 
@@ -269,9 +269,9 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = double("Status", :exitstatus => 0)
+        status = double(:stdout => output, :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource, @run_context)
-        expect(@provider).to receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
+        expect(@provider).to receive(:shell_out).and_return(status)
         expect(@provider.candidate_version).to eq("1.6.0.6")
       end
     end

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

@@ -19,138 +19,186 @@
 require 'spec_helper'
 
 describe Chef::Provider::Package::Rpm do
-  before(:each) do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-
-    @new_resource = Chef::Resource::Package.new("ImageMagick-c++")
-    @new_resource.source "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
-
-    @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
+  let(:provider) { Chef::Provider::Package::Rpm.new(new_resource, run_context) }
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:new_resource) do
+    Chef::Resource::Package.new("ImageMagick-c++").tap do |resource|
+      resource.source "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+    end
+  end
+  let(:exitstatus) { 0 }
+  let(:stdout) { String.new('') }
+  let(:status) { double('Process::Status', exitstatus: exitstatus, stdout: stdout) }
 
-    @status = double("Status", :exitstatus => 0)
+  before(:each) do
     allow(::File).to receive(:exists?).and_return(true)
+    allow(provider).to receive(:shell_out!).and_return(status)
   end
 
   describe "when determining the current state of the package" do
-
     it "should create a current resource with the name of new_resource" do
-      allow(@provider).to receive(:popen4).and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.name).to eq("ImageMagick-c++")
+      provider.load_current_resource
+      expect(provider.current_resource.name).to eq("ImageMagick-c++")
     end
 
     it "should set the current reource package name to the new resource package name" do
-      allow(@provider).to receive(:popen4).and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.package_name).to eq('ImageMagick-c++')
+      provider.load_current_resource
+      expect(provider.current_resource.package_name).to eq('ImageMagick-c++')
     end
 
     it "should raise an exception if a source is supplied but not found" do
       allow(::File).to receive(:exists?).and_return(false)
-      expect { @provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
     end
 
-    it "should get the source package version from rpm if provided" do
-      @stdout = StringIO.new("ImageMagick-c++ 6.5.4.7-7.el6_5")
-      expect(@provider).to receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      expect(@provider).to receive(:popen4).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.package_name).to eq("ImageMagick-c++")
-      expect(@provider.new_resource.version).to eq("6.5.4.7-7.el6_5")
-    end
+    context "installation exists" do
+      let(:stdout) { "ImageMagick-c++ 6.5.4.7-7.el6_5" }
+
+      it "should get the source package version from rpm if provided" do
+        expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status)
+        expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status)
+        provider.load_current_resource
+        expect(provider.current_resource.package_name).to eq("ImageMagick-c++")
+        expect(provider.new_resource.version).to eq("6.5.4.7-7.el6_5")
+      end
 
-    it "should return the current version installed if found by rpm" do
-      @stdout = StringIO.new("ImageMagick-c++ 6.5.4.7-7.el6_5")
-      expect(@provider).to receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(@status)
-      expect(@provider).to receive(:popen4).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.version).to eq("6.5.4.7-7.el6_5")
+      it "should return the current version installed if found by rpm" do
+        expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status)
+        expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status)
+        provider.load_current_resource
+        expect(provider.current_resource.version).to eq("6.5.4.7-7.el6_5")
+      end
     end
 
-    it "should raise an exception if the source is not set but we are installing" do
-      new_resource = Chef::Resource::Package.new("ImageMagick-c++")
-      provider = Chef::Provider::Package::Rpm.new(new_resource, @run_context)
-      expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+    context "source is uri formed" do
+      before(:each) do
+        allow(::File).to receive(:exists?).and_return(false)
+      end
+
+      %w(http HTTP https HTTPS ftp FTP).each do |scheme|
+        it "should accept uri formed source (#{scheme})" do
+          new_resource.source "#{scheme}://example.com/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+          expect(provider.load_current_resource).not_to be_nil
+        end
+      end
+
+      %w(file FILE).each do |scheme|
+        it "should accept uri formed source (#{scheme})" do
+          new_resource.source "#{scheme}:///ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+          expect(provider.load_current_resource).not_to be_nil
+        end
+      end
+
+      it "should raise an exception if an uri formed source is non-supported scheme" do
+        new_resource.source "foobar://example.com/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+        expect(provider.load_current_resource).to be_nil
+        expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      end
     end
 
-    it "should raise an exception if rpm fails to run" do
-      status = double("Status", :exitstatus => -1)
-      allow(@provider).to receive(:popen4).and_return(status)
-      expect { @provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+    context "source is not defiend" do
+      let(:new_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+
+      it "should raise an exception if the source is not set but we are installing" do
+        expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      end
     end
 
-    it "should not detect the package name as version when not installed" do
-      @status = double("Status", :exitstatus => -1)
-      @stdout = StringIO.new("package openssh-askpass is not installed")
-      @new_resource = Chef::Resource::Package.new("openssh-askpass")
-      @new_resource.source 'openssh-askpass'
-      @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-      expect(@provider).to receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      expect(@provider).to receive(:popen4).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.version).to be_nil
+    context "installation does not exist" do
+      let(:stdout) { String.new("package openssh-askpass is not installed") }
+      let(:exitstatus) { -1 }
+      let(:new_resource) do
+        Chef::Resource::Package.new("openssh-askpass").tap do |resource|
+          resource.source "openssh-askpass"
+        end
+      end
+
+      it "should raise an exception if rpm fails to run" do
+        allow(provider).to receive(:shell_out).and_return(status)
+        expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      end
+
+      it "should not detect the package name as version when not installed" do
+        expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status)
+        expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status)
+        provider.load_current_resource
+        expect(provider.current_resource.version).to be_nil
+      end
     end
   end
 
   describe "after the current resource is loaded" do
-    before do
-      @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-      @provider.current_resource = @current_resource
+    let(:current_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+    let(:provider) do
+      Chef::Provider::Package::Rpm.new(new_resource, run_context).tap do |provider|
+        provider.current_resource = current_resource
+      end
     end
 
     describe "when installing or upgrading" do
       it "should run rpm -i with the package source to install" do
-        expect(@provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        expect(provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.install_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
       it "should run rpm -U with the package source to upgrade" do
-        @current_resource.version("21.4-19.el5")
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        current_resource.version("21.4-19.el5")
+        expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
       it "should install package if missing and set to upgrade" do
-        @current_resource.version("ImageMagick-c++")
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        current_resource.version("ImageMagick-c++")
+        expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
-      it "should install from a path when the package is a path and the source is nil" do
-        @new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-        expect(@new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-        @provider.current_resource = @current_resource
-        expect(@provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+      context "allowing downgrade" do
+        let(:new_resource) { Chef::Resource::RpmPackage.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm") }
+        let(:current_resource) { Chef::Resource::RpmPackage.new("ImageMagick-c++") }
+
+        it "should run rpm -U --oldpackage with the package source to downgrade" do
+          new_resource.allow_downgrade(true)
+          current_resource.version("21.4-19.el5")
+          expect(provider).to receive(:shell_out!).with("rpm  -U --oldpackage /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+          provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        end
       end
 
-      it "should uprgrade from a path when the package is a path and the source is nil" do
-        @new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-        expect(@new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-        @current_resource.version("21.4-19.el5")
-        @provider.current_resource = @current_resource
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+      context "installing when the name is a path" do
+        let(:new_resource) { Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm") }
+        let(:current_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+
+        it "should install from a path when the package is a path and the source is nil" do
+          expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+          provider.current_resource = current_resource
+          expect(provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+          provider.install_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+        end
+
+        it "should uprgrade from a path when the package is a path and the source is nil" do
+          expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+          current_resource.version("21.4-19.el5")
+          provider.current_resource = current_resource
+          expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+          provider.upgrade_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+        end
       end
 
       it "installs with custom options specified in the resource" do
-        @provider.candidate_version = '11'
-        @new_resource.options("--dbpath /var/lib/rpm")
-        expect(@provider).to receive(:shell_out!).with("rpm --dbpath /var/lib/rpm -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package(@new_resource.name, @provider.candidate_version)
+        provider.candidate_version = '11'
+        new_resource.options("--dbpath /var/lib/rpm")
+        expect(provider).to receive(:shell_out!).with("rpm --dbpath /var/lib/rpm -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.install_package(new_resource.name, provider.candidate_version)
       end
     end
 
     describe "when removing the package" do
       it "should run rpm -e to remove the package" do
-        expect(@provider).to receive(:shell_out!).with("rpm  -e ImageMagick-c++-6.5.4.7-7.el6_5")
-        @provider.remove_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        expect(provider).to receive(:shell_out!).with("rpm  -e ImageMagick-c++-6.5.4.7-7.el6_5")
+        provider.remove_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
     end
   end