guard-jasmine 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12caddb0c39fa9e9eb322b6c951c89852701f973
-  data.tar.gz: f0cf28ed90b43983707498f0687bda3c13eae5b1
+  metadata.gz: 45fc874553284f4ee8092b587b54ceb0ce8b48b2
+  data.tar.gz: 884c06766e3d4b531647e789dff96662cfd8dfcc
 SHA512:
-  metadata.gz: 6e289b661a2d079a9da870b108afea5c1c3edb1da7e075ec09acfa000bd2ee25a5ef0b59f89a86b4e8e465d6da2765c38c2f16fb635f5798e548ea158c800696
-  data.tar.gz: 2399a04e13a740d2e1eaf8a4cf0452d16f6ccf37074a099449cca08c75a48a8d4c73eb7967250f26017d451b9e0c2e1857b9dffe6197a01f6535b3b9bd751cb5
+  metadata.gz: 7403cc1f1b17cdb34a59cabcaa5da958678d4be0972a53364f3fc5fbdb72075041d3ea48c40dadd4a6bbf5f79ebfb98ebfdd683c27e3756c96adf2df6c25e0f5
+  data.tar.gz: a7bfe2ca8e538707fccdbf0f71198ef5cc7e110c78570ed88aea080ec3b8ac42f2da6cac1c360372c221bb9065da921e38a828f14c092b64d7fbc1e3ecad0a8c

data/lib/guard/jasmine/phantomjs/guard-jasmine.js

@@ -1,9 +1,11 @@
 (function() {
-  var exitSuccessfully, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, waitFor;
+  var exitError, exitSuccessfully, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, system, waitFor;
+
+  system = require('system');
 
   options = {
-    url: phantom.args[0] || 'http://localhost:3000/jasmine',
-    timeout: parseInt(phantom.args[1] || 10000)
+    url: system.args[0] || 'http://localhost:3000/jasmine',
+    timeout: parseInt(system.args.args[1] || 10000)
   };
 
   page = require('webpage').create();
@@ -52,8 +54,8 @@
   reporterMissing = function() {
     var text;
     text = page.evaluate(function() {
-      var _ref;
-      return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
+      var ref;
+      return (ref = document.getElementsByTagName('body')[0]) != null ? ref.innerText : void 0;
     });
     return reportError("The reporter is not available!\nPerhaps the url ( " + options.url + " ) is incorrect?\n\n" + text);
   };
@@ -81,11 +83,18 @@
     return phantomExit();
   };
 
+  exitError = function(message) {
+    console.log(JSON.stringify({
+      error: message
+    }));
+    return phantomExit(1);
+  };
+
   specsTimedout = function() {
     var text;
     text = page.evaluate(function() {
-      var _ref;
-      return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
+      var ref;
+      return (ref = document.getElementsByTagName('body')[0]) != null ? ref.innerText : void 0;
     });
     reportError("Timeout waiting for the Jasmine test results!\n\n" + text);
     return phantomExit(1);
@@ -100,8 +109,14 @@
     interval = void 0;
     start = Date.now(0);
     wait = function() {
+      var e;
       if (!condition && (Date.now() - start < timeout)) {
-        return condition = test();
+        try {
+          return condition = test();
+        } catch (_error) {
+          e = _error;
+          return exitError(e);
+        }
       } else {
         clearInterval(interval);
         if (condition) {

data/lib/guard/jasmine/phantomjs/guard-reporter.js

@@ -23,7 +23,7 @@
   };
 
   ConsoleCapture = (function() {
-    var level, _i, _len, _ref;
+    var i, len, level, ref;
 
     ConsoleCapture.DOT_REPORTER_MATCH = /\[\d+m[F.]..0m/;
 
@@ -33,32 +33,32 @@
 
     ConsoleCapture.original_levels = {};
 
-    _ref = ConsoleCapture.levels;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      level = _ref[_i];
+    ref = ConsoleCapture.levels;
+    for (i = 0, len = ref.length; i < len; i++) {
+      level = ref[i];
       ConsoleCapture.original_levels[level] = console[level];
     }
 
     function ConsoleCapture() {
-      var _j, _len1, _ref1;
+      var j, len1, ref1;
       this.original = {};
       this.captured = [];
-      _ref1 = ConsoleCapture.levels;
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        level = _ref1[_j];
+      ref1 = ConsoleCapture.levels;
+      for (j = 0, len1 = ref1.length; j < len1; j++) {
+        level = ref1[j];
         this._reassign_level(level);
       }
     }
 
     ConsoleCapture.prototype.revert = function() {
-      var _j, _len1, _ref1, _results;
-      _ref1 = ConsoleCapture.levels;
-      _results = [];
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        level = _ref1[_j];
-        _results.push(ConsoleCapture.original[level] = ConsoleCapture.original_levels[level]);
+      var j, len1, ref1, results;
+      ref1 = ConsoleCapture.levels;
+      results = [];
+      for (j = 0, len1 = ref1.length; j < len1; j++) {
+        level = ref1[j];
+        results.push(ConsoleCapture.original[level] = ConsoleCapture.original_levels[level]);
       }
-      return _results;
+      return results;
     };
 
     ConsoleCapture.prototype._reassign_level = function(level) {
@@ -113,15 +113,15 @@
     };
 
     GuardReporter.prototype.specDone = function(spec) {
-      var error, failure, match, success, _i, _j, _len, _len1, _ref, _ref1;
+      var error, failure, i, j, len, len1, match, ref, ref1, success;
       this.resultReceived = true;
       spec = extendObject({
         logs: this.console.captured,
         errors: []
       }, spec);
-      _ref = spec.failedExpectations || [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        failure = _ref[_i];
+      ref = spec.failedExpectations || [];
+      for (i = 0, len = ref.length; i < len; i++) {
+        failure = ref[i];
         error = extendObject({
           trace: []
         }, failure);
@@ -136,9 +136,9 @@
         spec.errors.push(error);
       }
       delete spec.failedExpectations;
-      _ref1 = spec.passedExpectations || [];
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        success = _ref1[_j];
+      ref1 = spec.passedExpectations || [];
+      for (j = 0, len1 = ref1.length; j < len1; j++) {
+        success = ref1[j];
         this.stringifyExpection(success);
       }
       this.currentSuite.specs.push(spec);
@@ -147,20 +147,20 @@
     };
 
     GuardReporter.prototype.stringifyExpection = function(expected) {
-      var key, _i, _len, _ref, _results;
-      _ref = ['actual', 'expected'];
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        key = _ref[_i];
+      var i, key, len, ref, results;
+      ref = ['actual', 'expected'];
+      results = [];
+      for (i = 0, len = ref.length; i < len; i++) {
+        key = ref[i];
         if (isFunction(expected[key])) {
-          _results.push(expected[key] = expected[key].name || "function");
+          results.push(expected[key] = expected[key].name || "function");
         } else if (isObject(expected[key])) {
-          _results.push(expected[key] = expected[key].toString());
+          results.push(expected[key] = expected[key].toString());
         } else {
-          _results.push(void 0);
+          results.push(void 0);
         }
       }
-      return _results;
+      return results;
     };
 
     GuardReporter.prototype.resetConsoleLog = function() {
@@ -169,18 +169,18 @@
     };
 
     GuardReporter.prototype.eachSuite = function(suite) {
-      var suites, _i, _len, _ref;
+      var i, len, ref, suites;
       suites = [].concat(suite.suites);
-      _ref = suite.suites;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        suite = _ref[_i];
+      ref = suite.suites;
+      for (i = 0, len = ref.length; i < len; i++) {
+        suite = ref[i];
         suites = suites.concat(this.eachSuite(suite));
       }
       return suites;
     };
 
     GuardReporter.prototype.results = function() {
-      var spec, stats, suite, _i, _j, _len, _len1, _ref, _ref1;
+      var i, j, len, len1, ref, ref1, spec, stats, suite;
       stats = {
         time: (Date.now() - this.startedAt) / 1000,
         specs: 0,
@@ -188,13 +188,13 @@
         pending: 0,
         disabled: 0
       };
-      _ref = this.eachSuite(this.stack[0]);
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        suite = _ref[_i];
+      ref = this.eachSuite(this.stack[0]);
+      for (i = 0, len = ref.length; i < len; i++) {
+        suite = ref[i];
         stats.specs += suite.specs.length;
-        _ref1 = suite.specs;
-        for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-          spec = _ref1[_j];
+        ref1 = suite.specs;
+        for (j = 0, len1 = ref1.length; j < len1; j++) {
+          spec = ref1[j];
           if (void 0 !== stats[spec.status]) {
             stats[spec.status] += 1;
           }

data/lib/guard/jasmine/phantomjs/src/guard-jasmine.coffee

@@ -1,8 +1,9 @@
+system = require('system');
 
 # Set default values
 options =
-  url: phantom.args[0] || 'http://localhost:3000/jasmine'
-  timeout: parseInt(phantom.args[1] || 10000)
+  url: system.args[0] || 'http://localhost:3000/jasmine'
+  timeout: parseInt(system.args.args[1] || 10000)
 
 # Create the web page.
 page = require('webpage').create()
@@ -15,7 +16,7 @@ page.onError = (message, trace) ->
 page.onResourceError = (error)->
     page.reason = error.errorString
     page.reason_url = error.url
- 
+
 # Once the page is initialized, setup the script for
 # the GuardReporter class
 page.onInitialized = ->
@@ -74,6 +75,10 @@ exitSuccessfully = ->
     console.log JSON.stringify( results )
     phantomExit()
 
+exitError = (message)->
+    console.log JSON.stringify({error: message})
+    phantomExit(1)
+
 
 # Error message for when specs time out
 specsTimedout = ->
@@ -97,7 +102,10 @@ waitFor = (test, ready, timeout = 10000, timeoutFunction)->
     start = Date.now(0)
     wait = ->
         if !condition && (Date.now() - start < timeout)
-            condition = test()
+            try
+                condition = test()
+            catch e
+                exitError(e)
         else
           clearInterval interval
           if condition

data/lib/guard/jasmine/runner.rb

@@ -242,7 +242,7 @@ module Guard
           pp result if options[:debug]
           if result['error']
             if options[:is_cli]
-              fail 'An error occurred in the Jasmine runner'
+              fail "Runner error: #{result['error']}"
             else
               notify_runtime_error(result)
             end

data/lib/guard/jasmine/server.rb

@@ -147,6 +147,9 @@ module Guard
             cmd.unshift("ruby", "-S")
           end
           self.cmd = cmd
+          if options[:debug]
+            puts "Starting server using: #{cmd.join(' ')}"
+          end
           self.process = ChildProcess.build(*cmd.compact)
           process.environment['COVERAGE'] = options[:coverage].to_s
           process.environment['IGNORE_INSTRUMENTATION'] = options[:ignore_instrumentation].to_s

data/lib/guard/jasmine/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module JasmineVersion
     # Guard::Jasmine version that is used for the Gem specification
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Michael Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Guard gem for headless testing with Jasmine