guard-jasmine 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653c1770a0ee0afde89d96bc6b55e89523f9e6a7
-  data.tar.gz: 9da1156f41c0da97723d2ab83b908b02b7588faf
+  metadata.gz: 12caddb0c39fa9e9eb322b6c951c89852701f973
+  data.tar.gz: f0cf28ed90b43983707498f0687bda3c13eae5b1
 SHA512:
-  metadata.gz: 19f799979a9d26cc253abffd4e5ddf34d3c95e56ac0443f5d79242a3d6659eb31bdea642445c1edc52e836925ab4440647dda3c743a2e348201731dbc84f16b1
-  data.tar.gz: 1bd4ab0e7aa91dd28e1f031fb113b2c95930a6b2bdcac7b9b8101a0494cda518f414565d9b800840402c34a4cc492dc29630cb1743be7e4d6380f9b2411e9b04
+  metadata.gz: 6e289b661a2d079a9da870b108afea5c1c3edb1da7e075ec09acfa000bd2ee25a5ef0b59f89a86b4e8e465d6da2765c38c2f16fb635f5798e548ea158c800696
+  data.tar.gz: 2399a04e13a740d2e1eaf8a4cf0452d16f6ccf37074a099449cca08c75a48a8d4c73eb7967250f26017d451b9e0c2e1857b9dffe6197a01f6535b3b9bd751cb5

data/lib/guard/jasmine/cli.rb

@@ -7,7 +7,7 @@ require 'guard/jasmine/util'
 require 'guard/jasmine/server'
 
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # Small helper class to run the Jasmine runner_options once from the
     # command line. This can be useful to integrate guard-jasmine
     # into a continuous integration server.
@@ -225,7 +225,7 @@ module Guard
         end
 
       rescue => e
-        ::Guard::UI.error "Something went wrong: #{e.message}"
+        Compat::UI.error "Something went wrong: #{e.message}"
         Process.exit 2
       ensure
         ::Guard::Jasmine::Server.stop
@@ -239,7 +239,7 @@ module Guard
       # @see Guard::Jasmine::VERSION
       #
       def version
-        ::Guard::UI.info "Guard::Jasmine version #{ ::Guard::JasmineVersion::VERSION }"
+        Compat::UI.info "Guard::Jasmine version #{ ::Guard::JasmineVersion::VERSION }"
       end
     end
   end

data/lib/guard/jasmine/formatter.rb

@@ -1,5 +1,7 @@
+require 'guard/compat/plugin'
+
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # The Guard::Jasmine formatter collects console and
     # system notification methods and enhances them with
     # some color information.
@@ -13,7 +15,7 @@ module Guard
         # @option options [Boolean] :reset reset the UI
         #
         def info(message, options = {})
-          ::Guard::UI.info(message, options)
+          Compat::UI.info(message, options)
         end
 
         # Print a debug message to the console.
@@ -23,7 +25,7 @@ module Guard
         # @option options [Boolean] :reset reset the UI
         #
         def debug(message, options = {})
-          ::Guard::UI.debug(message, options)
+          Compat::UI.debug(message, options)
         end
 
         # Print a red error message to the console.
@@ -33,7 +35,7 @@ module Guard
         # @option options [Boolean] :reset reset the UI
         #
         def error(message, options = {})
-          ::Guard::UI.error(color(message, ';31'), options)
+          Compat::UI.error(color(message, ';31'), options)
         end
 
         # Print a green success message to the console.
@@ -43,7 +45,7 @@ module Guard
         # @option options [Boolean] :reset reset the UI
         #
         def success(message, options = {})
-          ::Guard::UI.info(color(message, ';32'), options)
+          Compat::UI.info(color(message, ';32'), options)
         end
 
         # Print a yellow pending message to the console.
@@ -53,7 +55,7 @@ module Guard
         # @option options [Boolean] :reset reset the UI
         #
         def spec_pending(message, options = {})
-          ::Guard::UI.info(color(message, ';33'), options)
+          Compat::UI.info(color(message, ';33'), options)
         end
 
         # Print a red spec failed message to the console.
@@ -62,7 +64,7 @@ module Guard
         # @param [Hash] options the output options
         #
         def spec_failed(message, options = {})
-          ::Guard::UI.info(color(message, ';31'), options)
+          Compat::UI.info(color(message, ';31'), options)
         end
 
         # Print a red spec failed message to the console.
@@ -71,7 +73,7 @@ module Guard
         # @param [Hash] options the output options
         #
         def suite_name(message, options = {})
-          ::Guard::UI.info(color(message, ';33'), options)
+          Compat::UI.info(color(message, ';33'), options)
         end
 
         # Outputs a system notification.
@@ -82,7 +84,7 @@ module Guard
         # @option options [String] :title the title of the system notification
         #
         def notify(message, options = {})
-          ::Guard::Notifier.notify(message, options)
+          Compat::UI.notify(message, options)
         end
 
         private
@@ -93,7 +95,7 @@ module Guard
         # @param [String] color_code the color code
         #
         def color(text, color_code)
-          ::Guard::UI.send(:color_enabled?) ? "\e[0#{ color_code }m#{ text }\e[0m" : text
+          Compat::UI.color_enabled? ? "\e[0#{ color_code }m#{ text }\e[0m" : text
         end
       end
     end

data/lib/guard/jasmine/inspector.rb

@@ -1,5 +1,7 @@
+require 'guard/compat/plugin'
+
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # The inspector verifies if the changed paths are valid
     # for Guard::Jasmine. Please note that request to {.clean}
     # paths keeps the current valid files cached until {.clear} is

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

@@ -2,7 +2,7 @@
   var exitSuccessfully, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, waitFor;
 
   options = {
-    url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine',
+    url: phantom.args[0] || 'http://localhost:3000/jasmine',
     timeout: parseInt(phantom.args[1] || 10000)
   };
 
@@ -12,6 +12,11 @@
     return reportError("Javascript error encountered on Jasmine test page: " + message, trace);
   };
 
+  page.onResourceError = function(error) {
+    page.reason = error.errorString;
+    return page.reason_url = error.url;
+  };
+
   page.onInitialized = function() {
     page.injectJs('guard-reporter.js');
     return page.evaluate(function() {
@@ -26,7 +31,7 @@
 
   page.onLoadFinished = function(status) {
     if (status !== 'success') {
-      return reportError("Unable to access Jasmine specs at " + options.url + ", page returned status: " + status);
+      return reportError("Unable to access Jasmine specs at " + page.reason_url + ". " + page.reason);
     } else {
       return waitFor(reporterReady, jasmineAvailable, options.timeout, reporterMissing);
     }

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

@@ -1,7 +1,7 @@
 
 # Set default values
 options =
-  url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine'
+  url: phantom.args[0] || 'http://localhost:3000/jasmine'
   timeout: parseInt(phantom.args[1] || 10000)
 
 # Create the web page.
@@ -12,6 +12,10 @@ page = require('webpage').create()
 page.onError = (message, trace) ->
     reportError "Javascript error encountered on Jasmine test page: #{ 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 = ->
@@ -24,7 +28,7 @@ page.onInitialized = ->
 # Once the page is finished loading
 page.onLoadFinished = (status)->
     if status isnt 'success'
-        reportError "Unable to access Jasmine specs at #{ options.url }, page returned status: #{status}"
+        reportError "Unable to access Jasmine specs at #{page.reason_url}. #{page.reason}"
     else
         waitFor reporterReady, jasmineAvailable, options.timeout, reporterMissing
 

data/lib/guard/jasmine/runner.rb

@@ -2,10 +2,13 @@
 
 require 'multi_json'
 require 'fileutils'
+
+require 'guard/compat/plugin'
+require 'guard/jasmine'
 require 'guard/jasmine/util'
 
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # The Jasmine runner handles the execution of the spec through the PhantomJS binary,
     # evaluates the JSON response from the PhantomJS Script `guard_jasmine.coffee`,
     # writes the result to the console and triggers optional system notifications.

data/lib/guard/jasmine/server.rb

@@ -5,8 +5,10 @@ require 'timeout'
 require 'childprocess'
 require 'jasmine'
 
+require 'guard/compat/plugin'
+
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # Start and stop a Jasmine test server for requesting the specs
     # from PhantomJS.
     #
@@ -47,7 +49,7 @@ module Guard
         #
         def stop
           if process
-            ::Guard::UI.info 'Guard::Jasmine stops server.'
+            Compat::UI.info 'Guard::Jasmine stops server.'
             process.stop(5)
           end
         end
@@ -105,7 +107,7 @@ module Guard
           rackup_config = options[:rackup_config]
           coverage      = options[:coverage] ? 'on' : 'off'
 
-          ::Guard::UI.info "Guard::Jasmine starts #{ server } spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
+          Compat::UI.info "Guard::Jasmine starts #{ server } spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
           execute(options, ['rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s, rackup_config])
         end
 
@@ -121,7 +123,7 @@ module Guard
           environment = options[:server_env]
           coverage    = options[:coverage] ? 'on' : 'off'
 
-          ::Guard::UI.info "Guard::Jasmine starts Unicorn spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
+          Compat::UI.info "Guard::Jasmine starts Unicorn spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
           execute(options, ['unicorn_rails', '-E', environment.to_s, '-p', port.to_s])
         end
 
@@ -132,7 +134,7 @@ module Guard
         # @option options [Symbol] server the rack server to use
         #
         def start_rake_server(port, task, options)
-          ::Guard::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
+          Compat::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
           execute(options, ['rake', task, "JASMINE_PORT=#{ port }"])
         end
 
@@ -151,8 +153,8 @@ module Guard
           process.io.inherit! if options[:verbose]
           process.start
         rescue => e
-          ::Guard::UI.error "Cannot start server using command #{ cmd.join(' ') }."
-          ::Guard::UI.error "Error was: #{ e.message }"
+          Compat::UI.error "Cannot start server using command #{ cmd.join(' ') }."
+          Compat::UI.error "Error was: #{ e.message }"
         end
 
         # Wait until the Jasmine test server is running.
@@ -164,7 +166,7 @@ module Guard
           Timeout.timeout(timeout) do
             loop do
               begin
-                ::TCPSocket.new('127.0.0.1', port).close
+                ::TCPSocket.new('localhost', port).close
                 break
               rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
                 # Ignore, server still not available
@@ -174,12 +176,12 @@ module Guard
           end
 
         rescue Timeout::Error
-          ::Guard::UI.warning "Timeout while waiting for the server to startup"
-          ::Guard::UI.warning "Most likely there is a configuration error that's preventing the server from starting"
-          ::Guard::UI.warning "You may need to increase the `:server_timeout` option."
-          ::Guard::UI.warning "The commandline that was used to start the server was:"
-          ::Guard::UI.warning cmd.join(' ')
-          ::Guard::UI.warning "You should attempt to run that and see if any errors occur"
+          Compat::UI.warning "Timeout while waiting for the server to startup"
+          Compat::UI.warning "Most likely there is a configuration error that's preventing the server from starting"
+          Compat::UI.warning "You may need to increase the `:server_timeout` option."
+          Compat::UI.warning "The commandline that was used to start the server was:"
+          Compat::UI.warning cmd.join(' ')
+          Compat::UI.warning "You should attempt to run that and see if any errors occur"
 
           throw :task_has_failed
         end

data/lib/guard/jasmine/util.rb

@@ -1,9 +1,10 @@
 require 'net/http'
 require 'timeout'
+require 'guard/compat/plugin'
 require 'guard/jasmine/formatter'
 
 module Guard
-  class Jasmine
+  class Jasmine < Plugin
     # Provider of some shared utility methods.
     #
     module Util

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.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -123,48 +123,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@flinkfinger.com