specjour 0.3.1 → 0.4.0

data/History.markdown

@@ -1,8 +1,19 @@
 History
 =======
 
+0.4.0 / 2011-03-09
+------------------
+
+l4rk and leshill
+
+* [added] Remove Jeweler
+* [added] Use RSpec2 for development
+* [added] Cucumber 0.9+ compatibility
+* [added] RSpec2 compatibility
+* [removed] No longer supporting RSpec 1 and Cucumber 0.8
+
 0.3.1 / 2010-10-16
-----------------
+------------------
 
 #### Fixes
 * Stopping bonjour actually stops the currently running service

data/README.markdown

@@ -104,18 +104,32 @@ By default, the dispatcher looks for managers matching the project's directory n
 
 ## Compatibility
 
-* RSpec 1.3.x
-* RSpec 2.0.0
-* Cucumber 0.8.5
-* Cucumber 0.9.2
+* RSpec 2
+* Cucumber 0.9+
 * Rails 2
 * Rails 3
 
+## Hacking on Specjour
+If you want to hack on specjour, here is how to test your changes:
+
+    source .dev
+    rake # run the test suite sanely
+    specjour # run the test suite with specjour
+    cd sample
+    specjour # run the cucumber test suite with specjour
+
+Then if all is good, go to another app and test your changes on your test suite:
+
+    gem build specjour.gemspec
+    cd /path/to/your/project
+    gem install -l /path/to/specjour/latest.gem
+    specjour
+
 ## Thanks
 
 * shayarnett - Cucumber support, pairing and other various patches
 * voxdolo - Endless support, alpha testing, various patches
-* leshill - Made rsync daemon configurable
+* l4rk and leshill - Removed Jeweler, added support for RSpec 2 and Cucumber 0.9+
 * testjour - Ripped off your name
 * parallel\_tests - Made my test suite twice as fast
 

data/Rakefile

@@ -1,42 +1,10 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "specjour"
-    gem.summary = %Q{Distribute your spec suite amongst your LAN via Bonjour.}
-    gem.description = %Q{Distribute your spec suite amongst your LAN via Bonjour.}
-    gem.email = "sandro.turriate@gmail.com"
-    gem.homepage = "http://github.com/sandro/specjour"
-    gem.authors = ["Sandro Turriate"]
-    gem.add_dependency "dnssd", "1.3.4"
-    gem.add_dependency "thor", ">=0.14.0"
-    gem.add_development_dependency "rspec", "1.3.0"
-    gem.add_development_dependency "rr", ">=0.10.11"
-    gem.add_development_dependency "cucumber", ">=0.9.0"
-    gem.add_development_dependency "yard", ">=0.5.3"
-    gem.add_development_dependency "jeweler", ">=1.4.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-task :spec => :check_dependencies
+RSpec::Core::RakeTask.new(:rcov)
 
 task :default => :spec
 

data/lib/specjour/cucumber/preloader.rb

@@ -2,28 +2,6 @@ module Specjour
   module Cucumber
     module Preloader
       def self.load(feature_file)
-        if CUCUMBER_09x
-          load_09x
-        else
-          load_08x
-        end
-      end
-
-      protected
-
-      def self.load_08x
-        cli = ::Cucumber::Cli::Main.new []
-        step_mother = cli.class.step_mother
-
-        step_mother.log = cli.configuration.log
-        step_mother.options = cli.configuration.options
-        step_mother.load_code_files(cli.configuration.support_to_load)
-        step_mother.after_configuration(cli.configuration)
-        features = step_mother.load_plain_text_features(cli.configuration.feature_files)
-        step_mother.load_code_files(cli.configuration.step_defs_to_load)
-      end
-
-      def self.load_09x
         configuration = ::Cucumber::Cli::Configuration.new
         configuration.parse! []
         runtime = ::Cucumber::Runtime.new(configuration)

data/lib/specjour/cucumber/runner.rb

@@ -4,15 +4,11 @@ module Specjour
       def self.run(feature, output)
         cli = ::Cucumber::Cli::Main.new(['--format', 'Specjour::Cucumber::DistributedFormatter', feature], output)
 
-        if CUCUMBER_09x
-          Cucumber.runtime.instance_variable_set(:@configuration, cli.configuration)
-          Cucumber.runtime.instance_eval do
-            tree_walker = @configuration.build_tree_walker(self)
-            self.visitor = tree_walker
-            tree_walker.visit_features(features)
-          end
-        else
-          cli.execute!(::Cucumber::Cli::Main.step_mother)
+        Cucumber.runtime.instance_variable_set(:@configuration, cli.configuration)
+        Cucumber.runtime.instance_eval do
+          tree_walker = @configuration.build_tree_walker(self)
+          self.visitor = tree_walker
+          tree_walker.visit_features(features)
         end
       end
     end

data/lib/specjour/cucumber.rb

@@ -10,7 +10,6 @@ module Specjour
       require 'specjour/cucumber/main_ext'
       require 'specjour/cucumber/runner'
 
-      CUCUMBER_09x = ::Cucumber::VERSION =~ /0\.9\.\d/
       ::Cucumber::Cli::Options.class_eval { def print_profile_information; end }
     rescue LoadError
     end

data/lib/specjour/db_scrub.rb

@@ -1,15 +1,20 @@
 module Specjour
   module DbScrub
-    require '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'
-      Rake::Task["db:structure:dump"].clear
-      Rake::Task["environment"].clear
+
+    begin
+      require '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'
+        Rake::Task["db:structure:dump"].clear
+        Rake::Task["environment"].clear
+      end
+    rescue LoadError
+      Specjour.logger.debug "Failed to load Rails rake tasks"
     end
 
     extend self

data/lib/specjour/printer.rb

@@ -99,7 +99,7 @@ module Specjour
     end
 
     def rspec_report
-      @rspec_report ||= Rspec::FinalReport.new
+      @rspec_report ||= RSpec::FinalReport.new
     end
 
     def cucumber_report

data/lib/specjour/rspec/distributed_formatter.rb

@@ -1,72 +1,48 @@
-module Specjour::Rspec
-  class DistributedFormatter < Spec::Runner::Formatter::BaseTextFormatter
-    require 'specjour/rspec/marshalable_rspec_failure'
-
-    attr_reader :failing_messages, :passing_messages, :pending_messages, :output
-    attr_reader :duration, :example_count, :failure_count, :pending_count, :pending_examples, :failing_examples
-
-    def initialize(options, output)
-      @options = options
-      @output = output
-      @failing_messages = []
-      @passing_messages = []
-      @pending_messages = []
-      @pending_examples = []
-      @failing_examples = []
-    end
-
-    def example_failed(example, counter, failure)
-      failing_messages << colorize_failure('F', failure)
-      print_and_flush(failing_messages)
-    end
-
-    def example_passed(example)
-      passing_messages << green('.')
-      print_and_flush(passing_messages)
+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 example_pending(example, message, deprecated_pending_location=nil)
-      super
-      pending_messages << yellow('*')
-      print_and_flush(pending_messages)
+    def noop(*args)
     end
+    alias dump_pending noop
+    alias dump_failures noop
+    alias start_dump noop
+    alias message noop
 
-    def dump_summary(duration, example_count, failure_count, pending_count)
-      @duration = duration
-      @example_count = example_count
-      @failure_count = failure_count
-      @pending_count = pending_count
-      output.send_message(:rspec_summary=, to_hash)
+    def color_enabled?
+      true
     end
 
-    def dump_pending
-      #noop
+    def dump_summary(*args)
+      output.send_message :rspec_summary=, metadata_for_examples
     end
 
-    def dump_failure(counter, failure)
-      failing_examples << failure
+    def close
+      @examples = []
+      super
     end
 
-    def start_dump
-      print_and_flush failing_messages
-      print_and_flush passing_messages
-      print_and_flush pending_messages
-    end
+    protected
 
-    def to_hash
-      h = {}
-      [:duration, :example_count, :failure_count, :pending_count, :pending_examples, :failing_examples].each do |key|
-        h[key] = send(key)
+    def marshalable_execution_result(execution_result)
+      if exception = execution_result[:exception]
+        execution_result[:exception] = MarshalableException.new(exception)
       end
-      h
+      execution_result
     end
 
-    protected
-
-    def print_and_flush(messages)
-      output.print messages.join
-      output.flush
-      messages.replace []
-    end
   end
 end

data/lib/specjour/rspec/final_report.rb

@@ -1,65 +1,73 @@
-module Specjour
-  module Rspec
-    class FinalReport
-      attr_reader :duration, :example_count, :failure_count, :pending_count, :pending_examples, :failing_examples
+module Specjour::RSpec
+  class FinalReport
+    attr_reader :examples
+    attr_reader :duration
 
-      def initialize
-        @duration = 0.0
-        @example_count = 0
-        @failure_count = 0
-        @pending_count = 0
-        @pending_examples = []
-        @failing_examples = []
-      end
-
-      def add(stats)
-        stats.each do |key, value|
-          if key == :duration
-            @duration = value.to_f if duration < value.to_f
-          else
-            increment(key, value)
-          end
-        end
-      end
+    def initialize
+      @examples = []
+      @duration = 0.0
+      ::RSpec.configuration.color_enabled = true
+      ::RSpec.configuration.output_stream = $stdout
+    end
 
-      def exit_status
-        failing_examples.empty?
+    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 increment(key, value)
-        current = instance_variable_get("@#{key}")
-        instance_variable_set("@#{key}", current + value)
-      end
+    def duration=(value)
+      @duration = value.to_f if duration < value.to_f
+    end
 
-      def formatter_options
-        @formatter_options ||= OpenStruct.new(
-          :colour   => true,
-          :autospec => false,
-          :dry_run  => false
-        )
-      end
+    def exit_status
+      formatter.failed_examples.empty?
+    end
 
-      def formatter
-        @formatter ||= begin
-          f = Spec::Runner::Formatter::BaseTextFormatter.new(formatter_options, $stdout)
-          f.instance_variable_set(:@pending_examples, pending_examples)
-          f
+    def metadata_for_examples(metadata_collection)
+      examples.concat(
+        metadata_collection.map do |partial_metadata|
+          example = ::RSpec::Core::Example.allocate
+          example.instance_variable_set(:@example_group_class,
+            OpenStruct.new(:metadata => {}, :ancestors => [])
+          )
+          metadata = ::RSpec::Core::Metadata.new
+          metadata.merge! partial_metadata
+          example.instance_variable_set(:@metadata, metadata)
+          example
         end
-      end
+      )
+    end
 
-      def summarize
-        if example_count > 0
-          formatter.dump_pending
-          dump_failures
-          formatter.dump_summary(duration, example_count, failure_count, pending_count)
-        end
-      end
+    def pending_examples
+      ::RSpec.world.find(examples, :execution_result => { :status => 'pending' })
+    end
 
-      def dump_failures
-        failing_examples.each_with_index do |failure, index|
-          formatter.dump_failure index + 1, failure
-        end
+    def failed_examples
+      ::RSpec.world.find(examples, :execution_result => { :status => 'failed' })
+    end
+
+    def formatter
+      @formatter ||= new_progress_formatter
+    end
+
+    def summarize
+      if examples.size > 0
+        formatter.start_dump
+        formatter.dump_pending
+        formatter.dump_failures
+        formatter.dump_summary(duration, examples.size, failed_examples.size, pending_examples.size)
       end
     end
+
+    protected
+    def new_progress_formatter
+      new_formatter = ::RSpec::Core::Formatters::ProgressFormatter.new($stdout)
+      new_formatter.instance_variable_set(:@failed_examples, failed_examples)
+      new_formatter.instance_variable_set(:@pending_examples, pending_examples)
+      new_formatter
+    end
   end
 end

data/lib/specjour/rspec/marshalable_exception.rb

@@ -1,4 +1,4 @@
-module Specjour::Rspec
+module Specjour::RSpec
   class MarshalableException
     attr_accessor :message, :backtrace, :class_name
 

data/lib/specjour/rspec/preloader.rb

@@ -1,4 +1,4 @@
-class Specjour::Rspec::Preloader
+class Specjour::RSpec::Preloader
   def self.load(spec_file)
     $LOAD_PATH.unshift File.join(Dir.pwd, 'spec')
     require spec_file

data/lib/specjour/rspec/runner.rb

@@ -1,11 +1,12 @@
-module Specjour::Rspec::Runner
+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
+    reset
+    args = ['--format=Specjour::RSpec::DistributedFormatter', spec]
+    ::RSpec::Core::Runner.run_in_process args, $stderr, output
+  end
+
+  def self.reset
+    ::RSpec.world.instance_variable_set(:@example_groups, [])
+    ::RSpec.configuration.instance_variable_set(:@formatter, nil)
   end
 end

data/lib/specjour/{rspec2 → rspec}/shared_example_group_ext.rb

@@ -1,4 +1,4 @@
-Rspec::Core::SharedExampleGroup.class_eval do
+RSpec::Core::SharedExampleGroup.class_eval do
 
   def ensure_shared_example_group_name_not_taken(name)
     if RSpec.world.shared_example_groups.has_key?(name)

data/lib/specjour/rspec.rb

@@ -1,35 +1,16 @@
 module Specjour
-  module Rspec
-    def self.load_rspec1
-      require 'spec'
-      require 'spec/runner/formatter/base_text_formatter'
+  module RSpec
+    require 'rspec/core'
+    require 'rspec/core/formatters/progress_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'
-      require 'rspec/core/formatters/progress_formatter'
-
-      require 'specjour/rspec/marshalable_exception'
-      require 'specjour/rspec/preloader'
-      require 'specjour/rspec2/distributed_formatter'
-      require 'specjour/rspec2/final_report'
-      require 'specjour/rspec2/runner'
-      require 'specjour/rspec2/shared_example_group_ext'
+    require 'specjour/rspec/marshalable_exception'
+    require 'specjour/rspec/preloader'
+    require 'specjour/rspec/distributed_formatter'
+    require 'specjour/rspec/final_report'
+    require 'specjour/rspec/runner'
+    require 'specjour/rspec/shared_example_group_ext'
 
-      ::Rspec::Core::Runner.disable_autorun!
-    end
-
-    begin
-      load_rspec2
-    rescue LoadError
-      load_rspec1
-    end
+    ::RSpec::Core::Runner.disable_autorun!
 
     def self.wants_to_quit
       if defined?(::RSpec) && ::RSpec.respond_to?(:wants_to_quit=)

data/lib/specjour/socket_helper.rb

@@ -4,6 +4,8 @@ module Specjour
 
     def ip_from_hostname(hostname)
       Socket.getaddrinfo(hostname, nil, Socket::AF_INET, Socket::SOCK_STREAM).first.fetch(3)
+    rescue SocketError
+      hostname
     end
 
     def hostname

data/lib/specjour/worker.rb

@@ -60,7 +60,7 @@ module Specjour
     end
 
     def load_app
-      Rspec::Preloader.load(preload_spec) if preload_spec
+      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}"
@@ -100,7 +100,7 @@ module Specjour
     end
 
     def run_spec(spec)
-      Specjour::Rspec::Runner.run(spec, connection)
+      Specjour::RSpec::Runner.run(spec, connection)
     end
 
     def send_run_times(run_times)

data/lib/specjour.rb

@@ -26,9 +26,9 @@ module Specjour
   autoload :Worker, 'specjour/worker'
 
   autoload :Cucumber, 'specjour/cucumber'
-  autoload :Rspec, 'specjour/rspec'
+  autoload :RSpec, 'specjour/rspec'
 
-  VERSION = "0.3.1".freeze
+  VERSION = "0.4.0"
   HOOKS_PATH = "./.specjour/hooks.rb"
 
   def self.interrupted?
@@ -37,7 +37,7 @@ module Specjour
 
   def self.interrupted=(bool)
     Cucumber.wants_to_quit
-    Rspec.wants_to_quit
+    RSpec.wants_to_quit
     @interrupted = bool
   end