X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b0d9abfbd0d3b78db57f09a8976b10a446542a99..9c716e8f505c97ab226ba3a73e3396e0d469349a:/cookbooks/python/resources/package.rb?ds=sidebyside diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb index d6431c87d..0a3f49170 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,20 +17,23 @@ # 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 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 +41,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