Add interactive option to example, fix output

Author: eablack

examples/login.ts

@@ -1,11 +1,17 @@
 import {Command} from '../src'
-
+import {flags} from '../src'
 class LoginCommand extends Command {
+  static flags = {
+    interactive: flags.boolean({char: 'i', description: 'login with username/password'}),
+  }
+
   async run() {
+    const {flags} = await this.parse(LoginCommand)
     this.log('logging in')
-    await this.heroku.login()
+    const interactive = (flags.interactive) ? 'interactive' : undefined
+    await this.heroku.login({method: interactive})
   }
 }
 
-(LoginCommand.run([]) as any)
+(LoginCommand.run(process.argv.slice(2)) as any)
   .catch(require('@oclif/core').Errors.handle)

examples/run.sh

@@ -5,9 +5,12 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-if [ ! -f "examples/$1.ts" ]; then
-  echo "Command '$1' not found in examples directory"
+COMMAND=$1
+shift
+
+if [ ! -f "examples/$COMMAND.ts" ]; then
+  echo "Command '$COMMAND' not found in examples directory"
   exit 1
 fi
 
-./node_modules/.bin/ts-node "examples/$1.ts" 
+./node_modules/.bin/ts-node "examples/$COMMAND.ts" "$@" 

src/flags/index.ts

@@ -1,6 +1,11 @@
-export {app, remote} from './app'
+import {Flags} from '@oclif/core'
 
+export {app, remote} from './app'
 export {org} from './org'
 export {pipeline} from './pipeline'
 export {team} from './team'
+
+// Explicitly export oclif flag types using object destructuring, sorted alphabetically
+export const {boolean, custom, directory, file, integer, option, string, url} = Flags
+
 export {Flags} from '@oclif/core'

src/index.ts

@@ -1,8 +1,6 @@
 
-// import * as completions from './completions'
-
 export {APIClient} from './api-client'
 export {Command, Command as default} from './command'
-
+export * as completions from './completions'
 export * as flags from './flags'
 export {vars} from './vars'

src/login.ts

@@ -7,8 +7,8 @@ import {Interfaces, ux} from '@oclif/core'
 import inquirer, {QuestionCollection} from 'inquirer'
 import PressToContinuePrompt from 'inquirer-press-to-continue'
 import Netrc from 'netrc-parser'
+import * as os from 'node:os'
 import open from 'open'
-import * as os from 'os'
 
 import {APIClient, HerokuAPIError} from './api-client'
 import {vars} from './vars'
@@ -60,12 +60,17 @@ export class Login {
         } else if (process.env.HEROKU_LEGACY_SSO === '1') {
           input = 'sso'
         } else {
-          await inquirer.prompt<{ key: KeyDescriptor }>({
+          const {key} = await inquirer.prompt<{ key: KeyDescriptor }>({
             anyKey: true,
             name: 'key',
-            pressToContinueMessage: 'heroku: Press any key to open up the browser to login or q to exit',
+            pressToContinueMessage: `heroku: Press any key to open up the browser to login or ${color.yellow('q')} to exit`,
             type: 'press-to-continue',
           })
+          ux.stdout('')
+          if (key.value === 'q') {
+            ux.error('Login cancelled by user')
+          }
+
           input = 'browser'
         }
       }
@@ -325,9 +330,8 @@ export class Login {
     debug(`opening browser to ${url}`)
     ux.stderr(`Opening browser to:\n${url}\n`)
     ux.stderr(color.gray(
-      'If the browser fails to open or you\'re authenticating on a '
-      + 'remote machine, please manually open the URL above in your '
-      + 'browser.\n',
+      `If the browser fails to open or you're authenticating on a remote
+machine, please manually open the URL above in your browser.\n`,
     ))
     await open(url, {wait: false})