Merge branch 'CHEF-2398'

spazm · Jun 4, 2011 · bdc4033 · bdc4033
2 parents 627b643 + 1ee0ae9
commit bdc4033
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/chef/lib/chef/provider/package/easy_install.rb b/chef/lib/chef/provider/package/easy_install.rb
@@ -115,15 +115,15 @@ def candidate_version
         end
 
         def install_package(name, version)
-          run_command(:command => "#{easy_install_binary_path} \"#{name}==#{version}\"")
+          run_command(:command => "#{easy_install_binary_path}#{expand_options(@new_resource.options)} \"#{name}==#{version}\"")
         end
 
         def upgrade_package(name, version)
           install_package(name, version)
         end
 
         def remove_package(name, version)
-          run_command(:command => "#{easy_install_binary_path} -m #{name}")
+          run_command(:command => "#{easy_install_binary_path }#{expand_options(@new_resource.options)} -m #{name}")
         end
 
         def purge_package(name, version)

diff --git a/chef/spec/unit/provider/package/easy_install_spec.rb b/chef/spec/unit/provider/package/easy_install_spec.rb
@@ -38,7 +38,7 @@
     @pid = 2342
     @provider.stub!(:popen4).and_return(@status)
   end
-  
+
   describe "easy_install_binary_path" do
 
     it "should return a Chef::Provider::EasyInstall object" do
@@ -70,6 +70,14 @@
       @provider.install_package("boto", "1.8d")
     end
 
+    it "should run easy_install with the package name and version and specified options" do
+      @provider.should_receive(:run_command).with({
+        :command => "easy_install --always-unzip \"boto==1.8d\""
+      })
+      @new_resource.stub!(:options).and_return("--always-unzip")
+      @provider.install_package("boto", "1.8d")
+    end
+
     it "should run easy_install with the package name and version" do
       @provider.should_receive(:run_command).with({
         :command => "easy_install \"boto==1.8d\""
@@ -84,6 +92,14 @@
       @provider.remove_package("boto", "1.8d")
     end
 
+    it "should run easy_install -m with the package name and version and specified options" do
+      @provider.should_receive(:run_command).with({
+        :command => "easy_install -x -m boto"
+      })
+      @new_resource.stub!(:options).and_return("-x")
+      @provider.remove_package("boto", "1.8d")
+    end
+
     it "should run easy_install -m with the package name and version" do
       @provider.should_receive(:run_command).with({
         :command => "easy_install -m boto"