ya-git-jira 1.5.0 → 2.0.0

package/lib/spawn.ts

@@ -10,7 +10,7 @@ export interface SpawnOptions {
     expectQuiet?: boolean
 }
 
-const defaultOptions: SpawnOptions = {
+export const defaultOptions: SpawnOptions = {
     expectQuiet: false,
 }
 
@@ -29,8 +29,8 @@ export async function spawn(args: string[], options: SpawnOptions = defaultOptio
     return { out: out.trim(), err: err.trim(), code }
 }
 
-export async function doCommand(args: string[]): Promise<string> {
-    const { out, err } = await spawn(args)
+export async function doCommand(args: string[], options: SpawnOptions = defaultOptions): Promise<string> {
+    const { out, err } = await spawn(args, options)
     if (err) console.error(err)
     return out
 }

package/package.json

@@ -1,15 +1,25 @@
 {
   "name": "ya-git-jira",
   "description": "git extensions for Jira integration. Assumes bun is installed.",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "module": "dist/index.js",
   "type": "module",
   "bin": {
+    "git-api": "dist/bin/git-api.js",
     "git-bump": "dist/bin/git-bump.js",
+    "git-confluence-page-search": "dist/bin/git-confluence-page-search.js",
+    "git-confluence-page-show": "dist/bin/git-confluence-page-show.js",
+    "git-confluence-page-update": "dist/bin/git-confluence-page-update.js",
+    "git-confluence-page": "dist/bin/git-confluence-page.js",
+    "git-confluence-space-list": "dist/bin/git-confluence-space-list.js",
+    "git-confluence-space": "dist/bin/git-confluence-space.js",
+    "git-confluence-whoami": "dist/bin/git-confluence-whoami.js",
+    "git-confluence": "dist/bin/git-confluence.js",
     "git-jira-issue-list": "dist/bin/git-jira-issue-list.js",
     "git-jira-issue-show": "dist/bin/git-jira-issue-show.js",
     "git-jira-issue": "dist/bin/git-jira-issue.js",
     "git-jira-start": "dist/bin/git-jira-start.js",
+    "git-jira-whoami": "dist/bin/git-jira-whoami.js",
     "git-jira": "dist/bin/git-jira.js",
     "git-lab-group-list": "dist/bin/git-lab-group-list.js",
     "git-lab-group": "dist/bin/git-lab-group.js",
@@ -21,13 +31,19 @@
     "git-lab-namespace-list": "dist/bin/git-lab-namespace-list.js",
     "git-lab-namespace": "dist/bin/git-lab-namespace.js",
     "git-lab-project-list": "dist/bin/git-lab-project-list.js",
+    "git-lab-project-mr": "dist/bin/git-lab-project-mr.js",
+    "git-lab-project-mr-list": "dist/bin/git-lab-project-mr-list.js",
     "git-lab-project-pipeline": "dist/bin/git-lab-project-pipeline.js",
+    "git-lab-project-pipeline-jobs": "dist/bin/git-lab-project-pipeline-jobs.js",
+    "git-lab-project-pipeline-latest": "dist/bin/git-lab-project-pipeline-latest.js",
     "git-lab-project-pipeline-list": "dist/bin/git-lab-project-pipeline-list.js",
+    "git-lab-project-pipeline-log": "dist/bin/git-lab-project-pipeline-log.js",
     "git-lab-project-whereami": "dist/bin/git-lab-project-whereami.js",
     "git-lab-project": "dist/bin/git-lab-project.js",
     "git-lab-whoami": "dist/bin/git-lab-whoami.js",
     "git-lab": "dist/bin/git-lab.js",
-    "gitj": "dist/bin/gitj.js"
+    "gitj": "dist/bin/gitj.js",
+    "gitj-install-skills": "dist/bin/gitj-install-skills.js"
   },
   "scripts": {
     "preinstall": "bun run build.ts",

package/tests/all-help.test.ts

@@ -15,7 +15,12 @@ describe('bin scripts', () => {
 
     describe('--help', () => {
         scripts.forEach((script) => {
-            const stem = script.split('/').pop()?.split('-').pop()?.split('.').shift();
+            // Strip .ts, then remove the git-{service}- or gitj- prefix to get the command name.
+            // e.g. "git-jira-start" -> "start", "gitj-install-skills" -> "install-skills", "gitj" -> "gitj"
+            const base = script.replace(/\.ts$/, '')
+            const stem = base.startsWith('gitj-') ? base.slice('gitj-'.length)
+                : base === 'gitj' ? 'gitj'
+                : base.split('-').pop()!
             test(`"${script} --help" should contain 'Usage: ${stem}'"`, async () => {
                 const output = await doCommand(['bun', 'run', `${binDir}/${script}`, '--help']);
                 expect(output).toContain(`Usage: ${stem}`);

package/tests/gitj.test.ts

@@ -9,7 +9,7 @@ test("testing works", async (): Promise<void> => {
 test("gitj works", async (): Promise<void> => {
     const { out, code }: SpawnResult = await spawn(["bun", "run", "bin/gitj.ts"])
     expect(out).toMatch("Usage:")
-    expect(out).toMatch("Bump the version number in the current branch")
+    expect(out).toMatch("Bump the version number")
     expect(out).toMatch("Commands for working with Jira")
     expect(code).toBe(0)
 })

package/tests/help-all.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, test } from 'bun:test'
+import { doCommand } from '..'
+
+describe('--help-all', () => {
+    test('gitj --help-all prints the full command tree', async (): Promise<void> => {
+        const output = await doCommand(['bun', 'run', './bin/gitj.ts', '--help-all'])
+        // root
+        expect(output).toContain('gitj')
+        // top-level commands
+        expect(output).toContain('bump')
+        expect(output).toContain('confluence')
+        expect(output).toContain('jira')
+        expect(output).toContain('lab')
+        // deeply nested leaf commands
+        expect(output).toContain('search')
+        expect(output).toContain('whereami')
+        expect(output).toContain('train')
+        // tree-drawing characters
+        expect(output).toContain('├──')
+        expect(output).toContain('└──')
+        expect(output).toContain('│')
+    })
+
+    test('gitj --help-all includes descriptions', async (): Promise<void> => {
+        const output = await doCommand(['bun', 'run', './bin/gitj.ts', '--help-all'])
+        expect(output).toContain('Commands for working with Jira')
+        expect(output).toContain('Commands for working with GitLab')
+    })
+})