specjour 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/specjour

@@ -15,6 +15,10 @@ optparse = OptionParser.new do |opts|
     options[:batch_size] = n
   end
 
+  opts.on('-d', '--dispatcher HOSTNAME', "Only run specs from the dispatcher running on this host, i.e. farnsworth.local") do |name|
+    options[:registered_dispatcher] = name
+  end
+
   opts.on('--do-work OPTIONS', Array, 'INTERNAL USE ONLY') do |args|
     specs_to_run = args[3..-1]
     options[:worker_args] = args[0], args[1], args[2], specs_to_run
@@ -37,5 +41,5 @@ if options[:worker_args]
   options[:worker_args] << options[:batch_size]
   Specjour::Worker.new(*options[:worker_args]).run
 else
-  Specjour::Manager.new(options[:worker_size], options[:batch_size]).start
+  Specjour::Manager.new(options).start
 end

data/lib/specjour/dispatcher.rb

@@ -60,7 +60,7 @@ module Specjour
 
     def fetch_manager(uri)
       manager = DRbObject.new_with_uri(uri.to_s)
-      unless managers.include?(manager)
+      if !managers.include?(manager) && manager.available_for?(hostname)
         set_up_manager(manager, uri)
         managers << manager
         self.worker_size += manager.worker_size
@@ -78,9 +78,14 @@ module Specjour
         browser.stop unless reply.flags.more_coming?
       end
       puts "Managers found: #{managers.size}"
+      abort unless managers.size > 0
       printer.worker_size = worker_size
     end
 
+    def hostname
+      @hostname ||= Socket.gethostname
+    end
+
     def printer
       @printer ||= Printer.new.start
     end
@@ -107,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 => printer.hostname, :port => printer.port
+      manager.dispatcher_uri = URI::Generic.build :scheme => "specjour", :host => hostname, :port => printer.port
     end
 
     def sync_managers

data/lib/specjour/manager.rb

@@ -3,13 +3,19 @@ module Specjour
     require 'dnssd'
     include DRbUndumped
 
-    attr_accessor :project_name, :specs_to_run, :dispatcher_uri, :worker_size, :bonjour_service, :batch_size
+    attr_accessor :project_name, :specs_to_run, :dispatcher_uri
+    attr_reader :worker_size, :batch_size, :registered_dispatcher, :bonjour_service
 
-    def initialize(worker_size = 1, batch_size = 1)
-      @worker_size = worker_size
-      @batch_size = batch_size
+    def initialize(options = {})
+      @worker_size = options[:worker_size]
+      @batch_size = options[:batch_size]
+      @registered_dispatcher = options[:registered_dispatcher]
     end
 
+    def available_for?(hostname)
+      registered_dispatcher ? registered_dispatcher == hostname : true
+   end
+
     def bundle_install
       Dir.chdir(project_path) do
         unless system('bundle check > /dev/null')

data/lib/specjour/printer.rb

@@ -28,10 +28,6 @@ module Specjour
       report.add(summary)
     end
 
-    def hostname
-      @hostname ||= Socket.gethostname
-    end
-
     protected
 
     def disconnecting(client_port)

data/lib/specjour.rb

@@ -18,5 +18,5 @@ module Specjour
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Sandro Turriate