chartremotely 0.2.5__tar.gz → 0.2.7__tar.gz

{chartremotely-0.2.5 → chartremotely-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.2.5
+Version: 0.2.7
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 

{chartremotely-0.2.5 → chartremotely-0.2.7}/chartremotely/assets/shortcut-template.plist

@@ -17,6 +17,8 @@
 				<string>Which company?</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
 			</dict>
 		</dict>
 		<dict>
@@ -231,6 +233,8 @@
 				<string>Which company?</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
 			</dict>
 		</dict>
 		<dict>
@@ -425,6 +429,8 @@
 				<string>Spell the symbol</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
 			</dict>
 		</dict>
 		<dict>
@@ -753,6 +759,8 @@
 				<string>What scale?</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
 			</dict>
 		</dict>
 		<dict>
@@ -967,6 +975,8 @@
 				<string>Which timeframe?</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
 			</dict>
 		</dict>
 		<dict>
@@ -1052,6 +1062,19 @@
 				<string>Where?</string>
 				<key>WFInputType</key>
 				<string>Text</string>
+				<key>WFAskActionAllowsMultilineText</key>
+				<false/>
+			</dict>
+		</dict>
+		<dict>
+			<key>WFWorkflowActionIdentifier</key>
+			<string>is.workflow.actions.speaktext</string>
+			<key>WFWorkflowActionParameters</key>
+			<dict>
+				<key>WFSpeakTextWait</key>
+				<false/>
+				<key>WFText</key>
+				<string>On it, requesting your chart now. Look at your screen or visit the website for the screen capture.</string>
 			</dict>
 		</dict>
 		<dict>

{chartremotely-0.2.5 → chartremotely-0.2.7}/chartremotely/forward.py

@@ -57,11 +57,15 @@ def route(command: str, where: str, cfg: dict | None = None) -> str | None:
     agent_id, secret = cfg.get("agent_id"), cfg.get("agent_secret")
     if not (base and agent_id and secret):
         return ERR + "This Mac is not paired, so it can only drive its own chart."
-    wanted = where.strip()
+    # The Shortcut builds the command from this Mac's own replies, and every
+    # reply ends in a newline ("PLTR\n"), so a forwarded command arrives as
+    # "set PLTR\n | half\n". Run here, vocab strips that; the operator rightly
+    # refuses anything unprintable. Collapse the whitespace before it leaves.
+    wanted = " ".join(where.split())
     try:
         status, body = _post(f"{base}/agent/forward",
                              {"agent_id": agent_id, "secret": secret,
-                              "display": wanted, "cmd": command})
+                              "display": wanted, "cmd": " ".join(command.split())})
     except (urllib.error.URLError, TimeoutError, OSError):
         return ERR + "I could not reach the operator."
     if status == 200 and body.get("self"):

{chartremotely-0.2.5 → chartremotely-0.2.7}/chartremotely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.2.5
+Version: 0.2.7
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 

{chartremotely-0.2.5 → chartremotely-0.2.7}/chartremotely.egg-info/SOURCES.txt

@@ -43,4 +43,5 @@ tests/test_requestlog.py
 tests/test_resolve.py
 tests/test_setup.py
 tests/test_snapshot.py
+tests/test_stamp_changelog.py
 tests/test_timeframe.py

{chartremotely-0.2.5 → chartremotely-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chartremotely"
-version = "0.2.5"
+version = "0.2.7"
 description = "Remote control of desktop charting applications on macOS"
 readme = "README.md"
 requires-python = ">=3.12"

{chartremotely-0.2.5 → chartremotely-0.2.7}/tests/test_forward.py

@@ -67,15 +67,29 @@ def listener(operator, monkeypatch):
     from chartremotely import push
     monkeypatch.setattr(push, "after_reply", lambda *a: pictures.append(a))
     server.Handler.token = "T0KEN"
-    http = HTTPServer(("127.0.0.1", 0), server.Handler)
+    handled = threading.Event()
+
+    class Finishing(server.Handler):
+        # The reply goes out before the picture is scheduled, so a test that
+        # checks pictures must wait for the whole request, not just its reply.
+        def handle(self):
+            try:
+                super().handle()
+            finally:
+                handled.set()
+
+    http = HTTPServer(("127.0.0.1", 0), Finishing)
     threading.Thread(target=http.serve_forever, daemon=True).start()
 
     def post(body):
+        handled.clear()
         request = urllib.request.Request(
             f"http://127.0.0.1:{http.server_address[1]}/chart", data=json.dumps(body).encode(),
             method="POST", headers={"Content-Type": "application/json", "X-Token": "T0KEN"})
         with urllib.request.urlopen(request, timeout=10) as response:
-            return response.read().decode().strip()
+            reply = response.read().decode().strip()
+        assert handled.wait(5), "the listener never finished the request"
+        return reply
 
     yield post, ran, pictures
     http.shutdown()
@@ -170,9 +184,20 @@ def test_the_shortcut_asks_where_after_scale_and_sends_it_beside_cmd():
     actions = plistlib.loads(shortcut.template())["WFWorkflowActions"]
     prompts = [a["WFWorkflowActionParameters"].get("WFAskActionPrompt") for a in actions]
     assert prompts.index("Where?") > prompts.index("What scale?")
-    final = actions[prompts.index("Where?") + 1]["WFWorkflowActionParameters"]
+    final = next(a for a in actions[prompts.index("Where?"):]
+                 if a["WFWorkflowActionIdentifier"].endswith(".downloadurl"))["WFWorkflowActionParameters"]
     fields = {i["WFKey"]["Value"]["string"]: i["WFValue"]["Value"]
               for i in final["WFJSONValues"]["Value"]["WFDictionaryFieldValueItems"]}
     assert fields["cmd"]["string"] == "set  | ", "the vocab grammar is unchanged"
     where = actions[prompts.index("Where?")]["WFWorkflowActionParameters"]["UUID"]
     assert fields["where"]["attachmentsByRange"]["{0, 1}"]["OutputUUID"] == where
+
+
+def test_a_forwarded_command_carries_no_newlines_from_the_shortcut(listener):
+    post, ran, pictures = listener
+    # The Shortcut splices this Mac's own replies ("PLTR\n", "half\n") into the command.
+    post({"cmd": "set PLTR\n | half\n", "where": "Office\n"})
+    _, sent = StubOperator.seen[-1]
+    assert sent["cmd"] == "set PLTR | half"
+    assert sent["display"] == "Office"
+    assert ran == [] and pictures == []

{chartremotely-0.2.5 → chartremotely-0.2.7}/tests/test_setup.py

@@ -43,6 +43,26 @@ def test_the_template_carries_placeholders_and_no_ones_address_or_token():
     assert not re.search(r"<string>[A-Za-z0-9_-]{40,}</string>", raw)
 
 
+def test_every_question_takes_one_line_so_return_answers_it():
+    actions = plistlib.loads(shortcut.template())["WFWorkflowActions"]
+    asks = [a["WFWorkflowActionParameters"] for a in actions
+            if a["WFWorkflowActionIdentifier"].endswith(".ask")]
+    assert asks, "the template asks nothing"
+    for ask in asks:
+        assert ask.get("WFAskActionAllowsMultilineText") is False, ask.get("WFAskActionPrompt")
+
+
+def test_the_shortcut_says_it_is_on_it_while_the_request_goes_out():
+    actions = plistlib.loads(shortcut.template())["WFWorkflowActions"]
+    kinds = [a["WFWorkflowActionIdentifier"].rsplit(".", 1)[-1] for a in actions]
+    where = next(i for i, a in enumerate(actions)
+                 if a["WFWorkflowActionParameters"].get("CustomOutputName") == "Where")
+    assert kinds[where + 1:where + 3] == ["speaktext", "downloadurl"]
+    ack = actions[where + 1]["WFWorkflowActionParameters"]
+    assert ack["WFSpeakTextWait"] is False, "waiting for the words would delay the chart"
+    assert ack["WFText"].startswith("On it, requesting your chart now.")
+
+
 def test_filling_the_template_changes_the_placeholders_and_nothing_else():
     raw = shortcut.template()
     filled = shortcut.fill(raw, "https://mac.example.ts.net/chart", "T0KEN")

chartremotely-0.2.7/tests/test_stamp_changelog.py

@@ -0,0 +1,75 @@
+"""The CHANGELOG stamp the Release workflow runs after an automatic release."""
+
+import importlib.util
+from pathlib import Path
+
+_SCRIPT = Path(__file__).resolve().parents[1] / ".github" / "scripts" / "stamp_changelog.py"
+_spec = importlib.util.spec_from_file_location("stamp_changelog", _SCRIPT)
+stamp_changelog = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(stamp_changelog)
+
+HEAD = "# Changelog\n\nIntro.\n\n"
+OLD = "## [0.1.0] - 2026-01-01\n\n### Added\n- First.\n"
+
+
+def _log(unreleased: str) -> str:
+    return f"{HEAD}## [Unreleased]\n{unreleased}\n{OLD}"
+
+
+def _release(version, text, previous=""):
+    items = stamp_changelog.added(
+        stamp_changelog.unreleased_entries(text), stamp_changelog.unreleased_entries(previous)
+    )
+    return (version, "2026-02-02", items)
+
+
+def test_moves_shipped_lines_under_a_dated_section_keeping_subsections():
+    text = _log("\n### Fixed\n- A fix.\n\n### Added\n- A thing,\n  wrapped.\n")
+    out = stamp_changelog.stamp(text, [_release("0.1.1", text)])
+    assert out == (
+        f"{HEAD}## [Unreleased]\n\n"
+        "## [0.1.1] - 2026-02-02\n\n### Fixed\n- A fix.\n\n### Added\n- A thing,\n  wrapped.\n\n"
+        f"{OLD}"
+    )
+
+
+def test_a_second_run_changes_nothing():
+    text = _log("\n### Fixed\n- A fix.\n")
+    once = stamp_changelog.stamp(text, [_release("0.1.1", text)])
+    assert stamp_changelog.stamp(once, [_release("0.1.1", text)]) == once
+
+
+def test_empty_unreleased_is_left_alone():
+    text = _log("")
+    assert stamp_changelog.stamp(text, [_release("0.1.1", text)]) == text
+
+
+def test_each_release_takes_only_what_it_added_and_later_lines_stay():
+    at_first = _log("\n### Changed\n- One.\n")
+    at_second = _log("\n### Changed\n- One.\n- Two.\n")
+    main = _log("\n### Fixed\n- Three.\n\n### Changed\n- One.\n- Two.\n")
+    out = stamp_changelog.stamp(
+        main, [_release("0.1.1", at_first), _release("0.1.2", at_second, at_first)]
+    )
+    assert out == (
+        f"{HEAD}## [Unreleased]\n\n### Fixed\n- Three.\n\n"
+        "## [0.1.2] - 2026-02-02\n\n### Changed\n- Two.\n\n"
+        "## [0.1.1] - 2026-02-02\n\n### Changed\n- One.\n\n"
+        f"{OLD}"
+    )
+
+
+def test_repeated_subsections_merge_and_reworded_lines_stay_unreleased():
+    at_release = _log("\n### Changed\n- A.\n\n### Changed\n- B.\n- Old wording.\n")
+    main = _log("\n### Changed\n- A.\n\n### Changed\n- B.\n- New wording.\n")
+    out = stamp_changelog.stamp(main, [_release("0.1.1", at_release)])
+    assert out == (
+        f"{HEAD}## [Unreleased]\n\n### Changed\n- New wording.\n\n"
+        "## [0.1.1] - 2026-02-02\n\n### Changed\n- A.\n- B.\n\n"
+        f"{OLD}"
+    )
+
+
+def test_a_version_that_already_has_a_section_is_skipped():
+    text = _log("\n### Fixed\n- A fix.\n")
+    assert stamp_changelog.stamp(text, [_release("0.1.0", text)]) == text