extract ui to console-ui

The idea is console-ui to describe a common API for other libraries to confirm to. So that, there ui output can work nicely within a larger system. * ui implementation * mock ui implementation
ember-cli · Nov 28, 2016 · 2f58ecb · 2f58ecb
1 parent 0f1784b
commit 2f58ecb
Show file tree

Hide file tree

Showing 37 changed files with 32 additions and 501 deletions.
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -58,7 +58,7 @@ function configureLogger(env) {
 
 // Options: Array cliArgs, Stream inputStream, Stream outputStream
 module.exports = function(options) {
-  var UI = options.UI || require('../ui');
+  var UI = options.UI || require('command-ui');
   var Yam = options.Yam || require('yam');
   var CLI = require('./cli');
   var Leek = options.Leek || require('leek');

diff --git a/lib/models/project.js b/lib/models/project.js
@@ -686,7 +686,7 @@ function ensureUI(_ui) {
 
   if (!ui) {
     // TODO: one UI (lib/cli/index.js also has one for now...)
-    var UI = require('../ui');
+    var UI = require('command-ui');
     ui = new UI({
       inputStream:  process.stdin,
       outputStream: process.stdout,

diff --git a/lib/ui/index.js b/lib/ui/index.js
diff --git a/lib/ui/write-error.js b/lib/ui/write-error.js
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "clean-base-url": "^1.0.0",
     "compression": "^1.4.4",
     "configstore": "^2.0.0",
+    "console-ui": "^1.0.2",
     "core-object": "^2.0.2",
     "diff": "^1.3.1",
     "ember-cli-broccoli-sane-watcher": "^2.0.3",

diff --git a/tests/factories/command-options.js b/tests/factories/command-options.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var defaults      = require('ember-cli-lodash-subset').defaults;
-var MockUI        = require('../helpers/mock-ui');
+var MockUI        = require('console-ui/mock');
 var MockAnalytics = require('../helpers/mock-analytics');
 var MockProject   = require('../helpers/mock-project');
 

diff --git a/tests/helpers/ember.js b/tests/helpers/ember.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var MockUI        = require('./mock-ui');
+var MockUI        = require('console-ui/mock');
 var MockAnalytics = require('./mock-analytics');
 var cli           = require('../../lib/cli');
 var path          = require('path');

diff --git a/tests/helpers/mock-project.js b/tests/helpers/mock-project.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var Project = require('../../lib/models/project');
-var MockUI        = require('../helpers/mock-ui');
+var MockUI  = require('console-ui/mock');
 
 function MockProject() {
   var root = process.cwd();

diff --git a/tests/helpers/mock-ui.js b/tests/helpers/mock-ui.js
diff --git a/tests/unit/analytics-test.js b/tests/unit/analytics-test.js
@@ -2,7 +2,7 @@
 
 var expect = require('chai').expect;
 var Command = require('../../lib/models/command');
-var MockUI = require('../helpers/mock-ui');
+var MockUI = require('console-ui/mock');
 var MockProject = require('../helpers/mock-project');
 var command;
 var called = false;

diff --git a/tests/unit/broccoli/ember-app-test.js b/tests/unit/broccoli/ember-app-test.js
@@ -9,7 +9,7 @@ var expect     = require('chai').expect;
 var proxyquire = require('proxyquire');
 var td = require('testdouble');
 
-var MockUI = require('../../helpers/mock-ui');
+var MockUI = require('console-ui/mock');
 
 var mergeTreesStub;
 var EmberApp = proxyquire('../../../lib/broccoli/ember-app', {

diff --git a/tests/unit/broccoli/merge-trees-test.js b/tests/unit/broccoli/merge-trees-test.js
@@ -7,7 +7,7 @@ var expect     = require('chai').expect;
 var proxyquire = require('proxyquire');
 var td = require('testdouble');
 
-var MockUI = require('../../helpers/mock-ui');
+var MockUI = require('console-ui/mock');
 
 var mergeTreesStub;
 var mergeTrees = proxyquire('../../../lib/broccoli/merge-trees', {

diff --git a/tests/unit/cli/cli-test.js b/tests/unit/cli/cli-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var expect        = require('chai').expect;
-var MockUI        = require('../../helpers/mock-ui');
+var MockUI        = require('console-ui/mock');
 var MockAnalytics = require('../../helpers/mock-analytics');
 var CLI           = require('../../../lib/cli/cli');
 var td = require('testdouble');

diff --git a/tests/unit/cli/lookup-command-test.js b/tests/unit/cli/lookup-command-test.js
@@ -4,7 +4,7 @@ var expect        = require('chai').expect;
 var lookupCommand = require('../../../lib/cli/lookup-command');
 var Command       = require('../../../lib/models/command');
 var Project       = require('../../../lib/models/project');
-var MockUI        = require('../../helpers/mock-ui');
+var MockUI        = require('console-ui/mock');
 var AddonCommand  = require('../../fixtures/addon/commands/addon-command');
 var OtherCommand  = require('../../fixtures/addon/commands/other-addon-command');
 var ClassCommand  = require('../../fixtures/addon/commands/addon-command-class');