mutant 0.10.4 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4645aa0ee3e10159d6e91c5762b1f43bd11a94e229ea2cdec29af0f15d922f92
-  data.tar.gz: 3c8eb88ab56bd83c1b4e26eb18ccb1c51f43875c3db5e36453661837e88b16b6
+  metadata.gz: e2d4849ffe2057370e38c3718afe4cbbfcbfaf76b058c4c5364ff2a7475a3122
+  data.tar.gz: 6e9abc09f95b929c6ee5b1f09745aa7ce01cc66ab70aaa3e044f2da5b897ce25
 SHA512:
-  metadata.gz: 7e961ab0e43eb8208f8a9c5dc626fb3787e37f81fbf96be9f4e3da0fb2532556dcf93ed491bf29fbedc7c099c0a6ad4e81b4b32448e5615fe2fb37b1bb08dd2b
-  data.tar.gz: c9d2e9344bcbfdeeb7a3108cfa5b94bae2b8527fdf03ae5f4a346f2d207371c40319a79f7a44782a0d8d98003834bf22d79188e46d555d9c18f1444d7fa3149a
+  metadata.gz: '050159a447e4f328e9283cea9785dc08bd51d6132995ff9ecda4cdfbda08f665f8294607f5eeaf390e9b3a069ae69dab675fc2767b1300973ec9bfa2b918b70a'
+  data.tar.gz: 582384118f7e8df7091280f6bc78e6d6f95f612f28a0892637d1e1a845c93754df29f5e463e8a1a69ca5f85ed95e666f82ab4ac957bf3a896d3f34fb26a5693b

data/bin/mutant

@@ -10,7 +10,6 @@ require 'mutant'
 
 command = Mutant::CLI.parse(
   arguments: ARGV,
-  config:    Mutant::Config::DEFAULT,
   world:     Mutant::WORLD
 )
 
@@ -40,7 +39,6 @@ status =
 
     Zombie::Mutant::CLI.parse(
       arguments: ARGV,
-      config:    Zombie::Mutant::Config::DEFAULT,
       world:     Zombie::Mutant::WORLD
     ).call
   else

data/lib/mutant.rb

@@ -163,6 +163,7 @@ require 'mutant/integration/null'
 require 'mutant/selector'
 require 'mutant/selector/expression'
 require 'mutant/selector/null'
+require 'mutant/world'
 require 'mutant/config'
 require 'mutant/cli'
 require 'mutant/cli/command'
@@ -178,16 +179,14 @@ require 'mutant/reporter/sequence'
 require 'mutant/reporter/cli'
 require 'mutant/reporter/cli/printer'
 require 'mutant/reporter/cli/printer/config'
+require 'mutant/reporter/cli/printer/coverage_result'
 require 'mutant/reporter/cli/printer/env'
 require 'mutant/reporter/cli/printer/env_progress'
 require 'mutant/reporter/cli/printer/env_result'
 require 'mutant/reporter/cli/printer/isolation_result'
-require 'mutant/reporter/cli/printer/mutation_progress_result'
 require 'mutant/reporter/cli/printer/mutation_result'
 require 'mutant/reporter/cli/printer/status_progressive'
-require 'mutant/reporter/cli/printer/subject_progress'
 require 'mutant/reporter/cli/printer/subject_result'
-require 'mutant/reporter/cli/printer/test_result'
 require 'mutant/reporter/cli/format'
 require 'mutant/repository'
 require 'mutant/repository/diff'
@@ -218,12 +217,14 @@ module Mutant
     stderr:             $stderr,
     stdout:             $stdout,
     thread:             Thread,
+    timer:              Timer.new(Process),
     warnings:           Warnings.new(Warning)
   )
 
   # Reopen class to initialize constant to avoid dep circle
   class Config
     DEFAULT = new(
+      coverage_criteria: Config::CoverageCriteria::DEFAULT,
       expression_parser: Expression::Parser.new([
         Expression::Method,
         Expression::Methods,
@@ -232,10 +233,11 @@ module Mutant
       ]),
       fail_fast:         false,
       includes:          EMPTY_ARRAY,
-      integration:       'null',
+      integration:       nil,
       isolation:         Mutant::Isolation::Fork.new(WORLD),
-      jobs:              Etc.nprocessors,
+      jobs:              nil,
       matcher:           Matcher::Config::DEFAULT,
+      mutation_timeout:  nil,
       reporter:          Reporter::CLI.build(WORLD.stdout),
       requires:          EMPTY_ARRAY,
       zombie:            false

data/lib/mutant/cli/command.rb

@@ -4,7 +4,7 @@ module Mutant
   module CLI
     # rubocop:disable Metrics/ClassLength
     class Command
-      include AbstractType, Anima.new(:world, :config, :main, :parent, :arguments)
+      include AbstractType, Anima.new(:world, :main, :parent, :arguments)
 
       include Equalizer.new(:parent, :arguments)
 
@@ -105,7 +105,7 @@ module Mutant
       def parse
         Either
           .wrap_error(OptionParser::InvalidOption) { parser.order(arguments) }
-          .lmap { |error| "#{full_name}: #{error}" }
+          .lmap(&method(:with_help))
           .bind(&method(:parse_remaining))
       end
 
@@ -159,9 +159,7 @@ module Mutant
         command_name, *arguments = arguments
 
         if command_name.nil?
-          Either::Left.new(
-            "Missing required subcommand!\n\n#{parser}"
-          )
+          Either::Left.new(with_help('Missing required subcommand!'))
         else
           find_command(command_name).bind do |command|
             command.parse(**to_h, parent: self, arguments: arguments)
@@ -187,9 +185,13 @@ module Mutant
         if subcommand
           Either::Right.new(subcommand)
         else
-          Either::Left.new("#{full_name}: Cannot find subcommand #{name.inspect}")
+          Either::Left.new(with_help("Cannot find subcommand #{name.inspect}"))
         end
       end
+
+      def with_help(message)
+        "#{full_name}: #{message}\n\n#{parser}"
+      end
     end # Command
     # rubocop:enable Metrics/ClassLength
   end # CLI

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

@@ -28,20 +28,30 @@ module Mutant
         #
         # @return [Bool]
         def zombie?
-          config.zombie
+          @config.zombie
         end
 
       private
 
+        def initialize(attributes)
+          super(attributes)
+          @config = Config.env
+        end
+
         def execute
           soft_fail(License.apply(world))
-            .bind { Config.load_config_file(world, config) }
-            .bind { |cli_config| Bootstrap.apply(world, cli_config) }
+            .bind { Config.load_config_file(world) }
+            .fmap(&method(:expand))
+            .bind { Bootstrap.apply(world, @config) }
             .bind(&Runner.public_method(:apply))
             .from_right { |error| world.stderr.puts(error); return false }
             .success?
         end
 
+        def expand(file_config)
+          @config = @config.merge(file_config)
+        end
+
         def soft_fail(result)
           result.either(
             lambda do |message|
@@ -60,7 +70,7 @@ module Mutant
         end
 
         def parse_remaining_arguments(arguments)
-          traverse(config.expression_parser.public_method(:apply), arguments)
+          traverse(@config.expression_parser.public_method(:apply), arguments)
             .fmap do |match_expressions|
               matcher(match_expressions: match_expressions)
               self
@@ -78,19 +88,19 @@ module Mutant
         end
 
         def set(**attributes)
-          @config = config.with(attributes)
+          @config = @config.with(attributes)
         end
 
         def matcher(**attributes)
-          set(matcher: config.matcher.with(attributes))
+          set(matcher: @config.matcher.with(attributes))
         end
 
         def add(attribute, value)
-          set(attribute => config.public_send(attribute) + [value])
+          set(attribute => @config.public_send(attribute) + [value])
         end
 
         def add_matcher(attribute, value)
-          set(matcher: config.matcher.add(attribute, value))
+          set(matcher: @config.matcher.add(attribute, value))
         end
 
         def add_environment_options(parser)
@@ -119,10 +129,10 @@ module Mutant
           parser.separator('Matcher:')
 
           parser.on('--ignore-subject EXPRESSION', 'Ignore subjects that match EXPRESSION as prefix') do |pattern|
-            add_matcher(:ignore_expressions, config.expression_parser.apply(pattern).from_right)
+            add_matcher(:ignore_expressions, @config.expression_parser.apply(pattern).from_right)
           end
           parser.on('--start-subject EXPRESSION', 'Start mutation testing at a specific subject') do |pattern|
-            add_matcher(:start_expressions, config.expression_parser.apply(pattern).from_right)
+            add_matcher(:start_expressions, @config.expression_parser.apply(pattern).from_right)
           end
           parser.on('--since REVISION', 'Only select subjects touched since REVISION') do |revision|
             add_matcher(
@@ -143,6 +153,9 @@ module Mutant
           parser.on('-j', '--jobs NUMBER', 'Number of kill jobs. Defaults to number of processors.') do |number|
             set(jobs: Integer(number))
           end
+          parser.on('-t', '--mutation-timeout NUMBER', 'Per mutation analysis timeout') do |number|
+            set(mutation_timeout: Float(number))
+          end
         end
       end # Run
       # rubocop:enable Metrics/ClassLength

data/lib/mutant/config.rb

@@ -1,61 +1,13 @@
 # frozen_string_literal: true
 
 module Mutant
-  # The outer world IO objects mutant does interact with
-  class World
-    include Adamantium::Flat, Anima.new(
-      :condition_variable,
-      :gem,
-      :gem_method,
-      :io,
-      :json,
-      :kernel,
-      :load_path,
-      :marshal,
-      :mutex,
-      :object_space,
-      :open3,
-      :pathname,
-      :process,
-      :stderr,
-      :stdout,
-      :thread,
-      :warnings
-    )
-
-    INSPECT = '#<Mutant::World>'
-
-    private_constant(*constants(false))
-
-    # Object inspection
-    #
-    # @return [String]
-    def inspect
-      INSPECT
-    end
-
-    # Capture stdout of a command
-    #
-    # @param [Array<String>] command
-    #
-    # @return [Either<String,String>]
-    def capture_stdout(command)
-      stdout, status = open3.capture2(*command, binmode: true)
-
-      if status.success?
-        Either::Right.new(stdout)
-      else
-        Either::Left.new("Command #{command} failed!")
-      end
-    end
-  end # World
-
   # Standalone configuration of a mutant execution.
   #
   # Does not reference any "external" volatile state. The configuration applied
   # to current environment is being represented by the Mutant::Env object.
   class Config
     include Adamantium::Flat, Anima.new(
+      :coverage_criteria,
       :expression_parser,
       :fail_fast,
       :includes,
@@ -63,6 +15,7 @@ module Mutant
       :isolation,
       :jobs,
       :matcher,
+      :mutation_timeout,
       :reporter,
       :requires,
       :zombie
@@ -72,30 +25,6 @@ module Mutant
       define_method(:"#{name}?") { public_send(name) }
     end
 
-    boolean = Transform::Boolean.new
-    integer = Transform::Primitive.new(Integer)
-    string  = Transform::Primitive.new(String)
-
-    string_array = Transform::Array.new(string)
-
-    TRANSFORM = Transform::Sequence.new(
-      [
-        Transform::Exception.new(SystemCallError, :read.to_proc),
-        Transform::Exception.new(YAML::SyntaxError, YAML.method(:safe_load)),
-        Transform::Hash.new(
-          optional: [
-            Transform::Hash::Key.new('fail_fast',   boolean),
-            Transform::Hash::Key.new('includes',    string_array),
-            Transform::Hash::Key.new('integration', string),
-            Transform::Hash::Key.new('jobs',        integer),
-            Transform::Hash::Key.new('requires',    string_array)
-          ],
-          required: []
-        ),
-        Transform::Hash::Symbolize.new
-      ]
-    )
-
     MORE_THAN_ONE_CONFIG_FILE = <<~'MESSAGE'
       Found more than one candidate for use as implicit config file: %s
     MESSAGE
@@ -108,17 +37,62 @@ module Mutant
 
     private_constant(*constants(false))
 
+    class CoverageCriteria
+      include Anima.new(:process_abort, :test_result, :timeout)
+
+      DEFAULT = new(
+        process_abort: false,
+        test_result:   true,
+        timeout:       false
+      )
+
+      TRANSFORM =
+        Transform::Sequence.new(
+          [
+            Transform::Hash.new(
+              optional: [
+                Transform::Hash::Key.new('process_abort', Transform::BOOLEAN),
+                Transform::Hash::Key.new('test_result',   Transform::BOOLEAN),
+                Transform::Hash::Key.new('timeout',       Transform::BOOLEAN)
+              ],
+              required: []
+            ),
+            Transform::Hash::Symbolize.new,
+            ->(value) { Either::Right.new(DEFAULT.with(**value)) }
+          ]
+        )
+    end # CoverageCriteria
+
+    # Merge with other config
+    #
+    # @param [Config] other
+    #
+    # @return [Config]
+    def merge(other)
+      other.with(
+        fail_fast:        fail_fast || other.fail_fast,
+        includes:         other.includes + includes,
+        jobs:             other.jobs || jobs,
+        integration:      other.integration || integration,
+        mutation_timeout: other.mutation_timeout || mutation_timeout,
+        matcher:          matcher.merge(other.matcher),
+        requires:         other.requires + requires,
+        zombie:           zombie || other.zombie
+      )
+    end
+
     # Load config file
     #
     # @param [World] world
     # @param [Config] config
     #
     # @return [Either<String,Config>]
-    def self.load_config_file(world, config)
-      files = CANDIDATES.map(&world.pathname.method(:new)).select(&:readable?)
+    def self.load_config_file(world)
+      config = DEFAULT
+      files = CANDIDATES.map(&world.pathname.public_method(:new)).select(&:readable?)
 
       if files.one?
-        load_contents(files.first).fmap(&config.method(:with))
+        load_contents(files.first).fmap(&config.public_method(:with))
       elsif files.empty?
         Either::Right.new(config)
       else
@@ -129,9 +103,38 @@ module Mutant
     def self.load_contents(path)
       Transform::Named
         .new(path.to_s, TRANSFORM)
-        .apply(path)
+        .call(path)
         .lmap(&:compact_message)
     end
     private_class_method :load_contents
+
+    # The configuration from the environment
+    #
+    # @return [Config]
+    def self.env
+      DEFAULT.with(jobs: Etc.nprocessors)
+    end
+
+    TRANSFORM = Transform::Sequence.new(
+      [
+        Transform::Exception.new(SystemCallError, :read.to_proc),
+        Transform::Exception.new(YAML::SyntaxError, YAML.method(:safe_load)),
+        Transform::Hash.new(
+          optional: [
+            Transform::Hash::Key.new('coverage_criteria', CoverageCriteria::TRANSFORM),
+            Transform::Hash::Key.new('fail_fast',         Transform::BOOLEAN),
+            Transform::Hash::Key.new('includes',          Transform::STRING_ARRAY),
+            Transform::Hash::Key.new('integration',       Transform::STRING),
+            Transform::Hash::Key.new('jobs',              Transform::INTEGER),
+            Transform::Hash::Key.new('mutation_timeout',  Transform::FLOAT),
+            Transform::Hash::Key.new('requires',          Transform::STRING_ARRAY)
+          ],
+          required: []
+        ),
+        Transform::Hash::Symbolize.new
+      ]
+    )
+
+    private_constant(:TRANSFORM)
   end # Config
 end # Mutant

data/lib/mutant/env.rb

@@ -24,10 +24,15 @@ module Mutant
     # @param [Config] config
     #
     # @return [Env]
+    #
+    # rubocop:disable Metrics/MethodLength
     def self.empty(world, config)
       new(
         config:           config,
-        integration:      Integration::Null.new(config),
+        integration:      Integration::Null.new(
+          expression_parser: config.expression_parser,
+          timer:             world.timer
+        ),
         matchable_scopes: EMPTY_ARRAY,
         mutations:        EMPTY_ARRAY,
         parser:           Parser.new,
@@ -36,6 +41,7 @@ module Mutant
         world:            world
       )
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Kill mutation
     #
@@ -43,14 +49,14 @@ module Mutant
     #
     # @return [Result::Mutation]
     def kill(mutation)
-      start = Timer.now
+      start = timer.now
 
       tests = selections.fetch(mutation.subject)
 
       Result::Mutation.new(
         isolation_result: run_mutation_tests(mutation, tests),
         mutation:         mutation,
-        runtime:          Timer.now - start
+        runtime:          timer.now - start
       )
     end
 
@@ -127,7 +133,7 @@ module Mutant
   private
 
     def run_mutation_tests(mutation, tests)
-      config.isolation.call do
+      config.isolation.call(config.mutation_timeout) do
         result = mutation.insert(world.kernel)
 
         if result.equal?(Loader::Result::VoidValue.instance)
@@ -138,5 +144,9 @@ module Mutant
       end
     end
 
+    def timer
+      world.timer
+    end
+
   end # Env
 end # Mutant