jasmine-phantom 0.0.1 → 0.0.2

data/README.markdown

@@ -1,8 +1,8 @@
 Jasmine Phantom
 ===============
 
-Jasmine Phantom provides a rake task that runs your jasmine specs via phanstomjs. It is adapted from the jasmine runner example that comes with
-phantom js. It requires jasmine `>= 1.2.0rc2`, which is only currency available via github.
+Jasmine Phantom provides a rake task that runs your jasmine specs via phantomjs. It is adapted from the jasmine runner example that comes with
+phantom js. It requires jasmine `>= 1.2.0rc2`, which is only currently available via GitHub.
 
 Installation
 ------------
@@ -18,7 +18,7 @@ Add jasmine 1.2.0rc2 and jasmine-phantom to your gemfile:
 
 and run `bundle install`.
 
-Then run `bundle exec rake jasmine` and check `http://localhost:8888/` to make sure you jasmine specs are passing.
+Then run `bundle exec rake jasmine` and check `http://localhost:8888/` to make sure your jasmine specs are passing.
 
 Download and install the appropriate [PhantomJS](http://code.google.com/p/phantomjs/downloads/list) for your platform.
 Make sure to add the directory with the `phantomjs` executable to your `PATH`.

data/lib/jasmine-phantom/run-jasmine.js

@@ -28,94 +28,103 @@ if (system.args.length !== 2) {
     phantom.exit();
 }
 
+function jasmineReportsFinished(page){
+  return page.evaluate(function(){
+    return jsApiReporter.finished;
+  });
+}
+
+function collectJasmineResults() {
+  console.log('');
+  var suites = jsApiReporter.suites();
+  var results = jsApiReporter.results();
+
+  for(var specId in results) {
+    var result = results[specId];
+    if (result.result != "passed") {
+
+      var name = findSpecName(specId, suites);
+
+      console.log(name);
+
+      for (var msgId in result.messages) {
+        console.log('  ' + result.messages[msgId]);
+      }
+
+      console.log('');
+    }
+  }
+
+  return summarizeResults(suites, results);
+
+  function findSpecName(specId, suites) {
+    for (var i in suites) {
+      if (suites[i].id == specId) {
+        return suites[i].name;
+      }
+
+      var name = findSpecName(specId, suites[i].children);
+
+      if (name) { return suites[i].name + ' ' + name };
+    }
+  }
+
+  function summarizeResults(suites, results) {
+    var total = { total: 0, passed: 0, failed: 0 }
+
+    for (var i in suites) {
+      var suite = suites[i];
+
+      if (suite.type == 'spec') {
+        total.total++;
+
+        if (results[suite.id].result == 'passed') {
+          total.passed++;
+        } else {
+          total.failed++;
+        }
+      }
+
+      var subTotal = summarizeResults(suite.children, results);
+      total.total += subTotal.total;
+      total.passed += subTotal.passed;
+      total.failed += subTotal.failed;
+    }
+
+    return total;
+  }
+}
+
+function sumUpAndExit(summary) {
+  console.log(summary.total + ' specs | ' + summary.failed + ' failing');
+
+  if (summary.passed == summary.total) {
+    phantom.exit();
+  } else {
+    phantom.exit(1);
+  }
+}
+
 var page = require('webpage').create();
 
 // Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
 page.onConsoleMessage = function(msg) {
-    console.log(msg);
+  console.log(msg);
 };
 
 page.open(system.args[1], function(status){
-    if (status !== "success") {
-        console.log("Unable to access network");
-        phantom.exit();
-    } else {
-        waitFor("Jasmine specs to report finished", function(){
-            return page.evaluate(function(){
-              return jsApiReporter.finished;
-            });
-        }, function(){
-            var summary = page.evaluate(function(){
-              console.log('');
-              var suites = jsApiReporter.suites();
-              var results = jsApiReporter.results();
-
-              for(var specId in results) {
-                var result = results[specId];
-                if (result.result != "passed") {
-
-                  var name = findSpecName(specId, suites);
-
-                  console.log(name);
-
-                  for (var msgId in result.messages) {
-                    console.log('  ' + result.messages[msgId]);
-                  }
-
-                  console.log('');
-                }
-              }
-
-              return summarizeResults(suites, results);
-
-              function findSpecName(specId, suites) {
-                for (var i in suites) {
-                  if (suites[i].id == specId) {
-                    return suites[i].name;
-                  }
-
-                  var name = findSpecName(specId, suites[i].children);
-
-                  if (name) { return suites[i].name + ' ' + name };
-                }
-              }
-
-              function summarizeResults(suites, results) {
-                var total = { total: 0, passed: 0, failed: 0 }
-
-                for (var i in suites) {
-                  var suite = suites[i];
-
-                  if (suite.type == 'spec') {
-                    total.total++;
-
-                    if (results[suite.id].result == 'passed') {
-                      total.passed++;
-                    } else {
-                      total.failed++;
-                    }
-                  }
-
-                  var subTotal = summarizeResults(suite.children, results);
-                  total.total += subTotal.total;
-                  total.passed += subTotal.passed;
-                  total.failed += subTotal.failed;
-                }
-
-                return total;
-              }
-
-              return passed;
-            });
-
-            console.log(summary.total + ' specs | ' + summary.failed + ' failing');
-
-            if (summary.passed == summary.total) {
-              phantom.exit();
-            } else {
-              phantom.exit(1);
-            }
-        });
-    }
-
+  if (status !== "success") {
+    console.log("Unable to access network");
+    phantom.exit();
+  } else {
+    waitFor(
+      "Jasmine specs to report finished",
+      function() { return jasmineReportsFinished(page); },
+      function(){
+        var summary = page.evaluate(collectJasmineResults);
+        sumUpAndExit(summary);
+      },
+      30000
+    );
+  }
 });

data/lib/jasmine-phantom/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Phantom
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-phantom
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153382420 !ruby/object:Gem::Requirement
+  requirement: &2153708660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153382420
+  version_requirements: *2153708660
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2153381920 !ruby/object:Gem::Requirement
+  requirement: &2153708160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.2.0rc2
   type: :runtime
   prerelease: false
-  version_requirements: *2153381920
+  version_requirements: *2153708160
 description: ! "jasmine-phantom provides a rake task, jasmine:phantom:ci,\n                     that
   runs your jasmine specs via the phantomjs browser just as if you had\n                     run
   rake jasmine and run them manually via your browser.\n\n                     You
@@ -65,12 +65,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1636865008111916093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1636865008111916093
 requirements: []
 rubyforge_project: jasmine-phantom
 rubygems_version: 1.8.6