Strip ANSI characters when fitting terminal width

src/commands/releases/index.js

@@ -2,6 +2,7 @@
 
 const cli = require('heroku-cli-util')
 const co = require('co')
+const stripAnsi = require('strip-ansi')
 
 function * run (context, heroku) {
   const statusHelper = require('../../status_helper')
@@ -74,7 +75,7 @@ function * run (context, heroku) {
 
           col.optimizationWidth = Math.max(
             col.optimizationWidth,
-            formattedValue.length
+            stripAnsi(formattedValue).length
           )
         }
       }
@@ -87,6 +88,24 @@ function * run (context, heroku) {
     }
   }
 
+  let handleColorStatus = function (options) {
+    if (context.flags.forceColor !== true) {
+      return
+    }
+
+    cli.color.enabled = true
+
+    let concatArguments = function (args) {
+      return Array.prototype.map.call(args, function (arg) {
+        return arg + ''
+      }).join(' ')
+    }
+
+    options.printLine = function (...args) {
+      cli.stdout += concatArguments(args) + '\n'
+    }
+  }
+
   if (context.flags.json) {
     cli.log(JSON.stringify(releases, null, 2))
   } else if (context.flags.extended) {
@@ -102,6 +121,7 @@ function * run (context, heroku) {
         {key: 'extended.slug_uuid'}
       ]
     }
+    handleColorStatus(options)
     optimizeWidth(releases, options.columns, 'description')
     cli.table(releases, options)
   } else if (releases.length === 0) {
@@ -117,6 +137,7 @@ function * run (context, heroku) {
         {key: 'created_at', format: (t) => time.ago(new Date(t))}
       ]
     }
+    handleColorStatus(options)
     optimizeWidth(releases, options.columns, 'description')
     cli.table(releases, options)
   }

test/commands/releases/index.js

@@ -5,6 +5,7 @@ const cli = require('heroku-cli-util')
 const nock = require('nock')
 const cmd = require('../../../src/commands/releases')
 const expect = require('unexpected')
+const stripAnsi = require('strip-ansi')
 
 const assertLineWidths = function (blob, lineWidth) {
   let lines = blob.split('\n')
@@ -323,6 +324,27 @@ v37  first commit                     jeff@heroku.com  2015/11/18 01:36:38 +0000
       .then(() => api.done())
   })
 
+  it('shows releases with correct width for ansi colors', () => {
+    process.stdout.columns = 80
+    let api = nock('https://api.heroku.com:443')
+      .get('/apps/myapp/releases')
+      .reply(200, releases)
+      .get('/apps/myapp/slugs/37994c83-39a3-4cbf-b318-8f9dc648f701')
+      .reply(200, slug)
+    return cmd.run({app: 'myapp', flags: {forceColor: true}})
+      .then(() => expect(stripAnsi(cli.stdout), 'to equal', `=== myapp Releases - Current: v37
+v41  thir… release command executing  jeff@heroku.com  2015/11/18 01:36:38 +0000
+v40  Set foo config vars              jeff@heroku.com  2015/11/18 01:37:41 +0000
+v39  Remove … release command failed  jeff@heroku.com  2015/11/18 01:36:38 +0000
+v38  seco… release command executing  jeff@heroku.com  2015/11/18 01:36:38 +0000
+v37  first commit                     jeff@heroku.com  2015/11/18 01:36:38 +0000
+`))
+      .then(() => assertLineWidths(stripAnsi(cli.stdout), 80))
+      .then(() => expect(stripAnsi(cli.stdout), 'not to equal', cli.stdout))
+      .then(() => expect(cli.stderr, 'to be empty'))
+      .then(() => api.done())
+  })
+
   it('shows pending releases without release phase', () => {
     process.stdout.columns = 80
     let api = nock('https://api.heroku.com:443')
@@ -404,6 +426,19 @@ v40      Set foo config vars  jeff@heroku.com  2015/11/18 01:37:41 +0000  1
       .then(() => api.done())
   })
 
+  it('shows extended info with correct width for ansi colors', () => {
+    let api = nock('https://api.heroku.com:443')
+      .get('/apps/myapp/releases?extended=true')
+      .reply(200, extended)
+    return cmd.run({app: 'myapp', flags: {extended: true, forceColor: true}})
+      .then(() => expect(stripAnsi(cli.stdout), 'to equal', `=== myapp Releases
+v40      Set foo config vars  jeff@heroku.com  2015/11/18 01:37:41 +0000  1                 uuid
+`))
+      .then(() => expect(stripAnsi(cli.stdout), 'not to equal', cli.stdout))
+      .then(() => expect(cli.stderr, 'to be empty'))
+      .then(() => api.done())
+  })
+
   it('shows no current release', () => {
     process.stdout.columns = 80
     releases[releases.length - 1].current = false