refs #6 fix to handle double-quoted string in json data for push subcommand

Author: t2y

app/src/main/java/jp/kazamori/github/actions/backlog/Main.java

@@ -8,26 +8,27 @@
 import jp.kazamori.github.actions.backlog.command.Push;
 import jp.kazamori.github.actions.backlog.common.StrUtil;
 import jp.kazamori.github.actions.backlog.config.ConfigUtil;
+import jp.kazamori.github.actions.backlog.constant.SubCommand;
 import lombok.val;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 
+import java.util.Arrays;
+
 @Command(name = "Backlog GitHub integration action",
         subcommands = {HelpCommand.class},
         description = "provides functionalities to integrate with Backlog")
 public class Main {
 
     @VisibleForTesting
     static String[] ensureArgumentTokens(String[] args) {
-        // for GitHub Actions
-        // it takes inputs as two strings like below
-        // "pull_request" "--repository kazamori/backlog-github-integration-action --pr-number 1"
-        if (args.length != 2) {
+        if (!args[0].equals(SubCommand.PUSH) && args.length != 2) {
             return args;
         }
-        val tokens = StrUtil.extractStringToTokens(args[0], args[1]);
+        val restArgs = Arrays.copyOfRange(args, 1, args.length);
+        val tokens = StrUtil.extractStringToTokens(args[0], String.join(" ", restArgs));
         tokens.add(0, args[0]);
         return tokens.toArray(new String[]{});
     }

app/src/main/java/jp/kazamori/github/actions/backlog/common/StrUtil.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Splitter;
 import jp.kazamori.github.actions.backlog.constant.SubCommand;
+import lombok.val;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -33,16 +34,16 @@ public static List<String> extractStringWithSingleQuoteToTokens(String str) {
     }
 
     private static String extractArgumentsWithoutCommits(String str, int commitsPosition, int quoteEnd) {
-        var s1 = str.substring(0, commitsPosition).trim();
+        val s1 = str.substring(0, commitsPosition).trim();
         if (str.length() == quoteEnd) {
             return s1;
         }
-        var s2 = str.substring(quoteEnd + 1, str.length()).trim();
+        val s2 = str.substring(quoteEnd + 1, str.length()).trim();
         return String.format("%s %s", s1, s2);
     }
 
     private static int getLastIndexFromBeginning(String str, int quoteStart, String quote) {
-        var index = str.indexOf(quote, quoteStart);
+        var index = str.indexOf(quote, quoteStart + 1);
         if (index < 0) {
             return index;
         }
@@ -61,16 +62,19 @@ private static int getLastIndexFromBeginning(String str, int quoteStart, String
     private static final String COMMITS_OPTION = "--commits";
 
     public static List<String> extractPushCommandArguments(String str) {
-        var commitsPosition = str.indexOf(COMMITS_OPTION);
+        val commitsPosition = str.indexOf(COMMITS_OPTION);
         if (commitsPosition < 0) {
             return extractStringWithDoubleQuoteToTokens(str);
         }
-        var quoteStart = str.indexOf(SINGLE_QUOTE, commitsPosition + 1);
-        var quoteEnd = getLastIndexFromBeginning(str, quoteStart, SINGLE_QUOTE);
-        var json = str.substring(quoteStart + 1, quoteEnd);
+        val quoteStart = str.indexOf(SINGLE_QUOTE, commitsPosition + 1);
+        val quoteEnd = getLastIndexFromBeginning(str, quoteStart, SINGLE_QUOTE);
+        if (quoteEnd < 0) {
+            throw new IllegalArgumentException("Invalid arguments");
+        }
+        val json = str.substring(quoteStart + 1, quoteEnd);
         // extract arguments without "--commits"
-        var others = extractArgumentsWithoutCommits(str, commitsPosition, quoteEnd);
-        var tokens = extractStringWithDoubleQuoteToTokens(others);
+        val others = extractArgumentsWithoutCommits(str, commitsPosition, quoteEnd);
+        val tokens = extractStringWithDoubleQuoteToTokens(others);
         tokens.add(COMMITS_OPTION);
         tokens.add(json);
         return tokens.stream().filter(e -> !e.trim().isEmpty()).collect(Collectors.toList());

app/src/test/java/jp/kazamori/github/actions/backlog/MainTest.java

@@ -35,8 +35,10 @@ void ensureArgumentTokensForPullRequest(String[] args, int expectedLength, Strin
 
     static Stream<Arguments> makePushArgsData() {
         return Stream.of(
-                arguments(new String[]{"push", "--commits '[{\"key\": \"value\"}]' --opt param"}, 5, "[{\"key\": \"value\"}]"),
-                arguments(new String[]{"push", "--opt param --commits '[{\"key\": \"handled by \\\"double quote\\\"\"}]'"},
+                arguments(new String[]{
+                        "push", "--commits '[{\"key\": \"value\"}]' --opt param"}, 5, "[{\"key\": \"value\"}]"),
+                arguments(new String[]{
+                        "push", "--opt param --commits '[{\"key\": \"handled by \\\"double", "quote\\\"\"}]'"},
                         5, "[{\"key\": \"handled by \\\"double quote\\\"\"}]"),
                 arguments(new String[]{"push", "--opt 'param' 'a\nb' --commits '[{\"key\": \"value\"}]' --verbose"},
                         7, "[{\"key\": \"value\"}]")