Remove specific namespaces from general wiki config

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

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index 76a6af7ec4a7aad7c64635b98f8ef5f81ab78df4..0679e87e34f7b75030610c1d79be94a7e6a17643 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: python
+# Cookbook:: python

 # Resource:: package
 #
 # Resource:: package
 #

-# Copyright 2017, OpenStreetMap Foundation
+# Copyright:: 2017, OpenStreetMap Foundation

 #
 # 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
 #
 #
 # 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
+# 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,24 +21,36 @@ default_action :install
 
 property :package_name, :kind_of => String, :name_property => true
 property :version, :kind_of => String
 
 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
 
 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
     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
     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
+    if new_resource.python_virtualenv
+      "#{new_resource.python_virtualenv}/bin/pip"
+    else
+      "pip#{new_resource.python_version}"
+    end

   end
 end
   end
 end