Qualify property names

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

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index 3a766957e55ddefc6f97f5b9247a512fd8899641..7dddd17afdb2caefef201557788acfc4c4089939 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -19,26 +19,33 @@
 
 default_action :install
 
-attribute :package_name, :kind_of => String, :name_attribute => true
-attribute :version, :kind_of => String
+property :package_name, :kind_of => String, :name_property => true
+property :version, :kind_of => String
+property :python_version, :kind_of => String
 
 action :install do
-  if version.nil?
-    execute "pip-install-#{name}" do
-      command "pip install #{new_resource.package_name}"
-      not_if "pip show #{new_resource.package_name}"
+  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
-      command "pip install #{new_resource.package_name}==#{new_resource.version}"
-      not_if "pip show #{new_resource.package_name} | fgrep -q #{new_resource.version}"
+    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
   end
 end
 
 action :remove do
-  execute "pip-uninstall-#{name}" do
-    command "pip uninstall #{new_resource.package_name}"
-    only_if "pip show #{new_resource.package_name}"
+  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
+
+action_class do
+  def pip_command
+    "pip#{new_resource.python_version}"
   end
 end