guard-jasmine 1.2.0 → 1.2.1

data/README.md

@@ -158,7 +158,7 @@ guard :jasmine, :jasmine_url => 'http://127.0.0.1:8888/jasmine-stories' do
 end
 ```
 
-## Rails without the asset pipeline and plain Ruby projects
+## Rails without the asset pipeline
 
 With Rails without the asset pipeline or a plain Ruby project, you can use [the Jasmine Gem][] to configure your Jasmine
 specs and server the Jasmine runner. You don't have full access to your running Rails app, but it's anyway a good
@@ -231,8 +231,9 @@ guard 'coffeescript', :input => 'spec/coffeescripts', :output => 'spec/javascrip
 
 If you like to use Guard::Jasmine with a plain Ruby project, you can create a Rack configuration file
 that starts a Rails instance with the asset pipeline and Jasminerice, having the full Rails testing
-comfort for non-Rails projects. Please have a look at the Rails with the asset pipeline section above
-to see how the setup works.
+comfort for non-Rails projects. Please have a look at the
+[Rails with the asset pipeline](https://github.com/netzpirat/guard-jasmine#rails-with-the-asset-pipeline-setup)
+section to see how the setup works.
 
 First you have the add the needed Gems to your `Gemfile`:
 
@@ -247,7 +248,7 @@ group :development, :test do
   gem 'tzinfo'
 
   gem 'thin'
-    
+
   gem 'jasminerice'
   gem 'jquery-rails'
   gem 'guard-jasmine'
@@ -600,7 +601,7 @@ before_script:
 
 When building an engine, your code lives at the root but the dummy Rails app is in another folder (like `test/dummy` or `spec/dummy`).
 
-So you have to import the Jasmine task in your `Rakefile`: 
+So you have to import the Jasmine task in your `Rakefile`:
 
 ```bash
 $ echo "import 'lib/tasks/jasmine.rake'" > Rakefile

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

@@ -1,6 +1,6 @@
 (function() {
   var Console,
-    __slice = Array.prototype.slice;
+    __slice = [].slice;
 
   Console = (function() {
 
@@ -59,7 +59,9 @@
       switch (type) {
         case '%s':
           result = String(object);
-          if (match = /'(.*)'/.exec(result)) result = match[1];
+          if (match = /'(.*)'/.exec(result)) {
+            result = match[1];
+          }
           break;
         case '%d':
         case '%i':
@@ -74,10 +76,14 @@
             result = Console.pp(object.toJSON());
           } else if (type === 'Object' && object.toString && object.toString() !== '[object Object]') {
             result = Console.pp(object.toString());
-            if (match = /'(.*)'/.exec(result)) result = match[1];
+            if (match = /'(.*)'/.exec(result)) {
+              result = match[1];
+            }
           } else if (type === 'String') {
             result = String(object);
-            if (match = /'(.*)'/.exec(result)) result = match[1];
+            if (match = /'(.*)'/.exec(result)) {
+              result = match[1];
+            }
           } else {
             result = Console.pp(object);
           }
@@ -87,7 +93,9 @@
 
     Console.pp = function(object, depth) {
       var key, result, type, value, _i, _len;
-      if (depth == null) depth = 0;
+      if (depth == null) {
+        depth = 0;
+      }
       type = Object.prototype.toString.call(object).slice(8, -1);
       result = '';
       switch (type) {
@@ -160,9 +168,13 @@
   })();
 
   if (typeof module !== 'undefined' && module.exports) {
-    if (module) module.exports = Console;
+    if (module) {
+      module.exports = Console;
+    }
   } else {
-    if (window) new Console(window.console);
+    if (window) {
+      new Console(window.console);
+    }
   }
 
 }).call(this);

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

@@ -17,7 +17,7 @@
 
     ConsoleReporter.prototype.specCount = 0;
 
-    ConsoleReporter.prototype.currentSpecs = [];
+    ConsoleReporter.prototype.currentSpecs = {};
 
     ConsoleReporter.prototype.nestedSuiteResults = {};
 
@@ -26,7 +26,7 @@
     };
 
     ConsoleReporter.prototype.reportSpecResults = function(spec) {
-      var messages, result, specResult, _i, _len, _ref;
+      var messages, result, specResult, _base, _i, _len, _name, _ref;
       if (!spec.results().skipped) {
         specResult = {
           id: spec.id,
@@ -40,10 +40,13 @@
             result = _ref[_i];
             messages.push(result.message);
           }
-          if (messages.length !== 0) specResult['messages'] = messages;
+          if (messages.length !== 0) {
+            specResult['messages'] = messages;
+          }
         }
         this.specCount += 1;
-        return this.currentSpecs.push(specResult);
+        (_base = this.currentSpecs)[_name = spec.suite.id] || (_base[_name] = []);
+        return this.currentSpecs[spec.suite.id].push(specResult);
       }
     };
 
@@ -55,7 +58,7 @@
           parent: (_ref = suite.parentSuite) != null ? _ref.id : void 0,
           description: suite.description,
           passed: suite.results().failedCount === 0,
-          specs: this.currentSpecs,
+          specs: this.currentSpecs[suite.id],
           suites: []
         };
         if (suite.parentSuite != null) {
@@ -63,16 +66,15 @@
           if (!this.nestedSuiteResults[parent]) {
             this.nestedSuiteResults[parent] = [];
           }
-          this.nestedSuiteResults[parent].push(suiteResult);
+          return this.nestedSuiteResults[parent].push(suiteResult);
         } else {
           this.addNestedSuites(suiteResult);
           this.removeEmptySuites(suiteResult);
           if (suiteResult.specs.length !== 0 || suiteResult.suites.length !== 0) {
-            this.runnerResult.suites.push(suiteResult);
+            return this.runnerResult.suites.push(suiteResult);
           }
         }
       }
-      return this.currentSpecs = [];
     };
 
     ConsoleReporter.prototype.reportRunnerResults = function(runner) {

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

@@ -101,8 +101,12 @@
     };
 
     Result.prototype.process = function() {
-      if (this.options.console !== 'never') this.addLogs(this.result);
-      if (this.options.errors !== 'never') this.addErrors(this.result);
+      if (this.options.console !== 'never') {
+        this.addLogs(this.result);
+      }
+      if (this.options.errors !== 'never') {
+        this.addErrors(this.result);
+      }
       this.cleanResult(this.result);
       return this.result;
     };
@@ -112,9 +116,13 @@
   })();
 
   if (typeof module !== 'undefined' && module.exports) {
-    if (module) module.exports = Result;
+    if (module) {
+      module.exports = Result;
+    }
   } else {
-    if (window) window.Result = Result;
+    if (window) {
+      window.Result = Result;
+    }
   }
 
 }).call(this);

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

@@ -14,7 +14,7 @@ class ConsoleReporter
   }
 
   specCount: 0
-  currentSpecs: []
+  currentSpecs: {}
   nestedSuiteResults: {}
 
   # Report the start of a spec.
@@ -42,7 +42,8 @@ class ConsoleReporter
         specResult['messages'] = messages if messages.length isnt 0
 
       @specCount += 1
-      @currentSpecs.push specResult
+      @currentSpecs[spec.suite.id] or= []
+      @currentSpecs[spec.suite.id].push specResult
 
   # Report results from a suite.
   #
@@ -55,7 +56,7 @@ class ConsoleReporter
         parent: suite.parentSuite?.id
         description: suite.description
         passed: suite.results().failedCount is 0
-        specs: @currentSpecs
+        specs: @currentSpecs[suite.id]
         suites: []
       }
 
@@ -70,8 +71,6 @@ class ConsoleReporter
         if suiteResult.specs.length isnt 0 || suiteResult.suites.length isnt 0
           @runnerResult.suites.push suiteResult
 
-    @currentSpecs = []
-
   # Report results from the runner.
   #
   # @param runner [jasmine.Runner] the runner

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 = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -91,134 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-coffeescript
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-shell
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch
@@ -266,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -454211367523524578
+      hash: 2617870575409266914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: