specjour 0.3.0 → 0.3.1

data/History.markdown

@@ -1,6 +1,15 @@
 History
 =======
 
+0.3.1 / 2010-10-16
+----------------
+
+#### Fixes
+* Stopping bonjour actually stops the currently running service
+* Only retry connecting to a DRb object 5 times instead of timing out
+  trying to connect to one bad connection
+* Set correct process name when the dispatcher starts a listener
+
 ## 0.3.0 / 2010-10-14
 
 * [fixed] Cucumber output for scenario outlines (delitescere & supaspoida)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/specjour/dispatcher.rb

@@ -4,7 +4,7 @@ module Specjour
     Thread.abort_on_exception = true
     include SocketHelper
 
-    attr_reader :project_alias, :managers, :manager_threads, :hosts, :options, :all_tests
+    attr_reader :project_alias, :managers, :manager_threads, :hosts, :options, :all_tests, :drb_connection_errors
     attr_accessor :worker_size, :project_path
 
     def initialize(options = {})
@@ -13,6 +13,7 @@ module Specjour
       @project_path = File.expand_path options[:project_path]
       @worker_size = 0
       @managers = []
+      @drb_connection_errors = Hash.new(0)
       find_tests
       clear_manager_threads
     end
@@ -77,17 +78,14 @@ module Specjour
     end
 
     def fetch_manager(uri)
-      Timeout.timeout(0.5) do
-        manager = DRbObject.new_with_uri(uri.to_s)
-        if !managers.include?(manager) && manager.available_for?(project_alias)
-          add_manager(manager)
-        end
+      manager = DRbObject.new_with_uri(uri.to_s)
+      if !managers.include?(manager) && manager.available_for?(project_alias)
+        add_manager(manager)
       end
-    rescue Timeout::Error
-      Specjour.logger.debug "Timeout: couldn't connect to manager at #{uri}"
     rescue DRb::DRbConnError => e
-      Specjour.logger.debug "#{e.message}: #{e.backtrace.join("\n")}"
-      retry
+      drb_connection_errors[uri] += 1
+      Specjour.logger.debug "#{e.message}: couldn't connect to manager at #{uri}"
+      retry if drb_connection_errors[uri] < 5
     end
 
     def fork_local_manager

data/lib/specjour/manager.rb

@@ -45,6 +45,7 @@ module Specjour
     end
 
     def drb_start
+      $PROGRAM_NAME = "specjour listen" if quiet?
       DRb.start_service drb_uri.to_s, self
       at_exit { DRb.stop_service }
     end
@@ -117,7 +118,7 @@ module Specjour
     end
 
     def bonjour_service
-      @bonjour_service = DNSSD::Service.new
+      @bonjour_service ||= DNSSD::Service.new
     end
 
     def cmd(command)
@@ -132,8 +133,13 @@ module Specjour
       end
     end
 
-    def suspend_bonjour(&block)
+    def stop_bonjour
       bonjour_service.stop
+      @bonjour_service = nil
+    end
+
+    def suspend_bonjour(&block)
+      stop_bonjour
       block.call
       bonjour_announce
     end

data/lib/specjour.rb

@@ -28,7 +28,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
   HOOKS_PATH = "./.specjour/hooks.rb"
 
   def self.interrupted?

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2010-10-16}
   s.default_executable = %q{specjour}
   s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
   s.email = %q{sandro.turriate@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-10-16 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency