testbot 0.6.9 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.7.0
+
+Added per project rvm support. Using this you can run testbot using system ruby
+while being able to run test processes using the project rvm environment. This
+is also useful if you have several projects with different rvm rubies and gemsets.
+
 0.6.9
 
 Removed dependency on macaddr as that does not work on some platforms.

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.9'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.7.0'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)

data/lib/runner/runner.rb

@@ -126,14 +126,18 @@ module Testbot::Runner
     end
 
     def before_run(job)
-      using_bundler = RubyEnv.bundler?(job.project)
-      bundler_cmd = using_bundler ? "bundle exec" : ""
+      rvm_prefix = RubyEnv.rvm_prefix(job.project)
+      bundler_cmd = (RubyEnv.bundler?(job.project) ? [rvm_prefix, "bundle &&", rvm_prefix, "bundle exec"] : [rvm_prefix]).compact.join(" ")
       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")
+      if File.exists?("#{job.project}/lib/tasks/testbot.rake")
+        system "#{command_prefix} rake testbot:before_run"
+      elsif File.exists?("#{job.project}/config/testbot/before_run.rb")
+        system "#{command_prefix} ruby config/testbot/before_run.rb"
+      else
+        # workaround to bundle within the correct env
+        system "#{command_prefix} ruby -e ''"
+      end
     end
 
     def first_job_from_build?

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

@@ -1,5 +1,4 @@
 class RubyEnv
-
   def self.bundler?(project_path)
     gem_exists?("bundler") && File.exists?("#{project_path}/Gemfile")
   end
@@ -27,10 +26,22 @@ class RubyEnv
     end
 
     if bundler?(project_path)
-      "#{ruby_interpreter} -S bundle exec #{command}".strip
+      "#{rvm_prefix(project_path)} #{ruby_interpreter} -S bundle exec #{command}".strip
     else
-      "#{ruby_interpreter} -S #{command}".strip
+      "#{rvm_prefix(project_path)} #{ruby_interpreter} -S #{command}".strip
     end
   end
 
+  def self.rvm_prefix(project_path)
+    if rvm?
+      rvmrc_path = File.join project_path, ".rvmrc"
+      if File.exists?(rvmrc_path)
+        File.read(rvmrc_path).to_s.strip + " exec"
+      end
+    end
+  end
+
+  def self.rvm?
+    system("rvm info") != nil
+  end
 end

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.9"
+    version = "0.7.0"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/test/integration_test.rb

@@ -22,7 +22,7 @@ class IntegrationTest < Test::Unit::TestCase
     system "rm -rf tmp; mkdir -p tmp; cp -rf test/fixtures/local tmp/local"
     system "export INTEGRATION_TEST=true; bin/testbot --runner --connect 127.0.0.1 --working_dir tmp/runner > /dev/null"
     system "export INTEGRATION_TEST=true; bin/testbot --server > /dev/null"
-     
+
     # For debug
     # Thread.new do
     #   system "export INTEGRATION_TEST=true; bin/testbot --runner run --connect 127.0.0.1 --working_dir tmp/runner"

data/test/runner/job_test.rb

@@ -30,6 +30,7 @@ module Testbot::Runner
         with("export RAILS_ENV=test; export TEST_ENV_NUMBER=; cd project; export RSPEC_COLOR=true; ruby -S bundle exec rspec spec/foo_spec.rb spec/bar_spec.rb").
         and_return('result text')
       flexmock(RubyEnv).should_receive(:bundler?).returns(true)
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
       job.run(0)
     end
 
@@ -53,6 +54,7 @@ module Testbot::Runner
       flexmock(job).should_receive(:run_and_return_result).
         with(/TEST_ENV_NUMBER=2/).
         and_return('result text')
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
       job.run(1)
     end
 
@@ -63,6 +65,7 @@ module Testbot::Runner
       stub_duration(10.55) 
       expect_put_with(10, "result text", "successful", 1055)
       flexmock(job).should_receive(:run_and_return_result).and_return('result text')
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
       job.run(0)
     end
 

data/test/runner/runner_test.rb

@@ -10,40 +10,42 @@ module Testbot::Runner
     should "use bundle exec in when calling rake testbot:before_run if bundler is present" do
       job = flexmock(:job, :project => "/path")
       flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(true)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
+
       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(File).should_receive(:exists?).with("/path/.rvmrc").and_return(false)
       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 rake testbot:before_run").once
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle && 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)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).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; 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
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle && 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)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).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
 end
 

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

@@ -4,7 +4,12 @@ require 'shoulda'
 require 'flexmock/test_unit'
 
 class RubyEnvTest < Test::Unit::TestCase
-  
+
+  def setup
+    # Can't override a stub in flexmock?
+    def RubyEnv.rvm?; false; end
+  end
+
   context "self.bundler?" do
 
     should "return true if bundler is installed and there is a Gemfile" do
@@ -26,6 +31,21 @@ class RubyEnvTest < Test::Unit::TestCase
 
   end
 
+  context "self.rvm_prefix" do
+
+    should "return rvm prefix if rvm is installed" do
+      def RubyEnv.rvm?; true; end
+      flexmock(File).should_receive(:exists?).with("path/to/project/.rvmrc").once.and_return(true)
+      flexmock(File).should_receive(:read).with("path/to/project/.rvmrc").once.and_return("rvm 1.8.7\n")
+      assert_equal "rvm 1.8.7 exec", RubyEnv.rvm_prefix("path/to/project")
+    end
+
+    should "return nil if rvm is not installed" do
+      assert_equal nil, RubyEnv.rvm_prefix("path/to/project")
+    end
+
+  end
+
   context "self.ruby_command" do
     
     should "use ruby by default" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 +02:00
+date: 2012-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
+  name: sinatra
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +48,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  type: :runtime
-  version_requirements: *id002
+  name: httparty
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +64,12 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
-  type: :runtime
-  version_requirements: *id003
+  name: net-ssh
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +80,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  type: :runtime
-  version_requirements: *id004
+  name: json_pure
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +96,12 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  type: :runtime
-  version_requirements: *id005
+  name: daemons
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: acts_as_rails3_generator
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +110,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id006
+  name: acts_as_rails3_generator
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: posix-spawn
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +126,12 @@ dependencies:
         - 3
         - 6
         version: 0.3.6
-  type: :runtime
-  version_requirements: *id007
+  name: posix-spawn
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id008
+  name: shoulda
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id009
+  name: rack-test
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: flexmock
+  type: :development
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id010
+  name: flexmock
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: rvm
+  type: :development
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +182,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id011
+  name: rvm
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -198,12 +198,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
-  version_requirements: *id012
+  name: rake
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  type: :development
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -212,12 +212,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id013
+  name: bundler
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: guard
+  type: :development
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -226,12 +226,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id014
+  name: guard
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: guard-test
+  type: :development
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -240,8 +240,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id015
+  name: guard-test
+  requirement: *id015
 description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com