mutant-rspec 0.6.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbec65e9fbbda710a2839b1236605eb36aed9ae
-  data.tar.gz: 90f3a08920d3733cff3518eb3c2ddc078ede29f4
+  metadata.gz: 46ada3b79ab252f059d8065f00d72003c6f66fa1
+  data.tar.gz: e8988daaeb561bf5e7456e4cc5ffeb52f93ff32c
 SHA512:
-  metadata.gz: e0bccffc513e8bf9b439df0d341f18151731683f94103e9efe7dcea041d4057213bdca4e21509f3965dd2206395c05bde28417787b6c374f798c5fc470008bb9
-  data.tar.gz: 1703e6caf48c5ec175082197df07587213005d9d3de01030581563eef6c81c240fc1027d63edf0eadc02abec50578e9de372415f968336dacef740d4ac98ad86
+  metadata.gz: 90dc03c3a632b7ca89eeb5235f1403fd01c97583aebe49736b343e72e42f4904981d5c74a05f6a14628b0902a90e3bca8444c4a161116b144b04dd0467749550
+  data.tar.gz: 7ba8812781d7209630b66acd13a7fbe99841d6cd13ac8813e9e68bd94c18a04609071ade1eb40a9668856273582d6c4286fc3cc5fd4778c27aed246ede3e06ca

data/lib/mutant/integration/rspec.rb

@@ -1,28 +1,28 @@
 require 'rspec/core'
-require 'rspec/core/formatters/base_text_formatter'
 
 module Mutant
   class Integration
     # Shared parts of rspec2/3 integration
     class Rspec < self
-      include AbstractType
 
-      register 'rspec'
+      ALL                  = Mutant::Expression.parse('*')
+      EXPRESSION_DELIMITER = ' '.freeze
+      LOCATION_DELIMITER   = ':'.freeze
+      EXIT_SUCCESS         = 0
+      CLI_OPTIONS          = IceNine.deep_freeze(%w[spec --fail-fast])
 
-      RSPEC_2_VERSION_PREFIX = '2.'.freeze
+      register 'rspec'
 
-      # Return integration compatible to currently loaded rspec
+      # Initialize rspec integration
       #
-      # @return [Integration]
+      # @return [undefined]
       #
       # @api private
       #
-      def self.build
-        if RSpec::Core::Version::STRING.start_with?(RSPEC_2_VERSION_PREFIX)
-          Rspec2.new
-        else
-          Rspec3.new
-        end
+      def initialize
+        @output = StringIO.new
+        @runner = RSpec::Core::Runner.new(RSpec::Core::ConfigurationOptions.new(CLI_OPTIONS))
+        @world  = RSpec.world
       end
 
       # Setup rspec integration
@@ -32,15 +32,14 @@ module Mutant
       # @api private
       #
       def setup
-        options.configure(configuration)
-        configuration.load_spec_files
+        @runner.setup($stderr, @output)
         self
       end
       memoize :setup
 
       # Return report for test
       #
-      # @param [Rspec::Test] test
+      # @param [Enumerable<Mutant::Test>] tests
       #
       # @return [Test::Result]
       #
@@ -48,25 +47,17 @@ module Mutant
       #
       # rubocop:disable MethodLength
       #
-      def run(test)
-        output = StringIO.new
-        failed = false
+      def call(tests)
+        examples = tests.map(&all_tests_index.method(:fetch)).to_set
+        filter_examples(&examples.method(:include?))
         start = Time.now
-        reporter = new_reporter(output)
-        reporter.report(1) do
-          example_group_index.fetch(test.expression.syntax).each do |example_group|
-            next if example_group.run(reporter)
-            failed = true
-            break
-          end
-        end
-        output.rewind
+        passed = @runner.run_specs(RSpec.world.ordered_example_groups).equal?(EXIT_SUCCESS)
+        @output.rewind
         Result::Test.new(
-          test:     nil,
-          mutation: nil,
-          output:   output.read,
+          tests:    nil,
+          output:   @output.read,
           runtime:  Time.now - start,
-          passed:   !failed
+          passed:   passed
         )
       end
 
@@ -77,136 +68,69 @@ module Mutant
       # @api private
       #
       def all_tests
-        example_group_index.keys.each_with_object([]) do |full_description, aggregate|
-          expression = Expression.try_parse(full_description) or next
-
-          aggregate << Test.new(self, expression)
-        end
+        all_tests_index.keys
       end
       memoize :all_tests
 
     private
 
-      # Return all example groups
+      # Return all tests index
       #
-      # @return [Hash<String, RSpec::Core::ExampleGroup]
+      # @return [Hash<Test, RSpec::Core::Example]
       #
       # @api private
       #
-      def example_group_index
-        index = Hash.new { |hash, key| hash[key] = [] }
-
-        RSpec.world.example_groups.flat_map(&:descendants).each do |example_group|
-          full_description = full_description(example_group)
-          index[full_description] << example_group
+      def all_tests_index
+        all_examples.each_with_object({}) do |example, index|
+          index[parse_example(example)] = example
         end
-
-        index
       end
-      memoize :example_group_index
+      memoize :all_tests_index
 
-      # Return configuration
+      # Parse example into test
+      #
+      # @param [RSpec::Core::Example]
       #
-      # @return [RSpec::Core::Configuration]
+      # @return [Test]
       #
       # @api private
       #
-      def configuration
-        RSpec::Core::Configuration.new
+      def parse_example(example)
+        metadata = example.metadata
+        location = metadata.fetch(:location)
+        full_description = metadata.fetch(:full_description)
+        expression = Expression.try_parse(full_description.split(EXPRESSION_DELIMITER, 2).first) || ALL
+
+        Test.new(
+          id:         "rspec:#{location} / #{full_description}",
+          expression: expression
+        )
       end
-      memoize :configuration, freezer: :noop
 
-      # Return options
+      # Return all examples
       #
-      # @return [RSpec::Core::ConfigurationOptions]
+      # @return [Array<String, RSpec::Core::Example]
       #
       # @api private
       #
-      def options
-        RSpec::Core::ConfigurationOptions.new(%w[--fail-fast spec])
+      def all_examples
+        @world.example_groups.flat_map(&:descendants).flat_map(&:examples)
       end
-      memoize :options, freezer: :noop
-
-      # Rspec2 integration
-      class Rspec2 < self
-
-        register 'rspec'
 
-      private
-
-        # Return options
-        #
-        # @return [RSpec::Core::ConfigurationOptions]
-        #
-        # @api private
-        #
-        def options
-          super.tap(&:parse_options)
-        end
-
-        # Return full description of example group
-        #
-        # @param [RSpec::Core::ExampleGroup] example_group
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def full_description(example_group)
-          example_group.metadata.fetch(:example_group).fetch(:full_description)
-        end
-
-        # Return new reporter
-        #
-        # @param [StringIO] output
-        #
-        # @return [RSpec::Core::Reporter]
-        #
-        # @api private
-        #
-        def new_reporter(output)
-          formatter = RSpec::Core::Formatters::BaseTextFormatter.new(output)
-
-          RSpec::Core::Reporter.new(formatter)
-        end
-
-      end # Rspec2
-
-      # Rspec 3 integration
-      class Rspec3 < self
-
-      private
-
-        # Return full description for example group
-        #
-        # @param [RSpec::Core::ExampleGroup] example_group
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def full_description(example_group)
-          example_group.metadata.fetch(:full_description)
-        end
-
-        # Return new reporter
-        #
-        # @param [StringIO] output
-        #
-        # @return [RSpec::Core::Reporter]
-        #
-        # @api private
-        #
-        def new_reporter(output)
-          formatter = RSpec::Core::Formatters::BaseTextFormatter.new(output)
-          notifications = RSpec::Core::Formatters::Loader.allocate.send(:notifications_for, formatter.class)
-
-          RSpec::Core::Reporter.new(configuration).tap do |reporter|
-            reporter.register_listener(formatter, *notifications)
-          end
+      # Filter examples
+      #
+      # @param [#call] predicate
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def filter_examples(&predicate)
+        @world.filtered_examples.each_value do |examples|
+          examples.keep_if(&predicate)
         end
+      end
 
-      end # Rspec3
     end # Rspec
   end # Integration
 end # Mutant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant-rspec
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.1
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutant
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.2.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.2.0
@@ -101,4 +101,3 @@ signing_key:
 specification_version: 4
 summary: Rspec integration for mutant
 test_files: []
-has_rdoc: