half the env tests are working with basic interpolation

ljharb · Apr 15, 2013 · 5891471 · 5891471
1 parent 601b340
commit 5891471
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -12,22 +12,34 @@ exports.quote = function (xs) {
     }).join(' ');
 };
 
-exports.parse = function (s) {
+exports.parse = function (s, env) {
+    if (!env) env = {};
     return s.match(/(['"])((\\\1|[^\1])*?)\1|(\\ |\S)+/g)
         .map(function (s) {
             if (/^'/.test(s)) {
                 return s
                     .replace(/^'|'$/g, '')
-                    .replace(/\\(["'\\$`(){}!#&*|])/g, '$1');
+                    .replace(/\\(["'\\$`(){}!#&*|])/g, '$1')
                 ;
             }
             else if (/^"/.test(s)) {
                 return s
                     .replace(/^"|"$/g, '')
-                    .replace(/\\(["'\\$`(){}!#&*|])/g, '$1');
+                    .replace(/\\(["'\\$`(){}!#&*|])/g, '$1')
+                    .replace(/\$(\w+)/g, getVar)
+                    .replace(/\${(\w+)}/g, getVar)
+                ;
+            }
+            else {
+                return s
+                    .replace(/\\([ "'\\$`(){}!#&*|])/g, '$1')
+                    .replace(/\$(\w+)/g, getVar)
+                    .replace(/\${(\w+)}/g, getVar)
                 ;
             }
-            else return s.replace(/\\([ "'\\$`(){}!#&*|])/g, '$1');
         })
     ;
+    function getVar (_, x) {
+        return String(env[x])
+    }
 };