refs #28 - fixed several issues with portability

@@ -25,34 +25,28 @@
  * DEALINGS IN THE SOFTWARE.
  * DEALINGS IN THE SOFTWARE.
  *
  *
  */
  */
-var fs = require('fs');
+(function(phantom) {
+    var fs = require('fs');
 
 
-var casperScript = phantom.args[1];
+    fs.pathJoin = function() {
+        return Array.prototype.join.call(arguments, this.separator);
+    };
 
 
-if (phantom.args.length < 2) {
-    if (!fs.isDirectory(phantom.args[0])) {
-        console.log('First argument must be the path to casper root path');
-    }
-    if (!fs.isFile(casperScript)) {
-        console.log('Usage: $ casperjs script.js');
-    }
+    if (!fs.isDirectory(phantom.args[0]) || !fs.isFile(fs.pathJoin(phantom.args[0], 'casper.js'))) {
+        console.log('First argument must be the absolute path to casper root path.');
         phantom.exit(1);
         phantom.exit(1);
-}
-
-var casperPath = phantom.args[0];
-
-function pathJoin() {
-    return Array.prototype.join.call(arguments, fs.separator);
-}
-
-var casperLibPath = pathJoin(casperPath, 'lib');
+    }
 
 
-if (!fs.isDirectory(casperLibPath)) {
-    console.log("Couldn't find CasperJS lib directory: " + casperLibPath);
+    if (!fs.isFile(phantom.args[1])) {
+        console.log('Usage: $ casperjs script.[js|coffee]');
         phantom.exit(1);
         phantom.exit(1);
-}
+    }
 
 
-[
+    phantom.casperPath = phantom.args[0];
+    phantom.casperScript = phantom.args[1];
+    phantom.casperLibPath = fs.pathJoin(phantom.casperPath, 'lib');
+
+    [
         'casper.js',
         'casper.js',
         'clientutils.js',
         'clientutils.js',
         'colorizer.js',
         'colorizer.js',
@@ -60,8 +54,10 @@ if (!fs.isDirectory(casperLibPath)) {
         'tester.js',
         'tester.js',
         'utils.js',
         'utils.js',
         'xunit.js'
         'xunit.js'
-].forEach(function(lib) {
-    phantom.injectJs(pathJoin(casperLibPath, lib));
-});
+    ].forEach(function(lib) {
+        phantom.injectJs(fs.pathJoin(phantom.casperLibPath, lib));
+    });
+
+    phantom.injectJs(phantom.args[1]);
 
 
-phantom.injectJs(phantom.args[1]);
+})(phantom);

@@ -56,7 +56,10 @@
             onStepTimeout:       null,
             onStepTimeout:       null,
             onTimeout:           null,
             onTimeout:           null,
             page:                null,
             page:                null,
-            pageSettings:        { userAgent: DEFAULT_USER_AGENT },
+            pageSettings:        {
+                localToRemoteUrlAccessEnabled: true,
+                userAgent:                     DEFAULT_USER_AGENT
+            },
             stepTimeout:         null,
             stepTimeout:         null,
             timeout:             null,
             timeout:             null,
             verbose:             false
             verbose:             false

+/**
+ * Phantom args parsing utilities.
+ *
+ */
+(function(phantom) {
+    phantom.Casper.Cli = function() {
+        /**
+         * Extract current named parameters passed to the phantom script through
+         * the command line. Named arguments are of the form --foo=bar ou --foo
+         *
+         */
+        this.named = phantom.args.forEach(function(arg) {
+            if (arg.indexOf('--') === 0) {
+                var match = /--(.*)=(.*)\s?/i.exec(arg);
+                if (match) {
+                    params[match[1]] = match[2];
+                } else {
+                    var match2 = /--(.*)\s?/i.exec(arg);
+                    if (match2) {
+                        params[match2[1]] = true;
+                    }
+                }
+            }
+        });
+
+        /**
+         * Checks that the specified named arguments have been passed to current
+         * phantom script. Dies on failure by default, but you can provide an
+         * onError callback for hooking on fail and do what you want.
+         *
+         */
+        this.requireNamedArgs = function(list, onError) {
+            var missing = [], params = phantom.extractNamedArgs();
+            for (var i = 0; i < list.length; i++) {
+                var name = list[i];
+                if (!params.hasOwnProperty(name)) {
+                    missing.push(name);
+                }
+            }
+            if (missing.length > 0) {
+                if (typeof(onError) === "function") {
+                    onError(missing);
+                } else {
+                    var s = missing.length > 1 ? 'are' : 'is a';
+                    console.log(JSON.stringify({
+                        status: "error",
+                        message: '"' + (missing.join('", "')) + '" ' + s + ' required named parameters.'
+                    }, null, '  '));
+                    phantom.exit(1);
+                }
+            }
+        };
+    };
+})(phantom);

@@ -314,7 +314,7 @@
             var entries = fs.list(dir).filter(function(entry) {
             var entries = fs.list(dir).filter(function(entry) {
                 return entry !== '.' && entry !== '..';
                 return entry !== '.' && entry !== '..';
             }).map(function(entry) {
             }).map(function(entry) {
-                return fs.absolute(pathJoin(dir, entry));
+                return fs.absolute(fs.pathJoin(dir, entry));
             });
             });
             entries.forEach(function(entry) {
             entries.forEach(function(entry) {
                 if (fs.isDirectory(entry)) {
                 if (fs.isDirectory(entry)) {
@@ -322,7 +322,7 @@
                 }
                 }
             });
             });
             return entries.filter(function(entry) {
             return entries.filter(function(entry) {
-                return isJsFile(fs.absolute(pathJoin(dir, entry)));
+                return isJsFile(fs.absolute(fs.pathJoin(dir, entry)));
             });
             });
         };
         };
 
 

-//phantom.injectJs('casper.js');
-phantom.injectJs('lib/vendors/esprima.js');
-
 var fs = require('fs');
 var fs = require('fs');
+
+phantom.injectJs(fs.pathJoin(phantom.casperLibPath, 'vendors', 'esprima.js'));
+
 var casper = new phantom.Casper({
 var casper = new phantom.Casper({
     faultTolerant: false,
     faultTolerant: false,
     verbose:       true
     verbose:       true
@@ -11,7 +11,18 @@ var tests = [];
 if (phantom.args.length > 2 && fs.isFile(phantom.args[2])) {
 if (phantom.args.length > 2 && fs.isFile(phantom.args[2])) {
     tests = [phantom.args[2]];
     tests = [phantom.args[2]];
 } else {
 } else {
-    tests = [fs.absolute(pathJoin(casperLibPath, '..', 'tests', 'suites'))];
+    tests = [fs.absolute(fs.pathJoin(phantom.casperLibPath, '..', 'tests', 'suites'))];
 }
 }
 
 
+// Overriding Casper.open to prefix all test urls
+phantom.Casper.extend({
+    open: function(location, options) {
+        options = isType(options, "object") ? options : {};
+        this.requestUrl = location;
+        var url = 'file://' + phantom.casperPath + '/' + location;
+        this.page.open(url);
+        return this;
+    }
+});
+
 casper.test.runSuites.apply(casper.test, tests);
 casper.test.runSuites.apply(casper.test, tests);

@@ -2,7 +2,7 @@
     t.comment('Casper.base64encode()');
     t.comment('Casper.base64encode()');
 
 
     casper.start('tests/site/index.html', function(self) {
     casper.start('tests/site/index.html', function(self) {
-        var image = self.base64encode('file://' + phantom.libraryPath + '/site/images/phantom.png');
+        var image = self.base64encode('file://' + phantom.casperPath + '/tests/site/images/phantom.png');
         t.assertEquals(image.length, 6160, 'Casper.base64encode() can retrieve base64 contents');
         t.assertEquals(image.length, 6160, 'Casper.base64encode() can retrieve base64 contents');
     });
     });