mutant 0.11.4 → 0.11.7

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

@@ -7,13 +7,13 @@ module Mutant
         class Run < self
           NAME              = 'run'
           SHORT_DESCRIPTION = 'Run code analysis'
-          SLEEP             = 60
           SUBCOMMANDS       = EMPTY_ARRAY
 
           UNLICENSED = <<~MESSAGE.lines.freeze
-            Soft fail, continuing in #{SLEEP} seconds
-            Next major version will enforce the license
-            See https://github.com/mbj/mutant#licensing
+            You are using mutant unlicensed.
+
+            See https://github.com/mbj/mutant#licensing to aquire a license.
+            Note: Its free for opensource use, which is recommended for trials.
           MESSAGE
 
           NO_TESTS_MESSAGE = <<~'MESSAGE'
@@ -40,7 +40,7 @@ module Mutant
         private
 
           def action
-            soft_fail(License.call(world))
+            License.call(world)
               .bind { bootstrap }
               .bind(&method(:validate_tests))
               .bind(&Runner.public_method(:call))
@@ -62,23 +62,6 @@ module Mutant
               Either::Left.new('Uncovered mutations detected, exiting nonzero!')
             end
           end
-
-          def soft_fail(result)
-            result.either(
-              lambda do |message|
-                stderr = world.stderr
-                stderr.puts(message)
-                UNLICENSED.each { |line| stderr.puts(unlicensed(line)) }
-                world.kernel.sleep(SLEEP)
-                Either::Right.new(nil)
-              end,
-              ->(_subscription) { Either::Right.new(nil) }
-            )
-          end
-
-          def unlicensed(message)
-            "[Mutant-License-Error]: #{message}"
-          end
         end # Run
       end # Environment
     end # Command

data/lib/mutant/cli/command.rb

@@ -184,9 +184,9 @@ module Mutant
       end
 
       def format_subcommands
-        commands = subcommands.map do |subcommand|
+        commands = subcommands.to_h do |subcommand|
           [subcommand.command_name, subcommand.short_description]
-        end.to_h
+        end
 
         width = commands.each_key.map(&:length).max
 

data/lib/mutant/env.rb

@@ -68,9 +68,9 @@ module Mutant
     #
     # @return Hash{Mutation => Enumerable<Test>}
     def selections
-      subjects.map do |subject|
+      subjects.to_h do |subject|
         [subject, selector.call(subject)]
-      end.to_h
+      end
     end
     memoize :selections
 
@@ -142,11 +142,10 @@ module Mutant
         result = mutation.insert(world.kernel)
         hooks.run(:mutation_insert_post, mutation)
 
-        if result.equal?(Loader::Result::VoidValue.instance)
-          Result::Test::VoidValue.instance
-        else
-          integration.call(tests)
-        end
+        result.either(
+          ->(_) { Result::Test::VoidValue.instance },
+          ->(_) { integration.call(tests) }
+        )
       end
     end
 

data/lib/mutant/license/subscription/opensource.rb

@@ -36,7 +36,7 @@ module Mutant
               fail "Unmatched git remote URL: #{input.inspect}"
             end
 
-            new(match[:host], match[:path])
+            new(match[:host], match[:path].downcase)
           end
           private_class_method :parse_url
         end

data/lib/mutant/loader.rb

@@ -9,17 +9,8 @@ module Mutant
 
     private_constant(*constants(false))
 
-    class Result
-      include Singleton
-
-      # Vale returned on successful load
-      class Success < self
-      end # Success
-
-      # Vale returned on MRI detecting void value expressions
-      class VoidValue < self
-      end # VoidValue
-    end # Result
+    VOID_VALUE = Either::Left.new(nil)
+    SUCCESS    = Either::Right.new(nil)
 
     # Call loader
     #
@@ -45,12 +36,12 @@ module Mutant
     rescue SyntaxError => exception
       # rubocop:disable Style/GuardClause
       if VOID_VALUE_REGEXP.match?(exception.message)
-        Result::VoidValue.instance
+        VOID_VALUE
       else
         raise
       end
     else
-      Result::Success.instance
+      SUCCESS
     end
   end # Loader
 end # Mutant

data/lib/mutant/matcher/config.rb

@@ -25,7 +25,7 @@ module Mutant
 
       private_constant(*constants(false))
 
-      DEFAULT = new(anima.attribute_names.map { |name| [name, []] }.to_h)
+      DEFAULT = new(anima.attribute_names.to_h { |name| [name, []] })
 
       expression = Transform::Block.capture(:expression) do |input|
         Mutant::Config::DEFAULT.expression_parser.call(input)
@@ -74,8 +74,7 @@ module Mutant
       def merge(other)
         self.class.new(
           to_h
-            .map { |name, value| [name, value + other.public_send(name)] }
-            .to_h
+            .to_h { |name, value| [name, value + other.public_send(name)] }
         )
       end
 

data/lib/mutant/matcher/method/instance.rb

@@ -41,6 +41,16 @@ module Mutant
             node.children.fetch(NAME_INDEX).equal?(method_name)
           end
 
+          def visibility
+            if scope.private_instance_methods.include?(method_name)
+              :private
+            elsif scope.protected_instance_methods.include?(method_name)
+              :protected
+            else
+              :public
+            end
+          end
+
           # Evaluator specialized for memoized instance methods
           class Memoized < self
             SUBJECT_CLASS = Subject::Method::Instance::Memoized

data/lib/mutant/matcher/method.rb

@@ -99,16 +99,40 @@ module Mutant
           node = matched_node_path.last || return
 
           self.class::SUBJECT_CLASS.new(
-            context: context,
-            node:    node
+            context:    context,
+            node:       node,
+            visibility: visibility
           )
         end
-        memoize :subject
 
         def matched_node_path
           AST.find_last_path(ast, &method(:match?))
         end
         memoize :matched_node_path
+
+        def visibility
+          # This can be cleaned up once we are on >ruby-3.0
+          # Method#{public,private,protected}? exists there.
+          #
+          # On Ruby 3.1 this can just be:
+          #
+          # if target_method.private?
+          #   :private
+          # elsif target_method.protected?
+          #   :protected
+          # else
+          #   :public
+          # end
+          #
+          # Change to this once 3.0 is EOL.
+          if scope.private_methods.include?(method_name)
+            :private
+          elsif scope.protected_methods.include?(method_name)
+            :protected
+          else
+            :public
+          end
+        end
       end # Evaluator
 
       private_constant(*constants(false))

data/lib/mutant/mutation.rb

@@ -7,7 +7,7 @@ module Mutant
     include Concord::Public.new(:subject, :node)
 
     CODE_DELIMITER = "\0"
-    CODE_RANGE     = (0..4).freeze
+    CODE_RANGE     = (..4).freeze
 
     # Mutation identification code
     #
@@ -69,7 +69,10 @@ module Mutant
         kernel:  kernel,
         source:  monkeypatch,
         subject: subject
-      )
+      ).fmap do
+        subject.post_insert
+        nil
+      end
     end
 
     # Rendered mutation diff

data/lib/mutant/mutator/node/arguments.rb

@@ -19,17 +19,27 @@ module Mutant
         end
 
         def emit_argument_presence
-          emit_type unless removed_block_arg?(EMPTY_ARRAY)
+          emit_type unless removed_block_arg?(EMPTY_ARRAY) || forward_arg?
 
-          Util::Array::Presence.call(children).each do |children|
-            unless removed_block_arg?(children) || (children.one? && n_mlhs?(children.first))
-              emit_type(*children)
+          children.each_with_index do |removed, index|
+            new_arguments = children.dup
+            new_arguments.delete_at(index)
+            unless n_forward_arg?(removed) || removed_block_arg?(new_arguments) || only_mlhs?(new_arguments)
+              emit_type(*new_arguments)
             end
           end
         end
 
-        def removed_block_arg?(children)
-          anonymous_block_arg? && children.none?(&ANONYMOUS_BLOCKARG_PRED)
+        def only_mlhs?(new_arguments)
+          new_arguments.one? && n_mlhs?(new_arguments.first)
+        end
+
+        def forward_arg?
+          children.last && n_forward_arg?(children.last)
+        end
+
+        def removed_block_arg?(new_arguments)
+          anonymous_block_arg? && new_arguments.none?(&ANONYMOUS_BLOCKARG_PRED)
         end
 
         def anonymous_block_arg?
@@ -47,7 +57,7 @@ module Mutant
         end
 
         def invalid_argument_replacement?(mutant, index)
-          n_arg?(mutant) && children[0...index].any?(&method(:n_optarg?))
+          n_arg?(mutant) && children[...index].any?(&method(:n_optarg?))
         end
 
         def emit_mlhs_expansion

data/lib/mutant/mutator/node/send/attribute_assignment.rb

@@ -7,7 +7,7 @@ module Mutant
         # Mutator for attribute assignments
         class AttributeAssignment < self
 
-          ATTRIBUTE_RANGE = (0..-2).freeze
+          ATTRIBUTE_RANGE = (..-2).freeze
 
           private_constant(*constants(false))
 

data/lib/mutant/mutator/node/send.rb

@@ -241,7 +241,9 @@ module Mutant
 
           argument = Mutant::Util.one(arguments)
 
-          emit_propagation(argument) unless n_kwargs?(argument)
+          return if n_kwargs?(argument) || n_forwarded_args?(argument)
+
+          emit_propagation(argument)
         end
 
         def mutate_receiver

data/lib/mutant/mutator/node/when.rb

@@ -22,7 +22,7 @@ module Mutant
 
         def mutate_conditions
           conditions = children.length - 1
-          children[0..-2].each_index do |index|
+          children[..-2].each_index do |index|
             delete_child(index) if conditions > 1
             mutate_child(index)
           end

data/lib/mutant/repository/diff.rb

@@ -50,7 +50,7 @@ module Mutant
             Mutant
               .traverse(->(line) { parse_line(root, line) }, lines)
               .fmap do |paths|
-                paths.map { |path| [path.path, path] }.to_h
+                paths.to_h { |path| [path.path, path] }
               end
           end
       end

data/lib/mutant/subject/method/instance.rb

@@ -17,6 +17,11 @@ module Mutant
           self
         end
 
+        def post_insert
+          scope.__send__(visibility, name)
+          self
+        end
+
         # Mutator for memoizable memoized instance methods
         class Memoized < self
           include AST::Sexp

data/lib/mutant/subject/method/singleton.rb

@@ -17,6 +17,11 @@ module Mutant
           self
         end
 
+        def post_insert
+          scope.singleton_class.__send__(visibility, name)
+          self
+        end
+
       end # Singleton
     end # Method
   end # Subject

data/lib/mutant/subject/method.rb

@@ -4,6 +4,7 @@ module Mutant
   class Subject
     # Abstract base class for method subjects
     class Method < self
+      include anima.add(:visibility)
 
       # Method name
       #

data/lib/mutant/subject.rb

@@ -33,6 +33,13 @@ module Mutant
       self
     end
 
+    # Perform post insert cleanup
+    #
+    # @return [self]
+    def post_insert
+      self
+    end
+
     # Source line range
     #
     # @return [Range<Integer>]

data/lib/mutant/transform.rb

@@ -351,7 +351,7 @@ module Mutant
       def transform_keys(keys, input)
         success(
           keys
-            .map do |key|
+            .to_h do |key|
               [
                 key.value,
                 coerce_key(key, input).from_right do |error|
@@ -359,7 +359,6 @@ module Mutant
                 end
               ]
             end
-            .to_h
         )
       end
       # rubocop:enable Metrics/MethodLength

data/lib/mutant/version.rb

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

data/lib/mutant/zombifier.rb

@@ -17,10 +17,7 @@ module Mutant
 
     include AST::Sexp
 
-    # rubocop:disable Lint/InheritException
     LoadError = Class.new(::LoadError)
-    # rubocop:enable Lint/InheritException
-
     # Initialize object
     #
     # @param [Symbol] namespace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.7
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +362,8 @@ files:
 homepage: https://github.com/mbj/mutant
 licenses:
 - Nonstandard
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -377,14 +372,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ''