ya-git-jira 2.0.0 → 2.1.1

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)

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

@@ -5,7 +5,7 @@ import { getPackageVersion } from '../lib/package'
 import { getMergeRequestsByBranch, type MergeRequest } from "../lib/gitlab"
 import { findProject } from '../lib/gitlab/project'
 import { getRemote, getCurrentBranch } from '../lib/git'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -37,14 +37,14 @@ export function create(): Command {
                 process.exit(0)
             }
             if (options.verbose) {
-                console.log(mrs)
+                console.log(JSON.stringify(mrs, null, 2))
             }
             else {
                 const filtered = mrs.map(m => {
                     const { iid, title, web_url, source_branch, target_branch, state, draft } = m
                     return { iid, title, web_url, source_branch, target_branch, state, draft }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -52,6 +52,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-mr-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-mr-list', create)

package/bin/git-lab-project-mr.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-project-mr-list'
 const version = await getPackageVersion()
 
@@ -19,6 +19,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-mr')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-mr', create)

package/bin/git-lab-project-pipeline-jobs.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getPipelineJobs, type Job } from '../lib/gitlab'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 
 const version = await getPackageVersion()
 
@@ -41,6 +41,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-pipeline-jobs')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-pipeline-jobs', create)

package/bin/git-lab-project-pipeline-latest.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getLatestPipeline, type Pipeline, getPipelineJobs, type Job } from '../lib/gitlab'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 
 const version = await getPackageVersion()
 
@@ -42,6 +42,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-pipeline-latest')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-pipeline-latest', create)

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

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getProjectPipelines, type Pipeline } from "../lib/gitlab"
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 import debug from 'debug'
 
 const version = await getPackageVersion()
@@ -26,14 +26,14 @@ export function create(): Command {
                 process.exit(1)
             }
             if (options.verbose) {
-                console.log(pipelines)
+                console.log(JSON.stringify(pipelines, null, 2))
             }
             else {
                 let filtered = pipelines.map((p: Pipeline) => {
                     const { id, web_url, updated_at, ref, sha } = p
                     return { id, web_url, updated_at, ref, sha }
                 })
-                console.log(filtered)
+                console.log(JSON.stringify(filtered, null, 2))
             }
         })
     return program
@@ -41,6 +41,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-pipeline-list')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-pipeline-list', create)

package/bin/git-lab-project-pipeline-log.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { getJobLog } from '../lib/gitlab'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 
 const version = await getPackageVersion()
 
@@ -44,6 +44,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-pipeline-log')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-pipeline-log', create)

package/bin/git-lab-project-pipeline.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 jobs from './git-lab-project-pipeline-jobs'
 import latest from './git-lab-project-pipeline-latest'
 import list from './git-lab-project-pipeline-list'
@@ -25,6 +25,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-pipeline')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-pipeline', create)

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

@@ -4,7 +4,7 @@ import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { findProject } from "../lib/gitlab/project"
 import { getRemote } from '../lib/git'
-import { isMain } from '../lib/is_main'
+import { runMain } from '../lib/is_main'
 const version = await getPackageVersion()
 
 export function create(): Command {
@@ -27,7 +27,7 @@ export function create(): Command {
                 process.exit(1)
             }
             if (options.verbose) {
-                console.log(project)
+                console.log(JSON.stringify(project, null, 2))
             } else {
                 const { id, name, path_with_namespace, ssh_url_to_repo } = project
                 console.log({id, name, path_with_namespace, ssh_url_to_repo })
@@ -38,6 +38,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project-whereami')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project-whereami', create)

package/bin/git-lab-project.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-project-list'
 import mr from './git-lab-project-mr'
 import pipeline from './git-lab-project-pipeline'
@@ -27,6 +27,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-project')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-project', create)

package/bin/git-lab-whoami.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander'
 import { getPackageVersion } from '../lib/package'
 import { whoami, type User } from "../lib/gitlab/user"
-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(user)
+                console.log(JSON.stringify(user, null, 2))
                 process.exit(0)
             }
             else {
@@ -32,6 +32,4 @@ export function create(): Command {
 
 export default create
 
-if (isMain('git-lab-whoami')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab-whoami', create)

package/bin/git-lab.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 groups from './git-lab-group'
 import merges from './git-lab-merge'
 import namespaces from './git-lab-namespace'
@@ -22,11 +22,18 @@ export function create(): Command {
         .addCommand(projects())
         .addCommand(whoami())
         .action(() => program.help())
+        .addHelpText('after', `
+Required git config:
+  gitlab.token   your GitLab personal access token
+
+Optional git config:
+  gitlab.host    your GitLab hostname (defaults to gitlab.com)
+  gitlab.user    your GitLab email (falls back to user.email)
+
+Set with: git config --global gitlab.token <value>`)
     return program
 }
 
 export default create
 
-if (isMain('git-lab')) {
-    await create().parseAsync(Bun.argv)
-}
+await runMain('git-lab', create)