From 5bee3c23482ef18bc002cfae26a17093db70c683 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Tue, 7 Aug 2012 16:41:34 -0400 Subject: [PATCH 1/2] Add easy_install module --- easy_install | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 easy_install diff --git a/easy_install b/easy_install new file mode 100755 index 00000000000..b7d4eaa8067 --- /dev/null +++ b/easy_install @@ -0,0 +1,91 @@ +#!/usr/bin/python + +EASY_INSTALL = None +VIRTUALENV = '/usr/local/bin/virtualenv' +ENV = None + + +def _find_easy_install(): + if ENV: + return os.path.join(ENV, 'bin', 'easy_install') + + paths = ['/usr/local/bin', '/usr/bin'] + + for p in paths: + e = p + '/easy_install' + if os.path.exists(e): + return e + + +def _ensure_virtualenv(): + if os.path.exists(os.path.join(ENV, 'bin', 'activate')): + return 0, '', '' + else: + return _run('%s %s' % (VIRTUALENV, ENV)) + + +def _is_package_installed(name): + cmd = '%s --dry-run %s' % (EASY_INSTALL, name) + rc, status_stdout, status_stderr = _run(cmd) + return not ('Reading' in status_stdout or 'Downloading' in status_stdout) + + +def _run(cmd): + # returns (rc, stdout, stderr) from shell command + process = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, shell=True) + stdout, stderr = process.communicate() + return (process.returncode, stdout, stderr) + + +def main(): + arg_spec = dict( + name=dict(required=True), + virtualenv=dict(default=None, required=False) + ) + + module = AnsibleModule(argument_spec=arg_spec) + + global EASY_INSTALL + global VIRTUALENV + global ENV + + name = module.params['name'] + ENV = module.params['virtualenv'] + EASY_INSTALL = _find_easy_install() + + rc = 0 + err = '' + out = '' + + if ENV: + rc_venv, out_venv, err_venv = _ensure_virtualenv() + + rc += rc_venv + out += out_venv + err += err_venv + + cmd = None + changed = False + installed = _is_package_installed(name) + + if not installed: + cmd = '%s %s' % (EASY_INSTALL, name) + rc_pip, out_pip, err_pip = _run(cmd) + + rc += rc_pip + out += out_pip + err += err_pip + + changed = True + + if rc != 0: + module.fail_json(msg=err, cmd=cmd) + + module.exit_json(changed=changed, binary=EASY_INSTALL, + name=name, virtualenv=ENV) + +# this is magic, see lib/ansible/module_common.py +#<> + +main() From 57579fdf11f23355b491fff9d9aab9602e75f905 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Wed, 8 Aug 2012 10:38:27 -0400 Subject: [PATCH 2/2] Updates per ansible/ansible#795 --- easy_install | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/easy_install b/easy_install index b7d4eaa8067..d8109430849 100755 --- a/easy_install +++ b/easy_install @@ -1,4 +1,23 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- + +# (c) 2012, Matt Wright +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# EASY_INSTALL = None VIRTUALENV = '/usr/local/bin/virtualenv' @@ -46,10 +65,6 @@ def main(): module = AnsibleModule(argument_spec=arg_spec) - global EASY_INSTALL - global VIRTUALENV - global ENV - name = module.params['name'] ENV = module.params['virtualenv'] EASY_INSTALL = _find_easy_install()