mutant 0.9.12 → 0.10.2

data/lib/mutant/meta/example/dsl.rb

@@ -25,10 +25,11 @@ module Mutant
         #
         # @return [undefined]
         def initialize(file, types)
+          @expected = []
           @file     = file
+          @lvars    = []
+          @source   = nil
           @types    = types
-          @node     = nil
-          @expected = []
         end
 
         # Example captured by DSL
@@ -38,28 +39,41 @@ module Mutant
         # @raise [RuntimeError]
         #   in case example cannot be build
         def example
-          fail 'source not defined' unless @node
+          fail 'source not defined' unless @source
           Example.new(
-            file:     @file,
-            node:     @node,
-            types:    @types,
-            expected: @expected
+            expected:        @expected,
+            file:            @file,
+            lvars:           @lvars,
+            node:            @node,
+            original_source: @source,
+            types:           @types
           )
         end
 
+        # Declare a local variable
+        #
+        # @param [Symbol]
+        def declare_lvar(name)
+          @lvars << name
+        end
+
       private
 
         def source(input)
-          fail 'source already defined' if @node
-          @node = node(input)
+          fail 'source already defined' if @source
+
+          @source = input
+          @node   = node(input)
         end
 
         def mutation(input)
-          node = node(input)
-          if @expected.include?(node)
+          expected = Expected.new(original_source: input, node: node(input))
+
+          if @expected.include?(expected)
             fail "Mutation for input: #{input.inspect} is already expected"
           end
-          @expected << node
+
+          @expected << expected
         end
 
         def singleton_mutations
@@ -70,14 +84,17 @@ module Mutant
         def node(input)
           case input
           when String
-            Unparser::Preprocessor.run(Unparser.parse(input))
-          when ::Parser::AST::Node
-            input
+            parser.parse(Unparser.buffer(input))
           else
-            fail "Cannot coerce to node: #{input.inspect}"
+            fail "Unsupported input: #{input.inspect}"
           end
         end
 
+        def parser
+          Unparser.parser.tap do |parser|
+            @lvars.each(&parser.static_env.public_method(:declare))
+          end
+        end
       end # DSL
     end # Example
   end # Meta

data/lib/mutant/meta/example/verification.rb

@@ -11,54 +11,96 @@ module Mutant
         #
         # @return [Boolean]
         def success?
-          [missing, unexpected, no_diffs, invalid_syntax].all?(&:empty?)
+          [
+            original_verification,
+            invalid,
+            missing,
+            no_diffs,
+            unexpected
+          ].all?(&:empty?)
         end
         memoize :success?
 
-        # Error report
-        #
-        # @return [String]
         def error_report
-          fail 'no error report on successful validation' if success?
-
-          YAML.dump(
-            'file'            => example.file,
-            'original_ast'    => example.node.inspect,
-            'original_source' => example.source,
-            'missing'         => format_mutations(missing),
-            'unexpected'      => format_mutations(unexpected),
-            'invalid_syntax'  => format_mutations(invalid_syntax),
-            'no_diff'         => no_diff_report
-          )
+          reports.join("\n")
         end
-        memoize :error_report
 
       private
 
+        def reports
+          reports = [example.file]
+          reports.concat(original)
+          reports.concat(original_verification)
+          reports.concat(make_report('Missing mutations:', missing))
+          reports.concat(make_report('Unexpected mutations:', unexpected))
+          reports.concat(make_report('No-Diff mutations:', no_diffs))
+          reports.concat(invalid)
+        end
+
+        def make_report(label, mutations)
+          if mutations.any?
+            [label, mutations.map(&method(:report_mutation))]
+          else
+            []
+          end
+        end
+
+        def report_mutation(mutation)
+          [
+            mutation.node.inspect,
+            mutation.source
+          ]
+        end
+
+        def original
+          [
+            'Original:',
+            example.node,
+            example.original_source
+          ]
+        end
+
+        def original_verification
+          validation = Unparser::Validation.from_string(example.original_source)
+          if validation.success?
+            []
+          else
+            [
+              prefix('[original]', validation.report)
+            ]
+          end
+        end
+
+        def prefix(prefix, string)
+          string.each_line.map do |line|
+            "#{prefix} #{line}"
+          end.join
+        end
+
+        def invalid
+          mutations.each_with_object([]) do |mutation, aggregate|
+            validation = Unparser::Validation.from_node(mutation.node)
+            aggregate << prefix('[invalid-mutation]', validation.report) unless validation.success?
+          end
+        end
+        memoize :invalid
+
         def unexpected
           mutations.reject do |mutation|
-            example.expected.include?(mutation.node)
+            example.expected.any? { |expected| expected.node.eql?(mutation.node) }
           end
         end
         memoize :unexpected
 
         def missing
-          (example.expected - mutations.map(&:node)).map do |node|
-            Mutation::Evil.new(self, node)
+          (example.expected.map(&:node) - mutations.map(&:node)).map do |node|
+            Mutation::Evil.new(nil, node)
           end
         end
         memoize :missing
 
-        def invalid_syntax
-          mutations.reject do |mutation|
-            ::Parser::CurrentRuby.parse(mutation.source)
-          rescue ::Parser::SyntaxError # rubocop:disable Lint/SuppressedException
-          end
-        end
-        memoize :invalid_syntax
-
         def no_diffs
-          mutations.select { |mutation| mutation.source.eql?(example.source) }
+          mutations.select { |mutation| mutation.source.eql?(example.original_source_generated) }
         end
         memoize :no_diffs
 

data/lib/mutant/mutator/node.rb

@@ -75,7 +75,7 @@ module Mutant
       end
 
       def emit_nil
-        emit(N_NIL) unless left_assignment?
+        emit(N_NIL) unless left_op_assignment?
       end
 
       def parent_node
@@ -86,7 +86,7 @@ module Mutant
         parent_node&.type
       end
 
-      def left_assignment?
+      def left_op_assignment?
         AST::Types::OP_ASSIGN.include?(parent_type) && parent.node.children.first.equal?(node)
       end
 

data/lib/mutant/mutator/node/{dstr.rb → dynamic_literal.rb}

@@ -3,17 +3,19 @@
 module Mutant
   class Mutator
     class Node
+      # Mutator for dynamic literals
+      class DynamicLiteral < self
 
-      # Dstr mutator
-      class Dstr < Generic
-
-        handle(:dstr)
+        handle(:dstr, :dsym)
 
       private
 
         def dispatch
-          super()
           emit_singletons
+
+          children.each_index do |index|
+            mutate_child(index, &method(:n_begin?))
+          end
         end
 
       end # Dstr

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

@@ -24,7 +24,7 @@ module Mutant
         end
 
         def emit_send_forms
-          return if left_assignment?
+          return if left_op_assignment?
 
           SEND_REPLACEMENTS.each do |selector|
             emit(s(:send, receiver, selector, *indices))
@@ -43,7 +43,7 @@ module Mutant
 
         def mutate_indices
           children_indices(index_range).each do |index|
-            emit_propagation(children.fetch(index)) unless left_assignment?
+            emit_propagation(children.fetch(index)) unless left_op_assignment?
             delete_child(index)
             mutate_child(index)
           end
@@ -77,7 +77,7 @@ module Mutant
           def dispatch
             super()
 
-            return if left_assignment?
+            return if left_op_assignment?
 
             emit_index_read
             emit(children.last)
@@ -89,7 +89,7 @@ module Mutant
           end
 
           def index_range
-            if left_assignment?
+            if left_op_assignment?
               NO_VALUE_RANGE
             else
               REGULAR_RANGE

data/lib/mutant/mutator/node/named_value/variable_assignment.rb

@@ -18,7 +18,7 @@ module Mutant
           }
 
           MAP = IceNine.deep_freeze(
-            Hash[map.map { |type, prefix| [type, [prefix, /^#{::Regexp.escape(prefix)}/]] }]
+            map.transform_values { |prefix| [prefix, /^#{::Regexp.escape(prefix)}/] }
           )
 
           handle(*MAP.keys)

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

@@ -15,10 +15,24 @@ module Mutant
 
         def dispatch
           emit_singletons
+
+          left_mutations
+
+          emit_right_mutations
+        end
+
+        def left_mutations
           emit_left_mutations do |node|
             !n_self?(node)
           end
-          emit_right_mutations
+
+          emit_left_promotion if n_send?(left)
+        end
+
+        def emit_left_promotion
+          receiver = left.children.first
+
+          emit_left(s(:ivasgn, *receiver)) if n_ivar?(receiver)
         end
 
       end # OpAsgn

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

@@ -159,7 +159,7 @@ module Mutant
         end
 
         def emit_naked_receiver
-          emit(receiver) if receiver
+          emit(receiver) if receiver && !left_op_assignment?
         end
 
         def mutate_arguments

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

@@ -8,6 +8,7 @@ module Mutant
         class AttributeAssignment < self
 
           ATTRIBUTE_RANGE = (0..-2).freeze
+
           private_constant(*constants(false))
 
         private

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

@@ -28,7 +28,7 @@ module Mutant
             * Bug in your test suite
             * Bug in your test suite under concurrency
 
-            The following exception was raised:
+            The following exception was raised while reading the killfork result:
 
             ```
             %s
@@ -60,8 +60,8 @@ module Mutant
           #
           # @return [undefined]
           def run
-            __send__(MAP.fetch(object.class))
             print_log_messages
+            __send__(MAP.fetch(object.class))
           end
 
         private
@@ -73,7 +73,13 @@ module Mutant
           def print_log_messages
             log = object.log
 
-            puts(LOG_MESSAGES % log) unless log.empty?
+            return if log.empty?
+
+            puts('Log messages (combined stderr and stdout):')
+
+            log.each_line do |line|
+              puts('[killfork] %<line>s' % { line: line })
+            end
           end
 
           def visit_child_error

data/lib/mutant/selector/expression.rb

@@ -14,7 +14,9 @@ module Mutant
       def call(subject)
         subject.match_expressions.each do |match_expression|
           subject_tests = integration.all_tests.select do |test|
-            match_expression.prefix?(test.expression)
+            test.expressions.any? do |test_expression|
+              match_expression.prefix?(test_expression)
+            end
           end
           return subject_tests if subject_tests.any?
         end

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

@@ -42,7 +42,7 @@ module Mutant
         private
 
           def wrap_node(mutant)
-            s(:begin, mutant, s(:send, nil, :memoize, s(:args, s(:sym, name), *options)))
+            s(:begin, mutant, s(:send, nil, :memoize, s(:sym, name), *options))
           end
 
           # The optional AST node for adamantium memoization options

data/lib/mutant/test.rb

@@ -4,7 +4,7 @@ module Mutant
   # Abstract base class for test that might kill a mutation
   class Test
     include Adamantium::Flat, Anima.new(
-      :expression,
+      :expressions,
       :id
     )
 

data/lib/mutant/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.10.2
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: variable
   requirement: !ruby/object:Gem::Requirement
@@ -254,28 +254,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.0'
 description: Mutation Testing for Ruby.
 email:
 - mbj@schirp-dso.com
@@ -303,6 +303,10 @@ files:
 - lib/mutant/ast/types.rb
 - lib/mutant/bootstrap.rb
 - lib/mutant/cli.rb
+- lib/mutant/cli/command.rb
+- lib/mutant/cli/command/root.rb
+- lib/mutant/cli/command/run.rb
+- lib/mutant/cli/command/subscription.rb
 - lib/mutant/config.rb
 - lib/mutant/context.rb
 - lib/mutant/env.rb
@@ -338,7 +342,6 @@ files:
 - lib/mutant/meta/example.rb
 - lib/mutant/meta/example/dsl.rb
 - lib/mutant/meta/example/verification.rb
-- lib/mutant/minitest/coverage.rb
 - lib/mutant/mutation.rb
 - lib/mutant/mutator.rb
 - lib/mutant/mutator/node.rb
@@ -356,8 +359,7 @@ files:
 - lib/mutant/mutator/node/const.rb
 - lib/mutant/mutator/node/define.rb
 - lib/mutant/mutator/node/defined.rb
-- lib/mutant/mutator/node/dstr.rb
-- lib/mutant/mutator/node/dsym.rb
+- lib/mutant/mutator/node/dynamic_literal.rb
 - lib/mutant/mutator/node/generic.rb
 - lib/mutant/mutator/node/if.rb
 - lib/mutant/mutator/node/index.rb
@@ -461,14 +463,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: ''