testbot 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.6
+
+Fixed a bug that caused auto_update not to check for an update after a job had been run.
+
 0.4.5
 
 Made auto_update a bit more reliable.

data/README.markdown

@@ -68,7 +68,7 @@ Using testbot with Rails 3:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.5'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.6'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :test, :features)

data/lib/runner.rb

@@ -4,6 +4,7 @@ require 'macaddr'
 require 'ostruct'
 require File.dirname(__FILE__) + '/shared/ssh_tunnel'
 require File.dirname(__FILE__) + '/adapters/adapter'
+require File.dirname(__FILE__) + '/runner/job'
 
 TIME_BETWEEN_NORMAL_POLLS = 1
 TIME_BETWEEN_QUICK_POLLS = 0.1
@@ -30,42 +31,6 @@ class CPU
 
 end
 
-class Job
-  attr_reader :root, :project, :requester_mac
-    
-  def initialize(runner, id, requester_mac, project, root, type, ruby_interpreter, files)
-    @runner, @id, @requester_mac, @project, @root, @type, @ruby_interpreter, @files =
-         runner, id, requester_mac, project, root, type, ruby_interpreter, files
-  end
-  
-  def jruby?
-    @ruby_interpreter == 'jruby'
-  end
-  
-  def run(instance)
-    puts "Running job #{@id} from #{@requester_mac}... "
-    test_env_number = (instance == 0) ? '' : instance + 1
-    result = "\n#{`hostname`.chomp}:#{Dir.pwd}\n"
-    base_environment = "export RAILS_ENV=test; export TEST_ENV_NUMBER=#{test_env_number}; cd #{@project};"
-    
-    adapter = Adapter.find(@type)
-    result += `#{base_environment} #{adapter.command(@project, ruby_cmd, @files)} 2>&1`
-
-    Server.put("/jobs/#{@id}", :body => { :result => result, :success => ($?.exitstatus == 0) })
-    puts "Job #{@id} finished."
-  end
-  
-  private
-  
-  def ruby_cmd
-    if @ruby_interpreter == 'jruby' && @runner.config.jruby_opts
-      'jruby ' + @runner.config.jruby_opts
-    else
-      @ruby_interpreter
-    end
-  end
-end
-
 class Server
   include HTTParty
 end
@@ -140,8 +105,8 @@ class Runner
       next unless cpu_available?
       
       next_job = Server.get("/jobs/next", :query => next_params) rescue nil
-      next if next_job == nil
-      last_check_found_a_job = true
+      last_check_found_a_job = (next_job != nil)
+      next unless last_check_found_a_job
 
       job = Job.new(*([ self, next_job.split(',') ].flatten))
       if first_job_from_requester?

data/lib/runner/job.rb

@@ -0,0 +1,36 @@
+class Job
+  attr_reader :root, :project, :requester_mac
+    
+  def initialize(runner, id, requester_mac, project, root, type, ruby_interpreter, files)
+    @runner, @id, @requester_mac, @project, @root, @type, @ruby_interpreter, @files =
+         runner, id, requester_mac, project, root, type, ruby_interpreter, files
+  end
+  
+  def jruby?
+    @ruby_interpreter == 'jruby'
+  end
+  
+  def run(instance)
+    puts "Running job #{@id} from #{@requester_mac}... "
+    test_env_number = (instance == 0) ? '' : instance + 1
+    result = "\n#{`hostname`.chomp}:#{Dir.pwd}\n"
+    base_environment = "export RAILS_ENV=test; export TEST_ENV_NUMBER=#{test_env_number}; cd #{@project};"
+    
+    adapter = Adapter.find(@type)
+    result += `#{base_environment} #{adapter.command(@project, ruby_cmd, @files)} 2>&1`
+
+    Server.put("/jobs/#{@id}", :body => { :result => result, :success => ($?.exitstatus == 0) })
+    puts "Job #{@id} finished."
+  end
+  
+  private
+  
+  def ruby_cmd
+    if @ruby_interpreter == 'jruby' && @runner.config.jruby_opts
+      'jruby ' + @runner.config.jruby_opts
+    else
+      @ruby_interpreter
+    end
+  end
+end
+

data/lib/testbot.rb

@@ -9,7 +9,7 @@ unless defined?(Testbot)
 
     # Don't forget to update readme and changelog
     def self.version
-      version = "0.4.5"
+      version = "0.4.6"
       dev_version_file = File.join(File.dirname(__FILE__), '..', 'DEV_VERSION')
       if File.exists?(dev_version_file)
         version += File.read(dev_version_file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -198,6 +198,7 @@ files:
 - lib/new_runner.rb
 - lib/railtie.rb
 - lib/requester.rb
+- lib/runner/job.rb
 - lib/runner.rb
 - lib/server/build.rb
 - lib/server/db.rb