CHEF-987: allow yum to do localinstalls

Author: Thom May

chef/lib/chef/provider/package/yum.rb

@@ -115,6 +115,23 @@ def load_current_resource
 @current_resource=Chef::Resource::Package.new(@new_resource.name)
 @current_resource.package_name(@new_resource.package_name)
 
+if@new_resource.source
+unless ::File.exists?(@new_resource.source)
+raiseChef::Exceptions::Package,"Package #{@new_resource.name} not found: #{@new_resource.source}"
+end
+
+Chef::Log.debug("Checking rpm status for #{@new_resource.package_name}")
+status=popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}")do |pid,stdin,stdout,stderr|
+stdout.eachdo |line|
+caseline
+when/([\w\d_.-]+)\s([\w\d_.-]+)/
+@current_resource.package_name($1)
+@new_resource.version($2)
+end
+end
+end
+end
+
 Chef::Log.debug("Checking yum info for #{@new_resource.package_name}")
 
 @yum.refresh
@@ -133,9 +150,15 @@ def load_current_resource
 end
 
 definstall_package(name,version)
-run_command_with_systems_locale(
-:command=>"yum -d0 -e0 -y install #{name}-#{version}"
-)
+if@new_resource.source
+run_command_with_systems_locale(
+:command=>"yum -d0 -e0 -y localinstall #{@new_resource.source}"
+)
+else
+run_command_with_systems_locale(
+:command=>"yum -d0 -e0 -y install #{name}-#{version}"
+)
+end
 @yum.flush
 end
 

chef/spec/unit/provider/package/yum_spec.rb

@@ -26,7 +26,8 @@
 :name=>"cups",
 :version=>nil,
 :package_name=>"cups",
-:updated=>nil
+:updated=>nil,
+:source=>nil
 )
 @current_resource=mock("Chef::Resource::Package",
 :null_object=>true,
@@ -90,7 +91,8 @@
 :name=>"emacs",
 :version=>nil,
 :package_name=>"emacs",
-:updated=>nil
+:updated=>nil,
+:source=>nil
 )
 @yum_cache=mock(
 'Chef::Provider::Yum::YumCache',
@@ -109,6 +111,15 @@
 })
 @provider.install_package("emacs","1.0")
 end
+
+it"should run yum localinstall if given a path to an rpm"do
+@new_resource.stub!(:source).and_return("/tmp/emacs-21.4-20.el5.i386.rpm")
+@provider.should_receive(:run_command_with_systems_locale).with({
+:command=>"yum -d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm"
+})
+@provider.install_package("emacs","21.4-20.el5")
+end
+
 end
 
 describeChef::Provider::Package::Yum,"upgrade_package"do
@@ -120,7 +131,8 @@
 :name=>"emacs",
 :version=>nil,
 :package_name=>"emacs",
-:updated=>nil
+:updated=>nil,
+:source=>nil
 )
 @yum_cache=mock(
 'Chef::Provider::Yum::YumCache',
@@ -166,7 +178,8 @@
 :name=>"emacs",
 :version=>nil,
 :package_name=>"emacs",
-:updated=>nil
+:updated=>nil,
+:source=>nil
 )
 @yum_cache=mock(
 'Chef::Provider::Yum::YumCache',
@@ -195,7 +208,8 @@
 :name=>"emacs",
 :version=>"10",
 :package_name=>"emacs",
-:updated=>nil
+:updated=>nil,
+:source=>nil
 )
 @yum_cache=mock(
 'Chef::Provider::Yum::YumCache',