flatware-rspec 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c080b0bb6d068e3d65c19230aacd62d811e0e151358ffebec9f83b0e1ab0ba
-  data.tar.gz: '079c5ecaea4b3aa461bd7ffa6c6ee7e6ed1e592d990e4d76af5f0dcf3fa4863f'
+  metadata.gz: 8c7ed50452251f91a122a1870cf0034e737bd9e245a2effca63876d352b6dfaa
+  data.tar.gz: 204dc1af97debe14947500af0bf54da88f5b5d6a8e95eda320b94ef81315be7f
 SHA512:
-  metadata.gz: '0692ddafa90238adf85ffb8648b9b64d5971a0a4047e932063226e88391344953f847fc90093c65a37d8e233426f3f53e6f1f53fc0bb056dc2705de1704283bd'
-  data.tar.gz: 4ccd74df9c6954319baa3c79da326d55dcb816ef0661439cf7be3a5c4bffa1fe29c9c51c3ffbe613aabd336e0c1a22fe4bcc1ca3463f8c8111c7a4d74e4eabaf
+  metadata.gz: 19970bba746199d0514531e83ceacdfd48a89ef3f0531ff6a9d42c5b89927e107fd429c11594f9a3e784c03014ee12911be9217188150609582e78091c4e578d
+  data.tar.gz: 8b1284ae49367edfa7ba0e5e06f95fe7df5523f9091340f0f5e08fba3e9a6332dcb6a342d075990ed78ed5fe723ae25b4604336a5cb60e16fc95918d8807cd45

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
 

data/lib/flatware/rspec.rb

@@ -15,15 +15,19 @@ 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
 
-      args = %w[
-        --format Flatware::RSpec::Formatter
-      ] + Array(job)
+    def run(job, _options = [])
+      ::RSpec.configuration.deprecation_stream = StringIO.new
+      ::RSpec.configuration.output_stream = StringIO.new
+      ::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

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_rspec(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,8 @@ module Flatware
         send_progress :pending
       end
 
-      def start_dump(*)
-        @checkpoint = Checkpoint.new
-      end
-
       def close(*)
-        Sink.client.checkpoint @checkpoint
+        Sink.client.checkpoint checkpoint
         @checkpoint = nil
       end
 
@@ -43,16 +39,19 @@ 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,
+        :close
+      )
+    end
   end
 end

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

@@ -4,13 +4,13 @@ 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)
@@ -22,10 +22,11 @@ module Flatware
 
           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 +41,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.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/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,7 @@
 module Flatware
   module RSpec
     module Marshalable
+      require 'flatware/rspec/marshalable/execution_result'
       require 'flatware/rspec/marshalable/shared_group_inclusion_backtrace'
 
       ##
@@ -14,7 +15,7 @@ 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)
 
@@ -25,6 +26,10 @@ module Flatware
 
         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])

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatware-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Brian Dunn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-15 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.rc2
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc3
 - !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,9 +56,11 @@ 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