feature(spawnify) getHome -> untildify

Author: coderaiser

lib/spawnify.js

@@ -9,6 +9,7 @@
 
         exec            = child_process.exec,
         tryCatch        = require('try-catch'),
+        untildify       = require('untildify'),
 
         WIN             = process.platform === 'win32',
         spawn           = child_process.spawn,
@@ -30,7 +31,7 @@
         assert(command, 'command could not be empty!');
 
         if (options && options.cwd)
-            options.cwd = parseDir(options.cwd);
+            options.cwd = untildify(options.cwd);
         else
             options     = {
                 cwd: process.cwd()
@@ -41,22 +42,12 @@
         return spawnify;
     };
 
-    function getHome() {
-        var HOME_WIN    = process.env.HOMEPATH,
-            HOME_UNIX   = process.env.HOME,
-            HOME        = HOME_WIN || HOME_UNIX;
-        
-        return HOME;
-    }
-    
     function parseDir(dir) {
-        var home    = getHome(),
-            cwd     = process.cwd();
+        var cwd = process.cwd();
 
         assert(dir, 'dir should be string!');
 
-        dir = dir.replace(/^~/, home)
-                 .replace(/^\./, cwd);
+        dir = dir.replace(/^\./, cwd);
 
         return dir;
     }
@@ -245,17 +236,14 @@
         var wasError, strs,
             self            = this,
             CD              = 'cd ',
-            HOME            = getHome(),
 
             isChangeVolume  = win.isChangeVolume(command),
             isVolume        = win.isVolume(command),
             paramDir,
 
-            regExpHome      = RegExp('^~'),
             regExpRoot      = RegExp('^[/\\\\]'),
 
             isWildCard,
-            isHome          = regExpHome.test(command) && !WIN,
             isRoot;
 
         this.on('error', function() {
@@ -267,10 +255,7 @@
                 this._emit('path', paramDir);
         });
 
-        if (isHome)
-            command     = command.replace('~', HOME);
-            
-        paramDir        = command;
+        paramDir        = untildify(command);
         isWildCard      = isContain(paramDir, ['*', '?']);
 
         if (!paramDir && !WIN)
@@ -293,7 +278,7 @@
                 command = command.replace(str, '');
             });
 
-            if (!isHome && !isRoot)
+            if (!isRoot)
                 paramDir    = path.join(currDir, paramDir);
 
             if (isWildCard)

package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "glob": "~7.0.0",
     "try-catch": "~1.0.0",
+    "untildify": "~2.1.0",
     "win32": "~0.9.4"
   },
   "license": "MIT",