testbot 0.3.7 → 0.3.8.pre

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.8
+
+Testbot now uses exit code to determine if the test run has failed.
+
 0.3.7
 
 The runner now checks right away for another job if it got one last time around.

data/lib/requester.rb

@@ -84,13 +84,12 @@ class Requester
 
       last_results_size = @build['results'].size
 
-      success = false if failed_build?(@build)
       break if @build['done']
     end
 
     puts if config.simple_output
 
-    success
+    @build["success"]
   end
 
   def self.create_by_config(path)
@@ -120,18 +119,10 @@ class Requester
     [ '0.0.0.0', 'localhost', '127.0.0.1' ].include?(config.server_host)
   end
 
-  def failed_build?(build)
-    result_lines.any? { |line| line_is_failure?(line) }
-  end
-
   def line_is_result?(line)
     line =~ /\d+ fail/
   end
 
-  def line_is_failure?(line)
-    line =~ /(\d{2,}|[1-9]) (fail|error)/
-  end
-
   def jruby?
     RUBY_PLATFORM =~ /java/ || !!ENV['USE_JRUBY']
   end

data/lib/runner.rb

@@ -51,7 +51,7 @@ class Job
     adapter = Adapter.find(@type)
     result += `#{base_environment} #{adapter.command(ruby_cmd, @files)} 2>&1`
 
-    Server.put("/jobs/#{@id}", :body => { :result => result })
+    Server.put("/jobs/#{@id}", :body => { :result => result, :success => ($?.exitstatus == 0) })
     puts "Job #{@id} finished."
   end
   

data/lib/server.rb

@@ -29,7 +29,7 @@ end
 get '/builds/:id' do
   build = Build.find(:id => params[:id].to_i)
   build.destroy if build[:done]
-  { "done" => build[:done], "results" => build[:results] }.to_json
+  { "done" => build[:done], "results" => build[:results], "success" => build[:success] }.to_json
 end
 
 get '/jobs/next' do
@@ -41,7 +41,7 @@ get '/jobs/next' do
 end
 
 put '/jobs/:id' do
-  Job.find(:id => params[:id].to_i).update(:result => params[:result]); nil
+  Job.find(:id => params[:id].to_i).update(:result => params[:result], :success => params[:success]); nil
 end
 
 get '/runners/ping' do

data/lib/server/db.rb

@@ -12,6 +12,7 @@ DB.create_table :builds do
   String :type
   String :requester_mac
   Integer :jruby
+  Boolean :success, :default => true
   Boolean :done, :default => false
 end
 
@@ -27,6 +28,7 @@ DB.create_table :jobs do
   Integer :jruby
   Integer :build_id
   Integer :taken_by_id
+  Boolean :success
   Datetime :taken_at, :default => nil
 end
 

data/lib/server/job.rb

@@ -7,6 +7,9 @@ class Job < Sequel::Model
       done = Job.filter([ "result IS NULL AND build_id = ?", self[:build_id] ]).count == 0
       build.update(:results => build[:results].to_s + hash[:result].to_s,
                    :done => done)
+
+      build_broken_by_job = (hash[:success] == "false" && build[:success])
+      build.update(:success => false) if build_broken_by_job
     end
   end
   

data/lib/testbot.rb

@@ -8,7 +8,7 @@ unless defined?(Testbot)
     require 'railtie' if defined?(Rails)
 
     # Don't forget to update readme and changelog
-    VERSION = "0.3.7"
+    VERSION = "0.3.8.pre"
 
     SERVER_PID = "/tmp/testbot_server.pid"
     RUNNER_PID = "/tmp/testbot_runner.pid"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 961916028
+  prerelease: true
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  - pre
+  version: 0.3.8.pre
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -218,12 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: