spassky 0.1.32 → 0.1.33

data/.gitignore

@@ -2,3 +2,4 @@ tmp
 *.swp
 pkg/*
 wurfl/*
+Gemfile.lock

data/README.md

@@ -1,6 +1,9 @@
 # Spassky #
 A distributed web testing tool. We use it at the BBC for testing our web apps on a wide range of mobile devices.
 
+
+![Spassky](https://github.com/BBC/spassky/raw/master/spassky.jpg)
+
 # Installation #
 
 ```
@@ -47,4 +50,4 @@ Physical devices act as test agents, connected permanently to a central server u
 ## Some features that would be nice to have ##
 - Conveniently run QUnit / Jasmine / other tests
 - Run tests on a subset of agents
-- Assertions on network activity (e.g. for caching tests)
+- Assertions on network activity (e.g. for caching tests)

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 
+desc "runs all tests"
 task :default do
   sh "rspec spec --color"
   sh "cucumber"

data/bin/spassky

@@ -5,4 +5,4 @@ require 'rubygems'
 require 'spassky'
 require 'spassky/client/cli'
 
-Spassky::Client::Cli.run(ARGV)
+Commandable.execute(ARGV)

data/features/device_timeout.feature

@@ -21,11 +21,9 @@ Feature: Device Timeout
   Scenario: One device times out
     Given a connected mobile device "ipad"
     When the device disconnects
-    And I run "spassky <host> timed-out.html" with the server host
+    And I run "spassky run timed-out.html <host>" with the server host
     Then the output should contain:
       """
       TIMED OUT timed-out.html on ipad
       """
     And the exit status should be 2
-
-

data/features/list_devices.feature

@@ -7,15 +7,9 @@ Feature: List Connected Devices
     Given a Wireless Universal Resource FiLe
     And a connected mobile device "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"
     And a connected mobile device "Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10"
-    When I run "spassky <host> devices" with the server host
+    When I run "spassky devices <host>" with the server host
     Then the output should contain:
     """
     iPhone (id = apple_iphone_ver1_suba543, mobile_browser = Safari, device_os_version = 1.0)
     iPad (id = apple_ipad_ver1_sub5312110, mobile_browser = Safari, device_os_version = 3.2)
     """
-
-#:id => "apple_iphone_ver1_suba543",
-#:mobile_browser => "Safari",
-#:pointing_method => "touchscreen",
-#:model_name => "iPhone",
-#:device_os_version => "1.0",

data/features/run_html_tests.feature

@@ -34,7 +34,7 @@ Feature: Run HTML Tests
 
   Scenario: No connected devices
     Given I have no connected devices
-    When I run "spassky <host> passing.html" with the server host
+    When I run "spassky run passing.html <host>" with the server host
     Then the output should contain:
       """
       There are no connected devices
@@ -43,7 +43,7 @@ Feature: Run HTML Tests
 
   Scenario: One passing test on one device
     Given a connected mobile device "blackberry"
-    When I run "spassky <host> passing.html" with the server host
+    When I run "spassky run passing.html <host>" with the server host
     Then the output should contain:
       """
       PASS passing.html on blackberry
@@ -53,7 +53,7 @@ Feature: Run HTML Tests
   Scenario: One passing test on two devices
     Given a connected mobile device "blackberry"
     And a connected mobile device "iphone"
-    When I run "spassky <host> passing.html" with the server host
+    When I run "spassky run passing.html <host>" with the server host
     Then the output should contain:
       """
       PASS passing.html on blackberry
@@ -66,7 +66,7 @@ Feature: Run HTML Tests
 
   Scenario: Failing test
     Given a connected mobile device "blackberry"
-    When I run "spassky <host> failing.html" with the server host
+    When I run "spassky run failing.html <host>" with the server host
     Then the output should contain:
       """
       FAIL failing.html on blackberry

data/features/run_qunit_tests.feature

@@ -19,7 +19,7 @@ Feature: Run QUnit Tests
         ok(true, "it passed");
       });
       """
-    And a file named "qunit_passing/qunit_test/qunit.js" with QUnit.js in it
+    And a file named "qunit_passing/qunit_test/qunit.js" with qunit.js in it
     And a file named "qunit_passing/qunit_test/suite.html" with:
       """
       <html>
@@ -32,7 +32,7 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky <host> qunit_passing/qunit_test" with the server host
+    When I run "spassky run qunit_passing/qunit_test <host>" with the server host
     Then the output should contain:
       """
       PASS qunit_test on blackberry
@@ -54,7 +54,7 @@ Feature: Run QUnit Tests
         ok(false, "it failed");
       });
       """
-    And a file named "qunit_failing/qunit_test/qunit.js" with QUnit.js in it
+    And a file named "qunit_failing/qunit_test/qunit.js" with qunit.js in it
     And a file named "qunit_failing/qunit_test/suite.html" with:
       """
       <html>
@@ -67,7 +67,7 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky <host> qunit_failing/qunit_test" with the server host
+    When I run "spassky run qunit_failing/qunit_test <host>" with the server host
     Then the output should contain:
       """
       FAIL qunit_test on blackberry

data/features/server.feature

@@ -1,8 +1,8 @@
 Feature: Server
   In order to spawn a spassky server
   As a developer
-  I want to be able to type 'spassky-server' to launch a server
+  I want to be able to type 'spassky server 9393' to launch a server
 
   Scenario: Launch Server
-    Given I run spassky-server
+    Given I run the command "spassky server 9393"
     Then it should not crash

data/features/step_definitions/steps.rb

@@ -9,6 +9,18 @@ Given /^a connected mobile device "([^"]*)"$/ do |user_agent|
   @last_user_agent = user_agent
 end
 
+Given /^I have two connected devices$/ do
+  1.upto(2) do |device_number|
+    user_agent = "device#{device_number}"
+    register_driver_with_user_agent user_agent
+    using_session(user_agent) do
+      visit '/device/connect'
+      @uri = URI.parse(current_url)
+    end
+    @last_user_agent = user_agent
+  end
+end
+
 Given /^I have no connected devices$/ do
   @uri = URI.parse(current_url)
 end
@@ -49,8 +61,8 @@ When /^the device disconnects$/ do
   end
 end
 
-Given /^I run spassky\-server$/ do
-  @spassky_server_process = ChildProcess.build('./bin/spassky-server')
+Given /^I run the command "spassky server 9393"$/ do
+  @spassky_server_process = ChildProcess.build('./bin/spassky server 9393')
   @spassky_server_process.start
 end
 

data/features/summary.feature

@@ -0,0 +1,37 @@
+Feature: Summary
+  In order to gauge the state of the project
+  As a News stakeholder
+  I want to summarised test results aftr a test run
+
+  Background: Two tests, one passes, one fails
+    Given a file named "passing.html" with:
+      """
+        <html>
+          <head></head>
+          <body>
+          <script type="text/javascript">
+          assert(true, 'this test should pass');
+          </script>
+          </body>
+        </html>
+      """
+    And a file named "failing.html" with:
+      """
+        <html>
+          <head></head>
+          <body>
+          <script type="text/javascript">
+          assert(false, 'this test should fail');
+          </script>
+          </body>
+        </html>
+      """
+
+  Scenario: One test passing on all devices
+    Given I have two connected devices
+    When I run "spassky run passing.html <host>" with the server host
+    Then the output should contain "2 passed"
+
+    #2 passed
+    #2 passed, 1 failed
+    #3 passed, 1 failed, 1 timed out

data/lib/spassky/client/cli.rb

@@ -1,19 +1,38 @@
+require 'spassky'
+require 'spassky/version'
+require 'spassky/server/app'
 require 'spassky/client/device_list_retriever'
 require 'spassky/client/test_runner'
 require 'spassky/client/pusher'
 require 'spassky/client/directory_reader'
+require 'commandable'
 
 module Spassky::Client
   class Cli
-    def self.run(argv)
-      if argv[1] == "devices"
-        DeviceListRetriever.new(argv[0]).get_connected_devices.each do |device|
-          puts device
-        end
-      else
-        writer = argv.include?('--colour') ? ColouredWriter : DefaultWriter
-        TestRunner.new(Pusher.new(argv[0]), writer.new(STDOUT), DirectoryReader.new).run_tests(argv[1])
+    extend Commandable
+
+    DEFAULT_PORT = "9191"
+    DEFAULT_SERVER = "http://localhost:#{DEFAULT_PORT}"
+
+    command "run a test"
+    def run(test, server = DEFAULT_SERVER, colour = false)
+      writer = colour ? ColouredWriter : DefaultWriter
+      pusher = Pusher.new(server)
+      test_runner = TestRunner.new(pusher, writer.new(STDOUT), DirectoryReader.new)
+      test_runner.run_tests(test)
+    end
+
+    command "list devices"
+    def devices(server = DEFAULT_SERVER)
+      Spassky::Client::DeviceListRetriever.new(server).get_connected_devices.each do |device|
+        puts device
       end
     end
+
+    command "run the spassky server"
+    def server(port = DEFAULT_PORT)
+      Spassky::Server::App.set :port, port
+      Spassky::Server::App.run!
+    end
   end
 end

data/lib/spassky/client/test_runner.rb

@@ -11,10 +11,15 @@ module Spassky::Client
     def run_tests(pattern)
       previous_test_result = nil
       test_name = File.basename(pattern)
+      begin
       @pusher.push(:name => test_name, :contents => @directory_reader.read_files(pattern).to_json) do |result|
         handle_test_result(previous_test_result, result)
         previous_test_result = result
       end
+      rescue => error
+        @writer.write_failing(error.message)
+        Kernel.exit(1)
+      end
     end
 
     def handle_test_result(previous_test_result, test_result)

data/lib/spassky/server/device_database.rb

@@ -4,7 +4,7 @@ require "singleton"
 require "fileutils"
 
 module Spassky::Server
-  LATEST = 'http://downloads.sourceforge.net/project/wurfl/WURFL/latest/wurfl-latest.xml.gz'
+  LATEST = 'http://sourceforge.net/projects/wurfl/files/WURFL/2.2/wurfl-2.2.xml.gz/download'
   WURFL_DIRECTORY = File.join(File.dirname(__FILE__), "..", "..", "..", "wurfl")
   WURFL_FILE = File.join(WURFL_DIRECTORY, "wurfl-latest.xml.gz")
 
@@ -20,6 +20,7 @@ module Spassky::Server
     def download_wurfl_file
       FileUtils.mkdir_p(WURFL_DIRECTORY)
       Kernel.puts("Downloading WURFL database")
+      RestClient.proxy = ENV["http_proxy"] if ENV["http_proxy"]
       content = RestClient.get(LATEST)
       File.open(WURFL_FILE, "w") do |file|
         file.write(content)

data/lib/spassky/test_result.rb

@@ -1,3 +1,4 @@
+require 'spassky/test_result_summariser'
 require 'json'
 
 module Spassky
@@ -15,14 +16,6 @@ module Spassky
       "pass"
     end
 
-    def count_fails
-      @device_statuses.count { |s| s.status == "fail" }
-    end
-
-    def count_timeouts
-      @device_statuses.count { |s| s.status == "timed out" }
-    end
-
     def completed_since(older_test_result)
       if older_test_result.nil?
         device_statuses.select { |s| s.completed? }
@@ -31,22 +24,9 @@ module Spassky
       end
     end
 
+
     def summary
-      result = "?"
-      count = @device_statuses.size
-      if count_timeouts > 0
-        result = "1 test timed out on #{count} device"
-      else
-        status = "passed"
-        fail_count = count_fails
-        if fail_count > 0
-          status = "failed"
-          count = fail_count
-        end
-        result = "1 test #{status} on #{count} device"
-      end
-      result << "s" if @device_statuses.size > 1
-      return result
+      TestResultSummariser.new(@device_statuses).summary
     end
 
     def to_json

data/lib/spassky/test_result_summariser.rb

@@ -0,0 +1,22 @@
+module Spassky
+  class TestResultSummariser
+    def initialize device_statuses
+      @device_statuses = device_statuses
+    end
+
+    def summary
+      statuses = []
+      passes = status_count "pass"
+      fails = status_count "fail"
+      timeouts = status_count "timed out"
+      statuses << "#{passes} passed" if passes > 0
+      statuses << "#{fails} failed" if fails > 0
+      statuses << "#{timeouts} timed out" if timeouts > 0
+      statuses.join ", "
+    end
+
+    def status_count status
+      @device_statuses.find_all { |device_status| device_status.status == status }.size
+    end
+  end
+end

data/lib/spassky/version.rb

@@ -1,3 +1,3 @@
 module Spassky
-  VERSION = '0.1.32'
+  VERSION = '0.1.33'
 end

data/spassky.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra'
   s.add_dependency 'rainbow'
   s.add_dependency 'wurfl-lite'
+  s.add_dependency 'commandable'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
@@ -30,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'aruba'
   s.add_development_dependency 'fakefs'
+  s.add_development_dependency 'ruby-debug19'
 end

data/spec/spassky/client/cli_spec.rb

@@ -16,58 +16,86 @@ module Spassky::Client
       TestRunner.stub!(:new).and_return(runner)
     end
 
-    it "creates a pusher with the server url as the first argument" do
-      Pusher.should_receive(:new).with("server_name").and_return(pusher)
-      TestRunner.should_receive(:new).with(pusher, anything(), anything()).and_return(runner)
-      Cli::run(["server_name", "test_name"])
-    end
+    describe "spassky run" do
+      it "creates a pusher with the server url as the first argument" do
+        Pusher.should_receive(:new).with("server_name").and_return(pusher)
+        TestRunner.should_receive(:new).with(pusher, anything(), anything()).and_return(runner)
+        Cli.new.run "test_name", "server_name"
+      end
 
-    it "runs a single test with the name as the second argument" do
-      runner.should_receive(:run_tests).with("test_name")
-      Cli::run(["server_name", "test_name"])
-    end
+      it "runs a single test with the name as the second argument" do
+        runner.should_receive(:run_tests).with("test_name")
+        Cli.new.run "test_name", "server_name"
+      end
 
-    context "without colour output option" do
-      it "creates a test runner with a default writer" do
-        default_writer = mock :default_writer
-        DefaultWriter.should_receive(:new).with(STDOUT).and_return(default_writer)
-        TestRunner.should_receive(:new).with(anything(), default_writer, anything())
-        Cli::run(["server_name", "test_name"])
+      context "without colour output option" do
+        it "creates a test runner with a default writer" do
+          default_writer = mock :default_writer
+          DefaultWriter.should_receive(:new).with(STDOUT).and_return(default_writer)
+          TestRunner.should_receive(:new).with(anything(), default_writer, anything())
+          Cli.new.run "test_name", "server_name"
+        end
       end
-    end
 
-    context "with colour output option" do
-      it "creates a test runner with a colour writer" do
-        coloured_writer = mock :coloured_writer
-        ColouredWriter.should_receive(:new).with(STDOUT).and_return(coloured_writer)
-        TestRunner.should_receive(:new).with(anything(), coloured_writer, anything())
-        Cli::run(["server_name", "test_name", "--colour"])
+      context "with colour output option" do
+        it "creates a test runner with a colour writer" do
+          coloured_writer = mock :coloured_writer
+          ColouredWriter.should_receive(:new).with(STDOUT).and_return(coloured_writer)
+          TestRunner.should_receive(:new).with(anything(), coloured_writer, anything())
+          Cli.new.run "test_name", "server_name", "--colour"
+        end
       end
     end
 
-    context "with devices as the second argument" do
+    context "spassky devices" do
       it "creates a new device list retriever with the passed in url" do
         device_list_retriever = mock :device_list_retriever
         device_list_retriever.stub!(:get_connected_devices).and_return([])
         DeviceListRetriever.should_receive(:new).with("http://localhost:9000").and_return(device_list_retriever)
-        Cli::run(["http://localhost:9000", "devices"])
+        Cli.new.devices "http://localhost:9000"
       end
 
       it "gets a list of devices" do
         device_list_retriever = mock :device_list_retriever
         device_list_retriever.should_receive(:get_connected_devices).and_return([])
         DeviceListRetriever.stub!(:new).and_return(device_list_retriever)
-        Cli::run(["http://localhost:9000", "devices"])
+        Cli.new.devices "http://localhost:9000"
       end
 
       it "outputs a list of devices" do
         device_list_retriever = mock :device_list_retriever
         device_list_retriever.stub!(:get_connected_devices).and_return(["iphone", "ipad", "nokia"])
         DeviceListRetriever.stub!(:new).and_return(device_list_retriever)
-        Cli.should_receive(:puts).with("iphone")
-        Cli.should_receive(:puts).with("ipad")
-        Cli.should_receive(:puts).with("nokia")
-        Cli::run(["http://localhost:9000", "devices"])
+        cli = Cli.new
+        cli.should_receive(:puts).with("iphone")
+        cli.should_receive(:puts).with("ipad")
+        cli.should_receive(:puts).with("nokia")
+        cli.devices "http://localhost:9000"
+      end
+    end
+
+    context "spassky server" do
+      before do
+        Spassky::Server::App.stub!(:run!)
+      end
+
+      context "without a port specified" do
+        it "sets the default port" do
+          Spassky::Server::App.should_receive(:set).with(:port, Cli::DEFAULT_PORT)
+          Cli.new.server
+        end
+      end
+
+      context "with a port specified" do
+        it "uses the specified port" do
+          Spassky::Server::App.should_receive(:set).with(:port, 9393)
+          Cli.new.server(9393)
+        end
+      end
+
+      it "launches the server" do
+        Spassky::Server::App.should_receive(:run!)
+        Cli.new.server
       end
     end
   end

data/spec/spassky/client/test_runner_spec.rb

@@ -81,6 +81,22 @@ module Spassky::Client
       end
     end
 
+    context "server pusher raises exception" do
+      before do
+        @test_pusher.stub!(:push).and_raise("hell")
+      end
+
+      it "writes out the error" do
+        @writer.should_receive(:write_failing).with("hell")
+        @test_runner.run_tests("foo_test")
+      end
+
+      it "exits with an error code" do
+        Kernel.should_receive(:exit).with(1)
+        @test_runner.run_tests("foo_test")
+      end
+    end
+
     context "in progress" do
       it "writes nothing" do
         @test_pusher.stub!(:push).and_yield(new_in_progress_test_result)

data/spec/spassky/test_result_spec.rb

@@ -9,13 +9,12 @@ module Spassky
       end
     end
 
-    context "when one device passes" do
-      it "outputs a summary" do
-        test_result = TestResult.new([
-          Spassky::DeviceTestStatus.new('agent1', 'pass', 'test')
-        ])
-        test_result.summary.should == "1 test passed on 1 device"
-      end
+    it "has a summary" do
+      device_statuses = stub(:device_statuses)
+      test_result_summariser = stub(:test_result_summariser)
+      test_result_summariser.stub!(:summary).and_return("the summary")
+      TestResultSummariser.stub!(:new).with(device_statuses).and_return(test_result_summariser)
+      TestResult.new(device_statuses).summary.should == "the summary"
     end
 
     context "when all devices pass" do
@@ -25,14 +24,6 @@ module Spassky
           Spassky::DeviceTestStatus.new('agent2', 'pass', 'test')
         ]).status.should == "pass"
       end
-
-      it "outputs a pluralised summary" do
-        test_result = TestResult.new([
-          Spassky::DeviceTestStatus.new('agent1', 'pass', 'test'),
-          Spassky::DeviceTestStatus.new('agent2', 'pass', 'test')
-        ])
-        test_result.summary.should == "1 test passed on 2 devices"
-      end
     end
 
     context "when any device fails" do
@@ -42,13 +33,6 @@ module Spassky
           Spassky::DeviceTestStatus.new('agent2', 'fail', 'test')
         ]).status.should == "fail"
       end
-
-      it "outputs a summary" do
-        test_result = TestResult.new([
-          Spassky::DeviceTestStatus.new('agent1', 'fail', 'test')
-        ])
-        test_result.summary.should == "1 test failed on 1 device"
-      end
     end
 
     context "when any test is still in progress" do
@@ -62,13 +46,6 @@ module Spassky
     end
 
     context "when 1 test times out" do
-      it "outputs the correct summary" do
-        test_result = TestResult.new([
-          Spassky::DeviceTestStatus.new('agent1', 'timed out', 'test')
-        ])
-        test_result.summary.should == "1 test timed out on 1 device"
-      end
-
       it "has the status 'timed out'" do
         test_result = TestResult.new([
           Spassky::DeviceTestStatus.new('agent1', 'timed out', 'test'),

data/spec/spassky/test_result_summariser_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+module Spassky
+  describe TestResultSummariser do
+    it "shows passing tests" do
+      device_statuses = [
+        DeviceTestStatus.new('agent1', 'pass', 'test'),
+        DeviceTestStatus.new('agent2', 'pass', 'test')
+      ]
+      TestResultSummariser.new(device_statuses).summary.should == "2 passed"
+    end
+
+    it "shows failing tests" do
+      device_statuses = [
+        DeviceTestStatus.new('agent1', 'fail', 'test'),
+        DeviceTestStatus.new('agent2', 'fail', 'test')
+      ]
+      TestResultSummariser.new(device_statuses).summary.should == "2 failed"
+    end
+
+    it "shows timed out tests" do
+      device_statuses = [
+        DeviceTestStatus.new('agent1', 'timed out', 'test'),
+        DeviceTestStatus.new('agent2', 'timed out', 'test')
+      ]
+      TestResultSummariser.new(device_statuses).summary.should == "2 timed out"
+    end
+
+    it "shows failed, passed and timed out tests" do
+      device_statuses = [
+        DeviceTestStatus.new('agent1', 'pass', 'test'),
+        DeviceTestStatus.new('agent2', 'pass', 'test'),
+        DeviceTestStatus.new('agent3', 'fail', 'test'),
+        DeviceTestStatus.new('agent4', 'fail', 'test'),
+        DeviceTestStatus.new('agent5', 'timed out', 'test'),
+        DeviceTestStatus.new('agent6', 'timed out', 'test')
+      ]
+      TestResultSummariser.new(device_statuses).summary.should == "2 passed, 2 failed, 2 timed out"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70267217719360 !ruby/object:Gem::Requirement
+  requirement: &2168560600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267217719360
+  version_requirements: *2168560600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70267217718940 !ruby/object:Gem::Requirement
+  requirement: &2168560040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267217718940
+  version_requirements: *2168560040
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70267217718520 !ruby/object:Gem::Requirement
+  requirement: &2168559360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267217718520
+  version_requirements: *2168559360
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70267217718100 !ruby/object:Gem::Requirement
+  requirement: &2168558800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267217718100
+  version_requirements: *2168558800
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &70267217717680 !ruby/object:Gem::Requirement
+  requirement: &2168558160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +67,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267217717680
+  version_requirements: *2168558160
+- !ruby/object:Gem::Dependency
+  name: commandable
+  requirement: &2168557360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2168557360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70267217717260 !ruby/object:Gem::Requirement
+  requirement: &2168556680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217717260
+  version_requirements: *2168556680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70267217716840 !ruby/object:Gem::Requirement
+  requirement: &2168556160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217716840
+  version_requirements: *2168556160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70267217716420 !ruby/object:Gem::Requirement
+  requirement: &2168555260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217716420
+  version_requirements: *2168555260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70267217716000 !ruby/object:Gem::Requirement
+  requirement: &2168554560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217716000
+  version_requirements: *2168554560
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70267217715580 !ruby/object:Gem::Requirement
+  requirement: &2168553980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +133,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217715580
+  version_requirements: *2168553980
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70267217715160 !ruby/object:Gem::Requirement
+  requirement: &2168553200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2168553200
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &2168552160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,25 +155,22 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267217715160
+  version_requirements: *2168552160
 description: ''
 email:
 - andrew.vos@gmail.com
 executables:
 - spassky
-- spassky-server
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/spassky
-- bin/spassky-server
 - config.ru
 - examples/qunit-failing/main.js
 - examples/qunit-failing/qunit.js
@@ -167,6 +185,7 @@ files:
 - features/run_qunit_tests.feature
 - features/server.feature
 - features/step_definitions/steps.rb
+- features/summary.feature
 - features/support/env.rb
 - features/support/fixtures/qunit.js
 - lib/spassky.rb
@@ -186,8 +205,10 @@ files:
 - lib/spassky/server/random_string_generator.rb
 - lib/spassky/server/test_run.rb
 - lib/spassky/test_result.rb
+- lib/spassky/test_result_summariser.rb
 - lib/spassky/version.rb
 - spassky.gemspec
+- spassky.jpg
 - spec/spassky/client/cli_spec.rb
 - spec/spassky/client/device_list_retriever_spec.rb
 - spec/spassky/client/directory_reader_spec.rb
@@ -200,8 +221,8 @@ files:
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
 - spec/spassky/test_result_spec.rb
+- spec/spassky/test_result_summariser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/BBC/spassky
 licenses: []
 post_install_message: 
@@ -222,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spassky
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ''
@@ -234,6 +255,7 @@ test_files:
 - features/run_qunit_tests.feature
 - features/server.feature
 - features/step_definitions/steps.rb
+- features/summary.feature
 - features/support/env.rb
 - features/support/fixtures/qunit.js
 - spec/spassky/client/cli_spec.rb
@@ -248,4 +270,5 @@ test_files:
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
 - spec/spassky/test_result_spec.rb
+- spec/spassky/test_result_summariser_spec.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    spassky (0.1.3)
-      json
-      rainbow
-      rest-client
-      sinatra
-      wurfl-lite
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    amatch (0.2.7)
-      spruz (~> 0.2)
-    aruba (0.4.3)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
-    builder (3.0.0)
-    capybara (1.0.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    cucumber (1.0.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    fakefs (0.3.2)
-    ffi (1.0.9)
-    gherkin (2.4.5)
-      json (>= 1.4.6)
-    hpricot (0.8.4)
-    json (1.5.3)
-    json_pure (1.5.3)
-    mime-types (1.16)
-    nokogiri (1.5.0)
-    rack (1.3.1)
-    rack-test (0.6.0)
-      rack (>= 1.0)
-    rainbow (1.1.1)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.2.2)
-      childprocess (>= 0.1.9)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    spruz (0.2.13)
-    term-ansicolor (1.0.5)
-    tilt (1.3.2)
-    wurfl-lite (1.1.0)
-      amatch (>= 0.2.5)
-      hpricot (!= 0.8.3, >= 0.8.2)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  capybara
-  cucumber
-  fakefs
-  rake
-  rspec
-  spassky!

data/bin/spassky-server

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'spassky'
-require 'spassky/server/app'
-
-if ARGV[0] == "--port" || ARGV[0] == "-p"
-  PORT = ARGV[1]
-end
-PORT ||= 9191
-
-Spassky::Server::App.set :port, PORT
-Spassky::Server::App.run!