testbot 0.4.2 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.4
+
+Changed to using the deamons gem. Seems to fix some problems with old processes
+not closing down when using auto_update.
+
 0.4.2
 
 Added support for quick deploys when developing testbot.

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

data/lib/runner.rb

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/adapters/adapter'
 TIME_BETWEEN_NORMAL_POLLS = 1
 TIME_BETWEEN_QUICK_POLLS = 0.1
 TIME_BETWEEN_PINGS = 5
-TIME_BETWEEN_VERSION_CHECKS = 60
+TIME_BETWEEN_VERSION_CHECKS = Testbot.version.include?('.DEV.') ? 5 : 60
 MAX_CPU_USAGE_WHEN_IDLE = 50
 
 class CPU
@@ -192,10 +192,17 @@ class Runner
     version = Server.get('/version') rescue Testbot.version
     return unless version != Testbot.version
 
-    if version.include?(".DEV.")
-      successful_install = system "wget #{@config.dev_gem_root}/testbot-#{version}.gem && gem install testbot-#{version}.gem && rm testbot-#{version}.gem"
+    # In a PXE cluster with a shared gem folder we only want one of them to do the update
+    if @config.wait_for_updated_gem
+      # Gem.available? is cached so it won't detect new gems.
+      gem = Gem::Dependency.new("testbot", version)
+      successful_install = !Gem::SourceIndex.from_installed_gems.search(gem).empty?
     else
-      successful_install = system "gem install testbot -v #{version}"
+      if version.include?(".DEV.")
+        successful_install = system("wget #{@config.dev_gem_root}/testbot-#{version}.gem && gem install testbot-#{version}.gem --no-ri --no-rdoc && rm testbot-#{version}.gem")
+      else
+        successful_install = system "gem install testbot -v #{version} --no-ri --no-rdoc"
+      end
     end
 
     if successful_install

data/lib/shared/simple_daemonize.rb

@@ -1,18 +1,24 @@
+require 'rubygems'
+require 'daemons'
+
 class SimpleDaemonize
   
-  def self.start(proc, pid_path)    
-    pid = fork { 
-      STDOUT.reopen "/dev/null"
-      proc.call
-    }
-    
-    File.open(pid_path, 'w') { |file| file.write(pid) }
-    pid
+  def self.start(proc, pid_path, app_name)    
+    working_dir = Dir.pwd
+
+    group = Daemons::ApplicationGroup.new(app_name)
+    group.new_application(:mode => :none).start
+
+    File.open(pid_path, 'w') { |file| file.write(Process.pid) }
+    Dir.chdir(working_dir)
+    proc.call
   end
   
   def self.stop(pid_path)
     return unless File.exists?(pid_path)
-    system "kill #{File.read(pid_path)} &> /dev/null"
+    pid = File.read(pid_path)
+
+    system "kill -9 #{pid} &> /dev/null"
     system "rm #{pid_path} &> /dev/null"
   end
   

data/lib/testbot.rb

@@ -9,7 +9,7 @@ unless defined?(Testbot)
 
     # Don't forget to update readme and changelog
     def self.version
-      version = "0.4.2"
+      version = "0.4.4"
       dev_version_file = File.join(File.dirname(__FILE__), '..', 'DEV_VERSION')
       if File.exists?(dev_version_file)
         version += File.read(dev_version_file)
@@ -89,6 +89,7 @@ unless defined?(Testbot)
                               :ssh_tunnel => opts[:ssh_tunnel], :server_user => opts[:user],
                               :max_jruby_instances => opts[:max_jruby_instances],
                               :dev_gem_root => opts[:dev_gem_root],
+                              :wait_for_updated_gem => opts[:wait_for_updated_gem],
                               :jruby_opts => opts[:jruby_opts])
           runner.run!
         }
@@ -96,8 +97,8 @@ unless defined?(Testbot)
         if opts[:runner] == 'run'
           proc.call
         else
-          pid = SimpleDaemonize.start(proc, Testbot::RUNNER_PID)
-          puts "Testbot runner started (pid: #{pid})"
+          puts "Testbot runner started (pid: #{Process.pid})"
+          SimpleDaemonize.start(proc, Testbot::RUNNER_PID, "testbot (runner)")
         end
       end
 
@@ -108,12 +109,12 @@ unless defined?(Testbot)
           require File.join(File.dirname(__FILE__), '/server')
           Sinatra::Application.run! :environment => "production"
         else
-          pid = SimpleDaemonize.start(lambda {
+          puts "Testbot server started (pid: #{Process.pid})"
+          SimpleDaemonize.start(lambda {
             ENV['DISABLE_LOGGING'] = "true"
             require File.join(File.dirname(__FILE__), '/server')
             Sinatra::Application.run! :environment => "production"
-          }, Testbot::SERVER_PID)
-          puts "Testbot server started (pid: #{pid})"
+          }, Testbot::SERVER_PID, "testbot (server)")
         end
       end
 

data/testbot.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('net-ssh', '>= 2.0.23')
   s.add_dependency('sequel', '>= 3.16.0')
   s.add_dependency('json', '>= 1.4.6')
+  s.add_dependency('daemons', '=1.0.10') # Because mongrel uses this version
   s.add_dependency('acts_as_rails3_generator')
 
   # Could work with older versions, but not newer (when deploying on debian)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -115,9 +115,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: acts_as_rails3_generator
+  name: daemons
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: acts_as_rails3_generator
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,11 +143,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -143,11 +159,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: mongrel
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -160,7 +176,7 @@ dependencies:
         - pre2
         version: 1.2.0.pre2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 description: Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com