mutant 0.9.13 → 0.10.5

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

@@ -4,8 +4,6 @@ module Mutant
   module License
     class Subscription
       class Commercial < self
-        include Concord.new(:authors)
-
         class Author
           include Concord.new(:email)
 
@@ -20,10 +18,10 @@ module Mutant
         def apply(world)
           candidates = candidates(world)
 
-          if (authors & candidates).any?
+          if (licensed & candidates).any?
             success
           else
-            failure(authors, candidates)
+            failure(licensed, candidates)
           end
         end
 

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

@@ -4,8 +4,6 @@ module Mutant
   module License
     class Subscription
       class Opensource < self
-        include Concord.new(:repositories)
-
         class Repository
           include Concord.new(:host, :path)
 
@@ -43,10 +41,13 @@ module Mutant
           private_class_method :parse_url
         end
 
-        private_constant(*constants(false))
-
         def self.from_json(value)
-          new(value.fetch('repositories').map(&Repository.method(:parse)))
+          new(
+            value
+              .fetch('repositories')
+              .map(&Repository.public_method(:parse))
+              .to_set
+          )
         end
 
         def apply(world)
@@ -59,10 +60,10 @@ module Mutant
       private
 
         def check_subscription(actual)
-          if (repositories.to_set & actual).any?
+          if (licensed & actual).any?
             success
           else
-            failure(repositories, actual)
+            failure(licensed, actual)
           end
         end
 

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/meta/example.rb

@@ -3,7 +3,19 @@
 module Mutant
   module Meta
     class Example
-      include Adamantium, Anima.new(:file, :node, :types, :expected)
+      include Adamantium
+      include Anima.new(
+        :expected,
+        :file,
+        :lvars,
+        :node,
+        :original_source,
+        :types
+      )
+
+      class Expected
+        include Anima.new(:original_source, :node)
+      end
 
       # Verification instance for example
       #
@@ -13,13 +25,13 @@ module Mutant
       end
       memoize :verification
 
-      # Normalized source
+      # Original source as generated by unparser
       #
       # @return [String]
-      def source
+      def original_source_generated
         Unparser.unparse(node)
       end
-      memoize :source
+      memoize :original_source_generated
 
       # Generated mutations on example source
       #

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