specjour 0.3.0.rc2 → 0.3.0.rc3

data/History.markdown

@@ -1,7 +1,16 @@
 History
 =======
 
-## 0.3.0.rc2 / thor
+## 0.3.0.rc3 / 2010-07-27
+
+* [fixed] Cucumber prints elapsed time
+
+* [added] Print hostname for each hostname (closes gh-8)
+
+* [added] Rspec2 support
+
+
+## 0.3.0.rc2 / 2010-07-14
 
 * [fixed] Cucumber compatibility with 0.8.5
 

data/README.markdown

@@ -2,17 +2,10 @@
 
 ## 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.
 2. Start a dispatcher in your project directory.
 3. Say farewell to your long coffee breaks.
 
-## Requirements
-* Bonjour or DNSSD (the capability and the gem)
-* Rsync (system command used)
-* Rspec (officially v1.3.0)
-
 ## Installation
     gem install specjour
 

data/Rakefile

@@ -11,8 +11,7 @@ begin
     gem.homepage = "http://github.com/sandro/specjour"
     gem.authors = ["Sandro Turriate"]
     gem.add_dependency "dnssd", "1.3.1"
-    gem.add_dependency "rspec"
-    gem.add_dependency "thor", "0.13.6"
+    gem.add_dependency "thor", "~>0.13.4"
     gem.add_development_dependency "rspec", "1.3.0"
     gem.add_development_dependency "rr", ">=0.10.11"
     gem.add_development_dependency "yard", ">=0.5.3"

data/VERSION

@@ -1 +1 @@
-0.3.0.rc2
+0.3.0.rc3

data/lib/specjour/connection.rb

@@ -52,7 +52,7 @@ module Specjour
       end
     end
 
-    def puts(arg)
+    def puts(arg='')
       print(arg << "\n")
     end
 
@@ -78,8 +78,10 @@ module Specjour
     def will_reconnect(&block)
       block.call
     rescue SystemCallError => error
-      reconnect
-      retry
+      unless Specjour.interrupted?
+        reconnect
+        retry
+      end
     end
   end
 end

data/lib/specjour/db_scrub.rb

@@ -1,8 +1,14 @@
 module Specjour
   module DbScrub
     require 'rake'
-    load 'tasks/misc.rake'
-    load 'tasks/databases.rake'
+    if defined?(Rails) && Rails.version =~ /^3/
+      task(:environment) {}
+      load 'rails/tasks/misc.rake'
+      load 'active_record/railties/databases.rake'
+    else
+      load 'tasks/misc.rake'
+      load 'tasks/databases.rake'
+    end
 
     extend self
 

data/lib/specjour/dispatcher.rb

@@ -4,11 +4,6 @@ module Specjour
     Thread.abort_on_exception = true
     include SocketHelper
 
-    class << self
-      attr_accessor :interrupted
-      alias interrupted? interrupted
-    end
-
     attr_reader :project_alias, :managers, :manager_threads, :hosts, :options, :all_tests
     attr_accessor :worker_size, :project_path
 
@@ -26,7 +21,6 @@ module Specjour
       gather_managers
       rsync_daemon.start
       dispatch_work
-      Signal.trap('INT') { Dispatcher.interrupted = true; exit 1 }
       printer.join if dispatching_tests?
       wait_on_managers
       exit printer.exit_status
@@ -73,8 +67,10 @@ module Specjour
     end
 
     def dispatch_work
-      puts "Managers found: #{managers.size}"
       puts "Workers found: #{worker_size}"
+      managers.each do |manager|
+        puts "#{manager.hostname} (#{manager.worker_size})"
+      end
       printer.worker_size = worker_size
       command_managers(true) { |m| m.dispatch }
     end

data/lib/specjour/printer.rb

@@ -109,7 +109,7 @@ module Specjour
     end
 
     def warn_if_workers_deserted
-      if disconnections != completed_workers && !Dispatcher.interrupted?
+      if disconnections != completed_workers && !Specjour.interrupted?
         puts
         puts workers_deserted_message
       end

data/lib/specjour/rspec/marshalable_exception.rb

@@ -0,0 +1,15 @@
+module Specjour::Rspec
+  class MarshalableException
+    attr_accessor :message, :backtrace, :class_name
+
+    def initialize(exception)
+      self.class_name = exception.class.name
+      self.message = exception.message
+      self.backtrace = exception.backtrace
+    end
+
+    def class
+      @class ||= OpenStruct.new :name => class_name
+    end
+  end
+end

data/lib/specjour/rspec/marshalable_rspec_failure.rb

@@ -18,18 +18,4 @@ module Specjour
       end
     end
   end
-
-  class MarshalableException
-    attr_accessor :message, :backtrace, :class_name
-
-    def initialize(exception)
-      self.class_name = exception.class.name
-      self.message = exception.message
-      self.backtrace = exception.backtrace
-    end
-
-    def class
-      @class ||= OpenStruct.new :name => class_name
-    end
-  end
 end

data/lib/specjour/rspec/runner.rb

@@ -0,0 +1,11 @@
+module Specjour::Rspec::Runner
+  def self.run(spec, output)
+    options = Spec::Runner::OptionParser.parse(
+      ['--format=Specjour::Rspec::DistributedFormatter', spec],
+      $stderr,
+      output
+    )
+    Spec::Runner.use options
+    options.run_examples
+  end
+end

data/lib/specjour/rspec.rb

@@ -1,10 +1,32 @@
 module Specjour
   module Rspec
-    require 'spec'
-    require 'spec/runner/formatter/base_text_formatter'
+    def self.load_rspec1
+      require 'spec'
+      require 'spec/runner/formatter/base_text_formatter'
+
+      require 'specjour/rspec/distributed_formatter'
+      require 'specjour/rspec/final_report'
+      require 'specjour/rspec/marshalable_exception'
+      require 'specjour/rspec/preloader'
+      require 'specjour/rspec/runner'
+    end
+
+    def self.load_rspec2
+      require 'rspec/core'
+      ::Rspec::Core::Runner.disable_autorun!
+
+      require 'specjour/rspec/marshalable_exception'
+      require 'specjour/rspec/preloader'
+      require 'specjour/rspec2/distributed_formatter'
+      require 'specjour/rspec2/final_report'
+      require 'specjour/rspec2/runner'
+    end
+
+    begin
+      load_rspec2
+    rescue LoadError
+      load_rspec1
+    end
 
-    require 'specjour/rspec/distributed_formatter'
-    require 'specjour/rspec/final_report'
-    require 'specjour/rspec/preloader'
   end
 end

data/lib/specjour/rspec2/distributed_formatter.rb

@@ -0,0 +1,38 @@
+module Specjour::Rspec
+  class DistributedFormatter < ::RSpec::Core::Formatters::ProgressFormatter
+
+    def metadata_for_examples
+      examples.map do |example|
+        metadata = example.metadata
+        {
+          :execution_result => marshalable_execution_result(example.execution_result),
+          :description      => metadata[:description],
+          :file_path        => metadata[:file_path],
+          :full_description => metadata[:full_description],
+          :line_number      => metadata[:line_number],
+          :location         => metadata[:location]
+        }
+      end
+    end
+
+    def noop
+    end
+    alias dump_pending noop
+    alias dump_failures noop
+    alias start_dump noop
+
+    def dump_summary(*args)
+      output.send_message :rspec_summary=, metadata_for_examples
+    end
+
+    protected
+
+    def marshalable_execution_result(execution_result)
+      if exception = execution_result[:exception_encountered]
+        execution_result[:exception_encountered] = MarshalableException.new(exception)
+      end
+      execution_result
+    end
+
+  end
+end

data/lib/specjour/rspec2/final_report.rb

@@ -0,0 +1,60 @@
+module Specjour::Rspec
+  class FinalReport
+    attr_reader :examples
+    attr_reader :duration
+
+    def initialize
+      @examples = []
+      @duration = 0.0
+    end
+
+    def add(data)
+      if data.respond_to?(:has_key?) && data.has_key?(:duration)
+        self.duration = data[:duration]
+      else
+        metadata_for_examples(data)
+      end
+    end
+
+    def duration=(value)
+      @duration = value.to_f if duration < value.to_f
+    end
+
+    def exit_status
+      formatter.failed_examples.empty?
+    end
+
+    def metadata_for_examples(metadata_collection)
+      examples.concat(
+        metadata_collection.map do |partial_metadata|
+          example = ::Rspec::Core::Example.allocate
+          metadata = ::Rspec::Core::Metadata.new
+          metadata.merge! partial_metadata
+          example.instance_variable_set(:@metadata, metadata)
+          example
+        end
+      )
+    end
+
+    def formatter
+      @formatter ||= new_progress_formatter
+    end
+
+    def summarize
+      if examples.size > 0
+        formatter.dump_summary(duration, formatter.example_count, formatter.failure_count, formatter.pending_count)
+        formatter.dump_pending
+        formatter.dump_failures
+      end
+    end
+
+    protected
+    def new_progress_formatter
+      new_formatter = ::Rspec::Core::Formatters::ProgressFormatter.new($stdout)
+      new_formatter.instance_variable_set(:@examples, examples)
+      new_formatter.instance_variable_set(:@example_count, examples.size)
+      Rspec.configuration.color_enabled = true
+      new_formatter
+    end
+  end
+end

data/lib/specjour/rspec2/runner.rb

@@ -0,0 +1,12 @@
+module Specjour::Rspec::Runner
+  def self.run(spec, output)
+    reset
+    options = ['--format=Specjour::Rspec::DistributedFormatter', spec]
+    ::Rspec::Core::Runner.run options, $stderr, output
+  end
+
+  def self.reset
+    ::Rspec.instance_variable_set(:@world, nil)
+    ::Rspec.configuration.instance_variable_set(:@formatter, nil)
+  end
+end

data/lib/specjour/worker.rb

@@ -34,15 +34,16 @@ module Specjour
     def run_tests
       load_app
       Configuration.after_fork.call
-      run_time = 0
+      run_times = Hash.new(0)
 
       while test = connection.next_test
         time = Benchmark.realtime do
           run_test test
         end
-        run_time += time if test =~ /_spec\.rb$/
+        run_times[test_type(test)] += time
       end
-      connection.send_message(:rspec_summary=, {:duration => sprintf("%6f", run_time)})
+
+      send_run_times(run_times)
       connection.send_message(:done)
       connection.disconnect
     end
@@ -60,6 +61,8 @@ module Specjour
     def load_app
       Rspec::Preloader.load(preload_spec) if preload_spec
       Cucumber::Preloader.load(preload_feature) if preload_feature
+    rescue StandardError => exception
+      $stderr.puts "Caught exception: #{exception.class} #{exception.message}\nProceeding..."
     end
 
     def printer_connection
@@ -74,7 +77,7 @@ module Specjour
 
     def run_test(test)
       print_status(test)
-      if test =~ /\.feature$/
+      if test_type(test) == :cucumber
         run_feature test
       else
         run_spec test
@@ -87,18 +90,22 @@ module Specjour
     end
 
     def run_spec(spec)
-      options = Spec::Runner::OptionParser.parse(
-        ['--format=Specjour::Rspec::DistributedFormatter', spec],
-        $stderr,
-        connection
-      )
-      Spec::Runner.use options
-      options.run_examples
+      Specjour::Rspec::Runner.run(spec, connection)
+    end
+
+    def send_run_times(run_times)
+      [:rspec, :cucumber].each do |type|
+        connection.send_message(:"#{type}_summary=", {:duration => sprintf("%6f", run_times[type])})
+      end
+    end
+
+    def test_type(test)
+      test =~ /\.feature$/ ? :cucumber : :rspec
     end
 
     def set_env_variables
-      ENV['RSPEC_COLOR'] = 'true'
-      ENV['TEST_ENV_NUMBER'] = number.to_s
+      ENV['RSPEC_COLOR'] ||= 'true'
+      ENV['TEST_ENV_NUMBER'] ||= number.to_s
     end
   end
 end

data/lib/specjour.rb

@@ -28,9 +28,14 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0.rc2".freeze
+  VERSION = "0.3.0.rc3".freeze
   HOOKS_PATH = ".specjour/hooks.rb"
 
+  class << self
+    attr_accessor :interrupted
+    alias interrupted? interrupted
+  end
+
   def self.logger
     @logger ||= new_logger
   end
@@ -53,4 +58,6 @@ module Specjour
   PROGRAM_NAME = $PROGRAM_NAME # keep a reference of the original program name
 
   GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+
+  Signal.trap('INT') { Specjour.interrupted = true; exit 1 }
 end

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0.rc2"
+  s.version = "0.3.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-07-27}
   s.default_executable = %q{specjour}
   s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
   s.email = %q{sandro.turriate@gmail.com}
@@ -45,8 +45,13 @@ Gem::Specification.new do |s|
      "lib/specjour/rspec.rb",
      "lib/specjour/rspec/distributed_formatter.rb",
      "lib/specjour/rspec/final_report.rb",
+     "lib/specjour/rspec/marshalable_exception.rb",
      "lib/specjour/rspec/marshalable_rspec_failure.rb",
      "lib/specjour/rspec/preloader.rb",
+     "lib/specjour/rspec/runner.rb",
+     "lib/specjour/rspec2/distributed_formatter.rb",
+     "lib/specjour/rspec2/final_report.rb",
+     "lib/specjour/rspec2/runner.rb",
      "lib/specjour/rsync_daemon.rb",
      "lib/specjour/socket_helper.rb",
      "lib/specjour/worker.rb",
@@ -83,23 +88,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= 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_runtime_dependency(%q<thor>, ["= 0.13.6"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.13.4"])
       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<thor>, ["= 0.13.6"])
+      s.add_dependency(%q<thor>, ["~> 0.13.4"])
       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<thor>, ["= 0.13.6"])
+    s.add_dependency(%q<thor>, ["~> 0.13.4"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<rr>, [">= 0.10.11"])
     s.add_dependency(%q<yard>, [">= 0.5.3"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
-  hash: 977940567
+  hash: 977940564
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
-  - rc2
-  version: 0.3.0.rc2
+  - rc3
+  version: 0.3.0.rc3
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -04:00
+date: 2010-07-27 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,39 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 35
         segments: 
         - 0
         - 13
-        - 6
-        version: 0.13.6
+        - 4
+        version: 0.13.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,11 +66,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,11 +82,11 @@ dependencies:
         - 11
         version: 0.10.11
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,7 +98,7 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: Distribute your spec suite amongst your LAN via Bonjour.
 email: sandro.turriate@gmail.com
 executables: 
@@ -149,8 +135,13 @@ files:
 - lib/specjour/rspec.rb
 - lib/specjour/rspec/distributed_formatter.rb
 - lib/specjour/rspec/final_report.rb
+- lib/specjour/rspec/marshalable_exception.rb
 - lib/specjour/rspec/marshalable_rspec_failure.rb
 - lib/specjour/rspec/preloader.rb
+- lib/specjour/rspec/runner.rb
+- lib/specjour/rspec2/distributed_formatter.rb
+- lib/specjour/rspec2/final_report.rb
+- lib/specjour/rspec2/runner.rb
 - lib/specjour/rsync_daemon.rb
 - lib/specjour/socket_helper.rb
 - lib/specjour/worker.rb