Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds an option to configure input/output streams, fixes #279 #280

Merged
merged 1 commit into from
Sep 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/inquirer.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ inquirer.ui = {
/**
* Create a new self-contained prompt module.
*/
inquirer.createPromptModule = function () {
inquirer.createPromptModule = function (opt) {
var promptModule = function (questions, allDone) {
var ui = new inquirer.ui.Prompt(promptModule.prompts);
var ui = new inquirer.ui.Prompt(promptModule.prompts, opt);
ui.run(questions, allDone);
return ui;
};
Expand Down
10 changes: 6 additions & 4 deletions lib/ui/baseUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ var readlineFacade = require('readline2');
var UI = module.exports = function (opt) {
// Instantiate the Readline interface
// @Note: Don't reassign if already present (allow test to override the Stream)
this.rl || (this.rl = readlineFacade.createInterface());
if (!this.rl) {
this.rl = readlineFacade.createInterface(opt);
}
this.rl.resume();

this.onForceClose = this.onForceClose.bind(this);
Expand All @@ -21,7 +23,7 @@ var UI = module.exports = function (opt) {
process.on('exit', this.onForceClose);

// Propagate keypress events directly on the readline
process.stdin.addListener('keypress', this.onKeypress);
this.rl.input.addListener('keypress', this.onKeypress);
};


Expand All @@ -43,12 +45,12 @@ UI.prototype.onForceClose = function () {
UI.prototype.close = function () {
// Remove events listeners
this.rl.removeListener('SIGINT', this.onForceClose);
process.stdin.removeListener('keypress', this.onKeypress);
this.rl.input.removeListener('keypress', this.onKeypress);
process.removeListener('exit', this.onForceClose);

// Restore prompt functionnalities
this.rl.output.unmute();
process.stdout.write('\x1B[?25h'); // show cursor
this.rl.output.write('\x1B[?25h'); // show cursor

// Close the readline
this.rl.output.end();
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/bottom-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Prompt.prototype.write = function (message) {
// Write message to screen and setPrompt to control backspace
this.rl.setPrompt( _.last(msgLines) );

if ( process.stdout.rows === 0 && process.stdout.columns === 0 ) {
if ( this.rl.output.rows === 0 && this.rl.output.columns === 0 ) {
/* When it's a tty through serial port there's no terminal info and the render will malfunction,
so we need enforce the cursor to locate to the leftmost position for rendering. */
rlUtils.left( this.rl, message.length + this.rl.line.length );
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ var Base = require('./baseUI');
* Base interface class other can inherits from
*/

var PromptUI = module.exports = function (prompts) {
Base.call(this);
var PromptUI = module.exports = function (prompts, opt) {
Base.call(this, opt);
this.prompts = prompts;
};
util.inherits(PromptUI, Base);
Expand Down
4 changes: 4 additions & 0 deletions test/helpers/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ var stub = {
write : function (str) {
this.__raw__ += str;
}
},
input: {
addListener : sinon.stub(),
removeListener: sinon.stub()
}
};

Expand Down