specjour 0.1.18 → 0.2.0

data/History.markdown

@@ -0,0 +1,8 @@
+History
+=======
+
+0.2.0
+-----
+*2010-04-20*
+
+* [added] Cucumber support. `rake specjour:cucumber`

data/README.markdown

@@ -31,6 +31,11 @@ Run the rake task to distribute the specs among the managers you started.
 
     $ rake specjour
 
+## Distribute the features
+Run the rake task to distribute the features among the managers you started.
+
+    $ rake specjour:cucumber
+
 ## Rails
 Edit your config/environment.rb
 

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.2.0

data/bin/specjour

@@ -2,12 +2,12 @@
 require 'optparse'
 require 'specjour'
 
-options = {:worker_size => 1, :batch_size => 1}
+options = {:batch_size => 1}
 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: specjour [options]"
 
-  opts.on('-w', '--workers WORKERS', Numeric, "Number of WORKERS to spin up, defaults to #{options[:worker_size]}") do |n|
+  opts.on('-w', '--workers WORKERS', Numeric, "Number of WORKERS to spin up, defaults to available cores") do |n|
     options[:worker_size] = n
   end
 
@@ -46,5 +46,6 @@ if options[:worker_args]
   options[:worker_args] << options[:batch_size]
   Specjour::Worker.new(*options[:worker_args]).run
 else
+  options[:worker_size] ||= Specjour::CPU.cores
   Specjour::Manager.new(options).start
 end

data/lib/specjour/connection.rb

@@ -6,7 +6,7 @@ module Specjour
     attr_reader :uri
     attr_writer :socket
 
-    def_delegators :socket, :flush, :closed?, :close, :gets, :each
+    def_delegators :socket, :flush, :closed?, :gets, :each
 
     def self.wrap(established_connection)
       host, port = established_connection.peeraddr.values_at(3,1)
@@ -19,16 +19,22 @@ module Specjour
       @uri = uri
     end
 
+    alias to_str to_s
+
     def connect
       timeout { connect_socket }
     end
 
+    def disconnect
+      socket.close
+    end
+
     def socket
       @socket ||= connect
     end
 
     def timeout(&block)
-      Timeout.timeout(5, &block)
+      Timeout.timeout(2, &block)
     rescue Timeout::Error
       raise Error, "Connection to dispatcher timed out"
     end

data/lib/specjour/cpu.rb

@@ -0,0 +1,13 @@
+module Specjour
+  module CPU
+    # inspired by github.com/grosser/parallel
+    def self.cores
+      case RUBY_PLATFORM
+      when /darwin/
+        `hwprefs cpu_count`.to_i
+      when /linux/
+        `grep --count processor /proc/cpuinfo`.to_i
+      end
+    end
+  end
+end

data/lib/specjour/cucumber/dispatcher.rb

@@ -0,0 +1,18 @@
+module Specjour
+  module Cucumber
+    class Dispatcher < ::Specjour::Dispatcher
+
+      protected
+
+      def all_specs
+        @all_specs ||= Dir.chdir(project_path) do
+          Dir["features/**/*.feature"]
+        end
+      end
+
+      def printer
+        @printer ||= Printer.start(all_specs)
+      end
+    end
+  end
+end

data/lib/specjour/cucumber/distributed_formatter.rb

@@ -0,0 +1,55 @@
+module Specjour::Cucumber
+  class DistributedFormatter < ::Cucumber::Formatter::Progress
+    class << self
+      attr_accessor :batch_size
+    end
+    @batch_size = 1
+
+    def initialize(step_mother, io, options)
+      @step_mother = step_mother
+      @io = io
+      @options = options
+      @failing_scenarios = []
+    end
+
+    def after_features(features)
+      print_summary
+      step_mother.scenarios.clear
+      step_mother.steps.clear
+    end
+
+    def prepare_failures
+      @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) }
+
+      if !@failures.empty?
+        @failures.each do |failure|
+          failure_message = ''
+          failure_message += format_string("cucumber " + failure.file_colon_line, :failed) +
+          failure_message += format_string(" # Scenario: " + failure.name, :comment)
+          @failing_scenarios << failure_message
+        end
+      end
+    end
+
+    def print_summary
+      prepare_failures
+
+      @io.send_message(:worker_summary=, to_hash)
+    end
+
+    OUTCOMES = [:failed, :skipped, :undefined, :pending, :passed]
+
+    def to_hash
+      hash = {}
+      [:scenarios, :steps].each do |type|
+        hash[type] = {}
+        OUTCOMES.each do |outcome|
+          hash[type][outcome] = step_mother.send(type, outcome).size
+        end
+      end
+      hash.merge!(:failing_scenarios => @failing_scenarios)
+      hash
+    end
+
+  end
+end

data/lib/specjour/cucumber/final_report.rb

@@ -0,0 +1,73 @@
+module Specjour
+  module Cucumber
+    class Summarizer
+      attr_reader :duration, :failing_scenarios
+      def initialize
+        @duration = 0.0
+        @failing_scenarios = []
+        @scenarios = Hash.new(0)
+        @steps = Hash.new(0)
+      end
+
+      def increment(category, type, count)
+        current = instance_variable_get("@#{category}")
+        current[type] += count
+      end
+
+      def add(stats)
+        stats.each do |category, hash|
+          if category == :failing_scenarios
+            @failing_scenarios += hash
+          elsif category == :duration
+            @duration = hash.to_f if duration < hash.to_f
+          else
+            hash.each do |type, count|
+              increment(category, type, count)
+            end
+          end
+        end
+      end
+
+      def scenarios(status=nil)
+        require 'ostruct'
+        length = status ? @scenarios[status] : @scenarios.inject(0) {|h,(k,v)| h += v}
+        any = @scenarios[status] > 0 if status
+        OpenStruct.new(:length => length , :any? => any)
+      end
+
+      def steps(status=nil)
+        require 'ostruct'
+        length = status ? @steps[status] : @steps.inject(0) {|h,(k,v)| h += v}
+        any = @steps[status] > 0 if status
+        OpenStruct.new(:length => length , :any? => any)
+      end
+    end
+
+    class FinalReport
+      include ::Cucumber::Formatter::Console
+      def initialize
+        @features = []
+        @summarizer = Summarizer.new
+      end
+
+      def add(stats)
+        @summarizer.add(stats)
+      end
+
+      def summarize
+        if @summarizer.failing_scenarios.any?
+          puts
+          puts
+          puts format_string("Failing Scenarios:", :failed)
+          @summarizer.failing_scenarios.each {|f| puts f }
+        end
+
+        default_format = lambda {|status_count, status| format_string(status_count, status)}
+        puts
+        puts scenario_summary(@summarizer, &default_format)
+        puts step_summary(@summarizer, &default_format)
+        puts format_duration(@summarizer.duration) if @summarizer.duration
+      end
+    end
+  end
+end

data/lib/specjour/cucumber/printer.rb

@@ -0,0 +1,9 @@
+module Specjour
+  module Cucumber
+    class Printer < ::Specjour::Printer
+      def report
+        @report ||= FinalReport.new
+      end
+    end
+  end
+end

data/lib/specjour/cucumber.rb

@@ -0,0 +1,14 @@
+module Specjour
+  module Cucumber
+    begin
+      require 'cucumber'
+      require 'cucumber/formatter/progress'
+
+      require 'specjour/cucumber/dispatcher'
+      require 'specjour/cucumber/distributed_formatter'
+      require 'specjour/cucumber/final_report'
+      require 'specjour/cucumber/printer'
+    rescue LoadError
+    end
+  end
+end

data/lib/specjour/dispatcher.rb

@@ -41,7 +41,7 @@ module Specjour
     end
 
     def fetch_manager(uri)
-      Timeout.timeout(1) do
+      Timeout.timeout(8) do
         manager = DRbObject.new_with_uri(uri.to_s)
         if !managers.include?(manager) && manager.available_for?(project_name)
           set_up_manager(manager, uri)
@@ -75,11 +75,7 @@ module Specjour
     end
 
     def printer
-      @printer ||= begin
-        p = Printer.new
-        p.specs_to_run = all_specs
-        p.start
-      end
+      @printer ||= Printer.start(all_specs)
     end
 
     def project_name

data/lib/specjour/manager.rb

@@ -48,6 +48,7 @@ module Specjour
     end
 
     def dispatch_workers
+      GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
       (1..worker_size).each do |index|
         worker_pids << fork do
           exec("specjour --batch-size #{batch_size} #{'--log' if Specjour.log?} --do-work #{project_path},#{dispatcher_uri},#{index}")

data/lib/specjour/printer.rb

@@ -3,9 +3,13 @@ module Specjour
     include Protocol
     RANDOM_PORT = 0
 
-    attr_accessor :worker_size, :specs_to_run, :completed_workers
+    def self.start(specs_to_run)
+      new(specs_to_run).start
+    end
+
+    attr_accessor :worker_size, :specs_to_run, :completed_workers, :disconnections
 
-    def initialize
+    def initialize(specs_to_run)
       super(
         port = RANDOM_PORT,
         host = "0.0.0.0",
@@ -15,6 +19,8 @@ module Specjour
         debug = true
       )
       @completed_workers = 0
+      @disconnections = 0
+      self.specs_to_run = specs_to_run
     end
 
     def serve(client)
@@ -40,7 +46,8 @@ module Specjour
     protected
 
     def disconnecting(client_port)
-      if completed_workers == worker_size
+      self.disconnections += 1
+      if disconnections == worker_size
         stop
       end
     end
@@ -59,11 +66,16 @@ module Specjour
     end
 
     def report
-      @report ||= FinalReport.new
+      @report ||= Rspec::FinalReport.new
     end
 
     def stopping
       report.summarize
+      if disconnections != completed_workers
+        puts "*" * 63
+        puts "* ERROR: NOT ALL WORKERS COMPLETED PROPERLY, RE-RUN THE SUITE *"
+        puts "*" * 63
+      end
     end
   end
 end

data/lib/specjour/{distributed_formatter.rb → rspec/distributed_formatter.rb}

@@ -1,6 +1,6 @@
-module Specjour
+module Specjour::Rspec
   class DistributedFormatter < Spec::Runner::Formatter::BaseTextFormatter
-    require 'specjour/marshalable_rspec_failure'
+    require 'specjour/rspec/marshalable_rspec_failure'
 
     class << self
       attr_accessor :batch_size

data/lib/specjour/rspec/final_report.rb

@@ -0,0 +1,62 @@
+module Specjour
+  module Rspec
+    class FinalReport
+      require 'specjour/rspec/marshalable_rspec_failure'
+      attr_reader :duration, :example_count, :failure_count, :pending_count, :pending_examples, :failing_examples
+
+      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 increment(key, value)
+        current = instance_variable_get("@#{key}")
+        instance_variable_set("@#{key}", current + value)
+      end
+
+      def formatter_options
+        @formatter_options ||= OpenStruct.new(
+          :colour   => true,
+          :autospec => false,
+          :dry_run  => false
+        )
+      end
+
+      def formatter
+        @formatter ||= begin
+          f = MarshalableFailureFormatter.new(formatter_options, $stdout)
+          f.instance_variable_set(:@pending_examples, pending_examples)
+          f
+        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 dump_failures
+        failing_examples.each_with_index do |failure, index|
+          formatter.dump_failure index + 1, failure
+        end
+      end
+    end
+  end
+end

data/lib/specjour/{marshalable_failure_formatter.rb → rspec/marshalable_failure_formatter.rb}

@@ -1,4 +1,4 @@
-module Specjour
+module Specjour::Rspec
   class MarshalableFailureFormatter < Spec::Runner::Formatter::BaseTextFormatter
     def dump_failure(counter, failure)
       @output.puts

data/lib/specjour/{marshalable_rspec_failure.rb → rspec/marshalable_rspec_failure.rb}

@@ -1,4 +1,4 @@
-module Specjour
+module Specjour::Rspec
   class Spec::Runner::Reporter::Failure
     attr_reader :backtrace, :message, :header, :exception_class_name
 

data/lib/specjour/rspec.rb

@@ -0,0 +1,10 @@
+module Specjour
+  module Rspec
+    require 'spec'
+    require 'spec/runner/formatter/base_text_formatter'
+
+    autoload :DistributedFormatter, 'specjour/rspec/distributed_formatter'
+    autoload :FinalReport, 'specjour/rspec/final_report'
+    autoload :MarshalableFailureFormatter, 'specjour/rspec/marshalable_failure_formatter'
+  end
+end

data/lib/specjour/rsync_daemon.rb

@@ -15,7 +15,7 @@ module Specjour
     def start
       write_config
       system("rsync", "--daemon", "--config=#{config_file}", "--port=8989")
-      at_exit { puts 'shutting down rsync'; stop }
+      at_exit { stop }
     end
 
     def stop

data/lib/specjour/tasks/dispatch.rake

@@ -5,6 +5,16 @@ namespace :specjour do
     args.with_defaults :project_path => Rake.original_dir
     Specjour::Dispatcher.new(args.project_path).start
   end
+
+  namespace :cucumber do
+    task :dispatch, [:project_path] do |task, args|
+      args.with_defaults :project_path => Rake.original_dir
+      Specjour::Cucumber::Dispatcher.new(args.project_path).start
+    end
+  end
+
+  desc "Dispatch the project to listening managers"
+  task :cucumber => "cucumber:dispatch"
 end
 
 desc "Dispatch the project to listening managers"

data/lib/specjour/worker.rb

@@ -1,4 +1,6 @@
 module Specjour
+  require 'specjour/cucumber'
+
   class Worker
     include Protocol
     include SocketHelpers
@@ -11,8 +13,7 @@ module Specjour
       @number = number.to_i
       @batch_size = batch_size.to_i
       self.printer_uri = printer_uri
-      GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
-      DistributedFormatter.batch_size = batch_size
+      Rspec::DistributedFormatter.batch_size = batch_size
       set_env_variables
     end
 
@@ -25,16 +26,16 @@ module Specjour
       run_time = 0
       Dir.chdir(project_path)
       while !printer.closed? && data = printer.gets(TERMINATOR)
-        spec = load_object(data)
-        if spec
+        test = load_object(data)
+        if test
           run_time += Benchmark.realtime do
-            run_spec spec
+            run_test test
           end
           printer.send_message(:ready)
         else
-          printer.send_message(:done)
           printer.send_message(:worker_summary=, {:duration => sprintf("%6f", run_time)})
-          printer.close
+          printer.send_message(:done)
+          printer.disconnect
         end
       end
     end
@@ -49,12 +50,26 @@ module Specjour
       Connection.new printer_uri
     end
 
+    def run_test(test)
+      puts "Running #{test}"
+      if test =~ /\.feature$/
+        run_feature test
+      else
+        run_spec test
+      end
+    end
+
+    def run_feature(feature)
+      set_up_cucumber
+      cli = ::Cucumber::Cli::Main.new(['--format', 'Specjour::Cucumber::DistributedFormatter', feature], printer)
+      cli.execute!(::Cucumber::Cli::Main.step_mother)
+    end
+
     def run_spec(spec)
-      puts "Running #{spec}"
       options = Spec::Runner::OptionParser.parse(
-        ['--format=Specjour::DistributedFormatter', spec],
+        ['--format=Specjour::Rspec::DistributedFormatter', spec],
         $stderr,
-        printer_connection
+        printer
       )
       Spec::Runner.use options
       options.run_examples
@@ -65,5 +80,13 @@ module Specjour
       ENV['RSPEC_COLOR'] = 'true'
       ENV['TEST_ENV_NUMBER'] = number.to_s
     end
+
+    def set_up_cucumber
+      unless @cucumber_loaded
+        Cucumber::DistributedFormatter.batch_size = batch_size
+        ::Cucumber::Cli::Options.class_eval { def print_profile_information; end }
+        @cucumber_loaded = true
+      end
+    end
   end
 end

data/lib/specjour.rb

@@ -1,10 +1,6 @@
-require 'spec'
-require 'spec/runner/formatter/base_text_formatter'
-require 'specjour/protocol'
-require 'specjour/core_ext/array'
+require 'drb'
 
 autoload :URI, 'uri'
-autoload :DRb, 'drb'
 autoload :Forwardable, 'forwardable'
 autoload :GServer, 'gserver'
 autoload :Timeout, 'timeout'
@@ -13,18 +9,20 @@ autoload :Logger, 'logger'
 autoload :Socket, 'socket'
 
 module Specjour
+  autoload :CPU, 'specjour/cpu'
   autoload :Connection, 'specjour/connection'
   autoload :Dispatcher, 'specjour/dispatcher'
-  autoload :DistributedFormatter, 'specjour/distributed_formatter'
-  autoload :FinalReport, 'specjour/final_report'
   autoload :Manager, 'specjour/manager'
-  autoload :MarshalableFailureFormatter, 'specjour/marshalable_failure_formatter'
   autoload :Printer, 'specjour/printer'
+  autoload :Protocol, 'specjour/protocol'
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :SocketHelpers, 'specjour/socket_helpers'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.18".freeze
+  autoload :Cucumber, 'specjour/cucumber'
+  autoload :Rspec, 'specjour/rspec'
+
+  VERSION = "0.2.0".freeze
 
   class Error < StandardError; end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 18
-  version: 0.1.18
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
+date: 2010-04-20 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- History.markdown
 - MIT_LICENSE
 - README.markdown
 - Rakefile
@@ -89,23 +90,28 @@ files:
 - bin/specjour
 - lib/specjour.rb
 - lib/specjour/connection.rb
-- lib/specjour/core_ext/array.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/distributed_formatter.rb
-- lib/specjour/final_report.rb
 - lib/specjour/manager.rb
-- lib/specjour/marshalable_failure_formatter.rb
-- lib/specjour/marshalable_rspec_failure.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_failure_formatter.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/lib/specjour/core_ext/array_spec.rb
 - spec/lib/specjour/worker_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -141,8 +147,6 @@ signing_key:
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: 
-- spec/lib/specjour/connection_spec.rb
-- spec/lib/specjour/core_ext/array_spec.rb
 - spec/lib/specjour/worker_spec.rb
 - spec/spec_helper.rb
 - spec/specjour_spec.rb

data/lib/specjour/core_ext/array.rb

@@ -1,15 +0,0 @@
-module Specjour
-  module Among
-    def among(group_size)
-      group_size = 1 if group_size.zero?
-      groups = Array.new(group_size) { [] }
-      offset = 0
-      each do |item|
-        groups[offset] << item
-        offset = (offset == group_size - 1) ? 0 : offset + 1
-      end
-      groups
-    end
-  end
-end
-::Array.send(:include, Specjour::Among)

data/lib/specjour/final_report.rb

@@ -1,60 +0,0 @@
-module Specjour
-  class FinalReport
-    require 'specjour/marshalable_rspec_failure'
-    attr_reader :duration, :example_count, :failure_count, :pending_count, :pending_examples, :failing_examples
-
-    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 increment(key, value)
-      current = instance_variable_get("@#{key}")
-      instance_variable_set("@#{key}", current + value)
-    end
-
-    def formatter_options
-      @formatter_options ||= OpenStruct.new(
-        :colour   => true,
-        :autospec => false,
-        :dry_run  => false
-      )
-    end
-
-    def formatter
-      @formatter ||= begin
-        f = MarshalableFailureFormatter.new(formatter_options, $stdout)
-        f.instance_variable_set(:@pending_examples, pending_examples)
-        f
-      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 dump_failures
-      failing_examples.each_with_index do |failure, index|
-        formatter.dump_failure index + 1, failure
-      end
-    end
-  end
-end

data/spec/lib/specjour/connection_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Specjour::Connection do
-  require 'stringio'
-  describe "#print" do
-    context "connection unavailable" do
-      let(:connection) do
-        Specjour::Connection.new(URI.parse("specjour://me.local:12345"))
-      end
-
-      it "reconnects" do
-        socket = mock(:closed? => false, :close => true)
-        socket.stub(:print).and_raise(Errno::EPIPE)
-        connection.instance_variable_set(:@socket, socket)
-        new_socket = mock(:print => true)
-        TCPSocket.stub(:open => new_socket)
-        connection.print('hi').should be_true
-      end
-    end
-  end
-end

data/spec/lib/specjour/core_ext/array_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe "Array splitting among many" do
-  describe "#among" do
-    let(:array) { [1,2,3,4,5] }
-
-    it "splits among 0" do
-      array.among(0).should == [[1,2,3,4,5]]
-    end
-
-    it "splits among by 1" do
-      array.among(1).should == [[1,2,3,4,5]]
-    end
-
-    it "splits among by 2" do
-      array.among(2).should == [[1,3,5],[2,4]]
-    end
-
-    it "splits among by 3" do
-      array.among(3).should == [[1,4],[2,5],[3]]
-    end
-
-    it "splits among by 4" do
-      array.among(4).should == [[1,5],[2],[3],[4]]
-    end
-
-    it "splits among by 5" do
-      array.among(5).should == [[1],[2],[3],[4],[5]]
-    end
-  end
-end