mutant 0.10.12 → 0.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c573735f4e77ea0dd9313412e82bbca47771e8fd379c5d53393e855248b7792
-  data.tar.gz: 7c59c273789c9fb3d85dd858a7ed7d6bec85b8440ad05736f70541325d214947
+  metadata.gz: 561ad5a2483b3678f3bbcd3ab1ddbef3259f589548b59f3f42e993b76e50e120
+  data.tar.gz: dd3b79cbeb3bca13e502b9c43cbb59d2d3656e0f37905d5cbb33ac1e1ac98fb1
 SHA512:
-  metadata.gz: ff3a349908f6f3f83ace0ce4de9555b981f6a82515954e635a7539b2d8852d9bfa740a2c33afd2b3b49a34e0358920be9d0c22b8c05c2903356d75b9c4a4ccc6
-  data.tar.gz: 2b3cc3f947b50bc407c8c5a3239ad5bbddf2ff2adc773e661f8279d650297accaad05cdcdbce5e64ae04e419dd63740e0de493542f44464bb5d7d7ee60ab37c1
+  metadata.gz: 8d314dfd39fba6e6becf5d3410df2b6c95f94a5861df6446cb804b058edcad4d8b4a6ed98a6a21f4cfed3af48a450a17a3579b9b39e6814a60c4f10d746f77f9
+  data.tar.gz: 1ef113b288fca26803593efe136e2c8e49002eb6f33722373eaacf0276078ac6ac4624139c10636498cf2e9c5eec8c64512b08796833380f457e5f1497bcab61

data/lib/mutant.rb

@@ -226,7 +226,7 @@ module Mutant
   # Reopen class to initialize constant to avoid dep circle
   class Config
     DEFAULT = new(
-      coverage_criteria: Config::CoverageCriteria::DEFAULT,
+      coverage_criteria: Config::CoverageCriteria::EMPTY,
       expression_parser: Expression::Parser.new([
         Expression::Method,
         Expression::Methods,

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

@@ -29,7 +29,7 @@ module Mutant
         end
 
         def expand(file_config)
-          @config = Config.env.merge(file_config).merge(@config)
+          @config = Config.env.merge(file_config).merge(@config).expand_defaults
         end
 
         def parse_remaining_arguments(arguments)

data/lib/mutant/config.rb

@@ -40,6 +40,12 @@ module Mutant
     class CoverageCriteria
       include Anima.new(:process_abort, :test_result, :timeout)
 
+      EMPTY = new(
+        process_abort: nil,
+        test_result:   nil,
+        timeout:       nil
+      )
+
       DEFAULT = new(
         process_abort: false,
         test_result:   true,
@@ -61,6 +67,22 @@ module Mutant
             ->(value) { Either::Right.new(DEFAULT.with(**value)) }
           ]
         )
+
+      def merge(other)
+        self.class.new(
+          process_abort: overwrite(other, :process_abort),
+          test_result:   overwrite(other, :test_result),
+          timeout:       overwrite(other, :timeout)
+        )
+      end
+
+    private
+
+      def overwrite(other, attribute_name)
+        other_value = other.public_send(attribute_name)
+
+        other_value.nil? ? public_send(attribute_name) : other_value
+      end
     end # CoverageCriteria
 
     # Merge with other config
@@ -68,18 +90,24 @@ module Mutant
     # @param [Config] other
     #
     # @return [Config]
+    #
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def merge(other)
       other.with(
-        fail_fast:        fail_fast || other.fail_fast,
-        includes:         includes + other.includes,
-        jobs:             other.jobs || jobs,
-        integration:      other.integration || integration,
-        mutation_timeout: other.mutation_timeout || mutation_timeout,
-        matcher:          matcher.merge(other.matcher),
-        requires:         requires + other.requires,
-        zombie:           zombie || other.zombie
+        coverage_criteria: coverage_criteria.merge(other.coverage_criteria),
+        fail_fast:         fail_fast || other.fail_fast,
+        includes:          includes + other.includes,
+        jobs:              other.jobs || jobs,
+        integration:       other.integration || integration,
+        mutation_timeout:  other.mutation_timeout || mutation_timeout,
+        matcher:           matcher.merge(other.matcher),
+        requires:          requires + other.requires,
+        zombie:            zombie || other.zombie
       )
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     # Load config file
     #
@@ -100,6 +128,16 @@ module Mutant
       end
     end
 
+    # Expand config with defaults
+    #
+    # @return [Config]
+    def expand_defaults
+      with(
+        coverage_criteria: CoverageCriteria::DEFAULT.merge(coverage_criteria),
+        jobs:              jobs || 1
+      )
+    end
+
     def self.load_contents(path)
       Transform::Named
         .new(path.to_s, TRANSFORM)

data/lib/mutant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.10.13
 platform: ruby
 authors:
 - Markus Schirp