flatware-rspec 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6a0aaa1271e9e220195b1198be4374e2a3e0a40fbe0dbdb61fad0c4735ab4e0
-  data.tar.gz: 2e16cb3d10ac6a990a393b84e0a3ae04ea4ccccfdbb9de3d1b264d4729a2d32f
+  metadata.gz: 436149ce293c8e877b3c81d196dc5af1f74f697b8d10e12d0f29952f615c55ac
+  data.tar.gz: 0e888d9cf1b1a6a267a57670769c42dcd5af22982fa788524999a24f83914169
 SHA512:
-  metadata.gz: 2b133ea289d7abe6828bf0c7188bb389c113126ea8e79866aed5b973d4213b473f79e219c4f3d151f6c1bbf175fd48790140c531c6ce4eeb488837c4bd1ed618
-  data.tar.gz: 26d0a1a2a322ee2ad2cb4ac9b5d33c42aefdbe15a80d1c108d8e7d8b11a4f50e8bfb36e8003496c3215c939c74c3797f1eca7dad0c11843d96d1e9e1f3f85c3c
+  metadata.gz: af1b7330e2622dc1a43980870672fa020d4c1e49f36fa628a2ca28adac65cf0f5c4bbc86e5fe7fa0bb896b9c7c54215f0d6562c15fe428d0ee0b9a88330b2e9c
+  data.tar.gz: 21462ec96b948ec20853db6f34512e48fb8e757de345be832391114a45d70c63f01fba02ba9e0141d559407fae9c9d738c687a13a9d22925bef56e495eeddebf

data/README.md

@@ -1,7 +1,5 @@
-# Flatware [![Build Status][travis-badge]][travis] [![Code Climate][code-climate-badge]][code-climate]
+# Flatware [![Code Climate][code-climate-badge]][code-climate]
 
-[travis-badge]: https://travis-ci.org/briandunn/flatware.svg?branch=master
-[travis]: http://travis-ci.org/briandunn/flatware
 [code-climate-badge]: https://codeclimate.com/github/briandunn/flatware.png
 [code-climate]: https://codeclimate.com/github/briandunn/flatware
 
@@ -116,7 +114,7 @@ Flatware.configure do |conf|
   end
 
   conf.after_fork do |test_env_number|
-    config = ActiveRecord::Base.connection_config
+    config = ActiveRecord::Base.connection_db_config.configuration_hash
 
     ActiveRecord::Base.establish_connection(
       config.merge(

data/lib/flatware/rspec/checkpoint.rb

@@ -15,34 +15,48 @@ module Flatware
       def_delegators :failures_notification, :fully_formatted_failed_examples, :failure_notifications
       def_delegators :pending_notification, :fully_formatted_pending_examples, :pending_examples
 
-      EVENTS = %i[dump_profile dump_summary dump_pending dump_failures].freeze
+      EVENTS = %i[
+        deprecation
+        dump_failures
+        dump_pending
+        dump_profile
+        dump_summary
+      ].freeze
 
       attr_reader :events
 
       def initialize(events = {})
-        @events = events
+        @events = { deprecation: [] }.merge(events)
       end
 
-      EVENTS.each do |event|
+      def self.listen_for(event, &block)
         define_method(event) do |notification|
-          events[event] = Marshalable.for_event(event).from_notification(notification)
+          instance_exec(Marshalable.for_event(event).from_rspec(notification), &block)
         end
       end
 
-      def +(other)
-        self.class.new(
-          events.merge(other.events) { |_, event, other_event| event + other_event }
-        )
+      (EVENTS - %i[deprecation]).each do |event|
+        listen_for(event) do |notification|
+          events[event] = notification
+        end
       end
 
-      def failures?
-        summary.failures?
+      listen_for(:deprecation) do |deprecation|
+        events[:deprecation] << deprecation
+      end
+
+      def +(other)
+        self.class.new(events.merge(other.events) { |_, event, other_event| event + other_event })
       end
 
       def summary
         events.fetch(:dump_summary)
       end
 
+      def deprecations
+        events.fetch(:deprecation)
+      end
+
       def profile
         events[:dump_profile]
       end

data/lib/flatware/rspec/cli.rb

@@ -11,17 +11,20 @@ module Flatware
     method_option(
       'sink-endpoint',
       type: :string,
-      default: 'drbunix:sink'
+      default: 'drbunix:flatware-sink'
     )
     desc 'rspec [FLATWARE_OPTS]', 'parallelizes rspec'
     def rspec(*rspec_args)
       jobs = RSpec.extract_jobs_from_args rspec_args, workers: workers
-      formatter = Flatware::RSpec::Formatters::Console.new($stdout, $stderr)
+
+      formatter = Flatware::RSpec::Formatters::Console.new(
+        ::RSpec.configuration.output_stream,
+        deprecation_stream: ::RSpec.configuration.deprecation_stream
+      )
+
       Flatware.verbose = options[:log]
       Worker.spawn count: workers, runner: RSpec, sink: options['sink-endpoint']
-      start_sink(jobs: jobs,
-                 workers: workers,
-                 formatter: formatter)
+      start_sink(jobs: jobs, workers: workers, formatter: formatter)
     end
   end
 end

data/lib/flatware/rspec/formatter.rb

@@ -9,7 +9,7 @@ module Flatware
     class Formatter
       extend Forwardable
 
-      def_delegators :@checkpoint, *Checkpoint::EVENTS
+      def_delegators :checkpoint, *Checkpoint::EVENTS
 
       attr_reader :output
 
@@ -29,12 +29,12 @@ module Flatware
         send_progress :pending
       end
 
-      def start_dump(*)
-        @checkpoint = Checkpoint.new
+      def message(message)
+        Sink.client.message message
       end
 
       def close(*)
-        Sink.client.checkpoint @checkpoint
+        Sink.client.checkpoint checkpoint
         @checkpoint = nil
       end
 
@@ -43,16 +43,20 @@ module Flatware
       def send_progress(status)
         Sink.client.progress ProgressMessage.new status
       end
-    end
 
-    ::RSpec::Core::Formatters.register(
-      Formatter,
-      *Checkpoint::EVENTS,
-      :example_passed,
-      :example_failed,
-      :example_pending,
-      :start_dump,
-      :close
-    )
+      def checkpoint
+        @checkpoint ||= Checkpoint.new
+      end
+
+      ::RSpec::Core::Formatters.register(
+        self,
+        *Checkpoint::EVENTS,
+        :example_passed,
+        :example_failed,
+        :example_pending,
+        :message,
+        :close
+      )
+    end
   end
 end

data/lib/flatware/rspec/formatters/console.rb

@@ -4,28 +4,33 @@ module Flatware
   module RSpec
     module Formatters
       class Console
-        attr_reader :progress_formatter, :profile_formatter
+        attr_reader :progress_formatter, :out, :deprecation_stream
 
-        def initialize(out, _err)
-          ::RSpec.configuration.tty = true
-          ::RSpec.configuration.color = true
+        def initialize(out, deprecation_stream: StringIO.new)
+          @out = out
+          @deprecation_stream = deprecation_stream
+          ::RSpec.configuration.backtrace_exclusion_patterns += [%r{/lib/flatware/worker}, %r{/lib/flatware/rspec}]
           @progress_formatter = ::RSpec::Core::Formatters::ProgressFormatter.new(out)
-          @profile_formatter = ::RSpec::Core::Formatters::ProfileFormatter.new(out)
         end
 
         def progress(result)
           progress_formatter.public_send(message_for(result), nil)
         end
 
+        def message(message)
+          out.puts(message.message)
+        end
+
         def summarize(checkpoints)
           return if checkpoints.empty?
 
           result = checkpoints.reduce :+
 
+          progress_formatter.dump_pending(result) if result.pending_examples.any?
           progress_formatter.dump_failures(result)
+          dump_deprecations(result.deprecations)
+          dump_profile(result.profile) if result.profile
           progress_formatter.dump_summary(result.summary)
-          profile_formatter.dump_profile(result.profile) if result.profile
-          progress_formatter.dump_pending(result) if result.pending_examples.any?
         end
 
         def summarize_remaining(remaining)
@@ -40,6 +45,20 @@ module Flatware
 
         private
 
+        def dump_deprecations(deprecations)
+          formatter = ::RSpec::Core::Formatters::DeprecationFormatter.new(
+            deprecation_stream,
+            out
+          )
+
+          deprecations.each(&formatter.method(:deprecation))
+          formatter.deprecation_summary(nil)
+        end
+
+        def dump_profile(profile)
+          ::RSpec::Core::Formatters::ProfileFormatter.new(out).dump_profile(profile)
+        end
+
         def spec_list(remaining)
           remaining
             .flat_map(&:id).sort.each_with_index

data/lib/flatware/rspec/marshalable/deprecation_notification.rb

@@ -0,0 +1,11 @@
+module Flatware
+  module RSpec
+    module Marshalable
+      class DeprecationNotification < ::RSpec::Core::Notifications::SeedNotification
+        def self.from_rspec(notification)
+          notification
+        end
+      end
+    end
+  end
+end

data/lib/flatware/rspec/marshalable/example.rb

@@ -1,6 +1,9 @@
 module Flatware
   module RSpec
     module Marshalable
+      require 'flatware/rspec/marshalable/execution_result'
+      require 'flatware/rspec/marshalable/shared_group_inclusion_backtrace'
+
       ##
       # a subset of the rspec example interface that can traverse drb
       Example = Struct.new(
@@ -12,14 +15,29 @@ module Flatware
         ]
       ) do
         def initialize(rspec_example)
-          super(*members.map do |attribute|
+          super(marshalable_execution_result(rspec_example.execution_result), *members[1..].map do |attribute|
             rspec_example.public_send(attribute)
           end)
 
-          @metadata = rspec_example.metadata.slice(:extra_failure_lines, :shared_group_inclusion_backtrace)
+          @metadata = marshalable_metadata(rspec_example.metadata)
         end
 
         attr_reader :metadata
+
+        private
+
+        def marshalable_execution_result(execution_result)
+          ExecutionResult.from_rspec(execution_result)
+        end
+
+        def marshalable_metadata(rspec_metadata)
+          rspec_metadata.slice(:extra_failure_lines).tap do |metadata|
+            if (backtraces = rspec_metadata[:shared_group_inclusion_backtrace])
+              metadata[:shared_group_inclusion_backtrace] =
+                backtraces.map(&SharedGroupInclusionBacktrace.method(:from_rspec))
+            end
+          end
+        end
       end
     end
   end

data/lib/flatware/rspec/marshalable/examples_notification.rb

@@ -17,7 +17,7 @@ module Flatware
 
         attr_reader :reporter
 
-        def self.from_notification(rspec_notification)
+        def self.from_rspec(rspec_notification)
           new Reporter.from_rspec(rspec_notification.instance_variable_get(:@reporter))
         end
 

data/lib/flatware/rspec/marshalable/execution_result.rb

@@ -0,0 +1,18 @@
+module Flatware
+  module RSpec
+    module Marshalable
+      require 'flatware/serialized_exception'
+      class ExecutionResult < ::RSpec::Core::Example::ExecutionResult
+        def self.from_rspec(result)
+          new.tap do |marshalable|
+            marshalable.exception = result.exception && SerializedException.from(result.exception)
+
+            %i[finished_at run_time started_at status].each do |member|
+              marshalable.public_send(:"#{member}=", result.public_send(member))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/flatware/rspec/marshalable/profile_notification.rb

@@ -16,7 +16,7 @@ module Flatware
           )
         end
 
-        def self.from_notification(rspec_notification)
+        def self.from_rspec(rspec_notification)
           new(
             rspec_notification.duration,
             rspec_notification.examples.map(&Example.method(:new)),

data/lib/flatware/rspec/marshalable/shared_group_inclusion_backtrace.rb

@@ -0,0 +1,11 @@
+module Flatware
+  module RSpec
+    module Marshalable
+      class SharedGroupInclusionBacktrace < ::RSpec::Core::SharedExampleGroupInclusionStackFrame
+        def self.from_rspec(backtrace)
+          new(backtrace.shared_group_name.to_s, backtrace.inclusion_location)
+        end
+      end
+    end
+  end
+end

data/lib/flatware/rspec/marshalable/summary_notification.rb

@@ -13,7 +13,7 @@ module Flatware
           [failure_count, errors_outside_of_examples_count].any?(&:positive?)
         end
 
-        def self.from_notification(summary)
+        def self.from_rspec(summary)
           serialized_examples = [
             summary.examples,
             summary.failed_examples,

data/lib/flatware/rspec/marshalable.rb

@@ -1,6 +1,7 @@
 module Flatware
   module RSpec
     module Marshalable
+      require 'flatware/rspec/marshalable/deprecation_notification'
       require 'flatware/rspec/marshalable/examples_notification'
       require 'flatware/rspec/marshalable/profile_notification'
       require 'flatware/rspec/marshalable/summary_notification'
@@ -12,7 +13,8 @@ module Flatware
           dump_pending: ExamplesNotification,
           dump_failures: ExamplesNotification,
           dump_profile: ProfileNotification,
-          dump_summary: SummaryNotification
+          dump_summary: SummaryNotification,
+          deprecation: DeprecationNotification
         }.fetch(event)
       end
     end

data/lib/flatware/rspec.rb

@@ -15,15 +15,27 @@ module Flatware
       JobBuilder.new(args, workers: workers).jobs
     end
 
-    def run(job, _options = {})
-      runner = ::RSpec::Core::Runner
-      def runner.trap_interrupt() end
+    def runner
+      ::RSpec::Core::Runner.tap do |runner|
+        def runner.trap_interrupt() end
+      end
+    end
+
+    def output_stream
+      StringIO.new.tap do |output|
+        output.define_singleton_method(:tty?) do
+          $stdout.tty?
+        end
+      end
+    end
 
-      args = %w[
-        --format Flatware::RSpec::Formatter
-      ] + Array(job)
+    def run(job, _options = [])
+      ::RSpec.configuration.deprecation_stream = StringIO.new
+      ::RSpec.configuration.output_stream = output_stream
+      ::RSpec.configuration.add_formatter(Flatware::RSpec::Formatter)
 
-      runner.run(args, $stderr, $stdout)
+      runner.run(Array(job), $stderr, $stdout)
+      ::RSpec.reset # prevents duplicate runs
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatware-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Dunn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flatware
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 description: A distributed rspec runner
 email: brian@hashrocket.com
 executables: []
@@ -56,10 +56,13 @@ files:
 - lib/flatware/rspec/formatters/console.rb
 - lib/flatware/rspec/job_builder.rb
 - lib/flatware/rspec/marshalable.rb
+- lib/flatware/rspec/marshalable/deprecation_notification.rb
 - lib/flatware/rspec/marshalable/example.rb
 - lib/flatware/rspec/marshalable/example_group.rb
 - lib/flatware/rspec/marshalable/examples_notification.rb
+- lib/flatware/rspec/marshalable/execution_result.rb
 - lib/flatware/rspec/marshalable/profile_notification.rb
+- lib/flatware/rspec/marshalable/shared_group_inclusion_backtrace.rb
 - lib/flatware/rspec/marshalable/summary_notification.rb
 homepage: http://github.com/briandunn/flatware
 licenses:
@@ -76,14 +79,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A distributed rspec runner