feat: add support for JBang options (jbangArgs) in JBangTask

Author: ivangsa

README.adoc

@@ -36,6 +36,7 @@ following properties
 |===
 | Property   | Type         | Option        | System            | Environment       | Default                         | Required
 | script     | String       | jbang-script  | jbang.script      | JBANG_SCRIPT      |                                 | {required-icon}
+| jbangArgs  | List<String> | jbang-jbang-args | jbang.jbangArgs | JBANG_JBANG_ARGS  | [ ]                             | {optional-icon}
 | args       | List<String> | jbang-args    | jbang.args        | JBANG_ARGS        | [ ]                             | {optional-icon}
 | trusts     | List<String> | jbang-trusts  | jbang.trusts      | JBANG_TRUSTS      | [ ]                             | {optional-icon}
 | version    | String       | jbang-version | jbang.version     | JBANG_VERSION     | latest                          | {optional-icon}

src/main/groovy/dev/jbang/gradle/tasks/JBangTask.groovy

@@ -71,6 +71,7 @@ class JBangTask extends DefaultTask {
 
     private final StringState script
     private final StringState version
+    private final ListState jbangArgs
     private final ListState args
     private final ListState trusts
     private final DirectoryState installDir
@@ -81,6 +82,7 @@ class JBangTask extends DefaultTask {
 
         script = SimpleStringState.of(this, 'jbang.script', '')
         version = SimpleStringState.of(this, 'jbang.version', 'latest')
+        jbangArgs = SimpleListState.of(this, 'jbang.jbangArgs', [])
         args = SimpleListState.of(this, 'jbang.args', [])
         trusts = SimpleListState.of(this, 'jbang.trusts', [])
         installDir = SimpleDirectoryState.of(this, 'jbang.install.dir', jbangCacheDirectory.get())
@@ -96,6 +98,11 @@ class JBangTask extends DefaultTask {
         getVersion().set(version)
     }
 
+    @Option(option = 'jbang-jbang-args', description = 'JBang arguments to be used by JBang when running the script (if any) (OPTIONAL).')
+    void setJbangArgs(String jbangArgs) {
+        if (jbangArgs) getJbangArgs().set(jbangArgs.split(',').toList())
+    }
+
     @Option(option = 'jbang-args', description = 'The arguments to be used in the JBang script (if any) (OPTIONAL).')
     void setArgs(String args) {
         if (args) getArgs().set(args.split(',').toList())
@@ -118,6 +125,11 @@ class JBangTask extends DefaultTask {
         version.property
     }
 
+    @Internal
+    ListProperty<String> getJbangArgs() {
+        jbangArgs.property
+    }
+
     @Internal
     ListProperty<String> getArgs() {
         args.property
@@ -146,6 +158,12 @@ class JBangTask extends DefaultTask {
         version.provider
     }
 
+    @Input
+    @Optional
+    Provider<List<String>> getResolvedJbangArgs() {
+        jbangArgs.provider
+    }
+
     @Input
     @Optional
     Provider<List<String>> getResolvedArgs() {
@@ -271,7 +289,12 @@ class JBangTask extends DefaultTask {
             return
         }
         List<String> command = command()
-        command.add(findJBangExecutable() + ' trust add ' + String.join(' ', getResolvedTrusts().get()))
+        String trustCommand = findJBangExecutable() + ' trust add ' + String.join(' ', getResolvedTrusts().get())
+        command.add(trustCommand)
+
+        // Log the user-friendly trust command
+        logger.lifecycle("Executing JBang trust command: ${trustCommand}")
+
         ProcessResult result = execute(command)
         int exitValue = result.getExitValue()
         if (exitValue != 0 && exitValue != 1) {
@@ -283,19 +306,29 @@ class JBangTask extends DefaultTask {
         List<String> command = command()
         // A single string is needed, because if "sh -c jbang" is used for execution, the parameters need to be passed as single string
         StringBuilder executable = new StringBuilder(findJBangExecutable())
-        executable.append(' run ').append("\"").append(getResolvedScript().get()).append("\"")
+        executable.append(' run ')
+        if (getResolvedJbangArgs().get()) {
+            executable.append(' ').append(String.join(' ', getResolvedJbangArgs().get())).append(' ')
+        }
+
+        executable.append(getResolvedScript().get())
         if (getResolvedArgs().get()) {
             executable.append(' ').append(String.join(' ', getResolvedArgs().get()))
         }
+
         command.add(executable.toString())
+
+        // Log the user-friendly JBang command
+        logger.lifecycle("Executing JBang command: ${executable.toString()}")
+
         ProcessResult result = execute(command)
         if (result.getExitValue() != 0) {
             throw new IllegalStateException('Error while executing JBang. Exit code: ' + result.getExitValue())
         }
     }
 
     private ProcessResult execute(List<String> command) throws BuildException {
-        logger.info "jbang command = $command"
+        logger.debug "Full command with shell wrapper: $command"
         try {
             return new ProcessExecutor()
                 .command(command)
@@ -349,4 +382,4 @@ class JBangTask extends DefaultTask {
             }
         }
     }
-}
+}