mutant 0.11.19 → 0.11.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4809cb65459d6270021f50359d6b799b420fdd142a32524a2ebd772485c7a70b
-  data.tar.gz: b8284c5b2d2bd165b7ef78662910cb314a6a5b5cd619b5e411290a10a058ee57
+  metadata.gz: 28479ac15f5cf3d79de8ffd27e87601db35a642c09a9d717df6d34bfb41bc0c0
+  data.tar.gz: 1aa5fc440f828ab7a3b21fbb65534899be91281bfd238e86cf3e7e7098f3c4ba
 SHA512:
-  metadata.gz: c68d2e51e917a1b347a036c1619ad3a54fefee4e6dec6710f1d6b488c707437bb58597822dcc2108f55c5e6caa4e3226e52a2eeaa7012d39685203e161ec235b
-  data.tar.gz: 7894b0df9ce7e54757f04206f501e7e5a676a93694b53af09a2cb667a6fb0a02737747faddefeae0ff5808b629ef1b80b9a59bd0b1fee6fa13ef1984c72fad87
+  metadata.gz: 9a7bb108c85e012d4ba53444e612ff955f6ceafbac159f1d4a1561c62f8f693279d1673e2cde0899ef2356ac42bad99143405d2ab482c35215553548c734e662
+  data.tar.gz: 143cc0c327d18f4203a6769606ceb976aaf0fb748168680d80bc0d4d2099d203a4271cf2a3644307050421c841a9019441947250c21fdefaf7883c198f0887b8

data/lib/mutant/bootstrap.rb

@@ -88,7 +88,7 @@ module Mutant
         config, hooks, world = env.config, env.hooks, env.world
 
         env.record(:hooks_env_infection_pre) do
-          hooks.run(:env_infection_pre, env)
+          hooks.run(:env_infection_pre, env: env)
         end
 
         env.record(:require_target) do
@@ -101,7 +101,7 @@ module Mutant
         end
 
         env.record(:hooks_env_infection_post) do
-          hooks.run(:env_infection_post, env)
+          hooks.run(:env_infection_post, env: env)
         end
       end
     end

data/lib/mutant/cli/command/environment/run.rb

@@ -18,7 +18,8 @@ module Mutant
 
           NO_TESTS_MESSAGE = <<~'MESSAGE'
             ===============
-            Mutant found no tests. Mutation testing cannot be started.
+            Mutant found no tests available for mutation testing.
+            Mutation testing cannot be started.
 
             This can have various reasons:
 
@@ -41,7 +42,7 @@ module Mutant
           end
 
           def validate_tests(environment)
-            if environment.integration.all_tests.empty?
+            if environment.integration.available_tests.empty?
               Either::Left.new(NO_TESTS_MESSAGE)
             else
               Either::Right.new(environment)

data/lib/mutant/cli/command/environment/test.rb

@@ -21,7 +21,7 @@ module Mutant
 
             def list_tests(env)
               tests = env.integration.all_tests
-              print('Tests in environment: %d' % tests.length)
+              print('All tests in environment: %d' % tests.length)
               tests.each do |test|
                 print(test.identification)
               end

data/lib/mutant/cli/command/environment.rb

@@ -92,7 +92,6 @@ module Mutant
           end
         end
 
-        # rubocop:disable Metrics/MethodLength
         def add_matcher_options(parser)
           parser.separator('Matcher:')
 
@@ -103,10 +102,7 @@ module Mutant
             add_matcher(:start_expressions, @config.expression_parser.call(pattern).from_right)
           end
           parser.on('--since REVISION', 'Only select subjects touched since REVISION') do |revision|
-            add_matcher(
-              :subject_filters,
-              Repository::SubjectFilter.new(diff: Repository::Diff.new(to: revision, world: world))
-            )
+            add_matcher(:diffs, Repository::Diff.new(to: revision, world: world))
           end
         end
 

data/lib/mutant/env.rb

@@ -64,6 +64,10 @@ module Mutant
       )
     end
 
+    def emit_mutation_worker_process_start(index:)
+      hooks.run(:mutation_worker_process_start, index: index)
+    end
+
     # The test selections
     #
     # @return Hash{Mutation => Enumerable<Test>}
@@ -100,13 +104,21 @@ module Mutant
     end
     memoize :amount_mutations
 
-    # Amount of tests reachable by integration
+    # Amount of all tests the integration provides
     #
     # @return [Integer]
-    def amount_total_tests
+    def amount_all_tests
       integration.all_tests.length
     end
-    memoize :amount_total_tests
+    memoize :amount_all_tests
+
+    # Amount of tests available for mutation testing
+    #
+    # @return [Integer]
+    def amount_available_tests
+      integration.available_tests.length
+    end
+    memoize :amount_available_tests
 
     # Amount of selected subjects
     #
@@ -147,9 +159,9 @@ module Mutant
 
     def run_mutation_tests(mutation, tests)
       config.isolation.call(config.mutation.timeout) do
-        hooks.run(:mutation_insert_pre, mutation)
+        hooks.run(:mutation_insert_pre, mutation: mutation)
         result = mutation.insert(world.kernel)
-        hooks.run(:mutation_insert_post, mutation)
+        hooks.run(:mutation_insert_post, mutation: mutation)
 
         result.either(
           ->(_) { Result::Test::VoidValue.instance },

data/lib/mutant/hooks.rb

@@ -5,10 +5,11 @@ module Mutant
     include Adamantium, Anima.new(:map)
 
     DEFAULTS = %i[
-      env_infection_pre
       env_infection_post
+      env_infection_pre
       mutation_insert_post
       mutation_insert_pre
+      mutation_worker_process_start
     ].product([EMPTY_ARRAY]).to_h.transform_values(&:freeze).freeze
 
     MESSAGE = 'Unknown hook %s'
@@ -32,10 +33,10 @@ module Mutant
       )
     end
 
-    def run(name, payload)
+    def run(name, **payload)
       Hooks.assert_name(name)
 
-      map.fetch(name).each { |block| block.call(payload) }
+      map.fetch(name).each { |block| block.call(**payload) }
 
       self
     end

data/lib/mutant/integration.rb

@@ -88,11 +88,21 @@ module Mutant
     # @return [Result::Test]
     abstract_method :call
 
-    # Available tests for integration
+    # All tests this integration can run
+    #
+    # Some tests may not be available for mutation testing.
+    # See #available_tests
     #
     # @return [Enumerable<Test>]
     abstract_method :all_tests
 
+    # All tests available for mutation testing
+    #
+    # Subset ofr #al_tests
+    #
+    # @return [Enumerable<Test>]
+    abstract_method :available_tests
+
   private
 
     def timer

data/lib/mutant/matcher/config.rb

@@ -8,7 +8,7 @@ module Mutant
         :ignore,
         :subjects,
         :start_expressions,
-        :subject_filters
+        :diffs
       )
 
       INSPECT_FORMAT      = "#<#{self} %s>"
@@ -19,8 +19,8 @@ module Mutant
       PRESENTATIONS       = {
         ignore:            :syntax,
         start_expressions: :syntax,
-        subject_filters:   :inspect,
-        subjects:          :syntax
+        subjects:          :syntax,
+        diffs:             :inspect
       }.freeze
 
       private_constant(*constants(false))

data/lib/mutant/matcher/method.rb

@@ -120,6 +120,11 @@ module Mutant
         def matched_view
           return if source_location.nil?
 
+          # This is a performance optimization when using --since to avoid the cost of parsing
+          # every source file that could possibly map to a subject. A more fine-grained filtering
+          # takes places later in the process.
+          return unless relevant_source_file?
+
           ast
             .on_line(source_line)
             .select { |view| view.node.type.eql?(self.class::MATCH_NODE_TYPE) && match?(view.node) }
@@ -127,6 +132,10 @@ module Mutant
         end
         memoize :matched_view
 
+        def relevant_source_file?
+          env.config.matcher.diffs.all? { |diff| diff.touches_path?(source_path) }
+        end
+
         def visibility
           # This can be cleaned up once we are on >ruby-3.0
           # Method#{public,private,protected}? exists there.

data/lib/mutant/matcher.rb

@@ -31,7 +31,9 @@ module Mutant
     private_class_method :allowed_subject?
 
     def self.select_subject?(config, subject)
-      config.subject_filters.all? { |filter| filter.call(subject) }
+      config.diffs.all? do |diff|
+        diff.touches?(subject.source_path, subject.source_lines)
+      end
     end
     private_class_method :select_subject?
 

data/lib/mutant/mutation/runner.rb

@@ -41,12 +41,13 @@ module Mutant
 
       def self.mutation_test_config(env)
         Parallel::Config.new(
-          block:        env.method(:cover_index),
-          jobs:         env.config.jobs,
-          process_name: 'mutant-worker-process',
-          sink:         Sink.new(env: env),
-          source:       Parallel::Source::Array.new(jobs: env.mutations.each_index.to_a),
-          thread_name:  'mutant-worker-thread'
+          block:            env.method(:cover_index),
+          jobs:             env.config.jobs,
+          on_process_start: env.method(:emit_mutation_worker_process_start),
+          process_name:     'mutant-worker-process',
+          sink:             Sink.new(env: env),
+          source:           Parallel::Source::Array.new(jobs: env.mutations.each_index.to_a),
+          thread_name:      'mutant-worker-thread'
         )
       end
       private_class_method :mutation_test_config

data/lib/mutant/parallel/worker.rb

@@ -3,58 +3,69 @@
 module Mutant
   module Parallel
     class Worker
-      include Adamantium, Anima.new(
-        :connection,
-        :index,
-        :pid,
-        :process,
-        :var_active_jobs,
-        :var_final,
-        :var_running,
-        :var_sink,
-        :var_source
-      )
-
-      private(*anima.attribute_names)
-
-      public :index
+      class Config
+        include Adamantium, Anima.new(
+          :block,
+          :index,
+          :on_process_start,
+          :process_name,
+          :var_active_jobs,
+          :var_final,
+          :var_running,
+          :var_sink,
+          :var_source,
+          :world
+        )
+      end
+
+      include Adamantium, Anima.new(:connection, :config, :pid)
+
+      def self.start(**attributes)
+        start_config(Config.new(**attributes))
+      end
 
       # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/ParameterLists
-      def self.start(world:, block:, process_name:, **attributes)
+      def self.start_config(config)
+        world   = config.world
         io      = world.io
-        process = world.process
+        marshal = world.marshal
 
         request  = Pipe.from_io(io)
         response = Pipe.from_io(io)
 
-        pid = process.fork do
-          world.thread.current.name = process_name
-          world.process.setproctitle(process_name)
-
-          Child.new(
-            block:      block,
-            connection: Pipe::Connection.from_pipes(
-              marshal: world.marshal,
-              reader:  request,
-              writer:  response
-            )
-          ).call
+        pid = world.process.fork do
+          run_child(
+            config:     config,
+            connection: Pipe::Connection.from_pipes(marshal: marshal, reader: request, writer: response)
+          )
         end
 
         new(
           pid:        pid,
-          process:    process,
-          connection: Pipe::Connection.from_pipes(
-            marshal: world.marshal,
-            reader:  response,
-            writer:  request
-          ),
-          **attributes
+          config:     config,
+          connection: Pipe::Connection.from_pipes(marshal: marshal, reader: response, writer: request)
         )
       end
+      private_class_method :start_config
       # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/ParameterLists
+
+      def self.run_child(config:, connection:)
+        world = config.world
+
+        world.thread.current.name = config.process_name
+        world.process.setproctitle(config.process_name)
+
+        config.on_process_start.call(index: config.index)
+
+        loop do
+          connection.send_value(config.block.call(connection.receive_value))
+        end
+      end
+      private_class_method :run_child
+
+      def index
+        config.index
+      end
 
       # Run worker payload
       #
@@ -89,45 +100,38 @@ module Mutant
 
     private
 
+      def process
+        config.world.process
+      end
+
       def next_job
-        var_source.with do |source|
+        config.var_source.with do |source|
           source.next if source.next?
         end
       end
 
       def add_result(result)
-        var_sink.with do |sink|
+        config.var_sink.with do |sink|
           sink.result(result)
           sink.stop?
         end
       end
 
       def job_start(job)
-        var_active_jobs.with do |active_jobs|
+        config.var_active_jobs.with do |active_jobs|
           active_jobs << job
         end
       end
 
       def job_done(job)
-        var_active_jobs.with do |active_jobs|
+        config.var_active_jobs.with do |active_jobs|
           active_jobs.delete(job)
         end
       end
 
       def finalize
-        var_final.put(nil) if var_running.modify(&:pred).zero?
-      end
-
-      class Child
-        include Anima.new(:block, :connection)
-
-        def call
-          loop do
-            connection.send_value(block.call(connection.receive_value))
-          end
-        end
+        config.var_final.put(nil) if config.var_running.modify(&:pred).zero?
       end
-      private_constant :Child
     end # Worker
   end # Parallel
 end # Mutant

data/lib/mutant/parallel.rb

@@ -3,7 +3,6 @@
 module Mutant
   # Parallel execution engine of arbitrary payloads
   module Parallel
-
     # Run async computation returning driver
     #
     # @param [World] world
@@ -24,10 +23,11 @@ module Mutant
     def self.workers(world, config, shared)
       Array.new(config.jobs) do |index|
         Worker.start(
-          block:        config.block,
-          index:        index,
-          process_name: "#{config.process_name}-#{index}",
-          world:        world,
+          block:            config.block,
+          index:            index,
+          on_process_start: config.on_process_start,
+          process_name:     "#{config.process_name}-#{index}",
+          world:            world,
           **shared
         )
       end
@@ -93,6 +93,7 @@ module Mutant
       include Adamantium, Anima.new(
         :block,
         :jobs,
+        :on_process_start,
         :process_name,
         :sink,
         :source,

data/lib/mutant/reporter/cli/printer/env.rb

@@ -7,20 +7,22 @@ module Mutant
         # Env printer
         class Env < self
           delegate(
+            :amount_available_tests,
             :amount_mutations,
             :amount_selected_tests,
             :amount_subjects,
-            :amount_total_tests,
+            :amount_all_tests,
             :config,
             :test_subject_ratio
           )
 
           FORMATS = [
-            [:info,   'Subjects:        %s',        :amount_subjects      ],
-            [:info,   'Total-Tests:     %s',        :amount_total_tests   ],
-            [:info,   'Selected-Tests:  %s',        :amount_selected_tests],
-            [:info,   'Tests/Subject:   %0.2f avg', :test_subject_ratio   ],
-            [:info,   'Mutations:       %s',        :amount_mutations     ]
+            [:info,   'Subjects:        %s',        :amount_subjects       ],
+            [:info,   'All-Tests:       %s',        :amount_all_tests      ],
+            [:info,   'Available-Tests: %s',        :amount_available_tests],
+            [:info,   'Selected-Tests:  %s',        :amount_selected_tests ],
+            [:info,   'Tests/Subject:   %0.2f avg', :test_subject_ratio    ],
+            [:info,   'Mutations:       %s',        :amount_mutations      ]
           ].each(&:freeze)
 
           # Run printer

data/lib/mutant/repository/diff.rb

@@ -22,12 +22,16 @@ module Mutant
       # @raise [RepositoryError]
       #   when git command failed
       def touches?(path, line_range)
-        touched_paths
-          .from_right { |message| fail Error, message }
-          .fetch(path) { return false }
+        touched_path(path) { return false }
           .touches?(line_range)
       end
 
+      def touches_path?(path)
+        touched_path(path) { return false }
+
+        true
+      end
+
     private
 
       def repository_root
@@ -37,6 +41,10 @@ module Mutant
           .fmap(&world.pathname.public_method(:new))
       end
 
+      def touched_path(path, &block)
+        touched_paths.from_right { |message| fail Error, message }.fetch(path, &block)
+      end
+
       def touched_paths
         repository_root.bind(&method(:diff_index))
       end

data/lib/mutant/repository.rb

@@ -2,19 +2,5 @@
 
 module Mutant
   module Repository
-    # Subject filter based on repository diff
-    class SubjectFilter
-      include Adamantium, Anima.new(:diff)
-
-      # Test if subject was touched in diff
-      #
-      # @param [Subject] subject
-      #
-      # @return [Boolean]
-      def call(subject)
-        diff.touches?(subject.source_path, subject.source_lines)
-      end
-
-    end # SubjectFilter
   end # Repository
 end # Mutant

data/lib/mutant/selector/expression.rb

@@ -13,7 +13,7 @@ module Mutant
       # @return [Enumerable<Test>]
       def call(subject)
         subject.match_expressions.each do |match_expression|
-          subject_tests = integration.all_tests.select do |test|
+          subject_tests = integration.available_tests.select do |test|
             test.expressions.any? do |test_expression|
               match_expression.prefix?(test_expression)
             end

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.11.19'
+  VERSION = '0.11.20'
 end # Mutant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.11.19
+  version: 0.11.20
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs