cli width updates

.travis.yml

@@ -5,9 +5,8 @@ os:
 language: node_js
 node_js:
   - node
+  - '8'
   - '7'
   - '6'
   - '5'
   - '4'
-  - '0.12'
-  - '0.10'

appveyor.yml

@@ -2,12 +2,11 @@
 environment:
   matrix:
     # node.js
+    - nodejs_version: "8.0"
     - nodejs_version: "7.0"
     - nodejs_version: "6.0"
     - nodejs_version: "5.0"
     - nodejs_version: "4.0"
-    - nodejs_version: "0.12"
-    - nodejs_version: "0.10"
 
 # Install scripts. (runs after repo cloning)
 install:

index.js

@@ -1,14 +1,16 @@
 'use strict';
 
+var koalas = require('koalas');
+var isNum = require('is-number');
+var size = require('window-size');
 var readline = require('readline');
 var isBuffer = require('is-buffer');
 var flatten = require('arr-flatten');
 var extend = require('extend-shallow');
 var isWindows = require('is-windows');
 var MuteStream = require('mute-stream');
 var stripColor = require('strip-color');
-var size = require('window-size');
-var isNum = require('is-number');
+var sizeUtils = require('window-size/utils');
 var utils = module.exports;
 
 /**
@@ -291,7 +293,7 @@ utils.clearTrailingLines = function(rl, lines, height) {
   var len = height + lines;
 
   while (len--) {
-    readline.moveCursor(rl.output, -utils.cliWidth(), 0);
+    readline.moveCursor(rl.output, -utils.cliWidth(80), 0);
     readline.clearLine(rl.output, 0);
     if (len) readline.moveCursor(rl.output, 0, -1);
   }
@@ -326,12 +328,16 @@ utils.restoreCursorPos = function(rl, cursorPos) {
 /**
  * Get the width of the terminal
  *
+ * @param  {Number} `fallback` A fallback width to use if the actual width is not found.
  * @return {Number} Returns the number of columns.
  * @api public
  */
 
-utils.cliWidth = function() {
-  return isWindows() ? size.width - 1 : size.width;
+utils.cliWidth = function(fallback) {
+  var windows = isWindows();
+  var modifier = windows ? 1 : 0;
+  size = size || (windows ? sizeUtils.win() : sizeUtils.tput());
+  return koalas(size && size.width, fallback, modifier) - modifier;
 };
 
 /**

package.json

@@ -18,20 +18,21 @@
   ],
   "main": "index.js",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.0"
   },
   "scripts": {
     "test": "mocha"
   },
   "dependencies": {
-    "arr-flatten": "^1.0.3",
+    "arr-flatten": "^1.1.0",
     "extend-shallow": "^2.0.1",
     "is-buffer": "^1.1.5",
     "is-number": "^3.0.0",
     "is-windows": "^1.0.1",
-    "mute-stream": "^0.0.7",
+    "koalas": "^1.0.2",
+    "mute-stream": "0.0.7",
     "strip-color": "^0.1.0",
-    "window-size": "^1.0.0"
+    "window-size": "^1.1.0"
   },
   "devDependencies": {
     "mocha": "^3.3.0",

test/keypress.js

@@ -23,7 +23,9 @@ function listen(val, num, cb) {
 describe('.keypress', function() {
   beforeEach(function() {
     utils.keypress(process.stdin);
-    process.stdin.setRawMode(true);
+    if (typeof process.stdin.setRawMode === 'function') {
+      process.stdin.setRawMode(true);
+    }
   });
 
   it('should normalize number events', function(cb) {

test/test.js

@@ -4,9 +4,29 @@ require('mocha');
 var assert = require('assert');
 var utils = require('..');
 
+function override(obj) {
+  var getWindowSize = obj.getWindowSize;
+  var columns = obj.columns;
+  var rows = obj.rows;
+
+  obj.getWindowSize = null;
+  obj.columns = null;
+  obj.rows = null;
+
+  return function() {
+    obj.getWindowSize = getWindowSize;
+    obj.columns = columns;
+    obj.rows = rows;
+  };
+}
+
 describe('readline-utils', function() {
   it('should export an object', function() {
     assert(utils);
     assert.equal(typeof utils, 'object');
   });
+
+  it('should get the window width', function() {
+    assert.equal(typeof utils.cliWidth(), 'number');
+  });
 });