X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..3b7db03656d2f783af8ad7f9e6c19716773da602:/cookbooks/python/resources/package.rb

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index 4a3cb9f01..f794f2b5a 100644
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: python
+# Cookbook:: python
 # 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.
@@ -17,21 +17,39 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 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
+property :extra_index_url, :kind_of => String
 
 action :install do
   if new_resource.version.nil?
     execute "pip-install-#{new_resource.package_name}" do
-      command "#{pip_command} install #{new_resource.package_name}"
+      command "#{pip_command} install #{pip_extra_index} #{new_resource.package_name}"
       not_if "#{pip_command} show #{new_resource.package_name}"
     end
   else
     execute "pip-install-#{new_resource.package_name}" do
-      command "#{pip_command} install #{new_resource.package_name}==#{new_resource.version}"
+      command "#{pip_command} install #{pip_extra_index} #{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 :upgrade do
+  if new_resource.version.nil?
+    execute "pip-upgrade-#{new_resource.package_name}" do
+      command "#{pip_command} install #{pip_extra_index} --upgrade #{new_resource.package_name}"
+      only_if "#{pip_command} list --outdated | fgrep -q #{new_resource.package_name}"
+    end
+  else
+    execute "pip-upgrade-#{new_resource.package_name}" do
+      command "#{pip_command} install #{pip_extra_index} --upgrade #{new_resource.package_name}==#{new_resource.version}"
       not_if "#{pip_command} show #{new_resource.package_name} | fgrep -q #{new_resource.version}"
     end
   end
@@ -45,7 +63,17 @@ action :remove do
 end
 
 action_class do
+  def pip_extra_index
+    if new_resource.extra_index_url
+      "--extra-index-url '#{new_resource.extra_index_url}'"
+    end
+  end
+
   def pip_command
-    "pip#{new_resource.python_version}"
+    if new_resource.python_virtualenv
+      "#{new_resource.python_virtualenv}/bin/pip"
+    else
+      "pip#{new_resource.python_version}"
+    end
   end
 end