simple-project-tracker 1.2.0__tar.gz → 1.2.1__tar.gz

{simple_project_tracker-1.2.0/simple_project_tracker.egg-info → simple_project_tracker-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-project-tracker
-Version: 1.2.0
+Version: 1.2.1
 Summary: Simple project tracker
 Author-email: MattFor <mattfor@relaxy.xyz>
 License-Expression: MIT
@@ -120,9 +120,11 @@ List of notes that's separate from the main project database.
 ```sh
 t td                          # the whole list
 t td add write the changelog  # the rest of the line is the name
+t td add milk s shop n oat    # with a status and a note up front
 t td 3 done                   # also: t td done 3
 t td 3 st blocked             # any status you like
 t td 3 n waiting on review    # and a note under it
+t td write the docs n today   # by name; offers to add one that is not there
 t td list s:todo              # only what is still open
 t td clear                    # drop every finished one
 t td undo                     # take the last change back

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/README.md

@@ -88,9 +88,11 @@ List of notes that's separate from the main project database.
 ```sh
 t td                          # the whole list
 t td add write the changelog  # the rest of the line is the name
+t td add milk s shop n oat    # with a status and a note up front
 t td 3 done                   # also: t td done 3
 t td 3 st blocked             # any status you like
 t td 3 n waiting on review    # and a note under it
+t td write the docs n today   # by name; offers to add one that is not there
 t td list s:todo              # only what is still open
 t td clear                    # drop every finished one
 t td undo                     # take the last change back

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simple-project-tracker"
-version = "1.2.0"
+version = "1.2.1"
 description = "Simple project tracker"
 readme = "README.md"
 requires-python = ">=3.11"

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1/simple_project_tracker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-project-tracker
-Version: 1.2.0
+Version: 1.2.1
 Summary: Simple project tracker
 Author-email: MattFor <mattfor@relaxy.xyz>
 License-Expression: MIT
@@ -120,9 +120,11 @@ List of notes that's separate from the main project database.
 ```sh
 t td                          # the whole list
 t td add write the changelog  # the rest of the line is the name
+t td add milk s shop n oat    # with a status and a note up front
 t td 3 done                   # also: t td done 3
 t td 3 st blocked             # any status you like
 t td 3 n waiting on review    # and a note under it
+t td write the docs n today   # by name; offers to add one that is not there
 t td list s:todo              # only what is still open
 t td clear                    # drop every finished one
 t td undo                     # take the last change back

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/tests/test_todos.py

@@ -150,6 +150,48 @@ def test_a_todo_may_come_before_its_action(tmp_path: Path):
 	assert status_of(load_todos(holder.settings)["1"]) == "blocked"
 
 
+def test_every_word_before_the_action_is_the_todo(tmp_path: Path):
+	holder = context(tmp_path)
+
+	_ = run(holder, "add", "read the manual")
+	_ = run(holder, "add", "write the docs")
+
+	output = run(holder, "write", "the", "docs", "n", "before", "friday")
+
+	assert "note did nothing" not in output
+	assert load_todos(holder.settings)["2"].get("note") == "before friday"
+
+
+def test_a_todo_is_added_with_its_note_and_status(tmp_path: Path):
+	holder = context(tmp_path)
+
+	_ = run(holder, "add", "buy", "milk", "s", "blocked", "n", "oat", "not", "dairy")
+
+	todo = load_todos(holder.settings)["1"]
+
+	assert todo["name"] == "buy milk"
+	assert status_of(todo) == "blocked"
+	assert todo.get("note") == "oat not dairy"
+
+
+def test_a_note_for_a_missing_todo_adds_it(tmp_path: Path):
+	holder = context(tmp_path)
+
+	_ = run(holder, "add", "read the manual")
+	_ = run(holder, "lexiglance", "n", "respond", "to", "the", "pr")
+
+	todo = load_todos(holder.settings)["2"]
+
+	assert todo["name"] == "lexiglance"
+	assert todo.get("note") == "respond to the pr"
+
+	_ = run(holder, "9", "n", "nothing")
+	_ = run(holder, "manual", "n", "just the note")
+
+	assert len(load_todos(holder.settings)) == 2
+	assert load_todos(holder.settings)["1"].get("note") == "just the note"
+
+
 def test_a_bare_note_clears_it(tmp_path: Path):
 	holder = context(tmp_path)
 

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/tracker/cli/entries.py

@@ -424,16 +424,16 @@ class Kind:
 
 		return wanted
 
-	def edit(self, context: Context, args: list[str]) -> int:
+	def edit(self, context: Context, args: list[str], command: str = "edit") -> int:
 		if not args:
-			return self.missing("edit")
+			return self.missing(command)
 
 		if len(args) < 2:
 			print(f"[ERROR] edit requires a field: {', '.join(self.editable)}")
 			return 1
 
 		entries = self.load(context)
-		selected = self.chosen(context, entries, [args[0]], "edit")
+		selected = self.chosen(context, entries, [args[0]], command)
 
 		if selected is None:
 			return 1
@@ -514,13 +514,13 @@ class Kind:
 			return self.missing(name)
 
 		if name in self.greedy:
-			return self.edit(context, [args[0], name, *args[1:]])
+			return self.edit(context, [args[0], name, *args[1:]], name)
 
 		if len(args) < 2:
 			print(f"[ERROR] {name} requires a value")
 			return 1
 
-		return self.edit(context, [args[0], name, " ".join(args[1:])])
+		return self.edit(context, [args[0], name, " ".join(args[1:])], name)
 
 	def statuses(self, context: Context) -> int:
 		settings = context.settings

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/tracker/cli/todo.py

@@ -1,3 +1,4 @@
+import sys
 from typing import Any, final
 
 from tracker.cli.entries import (
@@ -31,6 +32,7 @@ from tracker.core.todos import (
 )
 from tracker.ui import mentions
 from tracker.ui.ansi import C
+from tracker.ui.ask import confirm as ask
 from tracker.ui.help import print_topic
 from tracker.ui.todos import (
 	note_text,
@@ -95,6 +97,9 @@ TAKES_SELECTION = frozenset(
 	{"check", "done", "edit", "note", "remove", "rename", "reopen", "status"}
 )
 
+# The words that end a new todo's name and start its fields, as in add milk n oat
+ADD_FIELDS = frozenset({"n", "nt", "s", "st"})
+
 
 def action_of(token: str) -> str:
 	return ALIASES.get(token.lower().strip("-"), "")
@@ -209,14 +214,28 @@ def action_list(context: Context, args: list[str]) -> int:
 
 
 def action_add(context: Context, args: list[str]) -> int:
-	name = " ".join(args).strip()
+	at = next(
+		(
+			index
+			for index, token in enumerate(args)
+			if token.lower().strip("-") in ADD_FIELDS
+		),
+		len(args),
+	)
+
+	name = " ".join(args[:at]).strip()
 
 	if not name:
 		print("[ERROR] add requires something to do")
-		print(f"{C.GRAY}        t td add read the manual{C.RESET}")
+		print(f"{C.GRAY}        t td add read the manual n before friday{C.RESET}")
 
 		return 1
 
+	wanted = TODO.fields_from(args[at:])
+
+	if wanted is None:
+		return 1
+
 	settings = context.settings
 	todos = TODO.load(context)
 
@@ -227,6 +246,9 @@ def action_add(context: Context, args: list[str]) -> int:
 		created=stamp(settings),
 	)
 
+	for field, value in wanted:
+		TODO.set(context, todo, field, value)
+
 	key = key_of(todo)
 	todos[key] = todo
 
@@ -325,6 +347,27 @@ def action_undo(context: Context) -> int:
 	return 0
 
 
+def offer_new(context: Context, name: str) -> bool:
+	"""A note or status for a todo that is not there yet may be meant to add it."""
+
+	# A number, a range or a selector (#3, :2, s:todo, all) names one that should exist
+	if (
+		name.lower() in ALL_SELECTORS
+		or not any(letter.isalpha() for letter in name)
+		or any(mark in name for mark in ":=")
+	):
+		return False
+
+	# The same test a name selector makes, so a todo it would find is never doubled
+	if any(name.lower() in todo["name"].lower() for todo in TODO.load(context).values()):
+		return False
+
+	if not (context.assume_yes or sys.stdin.isatty()):
+		return False
+
+	return ask(f"no todo matches '{name}', add it?", assume_yes=context.assume_yes)
+
+
 #
 # The command
 #
@@ -337,12 +380,31 @@ def command_todo(context: Context, args: list[str]) -> int:
 	action = action_of(args[0]) if args else "list"
 	arguments = args[1:]
 
-	# A td may come before its action
-	if not action and len(args) > 1:
-		following = action_of(args[1])
+	# A td may come before its action, and every word up to it is its name
+	if not action:
+		at = next(
+			(
+				index
+				for index, token in enumerate(args)
+				if action_of(token) in TAKES_SELECTION
+			),
+			0,
+		)
+
+		if at:
+			action, arguments = (
+				action_of(args[at]),
+				[" ".join(args[:at]), *args[at + 1 :]],
+			)
+
+	if (
+		action in ("note", "status")
+		and len(arguments) > 1
+		and offer_new(context, arguments[0])
+	):
+		mark = "n" if action == "note" else "s"
 
-		if following in TAKES_SELECTION:
-			action, arguments = following, [args[0], *args[2:]]
+		return action_add(context, [arguments[0], mark, *arguments[1:]])
 
 	context.log(f"todos: {len(TODO.load(context))}")
 

{simple_project_tracker-1.2.0 → simple_project_tracker-1.2.1}/tracker/share/help.txt

@@ -154,7 +154,7 @@
 
       {GRAY}Usage:{RESET}
          {GREEN}tracker todo{RESET}
-         {GREEN}tracker todo add <what to do...>{RESET}
+         {GREEN}tracker todo add <what to do...> [s <status>] [n <note...>]{RESET}
          {GREEN}tracker todo done <selection>{RESET}
          {GREEN}tracker todo reopen <selection>{RESET}
          {GREEN}tracker todo status <selection> <value>{RESET}
@@ -470,6 +470,7 @@
 
    {GREEN}t td{RESET}                     {GRAY}every todo{RESET}
    {GREEN}t td add <what to do>{RESET}    {GRAY}the rest of the line is the name{RESET}
+   {GREEN}t td add milk n oat{RESET}      {GRAY}up to {GREEN}n{GRAY} or {GREEN}s{GRAY}, then the note or status{RESET}
    {GREEN}t td done <selection>{RESET}    {GRAY}stamps it and marks it {GREEN}done{RESET}
    {GREEN}t td reopen <selection>{RESET}  {GRAY}puts it back{RESET}
    {GREEN}t td clear{RESET}               {GRAY}removes every finished one{RESET}
@@ -499,6 +500,8 @@
       {GREEN}t td 3 done{RESET}           {GRAY}the same as {GREEN}t td done 3{RESET}
       {GREEN}t td 3 st blocked{RESET}
       {GREEN}t td 3 nt {r}broken{/} build{RESET}
+      {GREEN}t td the docs n ok{RESET}    {GRAY}every word up to the action names the todo{RESET}
+      {GREEN}t td milk n oat{RESET}       {GRAY}offers to add one when nothing is called that{RESET}
 
    {GRAY}Editing takes the same fields and short forms as a project does:{RESET}