fix: consolidate completions (#38)

Author: RasPhilCo

src/completions.ts

@@ -3,8 +3,7 @@ import * as Config from '@oclif/config'
 import * as path from 'path'
 
 import deps from './deps'
-
-export {AppCompletion, RemoteCompletion} from './flags/app'
+import {configRemote, getGitRemotes} from './git'
 
 export const oneDay = 60 * 60 * 24
 
@@ -15,21 +14,11 @@ export const herokuGet = async (resource: string, ctx: { config: Config.IConfig
   return resources.map((a: any) => a.name).sort()
 }
 
-export const BuildpackCompletion: flags.ICompletion = {
-  skipCache: true,
-
-  options: async () => {
-    return [
-      'heroku/ruby',
-      'heroku/nodejs',
-      'heroku/clojure',
-      'heroku/python',
-      'heroku/java',
-      'heroku/gradle',
-      'heroku/scala',
-      'heroku/php',
-      'heroku/go',
-    ]
+export const AppCompletion: flags.ICompletion = {
+  cacheDuration: oneDay,
+  options: async ctx => {
+    let apps = await herokuGet('apps', ctx)
+    return apps
   },
 }
 
@@ -55,6 +44,24 @@ export const AppDynoCompletion: flags.ICompletion = {
   },
 }
 
+export const BuildpackCompletion: flags.ICompletion = {
+  skipCache: true,
+
+  options: async () => {
+    return [
+      'heroku/ruby',
+      'heroku/nodejs',
+      'heroku/clojure',
+      'heroku/python',
+      'heroku/java',
+      'heroku/gradle',
+      'heroku/scala',
+      'heroku/php',
+      'heroku/go',
+    ]
+  },
+}
+
 export const DynoSizeCompletion: flags.ICompletion = {
   cacheDuration: oneDay * 90,
   options: async ctx => {
@@ -112,6 +119,15 @@ export const RegionCompletion: flags.ICompletion = {
   },
 }
 
+export const RemoteCompletion: flags.ICompletion = {
+  skipCache: true,
+
+  options: async () => {
+    let remotes = getGitRemotes(configRemote())
+    return remotes.map(r => r.remote)
+  },
+}
+
 export const RoleCompletion: flags.ICompletion = {
   skipCache: true,
 

src/flags/app.ts

@@ -1,12 +1,11 @@
 import {flags} from '@oclif/command'
 import {CLIError, error} from '@oclif/errors'
 
-import {herokuGet, oneDay} from '../completions'
-import {Git} from '../git'
-import {vars} from '../vars'
+import {AppCompletion, RemoteCompletion} from '../completions'
+import {configRemote, getGitRemotes, IGitRemotes} from '../git'
 
 class MultipleRemotesError extends CLIError {
-  constructor(gitRemotes: IGitRemote[]) {
+  constructor(gitRemotes: IGitRemotes[]) {
     super(`Multiple apps in git remotes
   Usage: --remote ${gitRemotes[1].remote}
      or: --app ${gitRemotes[1].app}
@@ -20,14 +19,6 @@ class MultipleRemotesError extends CLIError {
   }
 }
 
-export const AppCompletion: flags.ICompletion = {
-  cacheDuration: oneDay,
-  options: async ctx => {
-    let apps = await herokuGet('apps', ctx)
-    return apps
-  },
-}
-
 export const app = flags.build({
   char: 'a',
   completion: AppCompletion,
@@ -47,52 +38,8 @@ export const app = flags.build({
   },
 })
 
-export const RemoteCompletion: flags.ICompletion = {
-  skipCache: true,
-
-  options: async () => {
-    let remotes = getGitRemotes(configRemote())
-    return remotes.map(r => r.remote)
-  },
-}
-
 export const remote = flags.build({
   char: 'r',
   completion: RemoteCompletion,
   description: 'git remote of app to use',
 })
-
-function configRemote() {
-  let git = new Git()
-  try {
-    return git.exec('config heroku.remote').trim()
-  } catch {}
-}
-
-interface IGitRemote {
-  remote: string
-  app: string
-}
-function getGitRemotes(onlyRemote: string | undefined): IGitRemote[] {
-  let git = new Git()
-  let appRemotes = []
-  let remotes
-  try {
-    remotes = git.remotes
-  } catch {
-    return []
-  }
-  for (let remote of remotes) {
-    if (onlyRemote && remote.name !== onlyRemote) continue
-    for (let prefix of vars.gitPrefixes) {
-      const suffix = '.git'
-      let match = remote.url.match(`${prefix}(.*)${suffix}`)
-      if (!match) continue
-      appRemotes.push({
-        app: match[1],
-        remote: remote.name,
-      })
-    }
-  }
-  return appRemotes
-}

src/git.ts

@@ -1,5 +1,7 @@
 import {CLIError} from '@oclif/errors'
 
+import {vars} from './vars'
+
 export interface IGitRemote {
   name: string
   url: string
@@ -31,3 +33,39 @@ export class Git {
     }
   }
 }
+
+export function configRemote() {
+  let git = new Git()
+  try {
+    return git.exec('config heroku.remote').trim()
+  } catch {}
+}
+
+export interface IGitRemotes {
+  remote: string
+  app: string
+}
+
+export function getGitRemotes(onlyRemote: string | undefined): IGitRemotes[] {
+  let git = new Git()
+  let appRemotes = []
+  let remotes
+  try {
+    remotes = git.remotes
+  } catch {
+    return []
+  }
+  for (let remote of remotes) {
+    if (onlyRemote && remote.name !== onlyRemote) continue
+    for (let prefix of vars.gitPrefixes) {
+      const suffix = '.git'
+      let match = remote.url.match(`${prefix}(.*)${suffix}`)
+      if (!match) continue
+      appRemotes.push({
+        app: match[1],
+        remote: remote.name,
+      })
+    }
+  }
+  return appRemotes
+}