mutant 0.10.35 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90188339d2ae50f1bc48723f56dc2740b6932a99cd8aae263543734aa66c494
-  data.tar.gz: dcd1e40f9dc9b37467ec067142da4f2c1c6351191de235b2a88237c16b6b936c
+  metadata.gz: 4fd616c16c6eb981572f300d63760de29c418e0c8c72b29b0462565aeec59271
+  data.tar.gz: cff1c3128b75347267692919f598642dc6906faff02253b8bb5cf0a738b7488e
 SHA512:
-  metadata.gz: 323cc89a39fb5163c7778d5a9ae7e989e207c974436207803d91118c502e17219b47514573d24d2e9003043bb170744110e68c9fa8dc2201236566d1a2f701c7
-  data.tar.gz: 4f27f289f727c157237f65a15241b8adce8f91027894690994908eb698895a4c81f57344138e7c1a010454aee06776a41460f1ed37a4f164871b58e71291c1ca
+  metadata.gz: 0a1fe601d15da1235e4384c15346f3080021b8f08dfdd2313f60882f722d45bc824d8099fd13cebe77ea97edd06ecba0bbd2ff64ede9b7f5765e2115652f4202
+  data.tar.gz: b61a27b8b5119e489908bb43aa4aec0a348e552b443fa3b937ed20718f436e77740b0b891fc731fd1126eb5170525ffa7388d4ab555f9a7ef7e33812141b4ec7

data/LICENSE

@@ -5,8 +5,8 @@ END-USER LICENSE AGREEMENT
 IMPORTANT: THIS SOFTWARE END-USER LICENSE AGREEMENT ("EULA") IS A LEGAL
 AGREEMENT (“Agreement”) BETWEEN YOU (THE CUSTOMER, EITHER AS AN INDIVIDUAL OR,
 IF PURCHASED OR OTHERWISE ACQUIRED BY OR FOR AN ENTITY, AS AN ENTITY) AND
-CONTRIBUTED SYSTEMS.  READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION
-PROCESS AND USING SIDEKIQ PRO AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”).
+SCHIRP DSO LTD.  READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION
+PROCESS AND USING MUTANT AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”).
 
 IT PROVIDES A LICENSE TO USE THE SOFTWARE AND CONTAINS WARRANTY INFORMATION
 AND LIABILITY DISCLAIMERS. BY INSTALLING AND USING THE SOFTWARE, YOU ARE

data/lib/mutant/bootstrap.rb

@@ -71,6 +71,10 @@ module Mutant
 
       hooks.run(:env_infection_pre, env)
 
+      config.environment_variables.each do |key, value|
+        world.environment_variables[key] = value
+      end
+
       config.includes.each(&world.load_path.public_method(:<<))
       config.requires.each(&world.kernel.public_method(:require))
 

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

@@ -62,6 +62,7 @@ module Mutant
           set(matcher: @config.matcher.add(attribute, value))
         end
 
+        # rubocop:disable Metrics/MethodLength
         def add_environment_options(parser)
           parser.separator('Environment:')
           parser.on('--zombie', 'Run mutant zombified') do
@@ -73,7 +74,14 @@ module Mutant
           parser.on('-r', '--require NAME', 'Require file with NAME') do |name|
             add(:requires, name)
           end
+          parser.on('--env KEY=VALUE', 'Set environment variable') do |value|
+            match = ENV_VARIABLE_KEY_VALUE_REGEXP.match(value) || fail("Invalid env variable: #{value.inspect}")
+            set(
+              environment_variables: @config.environment_variables.merge(match[:key] => match[:value])
+            )
+          end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def add_integration_options(parser)
           parser.separator('Integration:')

data/lib/mutant/config.rb

@@ -5,9 +5,12 @@ module Mutant
   #
   # Does not reference any "external" volatile state. The configuration applied
   # to current environment is being represented by the Mutant::Env object.
+  #
+  # rubocop:disable Metrics/ClassLength
   class Config
     include Adamantium, Anima.new(
       :coverage_criteria,
+      :environment_variables,
       :expression_parser,
       :fail_fast,
       :hooks,
@@ -48,16 +51,17 @@ module Mutant
     # rubocop:disable Metrics/MethodLength
     def merge(other)
       other.with(
-        coverage_criteria: coverage_criteria.merge(other.coverage_criteria),
-        fail_fast:         fail_fast || other.fail_fast,
-        hooks:             hooks + other.hooks,
-        includes:          includes + other.includes,
-        integration:       other.integration || integration,
-        jobs:              other.jobs || jobs,
-        matcher:           matcher.merge(other.matcher),
-        mutation_timeout:  other.mutation_timeout || mutation_timeout,
-        requires:          requires + other.requires,
-        zombie:            zombie || other.zombie
+        coverage_criteria:     coverage_criteria.merge(other.coverage_criteria),
+        environment_variables: environment_variables.merge(other.environment_variables),
+        fail_fast:             fail_fast || other.fail_fast,
+        hooks:                 hooks + other.hooks,
+        includes:              includes + other.includes,
+        integration:           other.integration || integration,
+        jobs:                  other.jobs || jobs,
+        matcher:               matcher.merge(other.matcher),
+        mutation_timeout:      other.mutation_timeout || mutation_timeout,
+        requires:              requires + other.requires,
+        zombie:                zombie || other.zombie
       )
     end
     # rubocop:enable Metrics/AbcSize
@@ -117,6 +121,24 @@ module Mutant
       )
     )
 
+    # Parse a hash of environment variables
+    #
+    # @param [Hash<Object,Object>]
+    #
+    # @return [Either<String,Hash<String,String>]
+    #
+    def self.parse_environment_variables(hash)
+      invalid = hash.keys.reject { |key| key.instance_of?(String) }
+      return Either::Left.new("Non string keys: #{invalid}") if invalid.any?
+
+      invalid = hash.keys.grep_v(ENV_VARIABLE_KEY_REGEXP)
+      return Either::Left.new("Invalid keys: #{invalid}") if invalid.any?
+
+      invalid = hash.values.reject { |value| value.instance_of?(String) }
+      return Either::Left.new("Non string values: #{invalid}") if invalid.any?
+
+      Either::Right.new(hash)
+    end
     TRANSFORM = Transform::Sequence.new(
       [
         Transform::Exception.new(SystemCallError, :read.to_proc),
@@ -124,14 +146,23 @@ module Mutant
         Transform::Hash.new(
           optional: [
             Transform::Hash::Key.new('coverage_criteria', ->(value) { CoverageCriteria::TRANSFORM.call(value) }),
-            Transform::Hash::Key.new('fail_fast',         Transform::BOOLEAN),
-            Transform::Hash::Key.new('hooks',             PATHNAME_ARRAY),
-            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('matcher',           Matcher::Config::LOADER),
-            Transform::Hash::Key.new('mutation_timeout',  Transform::FLOAT),
-            Transform::Hash::Key.new('requires',          Transform::STRING_ARRAY)
+            Transform::Hash::Key.new(
+              'environment_variables',
+              Transform::Sequence.new(
+                [
+                  Transform::Primitive.new(Hash),
+                  Transform::Block.capture(:environment_variables, &method(:parse_environment_variables))
+                ]
+              )
+            ),
+            Transform::Hash::Key.new('fail_fast',             Transform::BOOLEAN),
+            Transform::Hash::Key.new('hooks',                 PATHNAME_ARRAY),
+            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('matcher',               Matcher::Config::LOADER),
+            Transform::Hash::Key.new('mutation_timeout',      Transform::FLOAT),
+            Transform::Hash::Key.new('requires',              Transform::STRING_ARRAY)
           ],
           required: []
         ),
@@ -141,4 +172,5 @@ module Mutant
 
     private_constant(:TRANSFORM)
   end # Config
+  # rubocop:enable Metrics/ClassLength
 end # Mutant

data/lib/mutant/expression/descendants.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Mutant
+  class Expression
+    class Descendants < self
+      include Anima.new(:const_name)
+
+      REGEXP = /\Adescendants:(?<const_name>.+)\z/.freeze
+
+      def syntax
+        "descendants:#{const_name}"
+      end
+
+      def matcher
+        Matcher::Descendants.new(const_name: const_name)
+      end
+    end # Descendants
+  end # Expression
+end # Mutant

data/lib/mutant/matcher/chain.rb

@@ -14,7 +14,7 @@ module Mutant
       def call(env)
         matchers.flat_map do |matcher|
           matcher.call(env)
-        end
+        end.uniq
       end
 
     end # Chain

data/lib/mutant/matcher/descendants.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Mutant
+  class Matcher
+    # Matcher for all descendants by constant name
+    class Descendants < self
+      include Anima.new(:const_name)
+
+      def call(env)
+        const = env.world.try_const_get(const_name) or return EMPTY_ARRAY
+
+        Chain.new(
+          matched_scopes(env, const).map { |scope| Scope.new(scope.raw) }
+        ).call(env)
+      end
+
+    private
+
+      def matched_scopes(env, const)
+        env.matchable_scopes.select do |scope|
+          scope.raw.equal?(const) || const > scope.raw
+        end
+      end
+    end # Descendant
+  end # Matcher
+end # Mutant

data/lib/mutant/matcher/method.rb

@@ -82,7 +82,17 @@ module Mutant
         end
 
         def source_location
-          target_method.source_location
+          signature = sorbet_signature
+
+          if signature
+            signature.method.source_location
+          else
+            target_method.source_location
+          end
+        end
+
+        def sorbet_signature
+          T::Private::Methods.signature_for_method(target_method)
         end
 
         def subject

data/lib/mutant/matcher/methods.rb

@@ -21,7 +21,7 @@ module Mutant
       # @return [Enumerable<Subject>]
       def call(env)
         Chain.new(
-          methods.map { |method| matcher.new(scope, method) }
+          methods(env).map { |method| matcher.new(scope, method) }
         ).call(env)
       end
 
@@ -31,17 +31,16 @@ module Mutant
         self.class::MATCHER
       end
 
-      def methods
+      def methods(env)
         candidate_names.each_with_object([]) do |name, methods|
-          method = access(name)
-          methods << method if method.owner.equal?(candidate_scope)
+          method = access(env, name)
+          methods << method if method&.owner.equal?(candidate_scope)
         end
       end
-      memoize :methods
 
       def candidate_names
         CANDIDATE_NAMES
-          .map(&candidate_scope.public_method(:public_send))
+          .map { |name| candidate_scope.public_send(name, false) }
           .reduce(:+)
           .sort
       end
@@ -55,7 +54,7 @@ module Mutant
 
       private
 
-        def access(method_name)
+        def access(_env, method_name)
           scope.method(method_name)
         end
 
@@ -71,7 +70,7 @@ module Mutant
 
       private
 
-        def access(method_name)
+        def access(_env, method_name)
           scope.method(method_name)
         end
 
@@ -84,11 +83,33 @@ module Mutant
       class Instance < self
         MATCHER = Matcher::Method::Instance
 
+        MESSAGE = <<~'MESSAGE'
+          Caught an exception while accessing a method with
+          #instance_method that is part of #{public,privat,protected}_instance_methods.
+
+          This is a bug in your ruby implementation its stdlib, libaries our your code.
+
+          Mutant will ignore this method:
+
+          Object:    %<scope>s
+          Method:    %<method_name>s
+          Exception: %<exception>s
+
+          See: https://github.com/mbj/mutant/issues/1273
+        MESSAGE
+
       private
 
-        def access(method_name)
+        # rubocop:disable Lint/RescueException
+        def access(env, method_name)
           scope.instance_method(method_name)
+        rescue Exception => exception
+          env.warn(
+            MESSAGE % { scope: scope, method_name: method_name, exception: exception }
+          )
+          nil
         end
+        # rubocop:enable Lint/RescueException
 
         def candidate_scope
           scope

data/lib/mutant/version.rb

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

data/lib/mutant/world.rb

@@ -5,6 +5,7 @@ module Mutant
   class World
     include Adamantium, Anima.new(
       :condition_variable,
+      :environment_variables,
       :gem,
       :gem_method,
       :io,
@@ -49,6 +50,19 @@ module Mutant
       end
     end
 
+    # Try const get
+    #
+    # @param [String]
+    #
+    # @return [Class|Module|nil]
+    #
+    # rubocop:disable Lint/SuppressedException
+    def try_const_get(name)
+      kernel.const_get(name)
+    rescue NameError
+    end
+    # rubocop:enable Lint/SuppressedException
+
     # Deadline
     #
     # @param [Float, nil] allowed_time

data/lib/mutant.rb

@@ -14,6 +14,7 @@ require 'pathname'
 require 'regexp_parser'
 require 'set'
 require 'singleton'
+require 'sorbet-runtime'
 require 'stringio'
 require 'unparser'
 require 'yaml'
@@ -37,6 +38,11 @@ module Mutant
   EMPTY_ARRAY    = [].freeze
   EMPTY_HASH     = {}.freeze
   SCOPE_OPERATOR = '::'
+
+  env_key = /[a-zA-Z_\d]+/
+
+  ENV_VARIABLE_KEY_VALUE_REGEXP = /\A(?<key>#{env_key}+)=(?<value>.*)\z/.freeze
+  ENV_VARIABLE_KEY_REGEXP       = /\A#{env_key}\z/.freeze
 end # Mutant
 
 require 'mutant/procto'
@@ -163,23 +169,25 @@ require 'mutant/subject/method/instance'
 require 'mutant/subject/method/singleton'
 require 'mutant/subject/method/metaclass'
 require 'mutant/matcher'
-require 'mutant/matcher/config'
 require 'mutant/matcher/chain'
+require 'mutant/matcher/config'
+require 'mutant/matcher/descendants'
+require 'mutant/matcher/filter'
 require 'mutant/matcher/method'
-require 'mutant/matcher/method/singleton'
-require 'mutant/matcher/method/metaclass'
 require 'mutant/matcher/method/instance'
+require 'mutant/matcher/method/metaclass'
+require 'mutant/matcher/method/singleton'
 require 'mutant/matcher/methods'
 require 'mutant/matcher/namespace'
-require 'mutant/matcher/scope'
-require 'mutant/matcher/filter'
 require 'mutant/matcher/null'
+require 'mutant/matcher/scope'
 require 'mutant/matcher/static'
 require 'mutant/expression'
-require 'mutant/expression/parser'
+require 'mutant/expression/descendants'
 require 'mutant/expression/method'
 require 'mutant/expression/methods'
 require 'mutant/expression/namespace'
+require 'mutant/expression/parser'
 require 'mutant/test'
 require 'mutant/timer'
 require 'mutant/integration'
@@ -233,46 +241,49 @@ require 'mutant/license/subscription/commercial'
 
 module Mutant
   WORLD = World.new(
-    condition_variable: ConditionVariable,
-    gem:                Gem,
-    gem_method:         method(:gem),
-    io:                 IO,
-    json:               JSON,
-    kernel:             Kernel,
-    load_path:          $LOAD_PATH,
-    marshal:            Marshal,
-    mutex:              Mutex,
-    object_space:       ObjectSpace,
-    open3:              Open3,
-    pathname:           Pathname,
-    process:            Process,
-    stderr:             $stderr,
-    stdout:             $stdout,
-    thread:             Thread,
-    timer:              Timer.new(Process)
+    condition_variable:    ConditionVariable,
+    environment_variables: ENV,
+    gem:                   Gem,
+    gem_method:            method(:gem),
+    io:                    IO,
+    json:                  JSON,
+    kernel:                Kernel,
+    load_path:             $LOAD_PATH,
+    marshal:               Marshal,
+    mutex:                 Mutex,
+    object_space:          ObjectSpace,
+    open3:                 Open3,
+    pathname:              Pathname,
+    process:               Process,
+    stderr:                $stderr,
+    stdout:                $stdout,
+    thread:                Thread,
+    timer:                 Timer.new(Process)
   )
 
   # Reopen class to initialize constant to avoid dep circle
   class Config
     DEFAULT = new(
-      coverage_criteria: Config::CoverageCriteria::EMPTY,
-      expression_parser: Expression::Parser.new([
+      coverage_criteria:     Config::CoverageCriteria::EMPTY,
+      expression_parser:     Expression::Parser.new([
+        Expression::Descendants,
         Expression::Method,
         Expression::Methods,
         Expression::Namespace::Exact,
         Expression::Namespace::Recursive
       ]),
-      fail_fast:         false,
-      hooks:             EMPTY_ARRAY,
-      includes:          EMPTY_ARRAY,
-      integration:       nil,
-      isolation:         Mutant::Isolation::Fork.new(WORLD),
-      jobs:              nil,
-      matcher:           Matcher::Config::DEFAULT,
-      mutation_timeout:  nil,
-      reporter:          Reporter::CLI.build(WORLD.stdout),
-      requires:          EMPTY_ARRAY,
-      zombie:            false
+      fail_fast:             false,
+      environment_variables: EMPTY_HASH,
+      hooks:                 EMPTY_ARRAY,
+      includes:              EMPTY_ARRAY,
+      integration:           nil,
+      isolation:             Mutant::Isolation::Fork.new(WORLD),
+      jobs:                  nil,
+      matcher:               Matcher::Config::DEFAULT,
+      mutation_timeout:      nil,
+      reporter:              Reporter::CLI.build(WORLD.stdout),
+      requires:              EMPTY_ARRAY,
+      zombie:                false
     )
   end # Config
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.35
+  version: 0.11.3
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: sorbet-runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,7 @@ files:
 - lib/mutant/context.rb
 - lib/mutant/env.rb
 - lib/mutant/expression.rb
+- lib/mutant/expression/descendants.rb
 - lib/mutant/expression/method.rb
 - lib/mutant/expression/methods.rb
 - lib/mutant/expression/namespace.rb
@@ -212,6 +227,7 @@ files:
 - lib/mutant/matcher.rb
 - lib/mutant/matcher/chain.rb
 - lib/mutant/matcher/config.rb
+- lib/mutant/matcher/descendants.rb
 - lib/mutant/matcher/filter.rb
 - lib/mutant/matcher/method.rb
 - lib/mutant/matcher/method/instance.rb
@@ -368,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: ''