Removing commands in favor of new commands

packages/ci/package.json

@@ -10,9 +10,10 @@
     "@heroku-cli/schema": "^1.0.12",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
-    "async-file": "^2.0.2",
     "@types/inquirer": "0.0.42",
     "@types/validator": "^9.4.1",
+    "async-file": "^2.0.2",
+    "cli-ux": "^4.7.3",
     "got": "^8.3.2",
     "inquirer": "^6.0.0",
     "tslib": "^1",
@@ -23,15 +24,15 @@
     "@oclif/dev-cli": "^1",
     "@oclif/plugin-help": "^2",
     "@oclif/test": "^1.1.0",
-    "@types/nock": "^9.3.0",
-    "nock": "^9.2.5",
     "@oclif/tslint": "^1",
     "@types/chai": "^4",
     "@types/mocha": "^5",
+    "@types/nock": "^9.3.0",
     "@types/node": "^10",
     "chai": "^4",
     "globby": "^8",
     "mocha": "^5",
+    "nock": "^9.2.5",
     "nyc": "^12",
     "ts-node": "^6",
     "tslint": "^5",

packages/ci/src/commands/ci/last.ts

@@ -25,8 +25,8 @@ export default class CiLast extends Command {
 
     try {
       const headers = {Range: 'number ..; order=desc,max=1'}
-      const {body: latestTestRun} = await this.heroku.get<Heroku.TestRun>(`/pipelines/${pipeline.id}/test-runs`, {headers})
-      const {body: testRun} = await this.heroku.get<Heroku.TestRun>(`/pipelines/${pipeline.id}/test-runs/${latestTestRun[0].number}`)
+      const {body: latestTestRuns} = await this.heroku.get<Heroku.TestRun[]>(`/pipelines/${pipeline.id}/test-runs`, {headers})
+      const {body: testRun} = await this.heroku.get<Heroku.TestRun>(`/pipelines/${pipeline.id}/test-runs/${latestTestRuns[0].number}`)
       const {body: testNodes} = await this.heroku.get<Heroku.TestNode[]>(`/test-runs/${testRun.id}/test-nodes`)
 
       await displayTestRunInfo(this, testRun, testNodes, flags.node)

packages/ci/src/commands/ci/rerun.ts

@@ -2,13 +2,14 @@
 import {Command, flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 
+import cli from 'cli-ux'
+
 import * as Kolkrabbi from '../../interfaces/kolkrabbi'
 
 import {getPipeline} from '../../utils/pipelines'
 import {displayAndExit} from '../../utils/test-run'
 
 import {createSourceBlob} from '../../utils/source'
-import cli from 'cli-ux'
 
 export default class CiReRun extends Command {
   static description = 'rerun tests against current directory'
@@ -29,17 +30,17 @@ export default class CiReRun extends Command {
     const {flags, args} = this.parse(CiReRun)
     const pipeline = await getPipeline(flags, this)
 
-    let sourceTestRun:Heroku.TestRun;
+    let sourceTestRun: Heroku.TestRun
 
     if (args.number) {
       const testRunResponse = await this.heroku.get<Heroku.TestRun>(`/pipelines/${pipeline.id}/test-runs/${args.number}`)
-      sourceTestRun = testRunResponse.body;
+      sourceTestRun = testRunResponse.body
     } else {
       // TODO: why is this returning more than 1 record with that header in place?
       const {body: testRuns} = await this.heroku.get<Heroku.TestRun[]>(`/pipelines/${pipeline.id}/test-runs`, {headers: {Range: 'number ..; order=desc,max=1'}})
-      sourceTestRun = testRuns[0];
+      sourceTestRun = testRuns[0]
     }
-    this.log(`Rerunning test run #${sourceTestRun.number}...`);
+    this.log(`Rerunning test run #${sourceTestRun.number}...`)
 
     cli.action.start('Preparing source')
     const sourceBlobUrl = await createSourceBlob(sourceTestRun.commit_sha, this)

packages/ci/src/commands/ci/run.ts

@@ -2,13 +2,14 @@
 import {Command, flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 
+import cli from 'cli-ux'
+
 import * as Kolkrabbi from '../../interfaces/kolkrabbi'
 
 import {getPipeline} from '../../utils/pipelines'
 import {displayAndExit} from '../../utils/test-run'
 
 import {createSourceBlob} from '../../utils/source'
-import cli from 'cli-ux'
 
 const git = require('../../utils/git')
 export default class CiRun extends Command {

packages/ci/src/utils/test-run.ts

@@ -1,11 +1,12 @@
 import color from '@heroku-cli/color'
 import {get, RequestOptions} from 'https'
 
+import cli from 'cli-ux'
+
 import {Command} from '@heroku-cli/command'
 
 import * as Heroku from '@heroku-cli/schema'
 import * as http from 'http'
-import cli from 'cli-ux'
 
 function logStream(url: RequestOptions | string, fn: (res: http.IncomingMessage) => void) {
   return get(url, fn)
@@ -80,7 +81,7 @@ const RUNNING_STATES = [RUNNING].concat(TERMINAL_STATES)
 const BUILDING_STATES = [BUILDING, RUNNING].concat(TERMINAL_STATES)
 
 async function waitForStates(states: string[], testRun: Heroku.TestRun, command: Command) {
-  let newTestRun = testRun;
+  let newTestRun = testRun
 
   while (!states.includes(newTestRun.status!.toString())) {
     let {body: bodyTestRun} = await command.heroku.get<Heroku.TestRun>(`/pipelines/${testRun.pipeline!.id}/test-runs/${testRun.number}`)

packages/ci/test/commands/ci/info.test.ts

@@ -59,18 +59,15 @@ describe('ci:info', () => {
           pipeline: {id: pipeline.id},
           status: 'succeeded',
           setup_stream_url: `https://test-output.heroku.com/streams/${testRun.id.substring(0, 3)}/test-runs/${testRun.id}`,
-          output_stream_url: `https://test-output.heroku.com/streams/${testRun.id.substring(0, 3)}/test-runs/${testRun.id}`,
+          output_stream_url: `https://test-output.heroku.com/streams/${testRun.id.substring(0, 3)}/test-runs/${testRun.id}`
         }
       ])
     })
     .nock('https://test-output.heroku.com/streams', testOutputAPI => {
-      testOutputAPI.get(`${testRun.id.substring(0, 3)}/test-runs/${testRun.id}`)
+      testOutputAPI.get(`/${testRun.id.substring(0, 3)}/test-runs/${testRun.id}`)
       .reply(200, 'Test output')
     })
     .command(['ci:info', `${testRun.number}`, `--pipeline=${pipeline.name}`])
-    .catch(e => {
-      expect(e.message).to.contain('WTH')
-    })
     .it('and a pipeline without parallel test runs it shows node output', ({stdout}) => {
       expect(stdout).to.equal('Show info here----\n')
     })