guard-jasmine 1.19.2 → 2.0.0beta1

data/lib/guard/jasmine/server.rb

@@ -3,6 +3,7 @@
 require 'socket'
 require 'timeout'
 require 'childprocess'
+require 'jasmine'
 
 module Guard
   class Jasmine
@@ -53,13 +54,27 @@ module Guard
           end
         end
 
+        # A port was not specified, therefore we attempt to detect the best port to use
+        # @param [Hash] options the server options
+        # @option options [Symbol] server the rack server to use
+        # @return [Integer] port number
+        def choose_server_port(options)
+          if options[:server] == :jasmine_gem
+            ::Jasmine.config.port(:server)
+          else
+            ::Guard::Jasmine.find_free_server_port
+          end
+        end
+
         # Detect the server to use
         #
         # @param [String] spec_dir the spec directory
         # @return [Symbol] the server strategy
         #
         def detect_server(spec_dir)
-          if File.exists?('config.ru')
+          if spec_dir && File.exists?(File.join(spec_dir, 'support','jasmine.yml'))
+            :jasmine_gem
+          elsif File.exists?('config.ru')
             %w(unicorn thin mongrel puma).each do |server|
               begin
                 require server
@@ -69,8 +84,6 @@ module Guard
               end
             end
             :webrick
-          elsif spec_dir && File.exists?(File.join(spec_dir, 'support', 'jasmine.yml'))
-            :jasmine_gem
           else
             :none
           end
@@ -136,6 +149,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 }."
 
           self.process = ChildProcess.build('ruby', '-S', 'rake', task, "JASMINE_PORT=#{ port }")

data/lib/guard/jasmine/util.rb

@@ -86,13 +86,7 @@ module Guard
       # @return [Integer] a free server port
       #
       def find_free_server_port
-        server = TCPServer.new('127.0.0.1', 0)
-        port   = server.addr[1]
-        server.close
-
-        port
-      rescue Errno::EADDRINUSE
-        retry
+        ::Jasmine.find_unused_port
       end
 
       # Cross-platform way of finding an executable in the $PATH.

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.19.2'
+    VERSION = '2.0.0beta1'
   end
 end

metadata

@@ -1,37 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 2.0.0beta1
 platform: ruby
 authors:
 - Michael Kessler
+- Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: jasmine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,13 +110,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: childprocess
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,13 +138,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +152,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-shell
+  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: guard-rspec
+  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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,6 +210,7 @@ dependencies:
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@flinkfinger.com
+- nathan@stitt.org
 executables:
 - guard-jasmine
 - guard-jasmine-debug
@@ -107,23 +221,18 @@ files:
 - README.md
 - bin/guard-jasmine
 - bin/guard-jasmine-debug
+- lib/generators/guard_jasmine/install_generator.rb
+- lib/generators/guard_jasmine/templates/Guardfile
 - lib/guard/jasmine.rb
 - lib/guard/jasmine/cli.rb
 - lib/guard/jasmine/coverage.rb
 - lib/guard/jasmine/formatter.rb
 - lib/guard/jasmine/inspector.rb
-- lib/guard/jasmine/phantomjs/guard-jasmine.coffee
 - lib/guard/jasmine/phantomjs/guard-jasmine.js
-- lib/guard/jasmine/phantomjs/lib/console.js
-- lib/guard/jasmine/phantomjs/lib/junit_reporter.js
-- lib/guard/jasmine/phantomjs/lib/reporter.js
-- lib/guard/jasmine/phantomjs/lib/result.js
-- lib/guard/jasmine/phantomjs/src/console.coffee
-- lib/guard/jasmine/phantomjs/src/reporter.coffee
-- lib/guard/jasmine/phantomjs/src/result.coffee
-- lib/guard/jasmine/phantomjs/test/console_spec.coffee
-- lib/guard/jasmine/phantomjs/test/reporter_spec.coffee
-- lib/guard/jasmine/phantomjs/test/result_spec.coffee
+- lib/guard/jasmine/phantomjs/guard-reporter.js
+- lib/guard/jasmine/phantomjs/src/guard-jasmine.coffee
+- lib/guard/jasmine/phantomjs/src/guard-reporter.coffee
+- lib/guard/jasmine/phantomjs/test/guard-reporter_spec.coffee
 - lib/guard/jasmine/runner.rb
 - lib/guard/jasmine/server.rb
 - lib/guard/jasmine/task.rb
@@ -150,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Guard gem for headless testing with Jasmine

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

@@ -1,193 +0,0 @@
-# This file is the script that runs within PhantomJS, requests the Jasmine specs
-# and waits until they are ready.
-phantom.injectJs 'lib/result.js'
-
-# Set default values
-options =
-  url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine'
-  timeout: parseInt(phantom.args[1] || 10000)
-  specdoc: phantom.args[2] || 'failure'
-  focus: /true/i.test phantom.args[3]
-  console: phantom.args[4] || 'failure'
-  errors: phantom.args[5] || 'failure'
-  junit: /true/i.test phantom.args[6]
-  junit_consolidate: /true/i.test phantom.args[7]
-  junit_save_path: phantom.args[8] || ''
-
-# Create the web page.
-#
-page = require('webpage').create()
-
-# Used to collect log messages for later assignment to the spec
-#
-currentSpecId = -1
-logs = {}
-errors = {}
-resultsKey = "__jr" + Math.ceil(Math.random() * 1000000)
-fs = require("fs")
-
-# Catch JavaScript errors
-#
-page.onError = (msg, trace) ->
-  if currentSpecId
-    errors[currentSpecId] ||= []
-    errors[currentSpecId].push({ msg: msg, trace: trace })
-
-# Capture console.log output to add it to
-# the result when specs have finished.
-#
-page.onConsoleMessage = (msg, line, source) ->
-  if /^RUNNER_END$/.test(msg)
-    result = page.evaluate -> window.reporter.runnerResult
-    console.log JSON.stringify(new Result(result, logs, errors, options).process())
-    page.evaluate -> window.resultReceived = true
-
-  else if /^SPEC_START: (\d+)$/.test(msg)
-    currentSpecId = Number(RegExp.$1)
-
-  else
-    logs[currentSpecId] ||= []
-    logs[currentSpecId].push(msg)
-
-# Initialize the page before the JavaScript is run.
-#
-page.onInitialized = ->
-  overloadPageEvaluate(page)
-  setupWriteFileFunction(page, resultsKey, fs.separator)
-
-  page.injectJs 'lib/console.js'
-  page.injectJs 'lib/reporter.js'
-  page.injectJs 'lib/junit_reporter.js'
-
-  setupReporters = ->
-    # Attach the console reporter when the document is ready.
-    window.onload = ->
-      window.onload = null
-      window.resultReceived = false
-      window.reporter = new ConsoleReporter()
-      if window.jasmine
-        jasmine.getEnv().addReporter(new JUnitXmlReporter("%save_path%", "%consolidate%"))
-        jasmine.getEnv().addReporter(window.reporter)
-
-  page.evaluate(setupReporters, {save_path: options.junit_save_path, consolidate: options.junit_consolidate})
-
-
-getXmlResults = (page, key) ->
-  getWindowObj = ->
-    window["%resultsObj%"] || {}
-  page.evaluate getWindowObj, {resultsObj: key}
-
-replaceFunctionPlaceholders= (fn, replacements) ->
-  if replacements && typeof replacements == 'object'
-    fn = fn.toString()
-    for p of replacements
-      if replacements.hasOwnProperty(p)
-        match = new RegExp("%" + p + "%", "g")
-        loop
-          fn = fn.replace(match, replacements[p])
-          break unless fn.indexOf(match) != -1
-  fn
-
-overloadPageEvaluate = (page) ->
-  page._evaluate = page.evaluate
-  page.evaluate = (fn, replacements) ->
-    page._evaluate(replaceFunctionPlaceholders(fn, replacements))
-  page
-
-setupWriteFileFunction= (page,key, path_separator) ->
-  saveData = () ->
-     window["%resultsObj%"] = {}
-     window.fs_path_separator = "%fs_path_separator%"
-     window.__phantom_writeFile = (filename, text) ->
-         window["%resultsObj%"][filename] = text;
-
-  page.evaluate saveData, {resultsObj: key, fs_path_separator: path_separator}
-
-# Open web page and run the Jasmine test runner
-#
-page.open options.url, (status) ->
-  # Avoid that a failed iframe load breaks the runner, see https://github.com/netzpirat/guard-jasmine/pull/19
-  page.onLoadFinished = ->
-  if status isnt 'success'
-    console.log JSON.stringify({ error: "Unable to access Jasmine specs at #{ options.url }" })
-    phantom.exit()
-  else
-    waitFor jasmineReady, jasmineAvailable, options.timeout, jasmineMissing
-
-# Test if the jasmine has been loaded
-#
-jasmineReady = ->
-  page.evaluate -> window.jasmine
-
-# Start specs after they are have been loaded
-#
-jasmineAvailable = ->
-  waitFor specsReady, specsDone, options.timeout, specsTimedout
-
-# Error message for when jasmine never loaded asynchronously
-#
-jasmineMissing = ->
-  text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
-
-  if text
-    error = """
-            The Jasmine reporter is not available!
-
-            #{ text }
-            """
-    console.log JSON.stringify({ error: error })
-  else
-    console.log JSON.stringify({ error: 'The Jasmine reporter is not available!' })
-
-# Test if the specs have finished.
-#
-specsReady = ->
-  page.evaluate -> window.resultReceived
-
-# Error message for when specs time out
-#
-specsTimedout = ->
-  text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
-  if text
-    error = """
-            Timeout waiting for the Jasmine test results!
-
-            #{ text }
-            """
-    console.log JSON.stringify({ error: error })
-  else
-    console.log JSON.stringify({ error: 'Timeout for the Jasmine test results!' })
-
-specsDone = ->
-  if options.junit == true
-    xml_results = getXmlResults(page, resultsKey)
-    for filename of xml_results
-      if xml_results.hasOwnProperty(filename) && (output = xml_results[filename]) && typeof(output) == 'string'
-        fs.write(filename, output, 'w')
-
-  phantom.exit()
-
-# Wait until the test condition is true or a timeout occurs.
-#
-# @param [Function] test the test that returns true if condition is met
-# @param [Function] ready the action when the condition is fulfilled
-# @param [Number] timeout the max amount of time to wait in milliseconds
-#
-waitFor = (test, ready, timeout = 10000, timeoutFunction) ->
-  start = Date.now()
-  condition = false
-  interval = undefined
-
-  wait = ->
-    if (Date.now() - start < timeout) and not condition
-      condition = test()
-    else
-      clearInterval interval
-
-      if condition
-        ready()
-      else
-        timeoutFunction()
-        phantom.exit(1)
-
-  interval = setInterval wait, 250