ya-git-jira 2.1.0 → 2.1.1

package/bin/git-api.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import { apiRequest, apiPaginate, serviceNames } from '../lib/api.ts'
 
 const version = await getPackageVersion()
@@ -65,6 +65,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-api')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-api', create)

package/bin/git-bump.ts

@@ -3,7 +3,7 @@
 import { createBranch, getCurrentBranch } from "../lib/git"
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -32,6 +32,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-bump')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-bump', create)

package/bin/git-confluence-page-search.ts

@@ -5,7 +5,7 @@ import { getPackageVersion } from '../lib/package'
 import { confluenceApi, confluenceSearch } from '../lib/confluence'
 import { getConfluenceConfig } from '../lib/confluence'
 import type { Page, SearchResult } from '../lib/confluence'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -24,7 +24,7 @@ export function create(): Command {
             if (options.exact) {
                 const pages = await confluenceApi(`pages?title=${encodeURIComponent(query)}`) as Array<Page>
                 if (options.verbose) {
-                    console.log(pages)
+                    console.log(JSON.stringify(pages, null, 2))
                 } else {
                     for (const page of pages) {
                         const url = `https://${host}/wiki/spaces/${page.spaceId}/pages/${page.id}`
@@ -38,7 +38,7 @@ export function create(): Command {
             const cql = `type=page AND ${field} ~ "${query}"`
             const results = await confluenceSearch(cql) as Array<SearchResult>
             if (options.verbose) {
-                console.log(results)
+                console.log(JSON.stringify(results, null, 2))
             } else {
                 for (const result of results) {
                     const id = result.content.id
@@ -53,6 +53,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-page-search')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-page-search', create)

package/bin/git-confluence-page-show.ts

@@ -5,7 +5,7 @@ import { getPackageVersion } from '../lib/package'
 import { confluenceApi } from '../lib/confluence'
 import { getConfluenceConfig } from '../lib/confluence'
 import type { Page } from '../lib/confluence'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -40,7 +40,7 @@ export function create(): Command {
                     process.exit(1)
                 }
             } else if (options.verbose) {
-                console.log(page)
+                console.log(JSON.stringify(page, null, 2))
             } else {
                 const { host } = await getConfluenceConfig()
                 const url = `https://${host}/wiki/spaces/${page.spaceId}/pages/${page.id}`
@@ -56,6 +56,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-page-show')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-page-show', create)

package/bin/git-confluence-page-update.ts

@@ -5,7 +5,7 @@ import { getPackageVersion } from '../lib/package'
 import { confluenceApi, confluenceApiWrite } from '../lib/confluence'
 import type { Page } from '../lib/confluence'
 import type { JSONValue } from '../lib/json'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 async function readStdin(): Promise<string> {
@@ -62,7 +62,7 @@ export function create(): Command {
 
             const result = await confluenceApiWrite(`pages/${id}`, 'PUT', body) as Page
             if (options.verbose) {
-                console.log(result)
+                console.log(JSON.stringify(result, null, 2))
             } else {
                 console.log(`Updated page ${result.id} "${result.title}" to version ${result.version.number}`)
             }
@@ -72,6 +72,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-page-update')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-page-update', create)

package/bin/git-confluence-page.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import search from './git-confluence-page-search'
 import show from './git-confluence-page-show'
 import update from './git-confluence-page-update'
@@ -23,6 +23,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-page')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-page', create)

package/bin/git-confluence-space-list.ts

@@ -4,7 +4,7 @@ import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { confluenceApi } from '../lib/confluence'
 import type { Space } from '../lib/confluence'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -17,7 +17,7 @@ export function create(): Command {
         .action(async (options) => {
             const spaces = await confluenceApi('spaces') as Array<Space>
             if (options.verbose) {
-                console.log(spaces)
+                console.log(JSON.stringify(spaces, null, 2))
             } else {
                 for (const space of spaces) {
                     console.log(`${space.key}\t${space.name}`)
@@ -29,6 +29,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-space-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-space-list', create)

package/bin/git-confluence-space.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import list from './git-confluence-space-list'
 const version = await getPackageVersion()
 
@@ -19,6 +19,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-space')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-space', create)

package/bin/git-confluence-whoami.ts

@@ -4,7 +4,7 @@ import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { confluenceApiV1 } from '../lib/confluence'
 import type { ConfluenceUser } from '../lib/confluence'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -17,7 +17,7 @@ export function create(): Command {
         .action(async (options) => {
             const myself = await confluenceApiV1('user/current') as ConfluenceUser
             if (options.verbose) {
-                console.log(myself)
+                console.log(JSON.stringify(myself, null, 2))
             } else {
                 const { displayName, email, accountId } = myself
                 console.log({ displayName, email, accountId })
@@ -28,6 +28,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-confluence-whoami')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence-whoami', create)

package/bin/git-confluence.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import whoami from './git-confluence-whoami'
 import space from './git-confluence-space'
 import page from './git-confluence-page'
@@ -17,11 +17,18 @@ export function create(): Command {
         .addCommand(whoami())
         .addCommand(space())
         .addCommand(page())
+        .addHelpText('after', `
+Required git config:
+  confluence.host    your Confluence hostname (or jira.host as fallback)
+  confluence.token   your Atlassian API token (or jira.token as fallback)
+
+Optional git config:
+  confluence.user    your Confluence email (falls back to jira.user, then user.email)
+
+Set with: git config --global confluence.host <value>`)
     return program
 }
 
 export default create
 
-if (isMain('git-confluence')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-confluence', create)

package/bin/git-jira-issue-list.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { myUnresolvedIssues } from "../lib/jira"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -24,6 +24,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-jira-issue-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira-issue-list', create)

package/bin/git-jira-issue-show.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getIssue } from "../lib/jira"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import { getJiraConfig } from '../lib/jira'
 const version = await getPackageVersion()
 
@@ -22,7 +22,7 @@ export function create(): Command {
                 process.exit(1)
             }
             if (options.verbose) {
-                console.log(issue)
+                console.log(JSON.stringify(issue, null, 2))
             } else {
                 const { host } = await getJiraConfig()
                 const summary = issue.fields.summary
@@ -35,6 +35,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-jira-issue-show')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira-issue-show', create)

package/bin/git-jira-issue.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import list from './git-jira-issue-list'
 import show from './git-jira-issue-show'
 const version = await getPackageVersion()
@@ -22,6 +22,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-jira-issue')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira-issue', create)

package/bin/git-jira-start.ts

@@ -4,7 +4,7 @@ import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { createBranch } from "../lib/git"
 import { getIssue } from "../lib/jira"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 function toKebab(s: string): string {
@@ -37,6 +37,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-jira-start')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira-start', create)

package/bin/git-jira-whoami.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getMyself } from '../lib/jira'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -16,7 +16,7 @@ export function create(): Command {
         .action(async (options) => {
             const myself = await getMyself()
             if (options.verbose) {
-                console.log(myself)
+                console.log(JSON.stringify(myself, null, 2))
             } else {
                 const { displayName, emailAddress, accountId } = myself as any
                 console.log({ displayName, emailAddress, accountId })
@@ -27,6 +27,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-jira-whoami')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira-whoami', create)

package/bin/git-jira.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import start from './git-jira-start'
 import issue from './git-jira-issue'
 import issues from './git-jira-issue-list'
@@ -19,11 +19,18 @@ export function create(): Command {
         .addCommand(issue())
         .addCommand(issues())
         .addCommand(whoami())
+        .addHelpText('after', `
+Required git config:
+  jira.host    your Jira hostname (e.g. yourcompany.atlassian.net)
+  jira.token   your Atlassian API token
+
+Optional git config:
+  jira.user    your Jira email (falls back to user.email)
+
+Set with: git config --global jira.host <value>`)
     return program
 }
 
 export default create
 
-if (isMain('git-jira')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-jira', create)

package/bin/git-lab-group-list.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import { getGroups } from '../lib/gitlab'
 const version = await getPackageVersion()
 
@@ -16,13 +16,13 @@ export function create(): Command {
         .action(async (options) => {
             const groups = await getGroups()
             if (options.verbose)
-                console.log(groups)
+                console.log(JSON.stringify(groups, null, 2))
             else {
                 const filtered = groups.map(g => {
                     const { id, name, full_path } = g
                     return { id, name, full_path }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -30,6 +30,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-group-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-group-list', create)

package/bin/git-lab-group.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 import list from './git-lab-group-list'
@@ -20,6 +20,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-group')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-group', create)

package/bin/git-lab-merge-active.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getMyMergeRequestsInProgress } from "../lib/gitlab"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -20,7 +20,7 @@ export function create(): Command {
                 process.exit(1)
             }
             if (options.verbose) {
-                console.log(merges)
+                console.log(JSON.stringify(merges, null, 2))
                 process.exit(0)
             }
             else {
@@ -28,7 +28,7 @@ export function create(): Command {
                     const { title, web_url, source_branch, target_branch } = m
                     return { title, web_url, source_branch, target_branch }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -36,6 +36,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-merge-active')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-merge-active', create)

package/bin/git-lab-merge-todo.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getMyMergeRequestsToReview, type MergeRequest } from "../lib/gitlab"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -16,14 +16,14 @@ export function create(): Command {
         .action(async (options) => {
             const mrs: MergeRequest[] = await getMyMergeRequestsToReview()
             if (options.verbose) {
-                console.log(mrs)
+                console.log(JSON.stringify(mrs, null, 2))
             }
             else {
                 const filtered = mrs.map(mr => {
                     const { title, web_url, source_branch, target_branch } = mr
                     return { title, web_url, source_branch, target_branch }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -31,6 +31,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-merge-todo')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-merge-todo', create)

package/bin/git-lab-merge-train-list.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import { getMergeTrains } from '../lib/gitlab/merge-trains'
 const version = await getPackageVersion()
 
@@ -14,13 +14,11 @@ export function create(): Command {
         .description('List merge trains for the current project')
         .action(async () => {
             const trains = await getMergeTrains()
-            console.log(trains)
+            console.log(JSON.stringify(trains, null, 2))
         })
     return program
 }
 
 export default create
 
-if (isMain('git-lab-merge-train-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-merge-train-list', create)

package/bin/git-lab-merge-train.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 import list from './git-lab-merge-train-list'
@@ -20,6 +20,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-merge-train')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-merge-train', create)

package/bin/git-lab-merge.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import todo from './git-lab-merge-todo'
 import active from './git-lab-merge-active'
 import train from './git-lab-merge-train'
@@ -24,6 +24,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-merge')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-merge', create)

package/bin/git-lab-namespace-list.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import { getNamespaces } from '../lib/gitlab/namespace'
 
 const version = await getPackageVersion()
@@ -15,13 +15,11 @@ export function create(): Command {
         .description('List namespaces for the current user')
         .action(async () => {
             const namespaces = await getNamespaces()
-            console.log(namespaces)
+            console.log(JSON.stringify(namespaces, null, 2))
         })
     return program
 }
 
 export default create
 
-if (isMain('git-lab-namespace-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-namespace-list', create)

package/bin/git-lab-namespace.ts

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import list from './git-lab-namespace-list'
 const version = await getPackageVersion()
 
@@ -19,6 +19,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-namespace')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-namespace', create)

package/bin/git-lab-project-list.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getProjects, type Project } from "../lib/gitlab/project"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -21,14 +21,14 @@ export function create(): Command {
                 process.exit(1)
             }
             if (options.verbose) {
-                console.log(projects)
+                console.log(JSON.stringify(projects, null, 2))
             }
             else {
                 let filtered = projects.map((p: Project) => {
                     const { id, name, path_with_namespace, ssh_url_to_repo } = p
                     return { id, name, path_with_namespace, ssh_url_to_repo }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -36,6 +36,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-list', create)