guard-jasmine 0.9.8 → 0.9.9

data/README.md

@@ -403,12 +403,19 @@ With the given `guard-jasmine` script you're able to configure [Travis CI](http:
 Simply use the `script` setting in your `.travis.yml`:
 
 ```yaml
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 script: 'bundle exec guard-jasmine'
 ```
 
 You can also run your Guard::Jasmine specs after your specs that are ran with `rake` by using `after_script`:
 
 ```yaml
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+script: 'rake spec'
 after_script: 'bundle exec guard-jasmine'
 ```
 

data/lib/guard/jasmine.rb

@@ -1,7 +1,8 @@
+require 'net/http'
+
 require 'guard'
 require 'guard/guard'
 require 'guard/watcher'
-require 'net/http'
 
 module Guard
 
@@ -10,10 +11,12 @@ module Guard
   #
   class Jasmine < Guard
 
-    autoload :Formatter, 'guard/jasmine/formatter'
     autoload :Inspector, 'guard/jasmine/inspector'
     autoload :Runner, 'guard/jasmine/runner'
     autoload :Server, 'guard/jasmine/server'
+    autoload :Util, 'guard/jasmine/util'
+
+    extend Util
 
     attr_accessor :last_run_failed, :last_failed_paths
 
@@ -72,11 +75,11 @@ module Guard
     # @raise [:task_has_failed] when run_on_change has failed
     #
     def start
-      if phantomjs_bin_valid?(options[:phantomjs_bin])
+      if Jasmine.phantomjs_bin_valid?(options[:phantomjs_bin])
 
         Server.start(options[:server], options[:port], options[:server_env]) unless options[:server] == :none
 
-        if jasmine_runner_available?(options[:jasmine_url])
+        if Jasmine.runner_available?(options[:jasmine_url])
           run_all if options[:all_on_start]
         end
       else
@@ -137,98 +140,5 @@ module Guard
       throw :task_has_failed unless passed
     end
 
-    private
-
-    # Verifies if the Jasmine test runner is available.
-    #
-    # @param [String] url the location of the test runner
-    # @return [Boolean] when the runner is available
-    #
-    def jasmine_runner_available?(url)
-      url = URI.parse(url)
-
-      begin
-        Net::HTTP.start(url.host, url.port) do |http|
-          response = http.request(Net::HTTP::Head.new(url.path))
-
-          if response.code.to_i == 200
-            Formatter.info("Jasmine test runner is available at #{ url }")
-          else
-            notify_failure("Jasmine test runner isn't available", "Jasmine test runner isn't available at #{ url }")
-          end
-
-          response.code.to_i == 200
-        end
-
-      rescue
-        notify_failure("Jasmine test runner isn't available", "Jasmine test runner isn't available at #{ url }")
-
-        false
-      end
-    end
-
-    # Verifies that the phantomjs bin is available and the
-    # right version is installed.
-    #
-    # @param [String] bin the location of the phantomjs bin
-    # @return [Boolean] when the runner is available
-    #
-    def phantomjs_bin_valid?(bin)
-      if bin && !bin.empty?
-        version = `#{ bin } --version`
-
-        if version
-          # Remove all but version, e.g. from '1.5 (development)'
-          version = version.match(/(\d\.)*(\d)/)[0]
-
-          if Gem::Version.new(version) < Gem::Version.new('1.3.0')
-            notify_failure('Wrong PhantomJS version', "PhantomJS executable at #{ bin } must be at least version 1.3.0")
-          else
-            true
-          end
-        else
-          notify_failure('PhantomJS executable missing', "PhantomJS executable doesn't exist at #{ bin }")
-        end
-      else
-        notify_failure('PhantomJS executable missing', "PhantomJS executable couldn't be auto detected.")
-      end
-    end
-
-    # Notify a failure.
-    #
-    # @param title [String] the failure title
-    # @param message [String] the failure message
-    #
-    def notify_failure(title, message)
-      Formatter.error(message)
-      Formatter.notify(message,
-                       :title    => title,
-                       :image    => :failed,
-                       :priority => 2) if options[:notification]
-      false
-    end
-
-    # Cross-platform way of finding an executable in the $PATH.
-    # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-    #
-    # @example
-    #   which('ruby') #=> /usr/bin/ruby
-    #
-    # @param cmd [String] the executable to find
-    # @return [String, nil] the path to the executable
-    #
-    def self.which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = "#{ path }/#{ cmd }#{ ext }"
-          return exe if File.executable?(exe)
-        end
-      end
-
-      nil
-    end
-
   end
 end

data/lib/guard/jasmine/cli.rb

@@ -4,6 +4,7 @@ require 'guard/jasmine/version'
 require 'guard/jasmine/runner'
 require 'guard/jasmine/formatter'
 require 'guard/jasmine/server'
+require 'guard/jasmine/util'
 
 module Guard
   class Jasmine
@@ -15,6 +16,7 @@ module Guard
     # This outputs the specdoc and disables any notifications.
     #
     class CLI < Thor
+      extend Util
 
       default_task :spec
 
@@ -41,7 +43,6 @@ module Guard
       method_option :bin,
                     :type => :string,
                     :aliases => '-b',
-                    :default => '/usr/local/bin/phantomjs',
                     :desc => 'The location of the PhantomJS binary'
 
       method_option :timeout,
@@ -72,7 +73,7 @@ module Guard
 
         runner = {}
         runner[:jasmine_url] = options.url
-        runner[:phantomjs_bin] = options.bin
+        runner[:phantomjs_bin] = options.bin || CLI.which('phantomjs')
         runner[:timeout] = options.timeout
         runner[:port] = options.port
         runner[:server_env] = options.server_env
@@ -84,13 +85,21 @@ module Guard
         runner[:max_error_notify] = 0
         runner[:specdoc] = :always
 
-        ::Guard::Jasmine::Server.start(runner[:server], runner[:port], runner[:server_env]) unless runner[:server] == :none
-        result = ::Guard::Jasmine::Runner.run(paths, runner)
+        if CLI.phantomjs_bin_valid?(runner[:phantomjs_bin])
+          ::Guard::Jasmine::Server.start(runner[:server], runner[:port], runner[:server_env]) unless runner[:server] == :none
 
-        ::Guard::Jasmine::Server.stop
+          if CLI.runner_available?(runner[:jasmine_url])
+            result = ::Guard::Jasmine::Runner.run(paths, runner)
+            ::Guard::Jasmine::Server.stop
 
-        exit_code = result.first ? 0 : 1
-        Process.exit exit_code
+            Process.exit result.first ? 0 : 1
+          else
+            Process.exit 2
+          end
+
+        else
+          Process.exit 2
+        end
 
       rescue Exception => e
         raise e if e.is_a?(SystemExit)

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

@@ -113,6 +113,7 @@ page.onInitialized = ->
         suites: []
       }
 
+      specCount: 0
       currentSpecs: []
       nestedSuiteResults: {}
 
@@ -140,6 +141,7 @@ page.onInitialized = ->
             messages.push result.message for result in spec.results().getItems()
             specResult['messages'] = messages if messages.length isnt 0
 
+          @specCount += 1
           @currentSpecs.push specResult
 
       # Report results from a suite.
@@ -180,7 +182,7 @@ page.onInitialized = ->
         @runnerResult['passed'] = runner.results().failedCount is 0
 
         @runnerResult['stats'] = {
-          specs: runner.results().totalCount
+          specs: @specCount
           failures: runner.results().failedCount
           time: runtime
         }

data/lib/guard/jasmine/util.rb

@@ -0,0 +1,90 @@
+require 'guard/jasmine/formatter'
+
+module Guard
+  class Jasmine
+
+    # Provider of some shared utility methods.
+    #
+    module Util
+
+      # Verifies if the Jasmine test runner is available.
+      #
+      # @param [String] url the location of the test runner
+      # @return [Boolean] when the runner is available
+      #
+      def runner_available?(url)
+        url = URI.parse(url)
+
+        begin
+          Net::HTTP.start(url.host, url.port) do |http|
+            response = http.request(Net::HTTP::Head.new(url.path))
+
+            if response.code.to_i == 200
+              ::Guard::Jasmine::Formatter.info "Jasmine test runner is available at #{ url }"
+            else
+              ::Guard::Jasmine::Formatter.error "Jasmine test runner isn't available at #{ url }"
+            end
+
+            response.code.to_i == 200
+          end
+
+        rescue
+          ::Guard::Jasmine::Formatter.error "Jasmine test runner isn't available at #{ url }"
+
+          false
+        end
+      end
+
+      # Verifies that the phantomjs bin is available and the
+      # right version is installed.
+      #
+      # @param [String] bin the location of the phantomjs bin
+      # @return [Boolean] when the runner is available
+      #
+      def phantomjs_bin_valid?(bin)
+        if bin && !bin.empty?
+          version = `#{ bin } --version`
+
+          if version
+            # Remove all but version, e.g. from '1.5 (development)'
+            version = version.match(/(\d\.)*(\d)/)[0]
+
+            if Gem::Version.new(version) < Gem::Version.new('1.3.0')
+              ::Guard::Jasmine::Formatter.error "PhantomJS executable at #{ bin } must be at least version 1.3.0"
+            else
+              true
+            end
+          else
+            ::Guard::Jasmine::Formatter.error "PhantomJS executable doesn't exist at #{ bin }"
+          end
+        else
+          ::Guard::Jasmine::Formatter.error "PhantomJS executable couldn't be auto detected."
+        end
+      end
+
+      # Cross-platform way of finding an executable in the $PATH.
+      # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+      #
+      # @example
+      #   which('ruby') #=> /usr/bin/ruby
+      #
+      # @param cmd [String] the executable to find
+      # @return [String, nil] the path to the executable
+      #
+      def which(cmd)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = "#{ path }/#{ cmd }#{ ext }"
+            return exe if File.executable?(exe)
+          end
+        end
+
+        nil
+      end
+
+    end
+
+  end
+end

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 = '0.9.8'
+    VERSION = '0.9.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70172271369340 !ruby/object:Gem::Requirement
+  requirement: &70095772257560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70172271369340
+  version_requirements: *70095772257560
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70172271368940 !ruby/object:Gem::Requirement
+  requirement: &70095772257160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172271368940
+  version_requirements: *70095772257160
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &70172271364640 !ruby/object:Gem::Requirement
+  requirement: &70095772256500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172271364640
+  version_requirements: *70095772256500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70172271364160 !ruby/object:Gem::Requirement
+  requirement: &70095772255840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172271364160
+  version_requirements: *70095772255840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70172271363600 !ruby/object:Gem::Requirement
+  requirement: &70095772255220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271363600
+  version_requirements: *70095772255220
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70172271362980 !ruby/object:Gem::Requirement
+  requirement: &70095772254600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271362980
+  version_requirements: *70095772254600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172271362320 !ruby/object:Gem::Requirement
+  requirement: &70095772254000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271362320
+  version_requirements: *70095772254000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70172271361880 !ruby/object:Gem::Requirement
+  requirement: &70095772253460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271361880
+  version_requirements: *70095772253460
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70172271361460 !ruby/object:Gem::Requirement
+  requirement: &70095772253040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271361460
+  version_requirements: *70095772253040
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70172271361000 !ruby/object:Gem::Requirement
+  requirement: &70095772252620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172271361000
+  version_requirements: *70095772252620
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch
@@ -145,6 +145,7 @@ files:
 - lib/guard/jasmine/server.rbc
 - lib/guard/jasmine/task.rb
 - lib/guard/jasmine/templates/Guardfile
+- lib/guard/jasmine/util.rb
 - lib/guard/jasmine/version.rb
 - lib/guard/jasmine/version.rbc
 - lib/guard/jasmine.rb