testbot 0.5.4 → 0.5.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.5.5
+
+Added RSpec2 support. Thanks to Bryan Helmkamp, https://github.com/brynary.
+
 0.5.4
 
 Fixed some typos that caused the ruby interpreter to always be "ruby".

data/README.markdown

@@ -1,7 +1,6 @@
-Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber. The basic idea is that you let testbot spread the load of running your tests across multiple machines to make the tests run faster.
-
-Using testbot on 11 machines (25 cores) we got our test suite down to **2 minutes from 30**. [More examples of how testbot is used](http://github.com/joakimk/testbot/wiki/How-testbot-is-being-used).
+Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber. The basic idea is that you let testbot spread the load of running your tests across multiple machines to make the tests run faster.
 
+Using testbot on 11 machines (25 cores) we got our test suite down to **2 minutes from 30**. [More examples of how testbot is used](http://github.com/joakimk/testbot/wiki/How-testbot-is-used).
 
 Installing
 ----
@@ -57,19 +56,19 @@ On every computer that should share CPU resources run:
 Running tests:
     
     testbot --test --connect 192.168.0.100
-    # --test could also be --spec or --features
+    # --test could also be --spec (RSpec), --rspec (RSpec 2) or --features
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.4'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.5'
     script/generate testbot --connect 192.168.0.100
 
-    rake testbot:spec (or :test, :features)
+    rake testbot:spec (or :rspec, :test, :features)
 
 Using testbot with Rails 3:
 
     rails g testbot --connect 192.168.0.100
-    rake testbot:spec (or :test, :features)
+    rake testbot:spec (or :rspec, :test, :features)
 
     # Gemfile:
     gem 'testbot'
@@ -129,3 +128,4 @@ 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/shared/adapters/adapter.rb

@@ -1,14 +1,17 @@
 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
   def self.all
-    [ RSpecAdapter, CucumberAdapter, TestUnitAdapter ]
+    [ RSpecAdapter, RSpec2Adapter, CucumberAdapter, TestUnitAdapter ]
   end
 
   def self.find(type)
     case type.to_sym
+    when :rspec
+      RSpec2Adapter
     when :spec
       RSpecAdapter
     when :features

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

@@ -6,14 +6,14 @@ class RubyEnv
 
   def self.ruby_command(project_path, opts = {})
     ruby_interpreter = opts[:ruby_interpreter] || "ruby"
-    
-    if File.exists?("#{project_path}/#{opts[:script]}")
+
+    if opts[:script] && File.exists?("#{project_path}/#{opts[:script]}")
       command = opts[:script]
     elsif opts[:bin]
       command = opts[:bin]
     else
       command = ruby_interpreter
-    end 
+    end
 
     if bundler?(project_path)
       "#{ruby_interpreter} -S bundle exec #{command}"

data/lib/shared/adapters/rspec2_adapter.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
+
+class RSpec2Adapter
+
+  def self.command(project_path, ruby_interpreter, files)
+    spec_command = RubyEnv.ruby_command(project_path,
+      :bin => "rspec",
+      :ruby_interpreter => ruby_interpreter)
+
+    if File.exists?("#{project_path}/spec/spec.opts")
+      spec_command += " -O spec/spec.opts"
+    end
+
+    "export RSPEC_COLOR=true; #{spec_command} #{files}"
+  end
+
+  def self.test_files(dir)
+    Dir["#{dir}/#{file_pattern}"]
+  end
+
+  def self.get_sizes(files)
+    files.map { |file| File.stat(file).size }
+  end
+
+  def self.requester_port
+    2299
+  end
+
+  def self.pluralized
+    'specs'
+  end
+
+  def self.base_path
+    "spec"
+  end
+
+  def self.name
+    'RSpec2'
+  end
+
+  def self.type
+    'rspec'
+  end
+
+private
+
+  def self.file_pattern
+    '**/**/*_spec.rb'
+  end
+
+end

data/lib/shared/testbot.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/version'))
 require File.expand_path(File.join(File.dirname(__FILE__), '/simple_daemonize'))
 require File.expand_path(File.join(File.dirname(__FILE__), '/adapters/adapter'))
 require 'fileutils'
@@ -5,16 +6,6 @@ require 'fileutils'
 module Testbot
   require 'railtie' if defined?(Rails)
 
-  # Don't forget to update readme and changelog
-  def self.version
-    version = "0.5.4"
-    dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
-    if File.exists?(dev_version_file)
-      version += File.read(dev_version_file)
-    end
-    version
-  end
-
   if ENV['INTEGRATION_TEST']
     SERVER_PID = "/tmp/integration_test_testbot_server.pid"
     RUNNER_PID = "/tmp/integration_test_testbot_runner.pid"

data/lib/shared/version.rb

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

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

@@ -52,6 +52,11 @@ class RubyEnvTest < Test::Unit::TestCase
       assert_equal 'ruby -S script/spec', RubyEnv.ruby_command("path/to/project", :script => "script/spec", :bin => "rspec")  
     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
+
     should "be able to use jruby" do
       flexmock(RubyEnv).should_receive(:bundler?).and_return(false)
       flexmock(File).should_receive(:exists?).and_return(true)

data/test/shared/adapters/test_adapter.rb

@@ -5,6 +5,7 @@ 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)
     assert_equal TestUnitAdapter, Adapter.find(:test)
@@ -15,7 +16,7 @@ class AdapterTest < Test::Unit::TestCase
   end
   
   should "return be able to all types" do
-    assert_equal [ RSpecAdapter, CucumberAdapter, TestUnitAdapter ], Adapter.all
+    assert_equal [ RSpecAdapter, RSpec2Adapter, CucumberAdapter, TestUnitAdapter ], Adapter.all
   end
   
 end

data/testbot.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/lib/shared/testbot')
+require File.expand_path(File.dirname(__FILE__) + '/lib/shared/version')
 
 Gem::Specification.new do |s|
   s.name        = "testbot"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -256,11 +256,13 @@ files:
 - lib/shared/adapters/adapter.rb
 - lib/shared/adapters/cucumber_adapter.rb
 - lib/shared/adapters/helpers/ruby_env.rb
+- lib/shared/adapters/rspec2_adapter.rb
 - lib/shared/adapters/rspec_adapter.rb
 - lib/shared/adapters/test_unit_adapter.rb
 - lib/shared/simple_daemonize.rb
 - lib/shared/ssh_tunnel.rb
 - lib/shared/testbot.rb
+- lib/shared/version.rb
 - lib/tasks/testbot.rake
 - lib/testbot.rb
 - test/fixtures/local/config/testbot.yml
@@ -316,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A test distribution tool.