jspec-steventux 3.3.2 → 3.3.2.1

data/bin/jspec

@@ -170,7 +170,8 @@ command :run do |c|
   c.option '-R', '--rhino', 'Run specs using Rhino'
   c.option '-N', '--node', 'Run specs using Node.js'
   c.option '-S', '--server', 'Run specs using the JSpec server'
-  c.option '-P', '--port NUMBER', Integer, 'Start JSpec server using the given port number'
+  c.option '-P', '--port NUMBER', Integer, 'Start JSpec server using the given port number' 
+  c.option '-T', '--timeout NUMBER', Integer, 'Timeout for browsers used in CI testing'
   c.when_called do |args, options|
     JSpec::Project.for('.').run! args.first, options.__hash__
   end

data/jspec-steventux.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec-steventux}
-  s.version = "3.3.2"
+  s.version = "3.3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TJ Holowaychuk, S Laing"]
-  s.date = %q{2010-02-25}
+  s.authors = ["original author TJ Holowaychuk, adaptation for CI testing by S Laing"]
+  s.date = %q{2010-05-18}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{info@laingsolutions.com}

data/src/browsers.rb

@@ -51,7 +51,8 @@ class Browser
   def teardown_linux
     psout = IO.popen "ps -ef | grep #{self.to_s.downcase} | grep -v grep"
     psout.readlines.each { |psline|
-    pid = psline.split(/[\s]+/)[1].to_i
+      pid = psline.split(/[\s]+/)[1].to_i
+      puts "Killing browser process #{pid}"
       Process.kill 9, pid
     }
   end

data/src/project.rb

@@ -197,6 +197,7 @@ module JSpec
 
     def start_server path, options = {}
       options[:port] ||= 4444
+      options[:timeout] ||= 15
       set :port, options[:port]
       set :server, 'Mongrel'
       enable :sessions
@@ -204,7 +205,7 @@ module JSpec
       hook = File.expand_path normalize('server.rb')
       load hook if File.exists? hook
       browsers = browsers_for(options[:browsers]) if options.include? :browsers
-      JSpec::Server.new(path, options[:port]).start(browsers)
+      JSpec::Server.new(path, options[:port], options[:timeout]).start(browsers)
     end
 
     ##

data/src/server.rb

@@ -30,11 +30,17 @@ module JSpec
     
     attr_reader :server
     
+    ##
+    # TTL for browsers
+
+    attr_reader :timeout    
+
+
     ##
     # Initialize.
     
-    def initialize suite, port
-      @suite, @port, @host = suite, port, :localhost
+    def initialize suite, port, timeout
+      @suite, @port, @timeout, @host = suite, port, timeout, :localhost
     end
     
     ##
@@ -50,7 +56,7 @@ module JSpec
     def start browsers = nil
       browsers ||= Browser.subclasses.map { |browser| browser.new }
       browsers.map do |browser|
-        Thread.new {
+	Thread.new {
           sleep 1
           if browser.supported?
             browser.setup
@@ -59,13 +65,13 @@ module JSpec
           end
         }
         Thread.new {
-	        sleep 10
-	        browser.teardown		
-	      }
+          sleep timeout
+          browser.teardown		
+        }
       end.push(Thread.new {
         start!
       }).push(Thread.new {
-	      sleep 10
+	sleep ((timeout * browsers.size) + 1)
         stop!
       }).reverse.each { |thread| thread.join }
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: jspec-steventux
 version: !ruby/object:Gem::Version 
-  version: 3.3.2
+  version: 3.3.2.1
 platform: ruby
 authors: 
-- TJ Holowaychuk, S Laing
+- original author TJ Holowaychuk, adaptation for CI testing by S Laing
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +00:00
+date: 2010-05-18 00:00:00 +01:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency