From 5446bcdf903a93f21cead833e13dabebffba49ea Mon Sep 17 00:00:00 2001 From: Ralf Geschke Date: Wed, 21 May 2014 18:01:33 +0200 Subject: [PATCH 1/3] implemented the missing "command" option, defaults to "install"... --- packaging/composer | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/composer b/packaging/composer index 16dc420d20e..4a609e3c4fa 100644 --- a/packaging/composer +++ b/packaging/composer @@ -97,16 +97,17 @@ def parse_out(string): def has_changed(string): return (re.match("Nothing to install or update", string) != None) -def composer_install(module, options): +def composer_install(module, command, options): php_path = module.get_bin_path("php", True, ["/usr/local/bin"]) composer_path = module.get_bin_path("composer", True, ["/usr/local/bin"]) - cmd = "%s %s install %s" % (php_path, composer_path, " ".join(options)) + cmd = "%s %s %s %s" % (php_path, composer_path, command, " ".join(options)) return module.run_command(cmd) def main(): module = AnsibleModule( argument_spec = dict( + command = dict(default="install", type="str", required=False), working_dir = dict(aliases=["working-dir"], required=True), prefer_source = dict(default="no", type="bool", aliases=["prefer-source"]), prefer_dist = dict(default="no", type="bool", aliases=["prefer-dist"]), @@ -129,6 +130,10 @@ def main(): if module.check_mode: options.add("--dry-run") + # Get composer command with fallback to default + command = module.params['command'] + del module.params['command']; + # Prepare options for i in module.params: opt = "--%s" % i.replace("_","-") @@ -138,7 +143,7 @@ def main(): elif isinstance(p, (str)): options.add("%s=%s" % (opt, p)) - rc, out, err = composer_install(module, options) + rc, out, err = composer_install(module, command, options) if rc != 0: output = parse_out(err) From af332223649bf8b01347fa9779c7d54a7b42afbe Mon Sep 17 00:00:00 2001 From: Ralf Geschke Date: Wed, 21 May 2014 18:12:53 +0200 Subject: [PATCH 2/3] added missing description... --- packaging/composer | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/composer b/packaging/composer index 4a609e3c4fa..d9f43d061a2 100644 --- a/packaging/composer +++ b/packaging/composer @@ -28,6 +28,11 @@ version_added: "1.6" description: - Composer is a tool for dependency management in PHP. It allows you to declare the dependent libraries your project needs and it will install them in your project for you options: + command: + description: + - Composer command like "install", "update" and so option + required: false + default: install working_dir: description: - Directory of your project ( see --working-dir ) @@ -85,7 +90,7 @@ notes: EXAMPLES = ''' # Downloads and installs all the libs and dependencies outlined in the /path/to/project/composer.lock -- composer: working_dir=/path/to/project +- composer: command=install working_dir=/path/to/project ''' import os From d452bb896dc7a8c60bfa4a4fefdd64d135b4cda5 Mon Sep 17 00:00:00 2001 From: Ralf Geschke Date: Wed, 21 May 2014 18:14:21 +0200 Subject: [PATCH 3/3] added missing description of composer command --- packaging/composer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/composer b/packaging/composer index d9f43d061a2..f6d84bbfef7 100644 --- a/packaging/composer +++ b/packaging/composer @@ -30,7 +30,7 @@ description: options: command: description: - - Composer command like "install", "update" and so option + - Composer command like "install", "update" and so on required: false default: install working_dir: