testbot 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.1
+
+Added support for quicker and more automated updates when developing testbot.
+
 0.4.0
 
 Fixed RSpec 2 compability issue.

data/README.markdown

@@ -68,7 +68,7 @@ Using testbot with Rails 3:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.0'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.1'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :test, :features)
@@ -98,6 +98,7 @@ Features
 * You can add and remove computers at any time. Testbot simply gives abandoned jobs to other computers.
 * Testbot will try to balance the testload so that every computer finishes running the tests at the same time to reduce the time it takes to run the entire test suite. It does a good job, but has potential for further improvement.
 * 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.
 * Testbot is continuously tested for compability with Ruby 1.8.7 and 1.9.2.
 
 Contributing to testbot

data/bin/testbot

@@ -3,7 +3,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/testbot.rb'))
 
 def show_help
-  puts "Testbot #{Testbot::VERSION}"
+  puts "Testbot #{Testbot.version}"
   puts
   puts "Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber."
   puts

data/lib/runner.rb

@@ -189,10 +189,14 @@ class Runner
   
   def check_for_update
     return unless @config.auto_update
-    version = Server.get('/version') rescue Testbot::VERSION
-    return unless version != Testbot::VERSION
+    version = Server.get('/version') rescue Testbot.version
+    return unless version != Testbot.version
 
-    successful_install = system "gem install testbot -v #{version}"
+    if version.include?(".DEV.")
+      successful_install = system "gem install #{@config.dev_gem_root}/testbot-#{version}.gem"
+    else
+      successful_install = system "gem install testbot -v #{version}"
+    end
 
     if successful_install
       File.open("/tmp/update_testbot.sh", "w") { |file| file.write("#!/bin/sh\nsleep 5\ntestbot #{ARGV.join(' ')}") }
@@ -208,7 +212,7 @@ class Runner
   end
   
   def base_params
-    { :version => Testbot::VERSION, :uid => @uid }
+    { :version => Testbot.version, :uid => @uid }
   end
   
   def max_instances_running?

data/lib/server.rb

@@ -18,7 +18,7 @@ disable :logging if ENV['DISABLE_LOGGING']
 
 class Server
   def self.valid_version?(runner_version)
-    Testbot::VERSION == runner_version
+    Testbot.version == runner_version
   end
 end
 
@@ -68,5 +68,5 @@ get '/runners/available' do
 end
 
 get '/version' do
-  Testbot::VERSION
+  Testbot.version
 end

data/lib/server/runner.rb

@@ -19,11 +19,11 @@ class Runner < Sequel::Model
   end
   
   def self.find_all_outdated
-    DB[:runners].filter("version != ? OR version IS NULL", Testbot::VERSION)
+    DB[:runners].filter("version != ? OR version IS NULL", Testbot.version)
   end
   
   def self.find_all_available
-    DB[:runners].filter("version = ? AND last_seen_at > ?", Testbot::VERSION, Time.now - Runner.timeout)
+    DB[:runners].filter("version = ? AND last_seen_at > ?", Testbot.version, Time.now - Runner.timeout)
   end  
   
   def self.available_instances

data/lib/testbot.rb

@@ -8,7 +8,11 @@ unless defined?(Testbot)
     require 'railtie' if defined?(Rails)
 
     # Don't forget to update readme and changelog
-    VERSION = "0.4.0"
+    def self.version
+      version = "0.4.1"
+      version += ".DEV.#{Time.now.to_i}" if ENV['TESTBOT_DEV_DEPLOY']
+      version
+    end
 
     if ENV['INTEGRATION_TEST']
       SERVER_PID = "/tmp/integration_test_testbot_server.pid"
@@ -34,7 +38,7 @@ unless defined?(Testbot)
         if opts[:help]
           return false
         elsif opts[:version]
-          puts "Testbot #{Testbot::VERSION}"
+          puts "Testbot #{Testbot.version}"
         elsif [ true, 'run', 'start' ].include?(opts[:server])
           start_server(opts[:server])
         elsif opts[:server] == 'stop'
@@ -81,6 +85,7 @@ unless defined?(Testbot)
                               :auto_update => opts[:auto_update], :max_instances => opts[:cpus],
                               :ssh_tunnel => opts[:ssh_tunnel], :server_user => opts[:user],
                               :max_jruby_instances => opts[:max_jruby_instances],
+                              :dev_gem_root => opts[:dev_gem_root],
                               :jruby_opts => opts[:jruby_opts])
           runner.run!
         }

data/testbot.gemspec

@@ -4,7 +4,7 @@ require File.expand_path("lib/testbot")
 
 Gem::Specification.new do |s|
   s.name        = "testbot"
-  s.version     = Testbot::VERSION
+  s.version     = Testbot.version
   s.authors     = ["Joakim Kolsjö"]
   s.email       = ["joakim.kolsjo@gmail.com"]
   s.homepage    = "http://github.com/joakimk/testbot"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2010-12-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency