Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make easy_install module actually work. #878

Merged
merged 1 commit into from
Aug 15, 2012
Merged

Make easy_install module actually work. #878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 16 additions & 21 deletions library/easy_install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,9 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#

EASY_INSTALL = None
VIRTUALENV = '/usr/local/bin/virtualenv'
ENV = None


def _find_easy_install():
if ENV:
return os.path.join(ENV, 'bin', 'easy_install')
def _find_easy_install(env):
if env:
return os.path.join(env, 'bin', 'easy_install')

paths = ['/usr/local/bin', '/usr/bin']

Expand All @@ -36,15 +31,15 @@ def _find_easy_install():
return e


def _ensure_virtualenv():
if os.path.exists(os.path.join(ENV, 'bin', 'activate')):
def _ensure_virtualenv(env, virtualenv):
if os.path.exists(os.path.join(env, 'bin', 'activate')):
return 0, '', ''
else:
return _run('%s %s' % (VIRTUALENV, ENV))
return _run('%s %s' % (virtualenv, env))


def _is_package_installed(name):
cmd = '%s --dry-run %s' % (EASY_INSTALL, name)
def _is_package_installed(name, easy_install):
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)

Expand All @@ -66,26 +61,26 @@ def main():
module = AnsibleModule(argument_spec=arg_spec)

name = module.params['name']
ENV = module.params['virtualenv']
EASY_INSTALL = _find_easy_install()
env = module.params['virtualenv']
easy_install = _find_easy_install(env)

rc = 0
err = ''
out = ''

if ENV:
rc_venv, out_venv, err_venv = _ensure_virtualenv()
if env:
rc_venv, out_venv, err_venv = _ensure_virtualenv(env, '/usr/local/bin/virtualenv')

rc += rc_venv
out += out_venv
err += err_venv

cmd = None
changed = False
installed = _is_package_installed(name)
installed = _is_package_installed(name, easy_install)

if not installed:
cmd = '%s %s' % (EASY_INSTALL, name)
cmd = '%s %s' % (easy_install, name)
rc_pip, out_pip, err_pip = _run(cmd)

rc += rc_pip
Expand All @@ -97,8 +92,8 @@ def main():
if rc != 0:
module.fail_json(msg=err, cmd=cmd)

module.exit_json(changed=changed, binary=EASY_INSTALL,
name=name, virtualenv=ENV)
module.exit_json(changed=changed, binary=easy_install,
name=name, virtualenv=env)

# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
Expand Down