[groovy] branch GROOVY_2_5_X updated: GROOVY-9012 fix bug in grape resolve command to correctly handle positional parameters

[rp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rpopma pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
     new e82bc44  GROOVY-9012 fix bug in grape resolve command to correctly handle positional parameters
e82bc44 is described below

commit e82bc44ff6e19eb405b486e503a35ca1e03ef60c
Author: Remko Popma <re...@yahoo.com>
AuthorDate: Thu Feb 28 18:35:48 2019 +0900

    GROOVY-9012 fix bug in grape resolve command to correctly handle positional parameters
---
 src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
index 0ea6b7b..63fe188 100644
--- a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
+++ b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
@@ -223,6 +223,9 @@ class GrapeMain implements Runnable {
         @Option(names = ['-i', '--ivy'], description = 'Express dependencies in an ivy-like format')
         private boolean ivyFormatRequested
 
+        @Parameters(hidden = true) // parameter description is embedded in the command description
+        List<String> args = new ArrayList<>() // the positional parameters
+
         @ParentCommand GrapeMain parentCommand
 
         void run() {
@@ -232,7 +235,7 @@ class GrapeMain implements Runnable {
             Grape.getInstance()
             parentCommand.setupLogging(Message.MSG_ERR)
 
-            if ((arg.size() % 3) != 0) {
+            if ((args.size() % 3) != 0) {
                 println 'There needs to be a multiple of three arguments: (group module version)+'
                 return
             }
@@ -254,7 +257,7 @@ class GrapeMain implements Runnable {
                 before = 'export CLASSPATH='
                 between = ':'
                 after = ''
-            } else if (ivy) {
+            } else if (ivyFormatRequested) {
                 before = '<dependency '
                 between = '">\n<dependency '
                 after = '">'
@@ -264,7 +267,7 @@ class GrapeMain implements Runnable {
                 after = '\n'
             }
 
-            iter = arg.iterator()
+            def iter = args.iterator()
             def params = [[:]]
             def depsInfo = [] // this list will contain the module/group/version info of all resolved dependencies
             if (ivyFormatRequested) {
@@ -276,7 +279,7 @@ class GrapeMain implements Runnable {
             try {
                 def results = []
                 def uris = Grape.resolve(* params)
-                if(!ivyFormatRequested) {
+                if (!ivyFormatRequested) {
                     for (URI uri: uris) {
                         if (uri.scheme == 'file') {
                             results += new File(uri).path