testbot 0.6.5 → 0.6.6

data/CHANGELOG

@@ -1,3 +1,15 @@
+0.6.6
+
+The runner will now run config/testbot/before_run.rb if it exists.
+
+Replaced the old process code with the posix-spawn gem's methods. This fixed
+process shutdown in my current setup. Hopefully more stable overall.
+
+The requester will now request that the build is stopped when exiting early (like when killed),
+and not only on ctrl+c (SIGINT).
+
+Most of this was based on a fork by https://github.com/Skalar.
+
 0.6.5
 
 Fixed test unit require path so that it works with ruby 1.9.

data/README.markdown

@@ -67,7 +67,7 @@ Using testbot with Rails 2:
 
     # Add testbot to your Gemfile if you use bundler. You also need the plugin because
     # Rails 2 does not load raketasks from gems.
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.5'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.6'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)
@@ -140,4 +140,3 @@ More
 ----
 
 * Check the [wiki](http://github.com/joakimk/testbot/wiki) for more info.
-* Chat: [https://convore.com/github/testbot](https://convore.com/github/testbot)

data/lib/requester/requester.rb

@@ -43,7 +43,8 @@ module Testbot::Requester
 
       log "Syncing files" do
         rsync_ignores = config.rsync_ignores.to_s.split.map { |pattern| "--exclude='#{pattern}'" }.join(' ')
-        system "rsync -az --delete -e ssh #{rsync_ignores} . #{rsync_uri}"
+        # todo: exit when this fails
+        system "rsync -az --delete --delete-excluded -e ssh #{rsync_ignores} . #{rsync_uri}"
       end
 
       files = adapter.test_files(dir) 
@@ -70,7 +71,13 @@ module Testbot::Requester
         end
       end
 
-      trap("SIGINT") {  HTTParty.delete("#{server_uri}/builds/#{build_id}"); return false }
+      at_exit do
+        unless ENV['IN_TEST'] || @done
+          log "Notifying server we want to stop the run" do
+            HTTParty.delete("#{server_uri}/builds/#{build_id}")
+          end
+        end
+      end
 
       puts if config.logging
 
@@ -114,6 +121,7 @@ module Testbot::Requester
         puts "\n" + adapter.sum_results(@build['results'])
       end
 
+      @done = true
       @build["success"]
     end
 

data/lib/runner/job.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'runner.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'safe_result_text.rb'))
+require 'posix/spawn'
 
 module Testbot::Runner
   class Job
@@ -8,6 +9,7 @@ module Testbot::Runner
     def initialize(runner, id, build_id, project, root, type, ruby_interpreter, files)
       @runner, @id, @build_id, @project, @root, @type, @ruby_interpreter, @files =
         runner, id, build_id, project, root, type, ruby_interpreter, files
+      @success = true
     end
 
     def jruby?
@@ -31,15 +33,19 @@ module Testbot::Runner
     end
 
     def kill!(build_id)
-      if @build_id == build_id && @test_process
-        # The child process that runs the tests is a shell, we need to kill it's child process
-        system("pkill -KILL -P #{@test_process.pid}")
+      if @build_id == build_id && @pid
+        kill_processes
         @killed = true
       end
     end
 
     private
 
+    def kill_processes
+      # Kill process and its children (processes in the same group)
+      Process.kill('KILL', -@pid) rescue :failed_to_kill_process
+    end
+
     def status
       success? ? "successful" : "failed"
     end
@@ -55,23 +61,40 @@ module Testbot::Runner
     end
 
     def run_and_return_result(command)
-      @test_process = open("|#{command} 2>&1", 'r')
+      read_pipe = spawn_process(command)
+      
       output = ""
-      t = Time.now
-      while char = @test_process.getc
+      last_post_time = Time.now
+      while char = read_pipe.getc
         char = (char.is_a?(Fixnum) ? char.chr : char) # 1.8 <-> 1.9
         output << char
-        if Time.now - t > 0.5
+        if Time.now - last_post_time > 0.5
           post_results(output)
-          t = Time.now
+          last_post_time = Time.now
         end
       end
-      @test_process.close
+
+      # Kill child processes, if any
+      kill_processes
+
       output
     end
 
+    def spawn_process(command)
+      read_pipe, write_pipe = IO.pipe
+      @pid = POSIX::Spawn::spawn(command, :err => write_pipe, :out => write_pipe, :pgroup => true)
+
+      Thread.new do
+        Process.waitpid(@pid)
+        @success = ($?.exitstatus == 0)
+        write_pipe.close
+      end
+
+      read_pipe
+    end
+
     def success?
-      $?.exitstatus == 0
+      @success
     end
 
     def ruby_cmd

data/lib/runner/runner.rb

@@ -104,7 +104,7 @@ module Testbot::Runner
         job = Job.new(*([ self, next_job.split(',') ].flatten))
         if first_job_from_build?
           fetch_code(job)
-          before_run(job) if File.exists?("#{job.project}/lib/tasks/testbot.rake")
+          before_run(job)
         end
 
         @last_build_id = job.build_id
@@ -123,12 +123,18 @@ module Testbot::Runner
     end
 
     def fetch_code(job)
-      system "rsync -az --delete -e ssh #{job.root}/ #{job.project}"
+      system "rsync -az --delete --delete-excluded -e ssh #{job.root}/ #{job.project}"
     end
 
     def before_run(job)
-      bundler_cmd = RubyEnv.bundler?(job.project) ? "bundle; bundle exec" : ""
-      system "export RAILS_ENV=test; export TEST_INSTANCES=#{@config.max_instances}; cd #{job.project}; #{bundler_cmd} rake testbot:before_run"
+      using_bundler = RubyEnv.bundler?(job.project)
+      bundler_cmd = using_bundler ? "bundle exec" : ""
+      command_prefix = "cd #{job.project}; RAILS_ENV=test TEST_INSTANCES=#{@config.max_instances} #{bundler_cmd}"
+
+      # todo: exit if this fails, report back, etc.
+      system("cd #{job.project}; bundle") if using_bundler
+      system "#{command_prefix} rake testbot:before_run" if File.exists?("#{job.project}/lib/tasks/testbot.rake")
+      system "#{command_prefix} ruby config/testbot/before_run.rb" if File.exists?("#{job.project}/config/testbot/before_run.rb")
     end
 
     def first_job_from_build?

data/lib/shared/adapters/helpers/ruby_env.rb

@@ -1,7 +1,7 @@
 class RubyEnv
 
   def self.bundler?(project_path)
-    Gem.available?("bundler") && File.exists?("#{project_path}/Gemfile")
+    Gem::Specification.find_by_name("bundler") && File.exists?("#{project_path}/Gemfile") rescue false
   end
 
   def self.ruby_command(project_path, opts = {})

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.6.5"
+    version = "0.6.6"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/lib/tasks/testbot.rake

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../shared/adapters/adapter'
 namespace :testbot do
   
   def run_and_show_results(adapter, custom_path)
-    Rake::Task["testbot:before_request"].invoke
+    'testbot:before_request'.tap { |t| Rake::Task.task_defined?(t) && Rake::Task[t].invoke }
         
     require File.expand_path(File.join(File.dirname(__FILE__), '..', 'requester', 'requester.rb'))
     requester = Testbot::Requester::Requester.create_by_config("#{Rails.root}/config/testbot.yml")

data/test/requester/requester_test.rb

@@ -41,6 +41,7 @@ module Testbot::Requester
 
     def setup
       ENV['USE_JRUBY'] = nil
+      ENV['IN_TEST'] = 'true'
     end
 
     def mock_file_sizes
@@ -233,7 +234,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:get).once.with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                           :format => :json).and_return({ "done" => true, "results" => "" })
 
-        flexmock(requester).should_receive('system').with("rsync -az --delete -e ssh --exclude='.git' --exclude='tmp' . testbot@192.168.1.100:/path")
+        flexmock(requester).should_receive('system').with("rsync -az --delete --delete-excluded -e ssh --exclude='.git' --exclude='tmp' . testbot@192.168.1.100:/path")
         mock_file_sizes
 
         requester.run_tests(RspecAdapter, 'spec')
@@ -336,7 +337,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
 
-        flexmock(requester).should_receive('system').with("rsync -az --delete -e ssh  . cruise@somewhere:/tmp/testbot/foo")
+        flexmock(requester).should_receive('system').with("rsync -az --delete --delete-excluded -e ssh  . cruise@somewhere:/tmp/testbot/foo")
         mock_file_sizes
 
         requester.run_tests(RspecAdapter, 'spec')

data/test/runner/runner_test.rb

@@ -12,10 +12,38 @@ module Testbot::Runner
       flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(true)
       
       runner = Runner.new({:max_instances => 1})
+      flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(true)
+      flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(false)
       flexmock(runner)
-      flexmock(runner).should_receive(:system).with("export RAILS_ENV=test; export TEST_INSTANCES=1; cd /path; bundle; bundle exec rake testbot:before_run").once
+      flexmock(runner).should_receive(:system).with("cd /path; bundle").once
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle exec rake testbot:before_run").once
       runner.send(:before_run, job)
     end
+
+    should "be able to use a plain ruby before_run file" do
+      job = flexmock(:job, :project => "/path")
+      flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(true)
+      
+      runner = Runner.new({:max_instances => 1})
+      flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(false)
+      flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(true)
+      flexmock(runner)
+      flexmock(runner).should_receive(:system).with("cd /path; bundle").once
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle exec ruby config/testbot/before_run.rb").once
+      runner.send(:before_run, job)
+    end
+
+    should "be able to run without bundler" do
+      job = flexmock(:job, :project => "/path")
+      flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(false)
+      
+      runner = Runner.new({:max_instances => 1})
+      flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(false)
+      flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(true)
+      flexmock(runner)
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1  ruby config/testbot/before_run.rb").once
+      runner.send(:before_run, job)
+    end 
   end
 end
 

data/test/shared/adapters/helpers/ruby_env_test.rb

@@ -8,19 +8,19 @@ class RubyEnvTest < Test::Unit::TestCase
   context "self.bundler?" do
 
     should "return true if bundler is installed and there is a Gemfile" do
-      flexmock(Gem).should_receive(:available?).with("bundler").once.and_return(true)
+      flexmock(Gem::Specification).should_receive(:find_by_name).with("bundler").once.and_return(true)
       flexmock(File).should_receive(:exists?).with("path/to/project/Gemfile").once.and_return(true)
       assert_equal true, RubyEnv.bundler?("path/to/project")
     end
 
     should "return false if bundler is installed but there is no Gemfile" do
-      flexmock(Gem).should_receive(:available?).with("bundler").once.and_return(true)
+      flexmock(Gem::Specification).should_receive(:find_by_name).with("bundler").once.and_return(true)
       flexmock(File).should_receive(:exists?).and_return(false)
       assert_equal false, RubyEnv.bundler?("path/to/project")
     end
 
     should "return false if bundler is not installed" do
-      flexmock(Gem).should_receive(:available?).with("bundler").once.and_return(false)
+      flexmock(Gem::Specification).should_receive(:find_by_name).with("bundler").once.and_return(false)
       assert_equal false, RubyEnv.bundler?("path/to/project")
     end
 
@@ -53,7 +53,6 @@ class RubyEnvTest < Test::Unit::TestCase
     end
 
     should "not look for a script when none is provided" do
-      flexmock(File).should_receive(:exists?).once # Once for bundler check
       assert_equal 'ruby -S rspec', RubyEnv.ruby_command("path/to/project", :bin => "rspec")  
     end
 

data/testbot.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.executables = [ "testbot" ]
   s.files       = Dir.glob("lib/**/*") + Dir.glob("test/**/*") + %w(Gemfile .gemtest Rakefile testbot.gemspec CHANGELOG README.markdown bin/testbot) +
                   (File.exists?("DEV_VERSION") ? [ "DEV_VERSION" ] : [])
+
   s.add_dependency('sinatra', '>=1.0.0')
   s.add_dependency('httparty', '>= 0.6.1')
   s.add_dependency('macaddr', '>= 1.0.0')
@@ -20,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json_pure', '>= 1.4.6')
   s.add_dependency('daemons', '>= 1.0.10')
   s.add_dependency('acts_as_rails3_generator')
+  s.add_dependency('posix-spawn', '>= 0.3.6')
 
   s.add_development_dependency("shoulda")
   s.add_development_dependency("rack-test")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-28 00:00:00 +02:00
+date: 2012-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,21 +129,23 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: posix-spawn
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 3
+        - 6
+        version: 0.3.6
+  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: shoulda
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,7 +159,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: flexmock
+  name: rack-test
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -171,7 +173,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rvm
+  name: flexmock
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -185,9 +187,23 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rvm
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -199,11 +215,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -213,11 +229,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -227,11 +243,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: guard-test
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -241,7 +257,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com