specjour 0.2.3 → 0.2.4

data/History.markdown

@@ -1,6 +1,13 @@
 History
 =======
 
+0.2.4
+-----
+*2010-05-10*
+
+* [added] Correct exit status
+* [fixed] Will reconnect when connection is lost while requesting tests
+
 0.2.3
 -----
 *2010-04-25*

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/specjour/connection.rb

@@ -39,11 +39,17 @@ module Specjour
       raise Error, "Connection to dispatcher timed out"
     end
 
+    def next_test
+      will_reconnect do
+        send_message(:ready)
+        load_object socket.gets(TERMINATOR)
+      end
+    end
+
     def print(arg)
-      socket.print dump_object(arg)
-    rescue SystemCallError => error
-      reconnect
-      retry
+      will_reconnect do
+        socket.print dump_object(arg)
+      end
     end
 
     def puts(arg)
@@ -68,5 +74,12 @@ module Specjour
       socket.close unless socket.closed?
       connect
     end
+
+    def will_reconnect(&block)
+      block.call
+    rescue SystemCallError => error
+      reconnect
+      retry
+    end
   end
 end

data/lib/specjour/cucumber/final_report.rb

@@ -55,6 +55,10 @@ module Specjour
         @summarizer.add(stats)
       end
 
+      def exit_status
+        @summarizer.failing_scenarios.empty?
+      end
+
       def summarize
         if @summarizer.failing_scenarios.any?
           puts "\n\n"

data/lib/specjour/dispatcher.rb

@@ -24,6 +24,7 @@ module Specjour
       gather_managers
       dispatch_work
       printer.join
+      exit printer.exit_status
     end
 
     protected

data/lib/specjour/printer.rb

@@ -33,14 +33,20 @@ module Specjour
     end
 
     def ready(client)
-      client.print specs_to_run.shift
-      client.flush
+      synchronize do
+        client.print specs_to_run.shift
+        client.flush
+      end
     end
 
     def done(client)
       self.completed_workers += 1
     end
 
+    def exit_status
+      report.exit_status
+    end
+
     def worker_summary=(client, summary)
       report.add(summary)
     end
@@ -83,6 +89,10 @@ module Specjour
       end
     end
 
+    def synchronize(&block)
+      @connectionsMutex.synchronize &block
+    end
+
     def abandoned_worker_message
       data = "* ERROR: NOT ALL WORKERS COMPLETED PROPERLY *"
       filler = "*" * data.size

data/lib/specjour/rspec/final_report.rb

@@ -22,6 +22,10 @@ module Specjour
         end
       end
 
+      def exit_status
+        failing_examples.empty?
+      end
+
       def increment(key, value)
         current = instance_variable_get("@#{key}")
         instance_variable_set("@#{key}", current + value)

data/lib/specjour/worker.rb

@@ -22,22 +22,16 @@ module Specjour
     end
 
     def run
-      connection.send_message(:ready)
       run_time = 0
       Dir.chdir(project_path)
-      while !connection.closed? && data = connection.gets(TERMINATOR)
-        test = load_object(data)
-        if test
-          run_time += Benchmark.realtime do
-            run_test test
-          end
-          connection.send_message(:ready)
-        else
-          connection.send_message(:worker_summary=, {:duration => sprintf("%6f", run_time)})
-          connection.send_message(:done)
-          connection.disconnect
+      while test = connection.next_test
+        run_time += Benchmark.realtime do
+          run_test test
         end
       end
+      connection.send_message(:worker_summary=, {:duration => sprintf("%6f", run_time)})
+      connection.send_message(:done)
+      connection.disconnect
     end
 
     protected

data/lib/specjour.rb

@@ -23,7 +23,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 
   class Error < StandardError; end
 

data/specjour.gemspec

@@ -0,0 +1,101 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{specjour}
+  s.version = "0.2.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sandro Turriate"]
+  s.date = %q{2010-05-10}
+  s.default_executable = %q{specjour}
+  s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
+  s.email = %q{sandro.turriate@gmail.com}
+  s.executables = ["specjour"]
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
+  s.files = [
+    ".dev",
+     ".document",
+     ".gitignore",
+     "History.markdown",
+     "MIT_LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "bin/specjour",
+     "lib/specjour.rb",
+     "lib/specjour/connection.rb",
+     "lib/specjour/cpu.rb",
+     "lib/specjour/cucumber.rb",
+     "lib/specjour/cucumber/dispatcher.rb",
+     "lib/specjour/cucumber/distributed_formatter.rb",
+     "lib/specjour/cucumber/final_report.rb",
+     "lib/specjour/cucumber/printer.rb",
+     "lib/specjour/db_scrub.rb",
+     "lib/specjour/dispatcher.rb",
+     "lib/specjour/manager.rb",
+     "lib/specjour/printer.rb",
+     "lib/specjour/protocol.rb",
+     "lib/specjour/rspec.rb",
+     "lib/specjour/rspec/distributed_formatter.rb",
+     "lib/specjour/rspec/final_report.rb",
+     "lib/specjour/rspec/marshalable_rspec_failure.rb",
+     "lib/specjour/rsync_daemon.rb",
+     "lib/specjour/socket_helpers.rb",
+     "lib/specjour/tasks/dispatch.rake",
+     "lib/specjour/tasks/specjour.rb",
+     "lib/specjour/worker.rb",
+     "rails/init.rb",
+     "spec/cpu_spec.rb",
+     "spec/lib/specjour/worker_spec.rb",
+     "spec/manager_spec.rb",
+     "spec/rsync_daemon_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/specjour_spec.rb",
+     "specjour.gemspec"
+  ]
+  s.homepage = %q{http://github.com/sandro/specjour}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Distribute your spec suite amongst your LAN via Bonjour.}
+  s.test_files = [
+    "spec/cpu_spec.rb",
+     "spec/lib/specjour/worker_spec.rb",
+     "spec/manager_spec.rb",
+     "spec/rsync_daemon_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/specjour_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dnssd>, ["= 1.3.1"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<rr>, ["= 0.10.11"])
+      s.add_development_dependency(%q<yard>, ["= 0.5.3"])
+    else
+      s.add_dependency(%q<dnssd>, ["= 1.3.1"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<rr>, ["= 0.10.11"])
+      s.add_dependency(%q<yard>, ["= 0.5.3"])
+    end
+  else
+    s.add_dependency(%q<dnssd>, ["= 1.3.1"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<rr>, ["= 0.10.11"])
+    s.add_dependency(%q<yard>, ["= 0.5.3"])
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-05-10 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/specjour_spec.rb
+- specjour.gemspec
 has_rdoc: true
 homepage: http://github.com/sandro/specjour
 licenses: []