[Pkg-javascript-commits] [node-read] 01/05: Imported Upstream version 1.0.5

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository node-read.

commit 2f60af8c4b32bb5bd8cf05de4cf452dee9b28384
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Jul 29 02:21:23 2014 +0200

    Imported Upstream version 1.0.5
---
 README.md        |  4 ++--
 lib/read.js      | 27 ++++++++++++++-------------
 package.json     |  4 ++--
 test/basic.js    |  2 ++
 test/defaults.js |  2 ++
 test/many.js     |  2 ++
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 2edefdf..5967fad 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,8 @@ Every option is optional.
 * `default` The default value if the user enters nothing.
 * `edit` Allow the user to edit the default value.
 * `terminal` Treat the output as a TTY, whether it is or not.
-* `stdin` Readable stream to get input data from. (default `process.stdin`)
-* `stdout` Writeable stream to write prompts to. (default: `process.stdout`)
+* `input` Readable stream to get input data from. (default `process.stdin`)
+* `output` Writeable stream to write prompts to. (default: `process.stdout`)
 
 If silent is true, and the input is a TTY, then read will set raw
 mode, and read character by character.
diff --git a/lib/read.js b/lib/read.js
index 4b8a422..a93d1b3 100644
--- a/lib/read.js
+++ b/lib/read.js
@@ -17,24 +17,12 @@ function read (opts, cb) {
 
   var input = opts.input || process.stdin
   var output = opts.output || process.stdout
-  var m = new Mute({ replace: opts.replace })
-  m.pipe(output, {end: false})
-  output = m
-  var def = opts.default || ''
-  var terminal = !!(opts.terminal || output.isTTY)
-  var rlOpts = { input: input, output: output, terminal: terminal }
-
-  if (process.version.match(/^v0\.6/)) {
-    var rl = readline.createInterface(rlOpts.input, rlOpts.output)
-  } else {
-    var rl = readline.createInterface(rlOpts)
-  }
-
   var prompt = (opts.prompt || '').trim() + ' '
   var silent = opts.silent
   var editDef = false
   var timeout = opts.timeout
 
+  var def = opts.default || ''
   if (def) {
     if (silent) {
       prompt += '(<default hidden>) '
@@ -44,6 +32,19 @@ function read (opts, cb) {
       prompt += '(' + def + ') '
     }
   }
+  var terminal = !!(opts.terminal || output.isTTY)
+
+  var m = new Mute({ replace: opts.replace, prompt: prompt })
+  m.pipe(output, {end: false})
+  output = m
+  var rlOpts = { input: input, output: output, terminal: terminal }
+
+  if (process.version.match(/^v0\.6/)) {
+    var rl = readline.createInterface(rlOpts.input, rlOpts.output)
+  } else {
+    var rl = readline.createInterface(rlOpts)
+  }
+
 
   output.unmute()
   rl.setPrompt(prompt)
diff --git a/package.json b/package.json
index 04231c9..f9cb646 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "read",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "lib/read.js",
   "dependencies": {
-    "mute-stream": "~0.0.2"
+    "mute-stream": "~0.0.4"
   },
   "devDependencies": {
     "tap": "*"
diff --git a/test/basic.js b/test/basic.js
index f5324b4..f0926f3 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -52,6 +52,8 @@ function child () {
                        pass: pass,
                        verify: pass2,
                        passMatch: (pass === pass2)}))
+        if (process.stdin.unref)
+          process.stdin.unref()
       })
     })
   })
diff --git a/test/defaults.js b/test/defaults.js
index f3335ac..e3d2ac7 100644
--- a/test/defaults.js
+++ b/test/defaults.js
@@ -52,6 +52,8 @@ function child () {
                        pass: pass,
                        verify: pass2,
                        passMatch: (pass === pass2)}))
+        if (process.stdin.unref)
+          process.stdin.unref()
       })
     })
   })
diff --git a/test/many.js b/test/many.js
index 2aaa586..6a2f87b 100644
--- a/test/many.js
+++ b/test/many.js
@@ -32,6 +32,8 @@ function child () {
   read({prompt:'18'}, function (er, r18) {if (er) throw er
     console.log(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10,
                 r11, r12, r13, r14, r15, r16, r17, r18)
+    if (process.stdin.unref)
+      process.stdin.unref()
   })})})})})})})})})})})})})})})})})})
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-read.git