freeagent-cli 0.1.0__tar.gz → 0.2.1__tar.gz

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freeagent-cli
-Version: 0.1.0
+Version: 0.2.1
 Summary: CLI for submitting FreeAgent timeslips
 Project-URL: Homepage, https://github.com/tomdyson/freeagent-cli
 Project-URL: Repository, https://github.com/tomdyson/freeagent-cli
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 A small CLI for submitting FreeAgent timeslips without clicking through the web UI.
 
 ```
-freeagent-cli time submit --project acme --hours 1h30m --comment "fixed the thing"
+freeagent-cli log acme 1h30m "fixed the thing"
 ```
 
 ## Install
@@ -66,16 +66,27 @@ Credentials are stored at `~/Library/Application Support/freeagent-cli/config.js
 ## Usage
 
 ```
-freeagent-cli --help                              # canonical flow
-freeagent-cli projects list                       # projects + tasks in one call
-freeagent-cli time submit --project <name> --hours 1h30m [--task <name>] [--comment "..."] [--dry-run]
+freeagent-cli --help                                       # canonical flow
+freeagent-cli projects                                     # projects + tasks in one call
+freeagent-cli log <project> <duration> [comment...]        # submit a timeslip
+freeagent-cli recent                                       # last few timeslips
 ```
 
-- **`--hours`** accepts `1.5`, `90m`, `1h30m`, or `1:30`.
-- **`--project`** / **`--task`** match by case-insensitive name substring, numeric id, or full URL.
-- **`--task`** is optional when the project has a single task; otherwise the error message lists the choices.
+Examples:
+
+```
+freeagent-cli log Acme 1h30m "fixed the thing"
+freeagent-cli log Acme 90m fixed the thing                 # comment without quotes
+freeagent-cli log "Big Co" 1.5 --task Coding --date 2026-05-01
+freeagent-cli log Acme 1.5 --dry-run                       # preview, don't submit
+```
+
+- **Duration** accepts `1.5`, `90m`, `1h30m`, or `1:30`.
+- **Project / task** match by case-insensitive name substring, numeric id, or full URL.
+- **`--task`** is optional when the project has a single task; otherwise the error lists the choices.
 - **`--date`** defaults to today (ISO `YYYY-MM-DD` to override).
 - **`--dry-run`** resolves the project/task/date and prints the would-be submission without sending it.
+- **`projects --flat`** emits one project/task pair per line (tab-separated) for grep/awk.
 
 ## License
 

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/README.md

@@ -3,7 +3,7 @@
 A small CLI for submitting FreeAgent timeslips without clicking through the web UI.
 
 ```
-freeagent-cli time submit --project acme --hours 1h30m --comment "fixed the thing"
+freeagent-cli log acme 1h30m "fixed the thing"
 ```
 
 ## Install
@@ -39,16 +39,27 @@ Credentials are stored at `~/Library/Application Support/freeagent-cli/config.js
 ## Usage
 
 ```
-freeagent-cli --help                              # canonical flow
-freeagent-cli projects list                       # projects + tasks in one call
-freeagent-cli time submit --project <name> --hours 1h30m [--task <name>] [--comment "..."] [--dry-run]
+freeagent-cli --help                                       # canonical flow
+freeagent-cli projects                                     # projects + tasks in one call
+freeagent-cli log <project> <duration> [comment...]        # submit a timeslip
+freeagent-cli recent                                       # last few timeslips
 ```
 
-- **`--hours`** accepts `1.5`, `90m`, `1h30m`, or `1:30`.
-- **`--project`** / **`--task`** match by case-insensitive name substring, numeric id, or full URL.
-- **`--task`** is optional when the project has a single task; otherwise the error message lists the choices.
+Examples:
+
+```
+freeagent-cli log Acme 1h30m "fixed the thing"
+freeagent-cli log Acme 90m fixed the thing                 # comment without quotes
+freeagent-cli log "Big Co" 1.5 --task Coding --date 2026-05-01
+freeagent-cli log Acme 1.5 --dry-run                       # preview, don't submit
+```
+
+- **Duration** accepts `1.5`, `90m`, `1h30m`, or `1:30`.
+- **Project / task** match by case-insensitive name substring, numeric id, or full URL.
+- **`--task`** is optional when the project has a single task; otherwise the error lists the choices.
 - **`--date`** defaults to today (ISO `YYYY-MM-DD` to override).
 - **`--dry-run`** resolves the project/task/date and prints the would-be submission without sending it.
+- **`projects --flat`** emits one project/task pair per line (tab-separated) for grep/awk.
 
 ## License
 

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "freeagent-cli"
-version = "0.1.0"
+version = "0.2.1"
 description = "CLI for submitting FreeAgent timeslips"
 readme = "README.md"
 requires-python = ">=3.11"

freeagent_cli-0.2.1/src/freeagent_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/src/freeagent_cli/api.py

@@ -16,7 +16,7 @@ class FreeAgent:
             headers={
                 "Authorization": f"Bearer {auth.access_token(self.cfg)}",
                 "Accept": "application/json",
-                "User-Agent": "freeagent-cli/0.1",
+                "User-Agent": "freeagent-cli/0.2",
             },
             timeout=30,
         )
@@ -46,6 +46,17 @@ class FreeAgent:
     def tasks(self, project_url: str) -> list[dict]:
         return self.get("/v2/tasks", project=project_url).get("tasks", [])
 
+    def list_timeslips(self, *, from_date: str, to_date: str | None = None,
+                       user: str | None = None, nested: bool = False) -> list[dict]:
+        params: dict = {"from_date": from_date}
+        if to_date:
+            params["to_date"] = to_date
+        if user:
+            params["user"] = user
+        if nested:
+            params["nested"] = "true"
+        return self.get("/v2/timeslips", **params).get("timeslips", [])
+
     def create_timeslip(self, *, user: str, project: str, task: str,
                         dated_on: str, hours: float, comment: str | None = None) -> dict:
         body: dict = {

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/src/freeagent_cli/cli.py

@@ -37,17 +37,20 @@ def parse_hours(s: str) -> float:
     raise ValueError(f"Cannot parse duration {s!r}; try 1.5, 90m, 1h30m, or 1:30")
 
 
-class _HoursType(click.ParamType):
-    name = "duration"
-
-    def convert(self, value, param, ctx):
-        try:
-            return parse_hours(value)
-        except ValueError as e:
-            self.fail(str(e), param, ctx)
-
-
-HOURS = _HoursType()
+def format_hours(value) -> str:
+    """Format a decimal-hours value as 40m / 1h / 1h30m, rounding to the nearest minute."""
+    try:
+        total_min = round(float(value) * 60)
+    except (TypeError, ValueError):
+        return str(value)
+    if total_min == 0:
+        return "0m"
+    h, m = divmod(total_min, 60)
+    if h == 0:
+        return f"{m}m"
+    if m == 0:
+        return f"{h}h"
+    return f"{h}h{m}m"
 
 
 def _resolve(items: list[dict], query: str, label: str) -> dict:
@@ -85,13 +88,20 @@ def _pick_task(tasks: list[dict], task_q: str | None, project_name: str) -> dict
 
 @click.group(epilog="""
 \b
-Typical flow (for agents/scripts):
-  freeagent-cli projects list                 # projects + tasks in one call
-  freeagent-cli time submit --project <name> --hours 1h30m [--task <name>] [--comment "..."] [--dry-run]
+Typical flow:
+  freeagent-cli recent                            # check what you've already logged (avoids duplicates)
+  freeagent-cli log <project> <duration> [comment]  [--task <name>] [--dry-run]
+  freeagent-cli projects                          # first-time / discovery: projects + tasks
 
 \b
-Time formats accepted: 1.5  90m  1h30m  1:30
-Project/task selection: numeric id, full URL, or case-insensitive name substring.
+Examples:
+  freeagent-cli log Acme 1h30m "fixed the thing"
+  freeagent-cli log "Big Co" 90m --task Coding
+  freeagent-cli log Acme 1.5 --dry-run
+
+\b
+Time formats: 1.5  90m  1h30m  1:30
+Project/task: numeric id, full URL, or case-insensitive name substring.
 --task is optional only when the project has a single task; otherwise the error lists the choices.
 """)
 def main():
@@ -145,7 +155,7 @@ def auth_status():
     click.echo(f"Refresh: {'present' if c.refresh_token else 'missing'}")
 
 
-# -- me / projects / tasks -----------------------------------------------
+# -- me ------------------------------------------------------------------
 
 @main.command()
 def me():
@@ -155,36 +165,41 @@ def me():
     click.echo(u["url"])
 
 
-@main.group()
-def projects():
-    """Project commands."""
-
+# -- projects / tasks ----------------------------------------------------
 
-@projects.command("list")
+@main.command()
 @click.option("--all", "show_all", is_flag=True, help="Include inactive projects.")
 @click.option("--tasks/--no-tasks", "with_tasks", default=True,
               help="Include tasks for each project (default: yes).")
-def projects_list(show_all, with_tasks):
+@click.option("--flat", is_flag=True,
+              help="One project/task pair per line for grep (tab-separated).")
+def projects(show_all, with_tasks, flat):
     """List projects (and their tasks, by default)."""
     api = _api()
     view = "all" if show_all else "active"
     for p in api.projects(view=view):
         pid = p["url"].rsplit("/", 1)[-1]
-        click.echo(f"{pid}\t{p['name']}")
-        if with_tasks:
-            for t in api.tasks(p["url"]):
+        if not with_tasks:
+            click.echo(f"{pid}\t{p['name']}")
+            continue
+        ts = api.tasks(p["url"])
+        if flat:
+            if not ts:
+                click.echo(f"{pid}\t{p['name']}\t\t")
+            for t in ts:
+                tid = t["url"].rsplit("/", 1)[-1]
+                click.echo(f"{pid}\t{p['name']}\t{tid}\t{t['name']}")
+        else:
+            click.echo(f"{pid}\t{p['name']}")
+            for t in ts:
                 tid = t["url"].rsplit("/", 1)[-1]
                 click.echo(f"\t{tid}\t{t['name']}")
 
 
-@main.group()
-def tasks():
-    """Task commands."""
-
-
-@tasks.command("list")
+@main.command()
 @click.option("--project", "project_q", required=True, help="Project name substring, id, or URL.")
-def tasks_list(project_q):
+def tasks(project_q):
+    """List tasks for a project."""
     api = _api()
     project = _resolve(api.projects(view="active"), project_q, "project")
     for t in api.tasks(project["url"]):
@@ -192,31 +207,40 @@ def tasks_list(project_q):
         click.echo(f"{tid}\t{t['name']}")
 
 
-# -- time submit ---------------------------------------------------------
-
-@main.group()
-def time():
-    """Timeslip commands."""
-
+# -- log -----------------------------------------------------------------
 
-@time.command("submit")
-@click.option("--project", "project_q", required=True, help="Project name substring, id, or URL.")
+@main.command()
+@click.argument("project_q", metavar="PROJECT")
+@click.argument("duration", metavar="HOURS")
+@click.argument("comment_parts", nargs=-1, metavar="[COMMENT...]")
 @click.option("--task", "task_q", default=None,
               help="Task name substring, id, or URL. Optional only if the project has a single task.")
-@click.option("--hours", required=True, type=HOURS,
-              help="Duration: 1.5, 90m, 1h30m, 1:30, etc.")
 @click.option("--date", "date_", default=None, help="YYYY-MM-DD (default: today).")
-@click.option("--comment", default=None)
 @click.option("--dry-run", is_flag=True, help="Resolve and preview, but don't submit.")
-def time_submit(project_q, task_q, hours, date_, comment, dry_run):
-    """Submit a timeslip."""
+def log(project_q, duration, comment_parts, task_q, date_, dry_run):
+    """Submit a timeslip: PROJECT HOURS [COMMENT...].
+
+    \b
+    Examples:
+      freeagent-cli log Acme 1h30m "fixed the thing"
+      freeagent-cli log Acme 90m fixed the thing       # comment without quotes
+      freeagent-cli log "Big Co" 1.5 --task Coding --date 2026-05-01
+
+    Tip: run `freeagent-cli recent` first to avoid duplicate entries.
+    """
+    try:
+        hours = parse_hours(duration)
+    except ValueError as e:
+        raise click.UsageError(str(e))
+    comment = " ".join(comment_parts) if comment_parts else None
+
     api = _api()
     project = _resolve(api.projects(view="active"), project_q, "project")
     task = _pick_task(api.tasks(project["url"]), task_q, project["name"])
     dated_on = date_ or _dt.date.today().isoformat()
 
     if dry_run:
-        click.echo(f"DRY RUN — would submit {hours}h on {dated_on} → {project['name']} / {task['name']}")
+        click.echo(f"DRY RUN — would submit {format_hours(hours)} on {dated_on} → {project['name']} / {task['name']}")
         click.echo(f"  project: {project['url']}")
         click.echo(f"  task:    {task['url']}")
         if comment:
@@ -229,10 +253,38 @@ def time_submit(project_q, task_q, hours, date_, comment, dry_run):
         dated_on=dated_on, hours=hours, comment=comment,
     )
     ts = result["timeslips"][0] if "timeslips" in result else result.get("timeslip", result)
-    click.echo(f"Submitted {hours}h on {dated_on} → {project['name']} / {task['name']}")
+    click.echo(f"Submitted {format_hours(hours)} on {dated_on} → {project['name']} / {task['name']}")
     if isinstance(ts, dict) and "url" in ts:
         click.echo(ts["url"])
 
 
+# -- recent --------------------------------------------------------------
+
+@main.command()
+@click.option("-n", "limit", default=5, show_default=True, help="How many entries to show.")
+@click.option("--days", default=14, show_default=True, help="Look back this many days.")
+@click.option("--all-users", is_flag=True, help="Include other users (default: just you).")
+def recent(limit, days, all_users):
+    """Show recent timeslips (most recent first)."""
+    api = _api()
+    from_date = (_dt.date.today() - _dt.timedelta(days=days)).isoformat()
+    user_url = None if all_users else api.me()["url"]
+    slips = api.list_timeslips(from_date=from_date, user=user_url, nested=True)
+    slips.sort(
+        key=lambda t: (t.get("dated_on", ""), t.get("created_at", "")),
+        reverse=True,
+    )
+    if not slips:
+        click.echo(f"(no timeslips in the last {days} days)")
+        return
+    for s in slips[:limit]:
+        proj = s.get("project")
+        task_ = s.get("task")
+        pname = proj["name"] if isinstance(proj, dict) else "?"
+        tname = task_["name"] if isinstance(task_, dict) else "?"
+        comment = (s.get("comment") or "").replace("\n", " ")
+        click.echo(f"{s.get('dated_on','?')}\t{format_hours(s.get('hours'))}\t{pname}\t{tname}\t{comment}")
+
+
 if __name__ == "__main__":
     main()

{freeagent_cli-0.1.0 → freeagent_cli-0.2.1}/uv.lock

@@ -47,7 +47,7 @@ wheels = [
 
 [[package]]
 name = "freeagent-cli"
-version = "0.1.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

freeagent_cli-0.1.0/src/freeagent_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"