testbot 0.5.9 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.6.0
+
+Fixed bug that caused the runner to crash and block the server after checking for jobs (issue #34).
+
+Merged in https://github.com/joakimk/testbot/pull/33 (Bugfix: Run rake task testbot:before_run with bundler if present).
+
 0.5.9
 
 When you hit ctrl+c all related test jobs will be stopped (within about 5 seconds). You can

data/README.markdown

@@ -64,7 +64,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.5.9'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.0'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)
@@ -108,7 +108,7 @@ Features
 * You can access your testbot network through SSH by using the built in SSH tunneling code.
 * You can use the same testbot network with multiple projects.
 * You can abort a test run with ctrl+c and all remote processes will be stopped.
-* Testbot is continuously tested for compability with Ruby 1.8.7 and 1.9.2.
+* Testbot is continuously tested for compatibility with Ruby 1.8.7 and 1.9.2.
 
 Contributing to testbot
 ----

data/lib/runner/runner.rb

@@ -98,7 +98,7 @@ module Testbot::Runner
         clear_completed_instances 
 
         next_job = Server.get("/jobs/next", :query => next_params) rescue nil
-        last_check_found_a_job = (next_job != nil)
+        last_check_found_a_job = (next_job != nil && next_job.body != "")
         next unless last_check_found_a_job
 
         job = Job.new(*([ self, next_job.split(',') ].flatten))
@@ -127,7 +127,7 @@ module Testbot::Runner
     end
 
     def before_run(job)
-      bundler_cmd = RubyEnv.bundler?(job.project) ? "bundle; " : ""
+      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"
     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.5.9"
+    version = "0.6.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/runner/job_test.rb

@@ -27,8 +27,9 @@ module Testbot::Runner
 
       expect_put_with(10, "result text", true)
       flexmock(job).should_receive(:run_and_return_result).once.
-        with("export RAILS_ENV=test; export TEST_ENV_NUMBER=; cd project; export RSPEC_COLOR=true; ruby -S rspec spec/foo_spec.rb spec/bar_spec.rb").
+        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)
       job.run(0)
     end
 

data/test/runner/runner_test.rb

@@ -0,0 +1,21 @@
+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)
+      
+      runner = Runner.new({:max_instances => 1})
+      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
+      runner.send(:before_run, job)
+    end
+  end
+end
+

data/testbot.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("flexmock")
   s.add_development_dependency("cucumber")
   s.add_development_dependency("rvm")
-  s.add_development_dependency("rake")
+  s.add_development_dependency("rake", "0.8.7")
   s.add_development_dependency("bundler")
   s.add_development_dependency("guard")
   s.add_development_dependency("guard-test")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 +02:00
+date: 2011-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -204,12 +204,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -306,6 +308,7 @@ files:
 - test/requester/testbot.yml
 - test/requester/testbot_with_erb.yml
 - test/runner/job_test.rb
+- test/runner/runner_test.rb
 - test/server/group_test.rb
 - test/server/server_test.rb
 - test/shared/adapters/adapter_test.rb
@@ -350,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A test distribution tool.