jasmine-phantom 0.0.4 → 0.0.5

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2012 Flipstone Technology Partners, INC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.markdown

@@ -1,18 +1,15 @@
 Jasmine Phantom
 ===============
 
-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.
+Jasmine Phantom provides a rake task that runs your jasmine specs via phantomjs.
+It requires jasmine >= 1.2.0.
 
 Installation
 ------------
 
-Add jasmine 1.2.0rc2 and jasmine-phantom to your gemfile:
-
-    gem 'jasmine', '1.2.0.rc2',
-      git: "git://github.com/pivotal/jasmine-gem.git",
-      branch: "953d17dff4b4adba79b2a808b55cf33f4ff93af7"
+Add jasmine 1.2.0 and jasmine-phantom to your gemfile:
 
+    gem 'jasmine', '1.2.0'
     gem 'jasmine-phantom'
 
 

data/jasmine-phantom.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Jasmine::Phantom::VERSION
   s.authors     = ["David Vollbracht"]
   s.email       = ["david@flipstone.com"]
+  s.license     = "MIT"
   s.homepage    = "http://github.com/flipstone/jasmine-phantom"
   s.summary     = %q{Run you jasmine specs from the commant line using phantomjs}
   s.description = %q{jasmine-phantom provides a rake task, jasmine:phantom:ci,
@@ -25,5 +26,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "rails", '>= 3.0'
-  s.add_runtime_dependency "jasmine", '>= 1.2.0rc2'
+  s.add_runtime_dependency "jasmine", '>= 1.2.0'
 end

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

@@ -1,39 +1,3 @@
-var system = require('system');
-
-function waitFor(message, testFx, onReady, timeOutMillis) {
-  var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001; //< Default Max Timeout is 3s
-  var start = new Date().getTime();
-  var condition = false;
-  var interval = setInterval(function() {
-    if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) {
-      // If not time-out yet and condition not yet fulfilled
-      condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code
-    } else {
-      if(!condition) {
-        // If condition still not fulfilled (timeout but condition is 'false')
-        console.log("'Timed out waiting for " + message);
-        phantom.exit(1);
-      } else {
-        // Condition fulfilled (timeout and/or condition is 'true')
-        typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled
-        clearInterval(interval); //< Stop this interval
-      }
-    }
-  }, 100); //< repeat check every 100ms
-};
-
-
-if (system.args.length !== 2) {
-    console.log('Usage: run-jasmine.js URL');
-    phantom.exit();
-}
-
-function jasmineReportsFinished(page){
-  return page.evaluate(function(){
-    return jsApiReporter.finished;
-  });
-}
-
 function collectJasmineResults() {
   console.log('');
   var suites = jsApiReporter.suites();
@@ -59,7 +23,7 @@ function collectJasmineResults() {
 
   function findSpecName(specId, suites) {
     for (var i in suites) {
-      if (suites[i].id == specId) {
+      if (suites[i].id == specId && suites[i].type === "spec") {
         return suites[i].name;
       }
 
@@ -105,26 +69,44 @@ function sumUpAndExit(summary) {
   }
 }
 
-var page = require('webpage').create();
-
-// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
+var page = require('webpage').create()
 page.onConsoleMessage = function(msg) {
   console.log(msg);
 };
 
-page.open(system.args[1], function(status){
-  if (status !== "success") {
-    console.log("Unable to access network");
-    phantom.exit();
+var system = require('system');
+
+function jasmineReportsFinished(page){
+  return page.evaluate(function(){
+    return jsApiReporter.finished;
+  });
+}
+
+function waitForSpecsToFinish(page, seconds, whenDone) {
+  if (jasmineReportsFinished(page)) {
+    whenDone();
+  } else {
+    if (seconds > 0) {
+      setTimeout(
+        function() {waitForSpecsToFinish(page, seconds - 1, whenDone)},
+        1000
+      );
+    } else {
+      console.log("Jasmine tests didn't finish in 30 seconds... bailing out");
+      phantom.exit(2);
+    }
+  }
+}
+
+page.open(system.args[1], function(status) {
+  if (status == 'success') {
+    waitForSpecsToFinish(page, 30, function() {
+      var summary = page.evaluate(collectJasmineResults);
+      sumUpAndExit(summary);
+    });
   } else {
-    waitFor(
-      "Jasmine specs to report finished",
-      function() { return jasmineReportsFinished(page); },
-      function(){
-        var summary = page.evaluate(collectJasmineResults);
-        sumUpAndExit(summary);
-      },
-      30000
-    );
+    console.log('Unable to connect to Jasmine server at ' + system.args[1]);
+    phantom.exit(3);
   }
 });
+

data/lib/jasmine-phantom/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Phantom
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-phantom
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153244960 !ruby/object:Gem::Requirement
+  requirement: &2157907760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,18 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153244960
+  version_requirements: *2157907760
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2153244460 !ruby/object:Gem::Requirement
+  requirement: &2157906960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0rc2
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153244460
+  version_requirements: *2157906960
 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
@@ -45,6 +45,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
 - jasmine-phantom.gemspec
@@ -54,7 +55,8 @@ files:
 - lib/jasmine-phantom/tasks.rake
 - lib/jasmine-phantom/version.rb
 homepage: http://github.com/flipstone/jasmine-phantom
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -67,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2734063739697641060
+      hash: 1067914802477270472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2734063739697641060
+      hash: 1067914802477270472
 requirements: []
 rubyforge_project: jasmine-phantom
 rubygems_version: 1.8.6