testbot 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.7.1
+
+Fixed a bug introduced in 0.7.0. The TEST_INSTANCES env-variable are now
+present again when running before_run scripts.
+
 0.7.0
 
 Added per project rvm support. Using this you can run testbot using system ruby

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

data/lib/runner/runner.rb

@@ -128,7 +128,7 @@ module Testbot::Runner
     def before_run(job)
       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}"
+      command_prefix = "cd #{job.project} && export RAILS_ENV=test && export TEST_INSTANCES=#{@config.max_instances} && #{bundler_cmd}"
 
       if File.exists?("#{job.project}/lib/tasks/testbot.rake")
         system "#{command_prefix} rake testbot:before_run"

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.7.0"
+    version = "0.7.1"
     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: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-20 00:00:00 +01:00
+date: 2012-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -295,7 +295,6 @@ files:
 - test/requester/testbot.yml
 - test/requester/testbot_with_erb.yml
 - test/runner/job_test.rb
-- test/runner/runner_test.rb
 - test/runner/safe_result_text_test.rb
 - test/server/group_test.rb
 - test/server/server_test.rb

data/test/runner/runner_test.rb

@@ -1,51 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/shared/testbot.rb'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/runner/runner.rb'))
-require 'test/unit'
-require 'shoulda'
-require 'flexmock/test_unit'
-
-module Testbot::Runner
-
-  class RunnerTest < Test::Unit::TestCase
-    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; 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; 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
-