testbot 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.5.6
+
+Removed CPU usage check before running jobs (issue #25).
+
 0.5.5
 
 Added RSpec2 support. Thanks to Bryan Helmkamp, https://github.com/brynary.

data/README.markdown

@@ -60,7 +60,7 @@ Running tests:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.5'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.6'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)
@@ -122,7 +122,7 @@ You can also contribute by adding to the [wiki](http://github.com/joakimk/testbo
 How to add support for more test frameworks and/or programming languages
 ----
 
-Add a **lib/adapters/framework_name_adapter.rb** file, update **lib/adapters/adapter.rb** and this readme.
+Add a **lib/adapters/framework_name_adapter.rb** file and update this readme.
 
 More
 ----

data/lib/requester/requester.rb

@@ -3,7 +3,6 @@ require 'httparty'
 require 'macaddr'
 require 'ostruct'
 require File.dirname(__FILE__) + '/../shared/ssh_tunnel'
-require File.dirname(__FILE__) + '/../shared/adapters/adapter'
 require File.expand_path(File.dirname(__FILE__) + '/../shared/testbot')
 
 class Hash

data/lib/runner/runner.rb

@@ -11,16 +11,9 @@ module Testbot::Runner
   TIME_BETWEEN_QUICK_POLLS = 0.1
   TIME_BETWEEN_PINGS = 5
   TIME_BETWEEN_VERSION_CHECKS = Testbot.version.include?('.DEV.') ? 10 : 60
-  MAX_CPU_USAGE_WHEN_IDLE = 50
 
   class CPU
 
-    def self.current_usage
-      process_usages = `ps -eo pcpu`
-      total_usage = process_usages.split("\n").inject(0) { |sum, usage| sum += usage.strip.to_f }
-      (total_usage / count).to_i
-    end
-
     def self.count
       case RUBY_PLATFORM
       when /darwin/
@@ -103,7 +96,6 @@ module Testbot::Runner
 
         # Makes sure all instances are listed as available after a run
         clear_completed_instances 
-        next unless cpu_available?
 
         next_job = Server.get("/jobs/next", :query => next_params) rescue nil
         last_check_found_a_job = (next_job != nil)
@@ -143,10 +135,6 @@ module Testbot::Runner
       @last_requester_mac == nil
     end
 
-    def cpu_available?
-      @instances.size > 0 || CPU.current_usage < MAX_CPU_USAGE_WHEN_IDLE
-    end
-
     def time_for_update?
       time_for_update = ((Time.now - @last_version_check) >= TIME_BETWEEN_VERSION_CHECKS)
       @last_version_check = Time.now if time_for_update

data/lib/shared/adapters/adapter.rb

@@ -1,25 +1,27 @@
-require File.dirname(__FILE__) + '/rspec_adapter'
-require File.dirname(__FILE__) + '/rspec2_adapter'
-require File.dirname(__FILE__) + '/cucumber_adapter'
-require File.dirname(__FILE__) + '/test_unit_adapter'
-
 class Adapter
+
+  FILES = Dir[File.dirname(__FILE__) + "/*_adapter.rb"]
+  FILES.each { |file| require(file) }
+
   def self.all
-    [ RSpecAdapter, RSpec2Adapter, CucumberAdapter, TestUnitAdapter ]
+    FILES.map { |file| load_adapter(file)  }
   end
 
   def self.find(type)
-    case type.to_sym
-    when :rspec
-      RSpec2Adapter
-    when :spec
-      RSpecAdapter
-    when :features
-      CucumberAdapter
-    when :test
-      TestUnitAdapter
+    if adapter = all.find { |adapter| adapter.type == type.to_s }
+      adapter
     else
       raise "Unknown adapter: #{type}"
     end
   end
+
+  private
+
+  def self.load_adapter(file)
+    eval("::" + File.basename(file).
+         gsub(/\.rb/, '').
+         gsub(/(?:^|_)(.)/) { $1.upcase })
+  end
+
 end
+

data/lib/shared/adapters/rspec2_adapter.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
 
-class RSpec2Adapter
+class Rspec2Adapter
 
   def self.command(project_path, ruby_interpreter, files)
     spec_command = RubyEnv.ruby_command(project_path,

data/lib/shared/adapters/rspec_adapter.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
 
-class RSpecAdapter
+class RspecAdapter
   
   def self.command(project_path, ruby_interpreter, files)
     spec_command = RubyEnv.ruby_command(project_path, :script => "script/spec", :bin => "rspec",

data/lib/shared/version.rb

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

data/test/requester/test_requester.rb

@@ -27,7 +27,7 @@ module Testbot::Requester
     end
 
     def build_with_result(results)
-      requester_with_result(results).run_tests(RSpecAdapter, 'spec')
+      requester_with_result(results).run_tests(RspecAdapter, 'spec')
     end
 
     def setup
@@ -77,7 +77,7 @@ module Testbot::Requester
       should "should be able to create a build" do
         flexmock(Mac).should_receive(:addr).and_return('aa:aa:aa:aa:aa:aa')
         requester = Requester.new(:server_host => "192.168.1.100", :rsync_path => '/path', :available_runner_usage => '60%', :project => 'things', :server_user => "cruise")
-        flexmock(RSpecAdapter).should_receive(:test_files).with('spec').once.and_return([ 'spec/models/house_spec.rb', 'spec/models/car_spec.rb' ])
+        flexmock(RspecAdapter).should_receive(:test_files).with('spec').once.and_return([ 'spec/models/house_spec.rb', 'spec/models/car_spec.rb' ])
 
         flexmock(File).should_receive(:stat).once.with("spec/models/house_spec.rb").and_return(mock = Object.new); flexmock(mock).should_receive(:size).and_return(10)
         flexmock(File).should_receive(:stat).once.with("spec/models/car_spec.rb").and_return(mock = Object.new); flexmock(mock).should_receive(:size).and_return(20)
@@ -98,7 +98,7 @@ module Testbot::Requester
                                                            flexmock(requester).should_receive(:puts)
                                                            flexmock(requester).should_receive(:system)
 
-                                                           assert_equal true, requester.run_tests(RSpecAdapter, 'spec')
+                                                           assert_equal true, requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "keep calling the server for results until done" do
@@ -118,7 +118,7 @@ module Testbot::Requester
                                                               flexmock(requester).should_receive(:puts).once.with("job 2 done: ....")
                                                               flexmock(requester).should_receive(:puts).once.with("job 1 done: ....")
 
-                                                              requester.run_tests(RSpecAdapter, 'spec')
+                                                              requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "return false if not successful" do
@@ -136,7 +136,7 @@ module Testbot::Requester
                                                           flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
                                                           mock_file_sizes
 
-                                                          assert_equal false, requester.run_tests(RSpecAdapter, 'spec')
+                                                          assert_equal false, requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "not print empty lines when there is no result" do
@@ -155,7 +155,7 @@ module Testbot::Requester
                                                               flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
                                                               mock_file_sizes
 
-                                                              requester.run_tests(RSpecAdapter, 'spec')
+                                                              requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "sync the files to the server" do
@@ -172,7 +172,7 @@ module Testbot::Requester
                                                           flexmock(requester).should_receive('system').with("rsync -az --delete -e ssh --exclude='.git' --exclude='tmp' . testbot@192.168.1.100:/path")
                                                           mock_file_sizes
 
-                                                          requester.run_tests(RSpecAdapter, 'spec')
+                                                          requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "just try again if the request encounters an error while running and print on the fith time" do
@@ -193,7 +193,7 @@ module Testbot::Requester
                                                                                                                     flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
                                                                                                                     mock_file_sizes
 
-                                                                                                                    requester.run_tests(RSpecAdapter, 'spec')
+                                                                                                                    requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "just try again if the status returns as nil" do
@@ -212,7 +212,7 @@ module Testbot::Requester
                                                               flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
                                                               mock_file_sizes
 
-                                                              requester.run_tests(RSpecAdapter, 'spec')
+                                                              requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "remove unnessesary output from rspec when told to do so" do
@@ -234,7 +234,7 @@ module Testbot::Requester
                                                               flexmock(requester).should_receive(:puts)
                                                               mock_file_sizes
 
-                                                              requester.run_tests(RSpecAdapter, 'spec')
+                                                              requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "use SSHTunnel when specified (with a port that does not collide with the runner)" do
@@ -251,7 +251,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 
-        requester.run_tests(RSpecAdapter, 'spec')
+        requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "use another user for rsync and ssh_tunnel when specified" do
@@ -270,7 +270,7 @@ module Testbot::Requester
         flexmock(requester).should_receive('system').with("rsync -az --delete -e ssh  . cruise@somewhere:/tmp/testbot/foo")
         mock_file_sizes
 
-        requester.run_tests(RSpecAdapter, 'spec')
+        requester.run_tests(RspecAdapter, 'spec')
       end
 
       should "use another port for cucumber to be able to run at the same time as rspec" do
@@ -335,7 +335,7 @@ module Testbot::Requester
       should "return all lines with results in them" do
         results = "one\ntwo..\n... 0 failures\nthree"
         requester = requester_with_result(results)
-        requester.run_tests(RSpecAdapter, 'spec')
+        requester.run_tests(RspecAdapter, 'spec')
         assert_equal [ '... 0 failures' ], requester.result_lines
       end
 

data/test/shared/adapters/test_adapter.rb

@@ -4,19 +4,19 @@ require 'shoulda'
 
 class AdapterTest < Test::Unit::TestCase
   
-  should "be able to find the adapters" do
-    assert_equal RSpec2Adapter, Adapter.find(:rspec)
-    assert_equal RSpecAdapter, Adapter.find(:spec)
-    assert_equal CucumberAdapter, Adapter.find(:features)
+  should "be able to find adapters" do
+    assert_equal RspecAdapter, Adapter.find(:spec)
     assert_equal TestUnitAdapter, Adapter.find(:test)
   end
   
   should "find be able to find an adapter by string" do
-    assert_equal RSpecAdapter, Adapter.find("spec") 
+    assert_equal RspecAdapter, Adapter.find("spec") 
+    assert_equal TestUnitAdapter, Adapter.find("test") 
   end
   
-  should "return be able to all types" do
-    assert_equal [ RSpecAdapter, RSpec2Adapter, CucumberAdapter, TestUnitAdapter ], Adapter.all
+  should "be able to return a list of adapters" do
+    assert Adapter.all.include?(RspecAdapter)
+    assert Adapter.all.include?(TestUnitAdapter)
   end
   
 end

data/testbot.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email       = ["joakim.kolsjo@gmail.com"]
   s.homepage    = "http://github.com/joakimk/testbot"
   s.summary     = %q{A test distribution tool.}
-  s.description = %q{Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.}
+  s.description = %q{Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.}
   s.bindir      = "bin"
   s.executables = [ "testbot" ]
   s.files       = Dir.glob("lib/**/*") + Dir.glob("test/**/*") + %w(Gemfile .gemtest Rakefile testbot.gemspec CHANGELOG README.markdown bin/testbot) +

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +02:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -226,7 +226,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id014
-description: Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.
+description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com
 executables: