specjour 0.1.12 → 0.1.13

data/README.markdown

@@ -1,4 +1,7 @@
 # Specjour
+
+## FUCK SETI. Run specs with your spare CPU cycles.
+
 _Distribute your spec suite amongst your LAN via Bonjour._
 
 1. Spin up a manager on each machine that can run your specs.

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/bin/specjour

@@ -23,6 +23,10 @@ optparse = OptionParser.new do |opts|
     options[:worker_args] = args[0], args[1], args[2]
   end
 
+  opts.on('--log', TrueClass, 'print debug messages to stdout') do |val|
+    Specjour.new_logger Logger::DEBUG
+  end
+
   opts.on_tail('-v', '--version', 'Show the version of specjour') do
     abort Specjour::VERSION
   end

data/lib/specjour/connection.rb

@@ -1,18 +1,15 @@
 module Specjour
   class Connection
-    MAX_RECONNECTS = 5
-
     include Protocol
     extend Forwardable
 
     attr_reader :uri
     attr_writer :socket
-    attr_accessor :reconnection_attempts
 
     def_delegators :socket, :flush, :closed?, :close, :gets, :each
 
     def self.wrap(established_connection)
-      host, port = established_connection.peeraddr.values_at(2,1)
+      host, port = established_connection.peeraddr.values_at(3,1)
       connection = new URI::Generic.build(:host => host, :port => port)
       connection.socket = established_connection
       connection
@@ -20,23 +17,25 @@ module Specjour
 
     def initialize(uri)
       @uri = uri
-      @reconnection_attempts = 0
     end
 
     def connect
-      @socket = TCPSocket.open(uri.host, uri.port)
-    rescue SystemCallError => error
-      Kernel.puts "Could not connect to #{uri.to_s}\n#{error.inspect}"
+      timeout { connect_socket }
     end
 
     def socket
       @socket ||= connect
     end
 
+    def timeout(&block)
+      Timeout.timeout(5, &block)
+    rescue Timeout::Error
+      raise Error, "Connection to dispatcher timed out"
+    end
+
     def print(arg)
       socket.print dump_object(arg)
     rescue SystemCallError => error
-      Kernel.p error
       reconnect
       retry
     end
@@ -52,14 +51,16 @@ module Specjour
 
     protected
 
+    def connect_socket
+      @socket = TCPSocket.open(uri.host, uri.port)
+    rescue Errno::ECONNREFUSED => error
+      Specjour.logger.debug "Could not connect to #{uri.to_s}\n#{error.inspect}"
+      retry
+    end
+
     def reconnect
-      socket.close
-      if reconnection_attempts < MAX_RECONNECTS
-        connect
-        self.reconnection_attempts += 1
-      else
-        raise Error, "Lost connection #{MAX_RECONNECTS} times"
-      end
+      socket.close unless socket.closed?
+      connect
     end
   end
 end

data/lib/specjour/dispatcher.rb

@@ -40,12 +40,16 @@ module Specjour
     end
 
     def fetch_manager(uri)
-      manager = DRbObject.new_with_uri(uri.to_s)
-      if !managers.include?(manager) && manager.available_for?(project_name)
-        set_up_manager(manager, uri)
-        managers << manager
-        self.worker_size += manager.worker_size
+      Timeout.timeout(1) do
+        manager = DRbObject.new_with_uri(uri.to_s)
+        if !managers.include?(manager) && manager.available_for?(project_name)
+          set_up_manager(manager, uri)
+          managers << manager
+          self.worker_size += manager.worker_size
+        end
       end
+    rescue Timeout::Error
+      Specjour.logger.debug "Couldn't work with manager at #{uri}"
     end
 
     def gather_managers
@@ -53,7 +57,7 @@ module Specjour
       Signal.trap('INT') { exit }
       browser = DNSSD::Service.new
       begin
-        Timeout.timeout(5) do
+        Timeout.timeout(10) do
           browser.browse '_druby._tcp' do |reply|
             if reply.flags.add?
               resolve_reply(reply)
@@ -73,6 +77,10 @@ module Specjour
       @hostname ||= Socket.gethostname
     end
 
+    def host_ip
+      @host_ip ||= Specjour.ip_from_hostname hostname
+    end
+
     def printer
       @printer ||= begin
         p = Printer.new
@@ -91,7 +99,8 @@ module Specjour
 
     def resolve_reply(reply)
       DNSSD.resolve!(reply) do |resolved|
-        uri = URI::Generic.build :scheme => reply.service_name, :host => resolved.target, :port => resolved.port
+        resolved_ip = Specjour.ip_from_hostname(resolved.target)
+        uri = URI::Generic.build :scheme => reply.service_name, :host => resolved_ip, :port => resolved.port
         fetch_manager(uri)
         resolved.service.stop if resolved.service.started?
       end
@@ -103,7 +112,7 @@ module Specjour
 
     def set_up_manager(manager, uri)
       manager.project_name = project_name
-      manager.dispatcher_uri = URI::Generic.build :scheme => "specjour", :host => hostname, :port => printer.port
+      manager.dispatcher_uri = URI::Generic.build :scheme => "specjour", :host => host_ip, :port => printer.port
       at_exit { manager.kill_worker_processes }
     end
 

data/lib/specjour/manager.rb

@@ -44,7 +44,7 @@ module Specjour
     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}")
+          exec("specjour --batch-size #{batch_size} #{'--log' if Specjour.log?} --do-work #{project_path},#{dispatcher_uri},#{index}")
           Kernel.exit!
         end
       end

data/lib/specjour.rb

@@ -9,6 +9,8 @@ autoload :Forwardable, 'forwardable'
 autoload :GServer, 'gserver'
 autoload :Timeout, 'timeout'
 autoload :Benchmark, 'benchmark'
+autoload :Logger, 'logger'
+autoload :Socket, 'socket'
 
 module Specjour
   autoload :Connection, 'specjour/connection'
@@ -21,6 +23,25 @@ module Specjour
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.12".freeze
+  VERSION = "0.1.13".freeze
+
   class Error < StandardError; end
+
+  def self.logger
+    @logger ||= new_logger
+  end
+
+  def self.new_logger(level = Logger::UNKNOWN)
+    @logger = Logger.new $stdout
+    @logger.level = level
+    @logger
+  end
+
+  def self.log?
+    logger.level != Logger::UNKNOWN
+  end
+
+  def self.ip_from_hostname(hostname)
+    Socket.getaddrinfo(hostname, nil).last.fetch(3)
+  end
 end

data/spec/lib/specjour/connection_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Specjour::Connection do
+  require 'stringio'
+  describe "#print" do
+    context "connection unavailable" do
+      let(:connection) do
+        Specjour::Connection.new(URI.parse("specjour://me.local:12345"))
+      end
+
+      it "reconnects" do
+        socket = mock(:closed? => false, :close => true)
+        socket.stub(:print).and_raise(Errno::EPIPE)
+        connection.instance_variable_set(:@socket, socket)
+        new_socket = mock(:print => true)
+        TCPSocket.stub(:open => new_socket)
+        connection.print('hi').should be_true
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -04:00
+date: 2010-04-14 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,7 @@ signing_key:
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: 
+- spec/lib/specjour/connection_spec.rb
 - spec/lib/specjour/core_ext/array_spec.rb
 - spec/lib/specjour/worker_spec.rb
 - spec/spec_helper.rb