specjour 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/specjour/connection.rb

@@ -0,0 +1,52 @@
+module Specjour
+  class Connection
+    MAX_RECONNECTS = 5
+
+    include Protocol
+    extend Forwardable
+
+    attr_reader :uri, :connection
+    attr_accessor :reconnection_attempts
+
+    def_delegators :connection, :flush, :closed?, :close, :gets, :each
+
+    def initialize(uri)
+      @uri = uri
+      @reconnection_attempts = 0
+      connect
+    end
+
+    def connect
+      @connection = TCPSocket.open(uri.host, uri.port)
+    rescue SystemCallError => error
+      Kernel.puts "Could not connect to #{uri.to_s}\n#{error.inspect}"
+    end
+
+    def print(arg)
+      connection.print dump_object(arg)
+    rescue SystemCallError => error
+      Kernel.p error
+      reconnect
+      retry
+    end
+
+    def puts(arg)
+      print(arg << "\n")
+    end
+
+    def reconnect
+      connection.close
+      if reconnection_attempts < MAX_RECONNECTS
+        connect
+        self.reconnection_attempts += 1
+      else
+        raise Error, "Lost connection #{MAX_RECONNECTS} times"
+      end
+    end
+
+    def send_message(method_name, *args)
+      print([method_name, *args])
+      flush
+    end
+  end
+end

data/lib/specjour/dispatcher.rb

@@ -16,8 +16,6 @@ module Specjour
     def start
       rsync_daemon.start
       gather_managers
-      sync_managers
-      bundle_install_managers
       dispatch_work
       printer.join
     end
@@ -30,10 +28,6 @@ module Specjour
       end
     end
 
-    def bundle_install_managers
-      command_managers {|manager| manager.bundle_install }
-    end
-
     def command_managers(async = false, &block)
       managers.each do |manager|
         manager_threads << Thread.new(manager, &block)
@@ -45,11 +39,6 @@ module Specjour
       command_managers(true) { |m| m.dispatch }
     end
 
-    def drb_start
-      DRb.start_service nil, self
-      at_exit { puts 'shutting down DRb client'; DRb.stop_service }
-    end
-
     def fetch_manager(uri)
       manager = DRbObject.new_with_uri(uri.to_s)
       if !managers.include?(manager) && manager.available_for?(hostname)
@@ -63,11 +52,16 @@ module Specjour
       puts "Waiting for managers"
       Signal.trap('INT') { exit }
       browser = DNSSD::Service.new
-      browser.browse '_druby._tcp' do |reply|
-        if reply.flags.add?
-          resolve_reply(reply)
+      begin
+        Timeout.timeout(5) do
+          browser.browse '_druby._tcp' do |reply|
+            if reply.flags.add?
+              resolve_reply(reply)
+            end
+            browser.stop unless reply.flags.more_coming?
+          end
         end
-        browser.stop unless reply.flags.more_coming?
+      rescue Timeout::Error
       end
       puts "Managers found: #{managers.size}"
       abort unless managers.size > 0
@@ -112,10 +106,6 @@ module Specjour
       at_exit { manager.kill_worker_processes }
     end
 
-    def sync_managers
-      command_managers { |manager| manager.sync }
-    end
-
     def wait_on_managers
       manager_threads.each {|t| t.join; t.exit}
       reset_manager_threads

data/lib/specjour/manager.rb

@@ -34,7 +34,14 @@ module Specjour
     end
 
     def dispatch
-      bonjour_service.stop
+      suspend_bonjour do
+        sync
+        bundle_install
+        dispatch_workers
+      end
+    end
+
+    def dispatch_workers
       (1..worker_size).each do |index|
         worker_pids << fork do
           exec("specjour --batch-size #{batch_size} --do-work #{project_path},#{dispatcher_uri},#{index}")
@@ -43,7 +50,6 @@ module Specjour
       end
       at_exit { kill_worker_processes }
       Process.waitall
-      bonjour_announce
     end
 
     def start
@@ -65,6 +71,10 @@ module Specjour
 
     protected
 
+    def bonjour_announce
+      @bonjour_service = DNSSD.register! "specjour_manager_#{object_id}", "_#{drb_uri.scheme}._tcp", nil, drb_uri.port
+    end
+
     def cmd(command)
       puts command
       system command
@@ -74,8 +84,10 @@ module Specjour
       @drb_uri ||= URI.parse(DRb.uri)
     end
 
-    def bonjour_announce
-      @bonjour_service = DNSSD.register! "specjour_manager_#{object_id}", "_#{drb_uri.scheme}._tcp", nil, drb_uri.port
+    def suspend_bonjour(&block)
+      bonjour_service.stop
+      block.call
+      bonjour_announce
     end
   end
 end

data/lib/specjour/worker.rb

@@ -10,6 +10,7 @@ module Specjour
       @number = number.to_i
       @batch_size = batch_size.to_i
       self.printer_uri = printer_uri
+      printer
       GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
       DistributedFormatter.batch_size = batch_size
       Dir.chdir(project_path)
@@ -22,13 +23,17 @@ module Specjour
 
     def run
       printer.send_message(:ready)
+      run_time = 0
       while !printer.closed? && data = printer.gets(TERMINATOR)
         spec = load_object(data)
         if spec
-          run_spec spec
+          run_time += Benchmark.realtime do
+            run_spec spec
+          end
           printer.send_message(:ready)
         else
           printer.send_message(:done)
+          printer.send_message(:worker_summary=, {:duration => sprintf("%6f", run_time)})
           printer.close
         end
       end
@@ -41,7 +46,7 @@ module Specjour
     end
 
     def printer_connection
-      TCPSocket.open(printer_uri.host, printer_uri.port).extend Protocol
+      Connection.new printer_uri
     end
 
     def run_spec(spec)

data/lib/specjour.rb

@@ -7,8 +7,11 @@ autoload :URI, 'uri'
 autoload :DRb, 'drb'
 autoload :Forwardable, 'forwardable'
 autoload :GServer, 'gserver'
+autoload :Timeout, 'timeout'
+autoload :Benchmark, 'benchmark'
 
 module Specjour
+  autoload :Connection, 'specjour/connection'
   autoload :Dispatcher, 'specjour/dispatcher'
   autoload :DistributedFormatter, 'specjour/distributed_formatter'
   autoload :FinalReport, 'specjour/final_report'
@@ -18,5 +21,6 @@ module Specjour
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.10".freeze
+  VERSION = "0.1.11".freeze
+  class Error < StandardError; end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - VERSION
 - bin/specjour
 - lib/specjour.rb
+- lib/specjour/connection.rb
 - lib/specjour/core_ext/array.rb
 - lib/specjour/db_scrub.rb
 - lib/specjour/dispatcher.rb