specjour 0.7.0 → 2.0.0.rc1

data/lib/specjour.rb

@@ -1,27 +1,33 @@
-require 'drb'
+require 'tmpdir'
 
 autoload :URI, 'uri'
 autoload :Forwardable, 'forwardable'
-autoload :GServer, 'gserver'
 autoload :Timeout, 'timeout'
 autoload :Benchmark, 'benchmark'
 autoload :Logger, 'logger'
 autoload :Socket, 'socket'
 autoload :StringIO, 'stringio'
 autoload :OpenStruct, 'ostruct'
+autoload :Pathname, 'pathname'
 
 module Specjour
   autoload :CLI, 'specjour/cli'
+  autoload :Colors, 'specjour/colors'
   autoload :CPU, 'specjour/cpu'
   autoload :Configuration, 'specjour/configuration'
   autoload :Connection, 'specjour/connection'
   autoload :DbScrub, 'specjour/db_scrub'
   autoload :Dispatcher, 'specjour/dispatcher'
   autoload :Fork, 'specjour/fork'
+  autoload :Formatter, 'specjour/formatter'
+  autoload :Listener, 'specjour/listener'
+  autoload :Logger, 'specjour/logger'
   autoload :Loader, 'specjour/loader'
   autoload :Manager, 'specjour/manager'
+  autoload :Plugin, 'specjour/plugin'
   autoload :Printer, 'specjour/printer'
   autoload :Protocol, 'specjour/protocol'
+  autoload :RspecFormatter, "specjour/rspec_formatter"
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :SocketHelper, 'specjour/socket_helper'
   autoload :Worker, 'specjour/worker'
@@ -29,30 +35,49 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "0.7.0"
+  VERSION ||= "2.0.0.rc1"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
+  Time = Time.dup
 
   GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
   class Error < StandardError; end
 
+  def self.benchmark(msg)
+    $stderr.print "#{msg}... "
+    start_time = Time.now
+    yield
+  ensure
+    $stderr.puts "completed in #{Time.now - start_time}s"
+  end
+
+  def self.configuration(provided_config=nil)
+    if provided_config
+      @configuration = provided_config
+    elsif !instance_variable_defined?(:@configuration)
+      @configuration = Configuration.new
+    else
+      @configuration
+    end
+  end
+
   def self.interrupted?
     @interrupted
   end
 
   def self.interrupted=(bool)
     @interrupted = bool
-    if bool
-      will_quit(:RSpec)
-      will_quit(:Cucumber)
-    end
   end
 
-  def self.will_quit(framework)
-    if Object.const_defined?(framework)
-      framework = Object.const_get(framework)
-      framework.wants_to_quit = true if framework.respond_to?(:wants_to_quit=)
+  def self.load_custom_hooks
+    load HOOKS_PATH if File.exists?(HOOKS_PATH)
+  end
+
+  def self.load_plugins
+    $LOAD_PATH.each do |load_path|
+      file = File.expand_path("specjour_plugin.rb", load_path)
+      require file if File.exists?(file)
     end
   end
 
@@ -60,30 +85,31 @@ module Specjour
     @logger ||= new_logger
   end
 
-  def self.new_logger(level = Logger::UNKNOWN)
-    @logger = Logger.new $stderr
+  def self.new_logger(level = ::Logger::UNKNOWN, output=nil)
+    @logger = ::Logger.new output || $stderr
     @logger.level = level
+    @logger.formatter = lambda do |severity, datetime, progname, message|
+      "[#{severity} #{datetime.strftime("%I:%M:%S")}] #{progname}: #{message}\n"
+    end
     @logger
   end
 
-  def self.log?
-    logger.level != Logger::UNKNOWN
-  end
-
-  def self.load_custom_hooks
-    load HOOKS_PATH if File.exists?(HOOKS_PATH)
+  def self.plugin_manager
+    @plugin_manager ||= Specjour::Plugin::Manager.new
   end
 
   def self.trap_interrupt
     Signal.trap('INT') do
       self.interrupted = true
-      abort("\n")
+      plugin_manager.send_task(:interrupted!)
     end
   end
 
-  def self.benchmark(msg, &block)
-    print "#{msg}... "
-    time = Benchmark.realtime &block
-    puts "completed in #{time}s"
+  def self.trap_interrupt_with_exit
+    trap_interrupt
+    old_int = Signal.trap("INT") do
+      old_int.call()
+      abort("ABORTING\n")
+    end
   end
 end

data/lib/specjour_plugin.rb

@@ -0,0 +1,5 @@
+require "specjour/plugin/rails"
+require "specjour/plugin/rspec"
+
+Specjour.plugin_manager.register_plugin Specjour::Plugin::Rails.new
+Specjour.plugin_manager.register_plugin Specjour::Plugin::RSpec.new

metadata

@@ -1,194 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Sandro Turriate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    Specjour splits your RSpec suite across multiple machines, and
-  multiple\n    cores per machine, to run super-parallel-fast!  Also works with Cucumber.\n"
+description: |2
+      Specjour splits your RSpec suite across multiple machines, and multiple
+      cores per machine, to run super-parallel-fast!  Also works with Cucumber.
 email: sandro.turriate@gmail.com
 executables:
 - specjour
 extensions: []
 extra_rdoc_files: []
 files:
+- History.markdown
+- MIT_LICENSE
+- README.markdown
+- Rakefile
+- bin/specjour
+- lib/specjour.rb
 - lib/specjour/cli.rb
+- lib/specjour/colors.rb
 - lib/specjour/configuration.rb
 - lib/specjour/connection.rb
 - lib/specjour/cpu.rb
-- lib/specjour/cucumber/distributed_formatter.rb
-- lib/specjour/cucumber/final_report.rb
-- lib/specjour/cucumber/preloader.rb
-- lib/specjour/cucumber/runner.rb
-- lib/specjour/cucumber.rb
-- lib/specjour/db_scrub.rb
-- lib/specjour/dispatcher.rb
 - lib/specjour/fork.rb
+- lib/specjour/formatter.rb
+- lib/specjour/listener.rb
 - lib/specjour/loader.rb
-- lib/specjour/manager.rb
+- lib/specjour/logger.rb
+- lib/specjour/plugin.rb
+- lib/specjour/plugin/base.rb
+- lib/specjour/plugin/manager.rb
+- lib/specjour/plugin/rails.rb
+- lib/specjour/plugin/rails_v3.rb
+- lib/specjour/plugin/rails_v4.rb
+- lib/specjour/plugin/rspec.rb
+- lib/specjour/plugin/rspec_v2.rb
+- lib/specjour/plugin/rspec_v3.rb
+- lib/specjour/plugin/ssh.rb
 - lib/specjour/printer.rb
 - lib/specjour/protocol.rb
-- lib/specjour/rspec/distributed_formatter.rb
-- lib/specjour/rspec/final_report.rb
-- lib/specjour/rspec/marshalable_exception.rb
-- lib/specjour/rspec/preloader.rb
-- lib/specjour/rspec/runner.rb
-- lib/specjour/rspec/shared_example_group_ext.rb
-- lib/specjour/rspec.rb
+- lib/specjour/rspec_formatter.rb
 - lib/specjour/rsync_daemon.rb
 - lib/specjour/socket_helper.rb
 - lib/specjour/worker.rb
-- lib/specjour.rb
-- MIT_LICENSE
-- README.markdown
-- History.markdown
-- Rakefile
-- bin/specjour
+- lib/specjour_plugin.rb
 homepage: https://github.com/sandro/specjour
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1349309289117832663
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: []
-has_rdoc: 

data/lib/specjour/cucumber/distributed_formatter.rb

@@ -1,82 +0,0 @@
-module Specjour::Cucumber
-  class DistributedFormatter < ::Cucumber::Formatter::Progress
-
-    def initialize(step_mother, io, options)
-      @step_mother = step_mother
-      @io = io
-      @options = options
-      @failing_scenarios = []
-      @step_summary = []
-    end
-
-    def after_features(features)
-      print_summary
-      step_mother.scenarios.clear
-      step_mother.steps.clear
-    end
-
-    def prepare_failures
-      step_mother.scenarios(:failed).select do |s|
-        s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)
-      end.map do |failure|
-        if failure.is_a?(Cucumber::Ast::Scenario)
-          failure
-        elsif failure.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)
-          failure.scenario_outline
-        end
-      end.each do |failure|
-        @failing_scenarios << format_string("cucumber " + failure.file_colon_line, :failed) +
-                              format_string(" # Scenario: " + failure.name, :comment)
-      end
-    end
-
-    def prepare_elements(elements, status, kind)
-      output = ''
-      if elements.any?
-        output += format_string("\n(::) #{status} #{kind} (::)\n", status)
-        output += "\n"
-      end
-
-      elements.each_with_index do |element, i|
-        if status == :failed
-          output += print_exception(element.exception, status, 0)
-        else
-          output += format_string(element.backtrace_line, status)
-          output += "\n"
-        end
-        @step_summary << output unless output.nil? || output.empty?
-      end
-    end
-
-    def prepare_steps(type)
-      prepare_elements(step_mother.steps(type), type, 'steps')
-    end
-
-    def print_exception(e, status, indent)
-      format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status)
-    end
-
-    def print_summary
-      prepare_failures
-      prepare_steps(:failed)
-      prepare_steps(:undefined)
-
-      @io.send_message(:cucumber_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, :step_summary => @step_summary)
-      hash
-    end
-
-  end
-end

data/lib/specjour/cucumber/final_report.rb

@@ -1,83 +0,0 @@
-module Specjour
-  module Cucumber
-    class Summarizer
-      attr_reader :duration, :failing_scenarios, :step_summary
-      def initialize
-        @duration = 0.0
-        @failing_scenarios = []
-        @step_summary = []
-        @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 == :step_summary
-            @step_summary += 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)
-        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)
-        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
-        @io = $stdout
-        @features = []
-        @summarizer = Summarizer.new
-      end
-
-      def add(stats)
-        @summarizer.add(stats)
-      end
-
-      def exit_status
-        @summarizer.failing_scenarios.empty?
-      end
-
-      def summarize
-        if @summarizer.steps(:failed).any?
-          puts "\n\n"
-          @summarizer.step_summary.each {|f| puts f }
-        end
-
-        if @summarizer.failing_scenarios.any?
-          puts "\n\n"
-          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/preloader.rb

@@ -1,22 +0,0 @@
-module Specjour
-  module Cucumber
-    module Preloader
-      def self.load(paths, output)
-        Specjour.benchmark("Loading Cucumber Environment") do
-          require 'cucumber' unless defined?(::Cucumber::Cli)
-          args = paths.unshift '--format', 'Specjour::Cucumber::DistributedFormatter'
-          cli = ::Cucumber::Cli::Main.new(args, output)
-
-          configuration = cli.configuration
-          options = configuration.instance_variable_get(:@options)
-          options.instance_variable_set(:@skip_profile_information, true)
-
-          runtime = ::Cucumber::Runtime.new(configuration)
-          runtime.send :load_step_definitions
-          runtime.send :fire_after_configuration_hook
-          Cucumber.runtime = runtime
-        end
-      end
-    end
-  end
-end

data/lib/specjour/cucumber/runner.rb

@@ -1,15 +0,0 @@
-module Specjour
-  module Cucumber
-    module Runner
-      def self.run(feature)
-        Cucumber.runtime.instance_eval do
-          @loader = nil
-          @configuration.parse!([feature])
-          tree_walker = @configuration.build_tree_walker(self)
-          self.visitor = tree_walker
-          tree_walker.visit_features features
-        end
-      end
-    end
-  end
-end

data/lib/specjour/cucumber.rb

@@ -1,16 +0,0 @@
-module Specjour
-  module Cucumber
-    begin
-      require 'cucumber/formatter/progress'
-
-      require 'specjour/cucumber/distributed_formatter'
-      require 'specjour/cucumber/final_report'
-      require 'specjour/cucumber/preloader'
-      require 'specjour/cucumber/runner'
-    rescue LoadError
-    end
-
-    class << self; attr_accessor :runtime; end
-
-  end
-end

data/lib/specjour/db_scrub.rb

@@ -1,56 +0,0 @@
-# encoding: utf-8
-module Specjour
-  module DbScrub
-
-    begin
-      require 'rake'
-      extend Rake::DSL if defined?(Rake::DSL)
-      if defined?(Rails)
-        Rake::Task.define_task(:environment) { }
-        load 'rails/tasks/misc.rake'
-        load 'active_record/railties/databases.rake'
-      end
-    rescue LoadError
-      Specjour.logger.debug "Failed to load Rails rake tasks"
-    end
-
-    extend self
-
-    def drop
-      Rake::Task['db:drop'].invoke
-    end
-
-    def scrub
-      connect_to_database
-      puts "Resetting database #{ENV['TEST_ENV_NUMBER']}"
-      schema_load_task.invoke
-    end
-
-    protected
-
-    def connect_to_database
-      ActiveRecord::Base.remove_connection
-      ActiveRecord::Base.configurations = Rails.application.config.database_configuration
-      ActiveRecord::Base.establish_connection
-      connection
-    rescue # assume the database doesn't exist
-      Rake::Task['db:create'].invoke
-    end
-
-    def connection
-      ActiveRecord::Base.connection
-    end
-
-    def pending_migrations?
-      ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations.any?
-    end
-
-    def schema_load_task
-      Rake::Task[{ :sql  => "db:test:load_structure", :ruby => "db:test:load" }[ActiveRecord::Base.schema_format]]
-    end
-
-    def tables_to_purge
-      connection.tables - ['schema_migrations']
-    end
-  end
-end