@richhaase/c2 0.1.1 → 0.2.1

package/README.md

@@ -12,7 +12,7 @@ bun install -g @richhaase/c2
 
 # Or install from source
 git clone https://github.com/richhaase/c2.git
-cd c2cli
+cd c2
 bun install
 bun link
 ```
@@ -118,7 +118,7 @@ c2 export -f jsonl > workouts.jsonl
 
 ## Configuration
 
-Config lives at `~/.config/c2cli/config.json`. Created automatically on `c2 setup`.
+Config lives at `~/.config/c2/config.json`. Created automatically on `c2 setup`.
 
 ```json
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richhaase/c2",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "CLI tool for syncing and analyzing Concept2 rowing data",
   "keywords": [
     "concept2",

package/src/commands/report.ts

@@ -1,5 +1,6 @@
-import { writeFile } from "node:fs/promises";
-import { resolve } from "node:path";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
 import type { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { formatMeters } from "../display.ts";
@@ -651,7 +652,7 @@ ${buildRecentWorkouts(allWorkouts, recentCount)}
 ${buildProjection(goal, allWorkouts)}
 
 <div style="text-align: center; color: #484f58; font-size: 12px; margin-top: 32px; padding-bottom: 16px;">
-  Generated by c2cli &middot; Data from Concept2 Logbook &middot; ${fullDate(today)}
+  Generated by c2 &middot; Data from Concept2 Logbook &middot; ${fullDate(today)}
 </div>
 
 </body>
@@ -661,11 +662,11 @@ ${buildProjection(goal, allWorkouts)}
 export function registerReport(program: Command): void {
   program
     .command("report")
-    .description("Generate HTML progress report")
-    .option("-o, --output <file>", "output file path", "report.html")
+    .description("Generate HTML progress report and open in browser")
+    .option("-o, --output <file>", "save to a specific file instead of a temp file")
     .option("-w, --weeks <n>", "weeks of history to show", "12")
-    .option("--open", "open report in default browser")
-    .action(async (opts: { output: string; weeks: string; open?: boolean }) => {
+    .option("--no-open", "don't open in browser")
+    .action(async (opts: { output?: string; weeks: string; open: boolean }) => {
       const cfg = await loadConfig();
       if (!cfg.goal.start_date || !cfg.goal.end_date) {
         console.error("Goal dates not configured. Run `c2 setup` to set start and end dates.");
@@ -687,9 +688,14 @@ export function registerReport(program: Command): void {
       const summaries = buildWeekSummaries(workouts, new Date(), weeks);
       const html = buildHTML(goal, summaries, workouts, 10);
 
-      const outPath = resolve(opts.output);
+      let outPath: string;
+      if (opts.output) {
+        outPath = resolve(opts.output);
+      } else {
+        const dir = await mkdtemp(join(tmpdir(), "c2-report-"));
+        outPath = join(dir, "report.html");
+      }
       await writeFile(outPath, html, "utf-8");
-      console.log(`Report written to: ${outPath}`);
 
       if (opts.open) {
         const { spawn } = await import("node:child_process");
@@ -704,6 +710,8 @@ export function registerReport(program: Command): void {
           console.error(`Could not open report: ${err.message}`);
         });
         child.unref();
+      } else {
+        console.log(`Report written to: ${outPath}`);
       }
     });
 }

package/src/config.ts

@@ -19,7 +19,7 @@ export function defaultConfig(): Config {
 }
 
 export function configDir(): string {
-  return join(homedir(), ".config", "c2cli");
+  return join(homedir(), ".config", "c2");
 }
 
 export function dataDir(): string {

package/src/index.ts

@@ -23,6 +23,15 @@ registerTrend(program);
 registerExport(program);
 registerReport(program);
 
+// Default to `report` when run with no subcommand
+const args = process.argv.slice(2);
+const knownCommands = program.commands.map((c) => c.name());
+const hasSubcommand = args.some((a) => knownCommands.includes(a));
+const hasHelpOrVersion = args.some((a) => ["-h", "--help", "-v", "--version"].includes(a));
+if (args.length === 0 || (!hasSubcommand && !hasHelpOrVersion)) {
+  process.argv.splice(2, 0, "report");
+}
+
 program.parseAsync(process.argv).catch((err: Error) => {
   console.error(`Error: ${err.message}`);
   process.exit(1);

package/src/stats.ts

@@ -71,7 +71,8 @@ export function buildWeekSummaries(workouts: Workout[], now: Date, weeks: number
     if (t < cutoff || t > now) continue;
 
     const monday = mondayOf(t);
-    const idx = Math.floor((monday.getTime() - cutoff.getTime()) / (1000 * 60 * 60 * 24 * 7));
+    const diffDays = Math.round((monday.getTime() - cutoff.getTime()) / (1000 * 60 * 60 * 24));
+    const idx = Math.floor(diffDays / 7);
     if (idx < 0 || idx >= weeks) continue;
 
     const ws = summaries[idx]!;