mutant 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4645aa0ee3e10159d6e91c5762b1f43bd11a94e229ea2cdec29af0f15d922f92
-  data.tar.gz: 3c8eb88ab56bd83c1b4e26eb18ccb1c51f43875c3db5e36453661837e88b16b6
+  metadata.gz: c2e6667e21b413029cf11b268c6d36986a5960921945aad01199aaff5881a3c2
+  data.tar.gz: 3434159c18f80d786ecc728b3fde7eaa5e2c3939ec70c5d931e717288ba6d48f
 SHA512:
-  metadata.gz: 7e961ab0e43eb8208f8a9c5dc626fb3787e37f81fbf96be9f4e3da0fb2532556dcf93ed491bf29fbedc7c099c0a6ad4e81b4b32448e5615fe2fb37b1bb08dd2b
-  data.tar.gz: c9d2e9344bcbfdeeb7a3108cfa5b94bae2b8527fdf03ae5f4a346f2d207371c40319a79f7a44782a0d8d98003834bf22d79188e46d555d9c18f1444d7fa3149a
+  metadata.gz: a036402f0e95f0a41b16dbbede078a56f5ccee4d241052b034022fd6a7db505037cefb5b093061d2d12326f6a4e2ae7bd250ad7bb160586aa14dc831d019a398
+  data.tar.gz: 188b1bb29e0639c6a7f3c72b5ee4ca24ac25bc799181b1f7d2e6f0b056fb92aabe6b7c657345ac080e4002625dad227752c1e7c4a57d5e0f506d608f3c4be28d

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'
@@ -232,9 +233,9 @@ 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,
       reporter:          Reporter::CLI.build(WORLD.stdout),
       requires:          EMPTY_ARRAY,

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)
 

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::DEFAULT
+        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.env.merge(file_config).merge(@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(

data/lib/mutant/config.rb

@@ -1,55 +1,6 @@
 # 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
@@ -106,6 +57,23 @@ module Mutant
       mutant.yml
     ].freeze
 
+    # Merge with other config
+    #
+    # @param [Config] other
+    #
+    # @return [Config]
+    def merge(other)
+      other.with(
+        fail_fast:   fail_fast || other.fail_fast,
+        includes:    includes + other.includes,
+        jobs:        other.jobs || jobs,
+        integration: other.integration || integration,
+        matcher:     matcher.merge(other.matcher),
+        requires:    requires + other.requires,
+        zombie:      zombie || other.zombie
+      )
+    end
+
     private_constant(*constants(false))
 
     # Load config file
@@ -114,11 +82,12 @@ module Mutant
     # @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
@@ -133,5 +102,12 @@ module Mutant
         .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
   end # Config
 end # Mutant

data/lib/mutant/matcher/config.rb

@@ -44,6 +44,19 @@ module Mutant
         with(attribute => public_send(attribute) + [value])
       end
 
+      # Merge with other config
+      #
+      # @param [Config] other
+      #
+      # @return [Config]
+      def merge(other)
+        self.class.new(
+          to_h
+            .map { |name, value| [name, value + other.public_send(name)] }
+            .to_h
+        )
+      end
+
     private
 
       def present_attributes

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

@@ -14,8 +14,8 @@ module Mutant
           # @return [undefined]
           def run
             info 'Matcher:         %s', object.matcher.inspect
-            info 'Integration:     %s', object.integration
-            info 'Jobs:            %d', object.jobs
+            info 'Integration:     %s', object.integration || 'null'
+            info 'Jobs:            %s', object.jobs || 'auto'
             info 'Includes:        %s', object.includes
             info 'Requires:        %s', object.requires
           end

data/lib/mutant/version.rb

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

data/lib/mutant/world.rb

@@ -0,0 +1,52 @@
+# 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
+end # Mutant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -450,6 +450,7 @@ files:
 - lib/mutant/util.rb
 - lib/mutant/version.rb
 - lib/mutant/warnings.rb
+- lib/mutant/world.rb
 - lib/mutant/zombifier.rb
 homepage: https://github.com/mbj/mutant
 licenses: