Reparse argv

lib/nconf/stores/system.js

@@ -7,6 +7,7 @@
  */
 
 var util = require('util'),
+    optimist = require('optimist'),
     Memory = require('./memory').Memory;
 
 //
@@ -79,10 +80,10 @@ System.prototype.loadArgv = function () {
       argv;
 
   if (typeof this.argv === 'object') {
-    argv = require('optimist').options(this.argv).argv;
+    argv = optimist(process.argv.slice(2)).options(this.argv).argv;
   }
   else if (this.argv) {
-    argv = require('optimist').argv;
+    argv = optimist(process.argv.slice(2)).argv;
   }
 
   if (!argv) {
@@ -114,4 +115,5 @@ System.prototype.loadEnv = function () {
   });
 
   return this.store;
-};
+};
+

test/fixtures/scripts/nconf-change-argv.js

@@ -0,0 +1,18 @@
+/*
+ * nconf-change-argv.js: Test fixture for changing argv on the fly
+ *
+ * (C) 2011, Charlie Robbins
+ *
+ */
+
+var nconf = require('../../../lib/nconf');
+
+nconf.argv = true;
+
+//
+// Remove 'badValue', 'evenWorse' and 'OHNOEZ'
+//
+process.argv.splice(3, 3);
+nconf.system.loadArgv();
+process.stdout.write(nconf.get('something'));
+

test/provider-test.js

@@ -51,6 +51,10 @@ vows.describe('nconf/provider').addBatch({
       "when 'env' is set to true": helpers.assertSystemConf({
         script: path.join(fixturesDir, 'scripts', 'nconf-env.js'),
         env: { SOMETHING: 'foobar' }
+      }),
+      "when 'argv' is set to true and process.argv is modified": helpers.assertSystemConf({
+        script: path.join(fixturesDir, 'scripts', 'nconf-change-argv.js'),
+        argv: ['--something', 'badValue', 'evenWorse', 'OHNOEZ', 'foobar']
       })
     }
   }
@@ -84,4 +88,5 @@ vows.describe('nconf/provider').addBatch({
       }
     }
   }
-}).export(module);
+}).export(module);
+