whatnext 3.1__tar.gz → 3.2__tar.gz

{whatnext-3.1 → whatnext-3.2}/.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v6

{whatnext-3.1 → whatnext-3.2}/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
 
+## [v3.2] - 2026-04-09
+
+**Added:**
+- Summary view now shows a progress bar on the totals line.
+- `--ignore-queue` flag to ignore `@queue` constraints.
+- `--ignore-phase` flag to ignore `@phase` constraints.
+- `--ignore-all` flag to ignore all deferral constraints.
+
+**Fixes:**
+- Directories are now properly ignored without requiring wildcards,
+  (`example/` and `example` both now work, `example/**` continues to work).
+
+
 ## [v3.1] - 2026-03-14
 
 **Fixes:**

{whatnext-3.1 → whatnext-3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatnext
-Version: 3.1
+Version: 3.2
 Summary: A lister of tasks found in Markdown files
 Project-URL: Homepage, https://github.com/norm/whatnext
 Project-URL: Repository, https://github.com/norm/whatnext
@@ -14,6 +14,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Requires-Dist: termcolor
 Requires-Dist: toml

{whatnext-3.1 → whatnext-3.2}/docs/usage.md

@@ -224,7 +224,13 @@ To show a random selection of tasks rather than by priority, use `5r`.
         - [#] throw fruit at neighbours (they moved away)
     ```
 
--   `--ignore-after` — show all tasks, ignoring `@after` constraints.
+-   `--ignore-after` — ignore `@after` constraints.
+
+-   `--ignore-queue` — ignore `@queue` constraints.
+
+-   `--ignore-phase` — ignore `@phase` constraints.
+
+-   `--ignore-all` — ignore all deferral constraints (`@after`, `@phase`, `@queue`).
 
 -   `-o` / `--open` — show only open tasks.
 
@@ -252,7 +258,7 @@ To show a random selection of tasks rather than by priority, use `5r`.
     ▚▚▚▚▚▚▚▚▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░                  1 1  2  projects/obelisk.md
     ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░          0 0  5  projects/tinsel.md
                                                       ──────
-                                                      1 2 20  23, of 33 total
+    ▚▚▓▓▓▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  1 2 20  23, of 33 total
 
     ▚ Blocked  ▓ Partial  ░ Open
     ```
@@ -274,7 +280,7 @@ To show a random selection of tasks rather than by priority, use `5r`.
     ░░░░░░░░░░░░░░░░░░░░░               0 0 0 0  5  projects/tinsel.md
     ▚▚▚▚█████████████                   1 3 0 0  0  archived/projects/tangerine.md
                                         ──────────
-                                        2 5 1 2 23  33, of 33 total
+    ▚▚█████▓▒▒░░░░░░░░░░░░░░░░░░░░░░░░  2 5 1 2 23  33, of 33 total
 
     ▚ Cancelled  █ Done  ▓ Blocked  ▒ Partial  ░ Open
     ```
@@ -302,7 +308,7 @@ To show a random selection of tasks rather than by priority, use `5r`.
     █████░░░░░░░░░░░░░░░░░░░░                 1  4  projects/tinsel.md
     ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                               ────
-                                              5 25  30, of 33 total
+    ███████░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  5 25  30, of 33 total
 
     █ High  ░ (Overdue/Imminent/Medium/Normal)
     ```

{whatnext-3.1 → whatnext-3.2}/pyproject.toml

@@ -15,6 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
     "termcolor",

{whatnext-3.1 → whatnext-3.2}/tasks/deferring.md

@@ -22,3 +22,9 @@ Later sections also tagged with phase are not shown when earlier phases
 are incomplete. Non-tagged sections are shown as normal.
 
 - [X] implement \@phase directive for section-level sequencing
+
+Be able to ignore deferring controls to list all incomplete tasks.
+
+- [X] implement --ignore-queue
+- [X] implement --ignore-phase
+- [X] implement catch-all ignore flag

whatnext-3.2/tasks/ignoring.md

@@ -0,0 +1,3 @@
+Ignoring files.
+
+- [X] be able to ignore entire directories, not just files

whatnext-3.2/tasks/summaries.md

@@ -0,0 +1,3 @@
+Improvements to `--summary` output.
+
+- [X] show total %age progression across project, not just column totals

{whatnext-3.1 → whatnext-3.2}/tests/deferring.bats

@@ -320,3 +320,75 @@ teardown_file() {
     diff -u <(echo "$expected_stderr") <(echo "$stderr")
     [ $status -eq 0 ]
 }
+
+@test "queue can be ignored" {
+    expected_output=$(sed -e 's/^        //' <<"        EOF"
+        example/projects/fountain.md:
+            - [ ] nigredo, the blackening or melanosis
+            - [ ] albedo, the whitening or leucosis
+            - [ ] citrinitas, the yellowing or xanthosis
+            - [ ] rubedo, the reddening, purpling, or iosis
+        EOF
+    )
+
+    WHATNEXT_TODAY=2025-01-01 \
+        run whatnext --ignore-queue example/projects/fountain.md
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+}
+
+@test "phase can be ignored" {
+    expected_output=$(sed -e 's/^        //' <<"        EOF"
+        tests/deferring/phases.md:
+            # Bugs
+            - [ ] fix bug
+            # New feature [phase 1/3]
+            - [ ] install dependencies
+            # New feature / Implement [phase 2/3]
+            - [ ] write code
+            # New feature / Test [phase 3/3]
+            - [ ] run tests
+        EOF
+    )
+
+    run --separate-stderr \
+        whatnext \
+            --ignore-phase \
+            tests/deferring/phases.md
+
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+}
+
+@test "all deferral constraints can be ignored" {
+    expected_output=$(sed -e 's/^        //' <<"        EOF"
+        example/projects/fountain.md:
+            - [ ] nigredo, the blackening or melanosis
+            - [ ] albedo, the whitening or leucosis
+            - [ ] citrinitas, the yellowing or xanthosis
+            - [ ] rubedo, the reddening, purpling, or iosis
+        tests/deferring/deferred.md:
+            - [ ] wait for regular
+        tests/deferring/phases.md:
+            # Bugs
+            - [ ] fix bug
+            # New feature [phase 1/3]
+            - [ ] install dependencies
+            # New feature / Implement [phase 2/3]
+            - [ ] write code
+            # New feature / Test [phase 3/3]
+            - [ ] run tests
+        EOF
+    )
+
+    WHATNEXT_TODAY=2025-01-01 \
+        run --separate-stderr \
+            whatnext \
+                --ignore-all \
+                example/projects/fountain.md \
+                tests/deferring/deferred.md \
+                tests/deferring/phases.md
+
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+}

{whatnext-3.1 → whatnext-3.2}/tests/matching.bats

@@ -552,3 +552,75 @@ function setup {
     [ -n "$(echo "$output" | grep tasks.md)" ]
     [ $status -eq 0 ]
 }
+
+@test "ignore patterns without wildcard only match on whole names" {
+    expected_output=$(sed -e 's/^        //' <<"        EOF"
+        tasks.md:
+            # Get S Done / MEDIUM
+            - [ ] question entire existence
+
+        tasks.md:
+            # Get S Done
+            - [ ] come up with better projects
+            - [ ] start third project
+
+        archived/projects/tangerine.md:
+            # Project Tangerine / FINISHED
+            - [X] acquire trebuchet plans
+            - [X] source counterweight materials
+            - [X] build it
+            - [#] throw fruit at neighbours (they moved away)
+        EOF
+    )
+
+    echo "ignore = ['projects', 'task']" > "$BATS_TEST_TMPDIR/.whatnext"
+
+    run --separate-stderr \
+        whatnext \
+            --config "$BATS_TEST_TMPDIR/.whatnext" \
+            --all
+
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+
+    echo "ignore = ['projects/', 'tasks']" > "$BATS_TEST_TMPDIR/.whatnext"
+
+    run --separate-stderr \
+        whatnext \
+            --config "$BATS_TEST_TMPDIR/.whatnext" \
+            --all
+
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+}
+
+@test "glob patterns still work with directory patterns" {
+    expected_output=$(sed -e 's/^        //' <<"        EOF"
+        tasks.md:
+            # Get S Done / MEDIUM
+            - [ ] question entire existence
+
+        tasks.md:
+            # Get S Done
+            - [ ] come up with better projects
+            - [ ] start third project
+
+        archived/projects/tangerine.md:
+            # Project Tangerine / FINISHED
+            - [X] acquire trebuchet plans
+            - [X] source counterweight materials
+            - [X] build it
+            - [#] throw fruit at neighbours (they moved away)
+        EOF
+    )
+
+    echo "ignore = ['projects/**']" > "$BATS_TEST_TMPDIR/.whatnext"
+
+    run --separate-stderr \
+        whatnext \
+            --config "$BATS_TEST_TMPDIR/.whatnext" \
+            --all
+
+    diff -u <(echo "$expected_output") <(echo "$output")
+    [ $status -eq 0 ]
+}

{whatnext-3.1 → whatnext-3.2}/tests/summary.bats

@@ -19,7 +19,7 @@ function setup {
         ▚▚▚▚▚▚▚▚▓▓▓▓▓▓▓▓░░░░░░░░░░░░░░░░                  1 1  2  projects/obelisk.md
         ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░          0 0  5  projects/tinsel.md
                                                           ──────
-                                                          1 2 20  23, of 33 total
+        ▚▚▓▓▓▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  1 2 20  23, of 33 total
 
         ▚ Blocked  ▓ Partial  ░ Open
         EOF
@@ -45,7 +45,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░               0 0 0 0  5  projects/tinsel.md
         ▚▚▚▚█████████████                   1 3 0 0  0  archived/projects/tangerine.md
                                             ──────────
-                                            2 5 1 2 23  33, of 33 total
+        ▚▚█████▓▒▒░░░░░░░░░░░░░░░░░░░░░░░░  2 5 1 2 23  33, of 33 total
 
         ▚ Cancelled  █ Done  ▓ Blocked  ▒ Partial  ░ Open
         EOF
@@ -101,7 +101,7 @@ function setup {
         ░░░░░░      0 0 0 0  5  projects/tinsel.md
         ▚████       1 3 0 0  0  archived/projects/tangerine.md
                     ──────────
-                    2 5 1 2 23  33, of 33 total
+        ▚█▒░░░░░░░  2 5 1 2 23  33, of 33 total
 
         ▚ Cancelled  █ Done  ▓ Blocked  ▒ Partial  ░ Open
         EOF
@@ -126,7 +126,7 @@ function setup {
         █████████████████████                                  2  projects/obelisk.md
         ████████████████████████████████████████████████████   5  projects/tinsel.md
                                                               ──
-                                                              20  20, of 33 total
+        ████████████████████████████████████████████████████  20  20, of 33 total
 
         █ Open
         EOF
@@ -153,7 +153,7 @@ function setup {
         ████████████████████████                  5  0  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                                  ─────
-                                                 20 10  30, of 33 total
+        ██████████████████████████░░░░░░░░░░░░░  20 10  30, of 33 total
 
         █ Open  ░ (Cancelled/Done/Blocked/Partial)
         EOF
@@ -180,7 +180,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                                   ────
-                                                  2 28  30, of 33 total
+        ███░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  2 28  30, of 33 total
 
         █ Partial  ░ (Cancelled/Done/Blocked/Open)
         EOF
@@ -207,7 +207,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                                   ────
-                                                  1 29  30, of 33 total
+        █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  1 29  30, of 33 total
 
         █ Blocked  ░ (Cancelled/Done/Partial/Open)
         EOF
@@ -234,7 +234,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         ███████████████░░░░░                      3  1  archived/projects/tangerine.md
                                                   ────
-                                                  5 25  30, of 33 total
+        ███████░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  5 25  30, of 33 total
 
         █ Done  ░ (Cancelled/Blocked/Partial/Open)
         EOF
@@ -261,7 +261,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         █████░░░░░░░░░░░░░░░                      1  3  archived/projects/tangerine.md
                                                   ────
-                                                  2 28  30, of 33 total
+        ███░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  2 28  30, of 33 total
 
         █ Cancelled  ░ (Done/Blocked/Partial/Open)
         EOF
@@ -289,7 +289,7 @@ function setup {
         ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                0  5 0  projects/tinsel.md
         ▚▚▚▚▚░░░░░░░░░░░░░░                     1  0 3  archived/projects/tangerine.md
                                                 ──────
-                                                2 20 8  30, of 33 total
+        ▚▚▚▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░  2 20 8  30, of 33 total
 
         ▚ Cancelled  ▓ Open  ░ (Done/Blocked/Partial)
         EOF
@@ -316,7 +316,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                                   ────
-                                                  3 27  30, of 33 total
+        ████░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  3 27  30, of 33 total
 
         █ High  ░ (Overdue/Imminent/Medium/Normal)
         EOF
@@ -343,7 +343,7 @@ function setup {
         ░░░░░░░░░░░░░░░░░░░░░░░░░                 0  5  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░░░                      0  4  archived/projects/tangerine.md
                                                   ────
-                                                  2 28  30, of 33 total
+        ███░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░  2 28  30, of 33 total
 
         █ Medium  ░ (Overdue/Imminent/High/Normal)
         EOF
@@ -371,7 +371,7 @@ function setup {
         ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                0  5  0  projects/tinsel.md
         ░░░░░░░░░░░░░░░░░░                     0  0  4  archived/projects/tangerine.md
                                                ───────
-                                               3 17 10  30, of 33 total
+        ▚▚▚▚▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░░░░░░  3 17 10  30, of 33 total
 
         ▚ High  ▓ Normal  ░ (Overdue/Imminent/Medium)
         EOF

{whatnext-3.1 → whatnext-3.2}/tests/usage.bats

@@ -7,7 +7,8 @@ bats_require_minimum_version 1.5.0
 
     expected_output=$(sed -e 's/^        //' <<"        EOF"
         Usage: whatnext [-h] [--help] [--version] [--guide] [--dir DIR] [-s] [-e]
-                        [--relative] [-a] [--ignore-after] [--config CONFIG]
+                        [--relative] [-a] [--ignore-after] [--ignore-queue]
+                        [--ignore-phase] [--ignore-all] [--config CONFIG]
                         [--ignore PATTERN] [-q] [-o] [-p] [-b] [-d] [-c]
                         [--priority LEVEL] [--color | --no-color]
                         [match ...]
@@ -24,7 +25,8 @@ bats_require_minimum_version 1.5.0
 
     expected_output=$(sed -e 's/^        //' <<"        EOF"
         Usage: whatnext [-h] [--help] [--version] [--guide] [--dir DIR] [-s] [-e]
-                        [--relative] [-a] [--ignore-after] [--config CONFIG]
+                        [--relative] [-a] [--ignore-after] [--ignore-queue]
+                        [--ignore-phase] [--ignore-all] [--config CONFIG]
                         [--ignore PATTERN] [-q] [-o] [-p] [-b] [-d] [-c]
                         [--priority LEVEL] [--color | --no-color]
                         [match ...]
@@ -51,7 +53,11 @@ bats_require_minimum_version 1.5.0
           --relative           Show selected states relative to all others (use with
                                --summary)
           -a, --all            Include all tasks and files, not just incomplete
-          --ignore-after       Show all tasks, ignoring @after constraints
+          --ignore-after       Ignore @after constraints
+          --ignore-queue       Ignore @queue constraints
+          --ignore-phase       Ignore @phase constraints
+          --ignore-all         Ignore all deferral constraints (@after, @phase,
+                               @queue)
           --config CONFIG      Path to config file (default: WHATNEXT_CONFIG, or
                                '.whatnext' in --dir)
           --ignore PATTERN     Ignore files matching pattern (can be specified

{whatnext-3.1 → whatnext-3.2}/whatnext/summary.py

@@ -244,8 +244,13 @@ def format_summary(
         if all_tasks_total is None:
             all_tasks_total = displayed_total
         lines.append(f"{' ' * bar_width}{gap}{'─' * count_width}")
+        total_bar = build_bar(
+            total_counts, displayed_total, bar_width, char_map, bar_order
+        )
+        if use_colour:
+            total_bar = colored(total_bar, "blue", force_color=True)
         lines.append(
-            f"{' ' * bar_width}{gap}{total_str.rjust(count_width)}{gap}"
+            f"{total_bar}{gap}{total_str.rjust(count_width)}{gap}"
             f"{displayed_total}, of {all_tasks_total} total"
         )
 

{whatnext-3.1 → whatnext-3.2}/whatnext/whatnext.py

@@ -249,8 +249,18 @@ def load_config(config_path=None, directory="."):
 
 def is_ignored(filepath, ignore_patterns):
     for pattern in ignore_patterns:
-        if fnmatch.fnmatch(filepath, pattern):
-            return True
+        if pattern.endswith('/'):
+            dir_name = pattern.rstrip('/')
+            if filepath.startswith(dir_name + '/'):
+                return True
+        elif not any(c in pattern for c in ['*', '?', '[']):
+            if filepath == pattern:
+                return True
+            if filepath.startswith(pattern + '/'):
+                return True
+        else:
+            if fnmatch.fnmatch(filepath, pattern):
+                return True
     return False
 
 
@@ -487,7 +497,22 @@ def main():
     parser.add_argument(
         "--ignore-after",
         action="store_true",
-        help="Show all tasks, ignoring @after constraints",
+        help="Ignore @after constraints",
+    )
+    parser.add_argument(
+        "--ignore-queue",
+        action="store_true",
+        help="Ignore @queue constraints",
+    )
+    parser.add_argument(
+        "--ignore-phase",
+        action="store_true",
+        help="Ignore @phase constraints",
+    )
+    parser.add_argument(
+        "--ignore-all",
+        action="store_true",
+        help="Ignore all deferral constraints (@after, @phase, @queue)",
     )
     parser.add_argument(
         "--config",
@@ -640,13 +665,18 @@ def main():
                 for file in task_files
         ]
 
-    if not args.all and not args.ignore_after:
+    if not args.all and not args.ignore_after and not args.ignore_all:
         filtered_data = filter_deferred(filtered_data, ignore_patterns)
 
-    if not args.all:
+    if not args.all and not args.ignore_phase and not args.ignore_all:
         filtered_data = filter_phases(filtered_data)
 
-    if not args.all and not args.summary:
+    if (
+        not args.all
+        and not args.ignore_queue
+        and not args.ignore_all
+        and not args.summary
+    ):
         filtered_data = filter_queue(filtered_data)
 
     if args.summary: