jstd-runner 0.0.2 → 0.0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010 FINN.no AS
+Copyright 2010-2011 FINN.no AS
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.rdoc

@@ -22,4 +22,4 @@ A gem that provides a tool to launch a JsTestDriver server, capture browser(s) a
 
 == Copyright
 
-Copyright (c) 2010 FINN.no. See LICENSE for details.
+Copyright (c) 2010-2011 FINN.no. See LICENSE for details.

data/jstd-runner.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
 
-  s.add_dependency "selenium-webdriver", "0.1.0"
+  s.add_dependency "selenium-webdriver", ">= 0.1.4"
   s.add_dependency "eventmachine", "0.12.10"
   s.add_dependency "mail", "2.2.10"
   s.add_dependency "daemons", "1.1.0"

data/lib/jstd-runner/browser.rb

@@ -39,23 +39,24 @@ module JstdRunner
     def running?
       Log.info "browser state: #{status}"
       true
-    rescue
+    rescue => ex
+      Log.warn "#{self}#running? caught #{ex.message}"
       false
     end
 
     def status
-      status_span.text
+      status_spans.map { |e| e.text }.inspect
     end
 
     private
 
-    def status_span
+    def status_spans
       unless @switched
-        @browser.switch_to.frame("0")
+        @browser.switch_to.frame(@browser.find_element(:tag_name => "frame"))
         @switched = true
       end
 
-      @browser.find_element(:tag_name => "span")
+      @browser.find_elements(:tag_name => "span")
     end
 
   end

data/lib/jstd-runner/cli.rb

@@ -39,6 +39,10 @@ module JstdRunner
         op.on("-n", "--notify email1,email2,email3", Array) do |emails|
           runner.options[:emails] = emails
         end
+
+        op.on("-r", "--restart hour:minute") do |hour_minute|
+          runner.options[:restart_at] = hour_minute
+        end
       }.parse!(args)
     end
 

data/lib/jstd-runner/runner.rb

@@ -6,7 +6,8 @@ module JstdRunner
       :vnc              => false,
       :monitor_interval => 10,
       :browser          => :firefox,
-      :daemonize        => false
+      :daemonize        => false,
+      :restart_at       => nil
     }
 
     attr_reader :options
@@ -26,6 +27,7 @@ module JstdRunner
         start_server
         start_browser
         capture_browser
+        setup_restarts if options[:restart_at]
       }
     end
 
@@ -94,6 +96,7 @@ module JstdRunner
 
     def start_browser
       start_vnc if options[:vnc]
+
       browser.start
       browser.monitor(options[:monitor_interval]) {
         browser.restart
@@ -111,6 +114,20 @@ module JstdRunner
       browser.stop
     end
 
+    def setup_restarts
+      EM.daily options[:restart_at] do
+        Log.warn "daily restart"
+        restart
+        Log.warn "daily restart finished."
+      end
+    end
+
+    def restart
+      browser.restart
+      server.restart
+      capture_browser
+    end
+
     def start_vnc
       vnc.start
       ENV['DISPLAY'] = vnc.display

data/lib/jstd-runner/server.rb

@@ -8,7 +8,7 @@ module JstdRunner
     class StopError < StandardError
     end
 
-    JAR            = File.expand_path("../JsTestDriver-1.2.2.jar", __FILE__)
+    JAR            = File.expand_path("../JsTestDriver-1.3.2.jar", __FILE__)
     LAUNCH_TIMEOUT = 120 # this is huge, but I've seen it happen
 
     attr_reader :host, :port

data/lib/jstd-runner/version.rb

@@ -1,3 +1,3 @@
 module JstdRunner
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/jstd-runner.rb

@@ -1,6 +1,7 @@
 require "logger"
 require "optparse"
 require "etc"
+require 'time'
 
 module JstdRunner
   Log = Logger.new(STDOUT)
@@ -25,3 +26,17 @@ require "jstd-runner/server"
 require "jstd-runner/runner"
 
 
+module EventMachine
+  def self.daily at, &blk
+    time = Time.parse(at) - Time.now
+    time += 86400 if time < 0
+
+    EM.run do
+      run_me = proc{
+        EM.add_timer(86400, run_me)
+        blk.call
+      }
+      EM.add_timer(time, run_me)
+    end
+  end
+end

data/spec/jstd-runner/cli_spec.rb

@@ -43,5 +43,10 @@ module JstdRunner
       runner.should_receive(:run)
       cli.run
     end
+
+    it "configures restarts" do
+      cli "--restart 01:15"
+      runner.options[:restart_at].should == "01:15"
+    end
   end
 end

data/spec/jstd-runner/runner_spec.rb

@@ -35,6 +35,23 @@ module JstdRunner
       runner.run
     end
 
+    it "sets up restarts" do
+      browser = mock(Browser).as_null_object
+      server = mock(Server, :host => "localhost", :port => 1234).as_null_object
+
+      runner.stub!(:browser).and_return browser
+      runner.stub!(:server).and_return server
+
+      EM.should_receive(:daily).with("01:15").and_yield
+      runner.options[:restart_at] = "01:15"
+
+      server.should_receive(:restart)
+      browser.should_receive(:restart)
+      browser.should_receive(:capture).with("localhost", 1234).twice
+
+      runner.run
+    end
+
     # TODO: more specs here
   end
 end

data/spec/jstd-runner/server_spec.rb

@@ -8,6 +8,10 @@ module JstdRunner
     let(:connected_poller) { mock(:connected? => true, :closed? => false) }
     let(:closed_poller) {  mock(:connected? => false, :closed? => true) }
 
+    it "has a correct reference to the bundled jar" do
+      File.exist?(Server::JAR).should be_true
+    end
+
     it "launches the server on the given port" do
       server.stub!(:immediate_poller => closed_poller)
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jstd-runner
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
-default_executable: 
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
@@ -23,13 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+        version: 0.1.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id002
@@ -55,10 +42,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 10
         version: 2.2.10
   type: :runtime
   version_requirements: *id003
@@ -70,10 +53,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id004
@@ -85,10 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id005
@@ -111,7 +86,7 @@ files:
 - bin/jstd-runner
 - jstd-runner.gemspec
 - lib/jstd-runner.rb
-- lib/jstd-runner/JsTestDriver-1.2.2.jar
+- lib/jstd-runner/JsTestDriver-1.3.2.jar
 - lib/jstd-runner/browser.rb
 - lib/jstd-runner/cli.rb
 - lib/jstd-runner/monitorable.rb
@@ -126,7 +101,6 @@ files:
 - spec/jstd-runner/server_spec.rb
 - spec/jstd-runner/vnc_control_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jarib/jstd-runner
 licenses: []
 
@@ -140,23 +114,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: JsTestDriver wrapper
 test_files: []
 
+has_rdoc: