promptForExclusions allows range selection

Author: lfir

src/main/java/cf/maybelambda/fedora/ConsoleIOHelper.java

@@ -14,6 +14,8 @@ public class ConsoleIOHelper {
     static final String GREEN  = "\u001B[32m";
     static final String RED    = "\u001B[31m";
     static final String BLUE   = "\u001B[34m";
+    private static final String EXCLUDE_PROMPT = "Type in the number and/or range of numbers of packages to exclude "
+        + "(comma-separated, i.e. 2,3,5..9)\nor press Enter to keep all: ";
 
     static boolean confirm(Scanner scanner, String prompt) {
         System.out.print(prompt + " [y/N]: ");
@@ -25,32 +27,42 @@ static List<String> promptForExclusions(List<String> packages, Scanner scanner)
         for (int i = 0; i < packages.size(); i++) {
             System.out.printf("%2d. %s\n", i + 1, packages.get(i));
         }
-        System.out.print("Enter the numbers of any packages to exclude (comma-separated), or press Enter to keep all: ");
+        System.out.print(EXCLUDE_PROMPT);
 
         String excludeInput = scanner.nextLine().trim();
-        String validInputRE = "^$|^\\d+$|^(\\d+,)+\\d$";
+        String validInputRE = "^$|^(\\d+|\\d+\\.\\.\\d+)(,(\\d+|\\d+\\.\\.\\d+))*$";
         if (!excludeInput.matches(validInputRE)) {
             throw new RuntimeException("Invalid selection");
         }
 
         Set<Integer> excludeIndexes = new HashSet<>();
-        if (!excludeInput.isEmpty()) {
-            for (String part : excludeInput.split(",")) {
-                try {
-                    int idx = Integer.parseInt(part.trim());
-                    if (idx >= 1 && idx <= packages.size()) {
-                        excludeIndexes.add(idx - 1);
+        for (String part : excludeInput.split(",")) {
+            if (excludeInput.isEmpty()) {
+                break;
+            }
+            if (part.contains("..")) {
+                String[] limits = part.split("\\.\\.");
+                int s = Integer.parseInt(limits[0]);
+                int e = Integer.parseInt(limits[1]);
+                if (s >= 1 && e <= packages.size()) {
+                    for (int i = s; i <= e; i++) {
+                        excludeIndexes.add(i - 1);
                     }
-                } catch (NumberFormatException ignored) {}
+                }
+            } else {
+                int idx = Integer.parseInt(part.trim());
+                if (idx >= 1 && idx <= packages.size()) {
+                    excludeIndexes.add(idx - 1);
+                }
             }
         }
+
         List<String> filtered = new ArrayList<>();
         for (int i = 0; i < packages.size(); i++) {
             if (!excludeIndexes.contains(i)) {
                 filtered.add(packages.get(i));
             }
         }
-
         return filtered;
     }
 

src/test/java/cf/maybelambda/fedora/ConsoleIOHelperTests.java

@@ -74,32 +74,59 @@ void promptForExclusionsKeepsAllWhenInputIsEmpty() {
     @Test
     void promptForExclusionsRemovesSome() {
         List<String> pkgs = List.of("nano", "vim", "htop", "curl");
-        Scanner scanner = new Scanner(new ByteArrayInputStream("2,4\n".getBytes(StandardCharsets.UTF_8)));
+        Scanner scanner = mock(Scanner.class);
+        when(scanner.nextLine()).thenReturn("2,4\n");
 
         List<String> result = promptForExclusions(pkgs, scanner);
 
         assertEquals(List.of("nano", "htop"), result);
+
+        when(scanner.nextLine()).thenReturn("4\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(List.of("nano", "vim", "htop"), result);
+
+        when(scanner.nextLine()).thenReturn("1,3..4\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(List.of("vim"), result);
+
+        when(scanner.nextLine()).thenReturn("1..3\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(List.of("curl"), result);
+
+        when(scanner.nextLine()).thenReturn("3..4,2\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(List.of("nano"), result);
     }
 
     @Test
     void promptForExclusionsHandlesInvalidIndexes() {
         List<String> pkgs = List.of("pkg1", "pkg2", "pkg3");
-        Scanner scanner = new Scanner(new ByteArrayInputStream("0,5,2\n".getBytes(StandardCharsets.UTF_8)));
+        Scanner scanner = mock(Scanner.class);
+        when(scanner.nextLine()).thenReturn("0,5,2\n");
 
         List<String> result = promptForExclusions(pkgs, scanner);
 
         assertEquals(List.of("pkg1", "pkg3"), result);
+
+        when(scanner.nextLine()).thenReturn("0..1\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(pkgs, result);
+
+        when(scanner.nextLine()).thenReturn("1..99\n");
+        result = promptForExclusions(pkgs, scanner);
+        assertEquals(pkgs, result);
     }
 
     @ParameterizedTest
     @ValueSource(strings = {
-        "1,,3",          // multiple consecutive commas
-        "1,3,",          // trailing comma
-        ",1,3",          // leading comma
-        "1a,2",          // invalid characters mixed with valid numbers
-        "1,abc,2",       // non-numeric characters
-        "qwerty",        // completely non-numeric input
-        "!@#, $%^, &*()" // special characters
+        "1,,3",                     // multiple consecutive commas
+        "1,3,",                     // trailing comma
+        ",1,3",                     // leading comma
+        "1a,2", "3, 5",             // invalid characters mixed with valid numbers
+        "1,abc,2",                  // non-numeric characters
+        "qwerty",                   // completely non-numeric input
+        "!@#, $%^, &*()",           // special characters
+        "1.54", "1...54", "6.-.12"  // malformed range
     })
     void promptForExclusionsThrowsRuntimeExceptionWhenInvalidInputRead(String input) {
         List<String> pkgs = List.of("pkg");