specjour 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/bin/specjour

@@ -20,8 +20,7 @@ optparse = OptionParser.new do |opts|
   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
+    options[:worker_args] = args[0], args[1], args[2]
   end
 
   opts.on_tail('-v', '--version', 'Show the version of specjour') do

data/lib/specjour/dispatcher.rb

@@ -42,15 +42,7 @@ module Specjour
     end
 
     def dispatch_work
-      distributable_specs = all_specs.among(worker_size)
-      last_index = 0
-      managers.each_with_index do |manager, index|
-        manager.specs_to_run = Array.new(manager.worker_size) do |i|
-          distributable_specs[last_index + i]
-        end
-        last_index += manager.worker_size
-        manager_threads << Thread.new(manager) {|m| m.dispatch}
-      end
+      command_managers(true) { |m| m.dispatch }
     end
 
     def drb_start
@@ -87,7 +79,11 @@ module Specjour
     end
 
     def printer
-      @printer ||= Printer.new.start
+      @printer ||= begin
+        p = Printer.new
+        p.specs_to_run = all_specs
+        p.start
+      end
     end
 
     def project_name

data/lib/specjour/distributed_formatter.rb

@@ -12,7 +12,7 @@ module Specjour
 
     def initialize(options, output)
       @options = options
-      @output = output.extend Specjour::Protocol
+      @output = output
       @failing_messages = []
       @passing_messages = []
       @pending_messages = []
@@ -41,8 +41,7 @@ module Specjour
       @example_count = example_count
       @failure_count = failure_count
       @pending_count = pending_count
-      output.puts [:worker_summary=, to_hash]
-      output.flush
+      output.send_message(:worker_summary=, to_hash)
     end
 
     def dump_pending

data/lib/specjour/manager.rb

@@ -37,7 +37,7 @@ module Specjour
       bonjour_service.stop
       (1..worker_size).each do |index|
         worker_pids << fork do
-          exec("specjour --batch-size #{batch_size} --do-work #{project_path},#{dispatcher_uri},#{index},#{specs_to_run[index - 1].join(',')}")
+          exec("specjour --batch-size #{batch_size} --do-work #{project_path},#{dispatcher_uri},#{index}")
           Kernel.exit!
         end
       end
@@ -55,7 +55,7 @@ module Specjour
 
     def drb_start
       DRb.start_service nil, self
-      Kernel.puts "Manager started at #{drb_uri}"
+      puts "Manager started at #{drb_uri}"
       at_exit { DRb.stop_service }
     end
 
@@ -66,7 +66,7 @@ module Specjour
     protected
 
     def cmd(command)
-      Kernel.puts command
+      puts command
       system command
     end
 

data/lib/specjour/printer.rb

@@ -3,8 +3,7 @@ module Specjour
     include Protocol
     RANDOM_PORT = 0
 
-    attr_reader :completed_workers
-    attr_accessor :worker_size
+    attr_accessor :worker_size, :specs_to_run, :completed_workers
 
     def initialize
       super(
@@ -19,34 +18,43 @@ module Specjour
     end
 
     def serve(client)
+      client.extend Protocol
       client.each(TERMINATOR) do |data|
-        process load_object(data)
+        process load_object(data), client
       end
     end
 
-    def worker_summary=(summary)
+    def ready(client)
+      client.print specs_to_run.shift
+      client.flush
+    end
+
+    def done(client)
+      self.completed_workers += 1
+    end
+
+    def worker_summary=(client, summary)
       report.add(summary)
     end
 
     protected
 
     def disconnecting(client_port)
-      @completed_workers += 1
       if completed_workers == worker_size
         stop
       end
     end
 
     def log(msg)
-      #noop
+      # noop
     end
 
-    def process(message)
+    def process(message, client)
       if message.is_a?(String)
         $stdout.print message
         $stdout.flush
       elsif message.is_a?(Array)
-        send(message.first, message[1])
+        send(message.first, client, *message[1..-1])
       end
     end
 

data/lib/specjour/protocol.rb

@@ -1,21 +1,27 @@
 module Specjour
   module Protocol
     TERMINATOR = "|ruojceps|"
+    TERMINATOR_REGEXP = /#{TERMINATOR}$/
 
-    def puts(arg)
-      print(arg << "\n")
+    def dump_object(data)
+      Marshal.dump(data) << TERMINATOR
+    end
+
+    def load_object(data)
+      Marshal.load(data.sub(TERMINATOR_REGEXP, ''))
     end
 
     def print(arg)
       super dump_object(arg)
     end
 
-    def dump_object(data)
-      Marshal.dump(data) << TERMINATOR
+    def puts(arg)
+      print(arg << "\n")
     end
 
-    def load_object(data)
-      Marshal.load(data.sub(/#{TERMINATOR}$/, ''))
+    def send_message(method_name, *args)
+      print([method_name, *args])
+      flush
     end
   end
 end

data/lib/specjour/worker.rb

@@ -1,45 +1,59 @@
 module Specjour
   class Worker
-    attr_accessor :dispatcher_uri
+    include Protocol
+    attr_accessor :printer_uri
     attr_reader :project_path, :specs_to_run, :number, :batch_size
 
-    def initialize(project_path, dispatcher_uri, number, specs_to_run, batch_size)
+    def initialize(project_path, printer_uri, number, batch_size)
       @project_path = project_path
       @specs_to_run = specs_to_run
       @number = number.to_i
       @batch_size = batch_size.to_i
-      self.dispatcher_uri = dispatcher_uri
+      self.printer_uri = printer_uri
+      GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+      DistributedFormatter.batch_size = batch_size
+      Dir.chdir(project_path)
+      set_env_variables
     end
 
-    def dispatcher_uri=(val)
-      @dispatcher_uri = URI.parse(val)
+    def printer_uri=(val)
+      @printer_uri = URI.parse(val)
     end
 
     def run
-      puts "Running #{specs_to_run.size} spec files..."
-      GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
-      DistributedFormatter.batch_size = batch_size
-      Dir.chdir(project_path) do
-        set_env_variables
-        options = Spec::Runner::OptionParser.parse(
-          rspec_options,
-          STDERR,
-          dispatcher
-        )
-        Spec::Runner.use options
-        options.run_examples
-        Spec::Runner.options.instance_variable_set(:@examples_run, true)
+      printer.send_message(:ready)
+      while !printer.closed? && data = printer.gets(TERMINATOR)
+        spec = load_object(data)
+        if spec
+          run_spec spec
+          printer.send_message(:ready)
+        else
+          printer.send_message(:done)
+          printer.close
+        end
       end
     end
 
     protected
 
-    def dispatcher
-      @dispatcher ||= TCPSocket.open dispatcher_uri.host, dispatcher_uri.port
+    def printer
+      @printer ||= printer_connection
+    end
+
+    def printer_connection
+      TCPSocket.open(printer_uri.host, printer_uri.port).extend Protocol
     end
 
-    def rspec_options
-      %w(--format=Specjour::DistributedFormatter) + specs_to_run
+    def run_spec(spec)
+      Kernel.puts "Running #{spec}"
+      options = Spec::Runner::OptionParser.parse(
+        ['--format=Specjour::DistributedFormatter', spec],
+        $stderr,
+        printer_connection
+      )
+      Spec::Runner.use options
+      options.run_examples
+      Spec::Runner.options.instance_variable_set(:@examples_run, true)
     end
 
     def set_env_variables

data/lib/specjour.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency