X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b058886e60a6ee9ac09bc07a3bfd3ed048a40a0..f8a576aca1270f703f38c3257cf533390692de06:/cookbooks/python/resources/package.rb?ds=sidebyside diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb index 7dddd17af..c838690af 100644 --- a/cookbooks/python/resources/package.rb +++ b/cookbooks/python/resources/package.rb @@ -1,14 +1,14 @@ # -# 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. # 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, @@ -17,11 +17,14 @@ # 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 action :install do if new_resource.version.nil? @@ -37,6 +40,20 @@ action :install do end end +action :upgrade do + if new_resource.version.nil? + execute "pip-upgrade-#{new_resource.package_name}" do + command "#{pip_command} install --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 --upgrade #{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-#{new_resource.package_name}" do command "#{pip_command} uninstall #{new_resource.package_name}" @@ -46,6 +63,10 @@ end action_class do 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