Allow overwrite when updating forum style

[chef.git] / cookbooks / python / resources / package.rb

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index d6431c87da8714116d29f5e0101b6ac5469a096b..fb9cf09bd3fac8fabba6dc9d66a3475cf57d84bc 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -8,7 +8,7 @@
 # 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
+# https://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,
@@ -22,15 +22,16 @@ default_action :install
 property :package_name, :kind_of => String, :name_property => true
 property :version, :kind_of => String
 property :python_version, :kind_of => String
+property :python_virtualenv, :kind_of => String
 
 action :install do
-  if version.nil?
-    execute "pip-install-#{name}" do
+  if new_resource.version.nil?
+    execute "pip-install-#{new_resource.package_name}" do
       command "#{pip_command} install #{new_resource.package_name}"
       not_if "#{pip_command} show #{new_resource.package_name}"
     end
   else
-    execute "pip-install-#{name}" do
+    execute "pip-install-#{new_resource.package_name}" do
       command "#{pip_command} install #{new_resource.package_name}==#{new_resource.version}"
       not_if "#{pip_command} show #{new_resource.package_name} | fgrep -q #{new_resource.version}"
     end
@@ -38,12 +39,18 @@ action :install do
 end
 
 action :remove do
-  execute "pip-uninstall-#{name}" do
+  execute "pip-uninstall-#{new_resource.package_name}" do
     command "#{pip_command} uninstall #{new_resource.package_name}"
     only_if "#{pip_command} show #{new_resource.package_name}"
   end
 end
 
-def pip_command
-  "pip#{python_version}"
+action_class do
+  def pip_command
+    if new_resource.python_virtualenv
+      "#{new_resource.python_virtualenv}/bin/pip"
+    else
+      "pip#{new_resource.python_version}"
+    end
+  end
 end