Merge pull request #1039 from indrajitr/homebrew-update
homebrew: Improve 'argument_spec' handling
This commit is contained in:
commit
b8c19e6531
1 changed files with 12 additions and 7 deletions
|
@ -3,6 +3,7 @@
|
|||
|
||||
# (c) 2013, Andrew Dunham <andrew@du.nham.ca>
|
||||
# (c) 2013, Daniel Jaouen <dcj24@cornell.edu>
|
||||
# (c) 2015, Indrajit Raychaudhuri <irc+code@indrajit.com>
|
||||
#
|
||||
# Based on macports (Jimmy Tang <jcftang@gmail.com>)
|
||||
#
|
||||
|
@ -23,6 +24,7 @@ DOCUMENTATION = '''
|
|||
---
|
||||
module: homebrew
|
||||
author:
|
||||
- "Indrajit Raychaudhuri (@indrajitr)"
|
||||
- "Daniel Jaouen (@danieljaouen)"
|
||||
- "Andrew Dunham (@andrew-d)"
|
||||
short_description: Package manager for Homebrew
|
||||
|
@ -45,13 +47,13 @@ options:
|
|||
description:
|
||||
- update homebrew itself first
|
||||
required: false
|
||||
default: "no"
|
||||
default: no
|
||||
choices: [ "yes", "no" ]
|
||||
upgrade_all:
|
||||
description:
|
||||
- upgrade all homebrew packages
|
||||
required: false
|
||||
default: "no"
|
||||
default: no
|
||||
choices: [ "yes", "no" ]
|
||||
install_options:
|
||||
description:
|
||||
|
@ -763,7 +765,11 @@ class Homebrew(object):
|
|||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec=dict(
|
||||
name=dict(aliases=["pkg"], required=False),
|
||||
name=dict(
|
||||
aliases=["pkg", "package", "formula"],
|
||||
required=False,
|
||||
type='list',
|
||||
),
|
||||
path=dict(required=False),
|
||||
state=dict(
|
||||
default="present",
|
||||
|
@ -775,12 +781,12 @@ def main():
|
|||
],
|
||||
),
|
||||
update_homebrew=dict(
|
||||
default="no",
|
||||
default=False,
|
||||
aliases=["update-brew"],
|
||||
type='bool',
|
||||
),
|
||||
upgrade_all=dict(
|
||||
default="no",
|
||||
default=False,
|
||||
aliases=["upgrade"],
|
||||
type='bool',
|
||||
),
|
||||
|
@ -795,7 +801,7 @@ def main():
|
|||
p = module.params
|
||||
|
||||
if p['name']:
|
||||
packages = p['name'].split(',')
|
||||
packages = p['name']
|
||||
else:
|
||||
packages = None
|
||||
|
||||
|
@ -839,4 +845,3 @@ from ansible.module_utils.basic import *
|
|||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
|
|
Loading…
Reference in a new issue