mutant 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6629a951cb8a81c688c0adc0acac1f3ff41f13b6
-  data.tar.gz: b8e775063ca733fe989083a38c31ef680135cbc1
+  metadata.gz: 37c56c026986c92dd3afb4306adaea0d80b130f2
+  data.tar.gz: 0513911185fbe4a6967146e75ebec39e77537875
 SHA512:
-  metadata.gz: f11084993d2875f56e6fd86174eaae8a1b8681feee2f81d4442914fc63ab9a7e8a9be395145b55b424519f5c7975f114bf5adf0c7e01ce1dca5b2aa091fd0364
-  data.tar.gz: 44e651cc4312db4388d975f1955791966055c67fc4a648a297e34535d9f47cea0588e94921098416d2a0636d0d4d26e017a75377960beeb28dcfa8ad555032c0
+  metadata.gz: 838d0e823d5666c5b615aa4c3f94af69c90034873cf07bc113524dfad2b265cdda16b350d189e410ff0229657fc425ddb0d34d442f19091a11151f2757f10b06
+  data.tar.gz: 60493346edfd51f98857e94c286de02c6293933ad379331f4513f18ec82b35f5c93ae5b6f14f8a196ac69d071004ba8529bd0ef902acf8ea8a32eb471b41f4b3

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.8.10 2016-01-24
+
+* Add support for parser 2.3 (via unparser 0.2.5)
+
 # v0.8.9 2016-01-05
 
 * Add mutation from `Hash#[]` to `Hash#key?` (#511)

data/config/devtools.yml

@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 10
+unit_test_timeout: 10.0

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 1173
+total_score: 1171

data/lib/mutant.rb

@@ -61,7 +61,6 @@ require 'mutant/actor/sender'
 require 'mutant/actor/mailbox'
 require 'mutant/actor/env'
 require 'mutant/parser'
-require 'mutant/delegator'
 require 'mutant/isolation'
 require 'mutant/parallel'
 require 'mutant/parallel/master'
@@ -131,7 +130,6 @@ require 'mutant/mutator/node/rescue'
 require 'mutant/mutator/node/match_current_line'
 require 'mutant/loader'
 require 'mutant/context'
-require 'mutant/context/scope'
 require 'mutant/scope'
 require 'mutant/subject'
 require 'mutant/subject/method'
@@ -168,6 +166,7 @@ require 'mutant/runner/sink'
 require 'mutant/result'
 require 'mutant/reporter'
 require 'mutant/reporter/null'
+require 'mutant/reporter/sequence'
 require 'mutant/reporter/cli'
 require 'mutant/reporter/cli/printer'
 require 'mutant/reporter/cli/printer/config'

data/lib/mutant/ast/types.rb

@@ -41,8 +41,9 @@ module Mutant
       # Nodes that are NOT generated by parser but used by mutant / unparser.
       EXTRA = symbolset.(%w[empty])
 
-      # Nodes that are currently missing from parser META
-      MISSING = symbolset.(%w[rational])
+      # Nodes that are currently missing from Parser::Meta::NODE_TYPES
+      # * https://github.com/whitequark/parser/pull/251
+      MISSING = symbolset.(%w[csend])
 
       # All node types mutant handles
       ALL = symbolset.((Parser::Meta::NODE_TYPES + EXTRA + MISSING) - BLACKLIST)

data/lib/mutant/context.rb

@@ -1,19 +1,91 @@
 module Mutant
   # An abstract context where mutations can be applied to.
   class Context
-    include Adamantium::Flat, AbstractType, Concord::Public.new(:source_path)
+    include Adamantium::Flat, Concord::Public.new(:scope, :source_path)
+    extend AST::Sexp
 
-    # Root ast node
-    #
-    # @param [Parser::AST::Node] node
+    NAMESPACE_DELIMITER = '::'.freeze
+
+    # Return root node for mutation
     #
     # @return [Parser::AST::Node]
-    abstract_method :root
+    def root(node)
+      nesting.reverse.reduce(node) do |current, scope|
+        self.class.wrap(scope, current)
+      end
+    end
 
     # Identification string
     #
     # @return [String]
-    abstract_method :identification
+    def identification
+      scope.name
+    end
+
+    # Wrap node into ast node
+    #
+    # @param [Class, Module] scope
+    # @param [Parser::AST::Node] node
+    #
+    # @return [Parser::AST::Class]
+    #   if scope is of kind Class
+    #
+    # @return [Parser::AST::Module]
+    #   if scope is of kind module
+    def self.wrap(scope, node)
+      name = s(:const, nil, scope.name.split(NAMESPACE_DELIMITER).last.to_sym)
+      case scope
+      when Class
+        s(:class, name, nil, node)
+      when Module
+        s(:module, name, node)
+      end
+    end
+
+    # Nesting of scope
+    #
+    # @return [Enumerable<Class,Module>]
+    def nesting
+      const = Object
+      name_nesting.map do |name|
+        const = const.const_get(name)
+      end
+    end
+    memoize :nesting
+
+    # Unqualified name of scope
+    #
+    # @return [String]
+    def unqualified_name
+      name_nesting.last
+    end
+
+    # Match expressions for scope
+    #
+    # @return [Enumerable<Expression>]
+    def match_expressions
+      name_nesting.each_index.reverse_each.map do |index|
+        Expression::Namespace::Recursive.new(
+          scope_name: name_nesting.take(index.succ).join(NAMESPACE_DELIMITER)
+        )
+      end
+    end
+    memoize :match_expressions
+
+    # Scope wrapped by context
+    #
+    # @return [Module|Class]
+    attr_reader :scope
+
+  private
+
+    # Nesting of names in scope
+    #
+    # @return [Array<String>]
+    def name_nesting
+      scope.name.split(NAMESPACE_DELIMITER)
+    end
+    memoize :name_nesting
 
   end # Context
 end # Mutant

data/lib/mutant/diff.rb

@@ -17,9 +17,7 @@ module Mutant
     def diff
       return if diffs.empty?
 
-      minimized_hunks.map do |hunk|
-        hunk.diff(:unified) << NEWLINE
-      end.join
+      minimized_hunk.diff(:unified) << NEWLINE
     end
     memoize :diff
 
@@ -74,19 +72,15 @@ module Mutant
       end
     end
 
-    # Minimized hunks
+    # Minimized hunk
     #
-    # @return [Array<Diff::LCS::Hunk>]
-    def minimized_hunks
+    # @return Diff::LCS::Hunk
+    def minimized_hunk
       head, *tail = hunks
 
-      tail.each_with_object([head]) do |right, aggregate|
-        left = aggregate.last
-        if right.overlaps?(left)
-          right.merge(left)
-          aggregate.pop
-        end
-        aggregate << right
+      tail.reduce(head) do |left, right|
+        right.merge(left)
+        right
       end
     end
 

data/lib/mutant/matcher/method.rb

@@ -69,9 +69,9 @@ module Mutant
 
         # Target context
         #
-        # @return [Context::Scope]
+        # @return [Context]
         def context
-          Context::Scope.new(scope, source_path)
+          Context.new(scope, source_path)
         end
 
         # Root source node

data/lib/mutant/mutation.rb

@@ -40,7 +40,7 @@ module Mutant
 
     # Test if mutation is killed by test reports
     #
-    # @param [Array<Report::Test>] test_reports
+    # @param [Result::Test] test_result
     #
     # @return [Boolean]
     def self.success?(test_result)

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

@@ -8,7 +8,7 @@ module Mutant
         # These nodes still need a dedicated mutator,
         # your contribution is that close!
         handle(
-          :ensure, :redo, :regopt, :retry, :arg_expr,
+          :csend, :ensure, :redo, :regopt, :retry, :arg_expr,
           :kwrestarg, :kwoptarg, :kwarg, :undef, :module, :empty,
           :alias, :for, :xstr, :back_ref, :class,
           :sclass, :match_with_lvasgn, :while_post,

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

@@ -3,10 +3,34 @@ module Mutant
     class CLI
       # CLI runner status printer base class
       class Printer
-        include AbstractType, Delegator, Adamantium::Flat, Concord.new(:output, :object), Procto.call(:run)
+        include AbstractType,
+                Adamantium::Flat,
+                Concord.new(:output, :object),
+                Procto.call(:run)
 
         private_class_method :new
 
+        # Create delegators to object
+        #
+        # @return [undefined]
+        def self.delegate(*names)
+          names.each(&method(:define_delegator))
+        end
+        private_class_method :delegate
+
+        # Create delegator to object
+        #
+        # @param [Symbol] name
+        #
+        # @return [undefined]
+        def self.define_delegator(name)
+          define_method(name) do
+            object.public_send(name)
+          end
+          private(name)
+        end
+        private_class_method :define_delegator
+
         delegate :success?
 
         NL = "\n".freeze

data/lib/mutant/reporter/sequence.rb

@@ -0,0 +1,22 @@
+module Mutant
+  class Reporter
+    class Sequence < self
+      include Concord.new(:reporters)
+
+      %i[warn progress report start].each do |name|
+        define_method(name) do |value|
+          reporters.each do |reporter|
+            reporter.public_send(name, value)
+          end
+
+          self
+        end
+      end
+
+      def delay
+        reporters.map(&:delay).min
+      end
+
+    end # Sequence
+  end # Reporter
+end # Mutant

data/lib/mutant/result.rb

@@ -136,14 +136,7 @@ module Mutant
         alive_mutation_results.empty?
       end
 
-      # Test if runner should continue on subject
-      #
-      # @return [Boolean]
-      def continue?
-        mutation_results.all?(&:success?)
-      end
-
-      # Killed mutations
+      # Alive mutations
       #
       # @return [Array<Result::Mutation>]
       def alive_mutation_results
@@ -179,7 +172,9 @@ module Mutant
         alive_mutation_results.length
       end
 
-      # Alive mutations
+    private
+
+      # Killed mutation results
       #
       # @return [Array<Result::Mutation>]
       def killed_mutation_results

data/lib/mutant/version.rb

@@ -1,4 +1,4 @@
 module Mutant
   # Current mutant version
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.8.10'.freeze
 end # Mutant

data/meta/dsym.rb

@@ -2,11 +2,11 @@ Mutant::Meta::Example.add do
   source ':"foo#{bar}baz"'
 
   singleton_mutations
-  # TODO: Unparser imperfection two asts with same source.
-  mutation s(:dsym, s(:nil), s(:begin, s(:send, nil, :bar)), s(:str, 'baz'))
-  mutation s(:dsym, s(:self), s(:begin, s(:send, nil, :bar)), s(:str, 'baz'))
-  mutation s(:dsym, s(:str, 'foo'), s(:begin, s(:self)), s(:str, 'baz'))
-  mutation s(:dsym, s(:str, 'foo'), s(:begin, s(:nil)), s(:str, 'baz'))
-  mutation s(:dsym, s(:str, 'foo'), s(:begin, s(:send, nil, :bar)), s(:nil))
-  mutation s(:dsym, s(:str, 'foo'), s(:begin, s(:send, nil, :bar)), s(:self))
+
+  mutation ':"#{nil}#{bar}#{"baz"}"'
+  mutation ':"#{self}#{bar}#{"baz"}"'
+  mutation ':"#{"foo"}#{nil}#{"baz"}"'
+  mutation ':"#{"foo"}#{self}#{"baz"}"'
+  mutation ':"#{"foo"}#{bar}#{nil}"'
+  mutation ':"#{"foo"}#{bar}#{self}"'
 end

data/mutant.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1'
 
-  gem.add_runtime_dependency('parser',        '~> 2.2.2')
-  gem.add_runtime_dependency('ast',           '~> 2.1')
+  gem.add_runtime_dependency('parser',        '~> 2.3.0')
+  gem.add_runtime_dependency('ast',           '~> 2.2')
   gem.add_runtime_dependency('diff-lcs',      '~> 1.2')
   gem.add_runtime_dependency('parallel',      '~> 1.3')
-  gem.add_runtime_dependency('morpher',       '~> 0.2.5')
+  gem.add_runtime_dependency('morpher',       '~> 0.2.6')
   gem.add_runtime_dependency('procto',        '~> 0.0.2')
   gem.add_runtime_dependency('abstract_type', '~> 0.0.7')
-  gem.add_runtime_dependency('unparser',      '~> 0.2.4')
+  gem.add_runtime_dependency('unparser',      '~> 0.2.5')
   gem.add_runtime_dependency('ice_nine',      '~> 0.11.1')
   gem.add_runtime_dependency('adamantium',    '~> 0.2.0')
   gem.add_runtime_dependency('memoizable',    '~> 0.4.2')
@@ -36,7 +36,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('anima',         '~> 0.3.0')
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
 
-  gem.add_development_dependency('devtools', '~> 0.1.1')
+  gem.add_development_dependency('devtools', '~> 0.1.3')
   gem.add_development_dependency('bundler',  '~> 1.10')
   gem.add_development_dependency('ffi',      '~> 1.9.6')
 end

data/spec/spec_helper.rb

@@ -26,7 +26,6 @@ require 'devtools/spec_helper'
 require 'unparser/cli'
 require 'mutant'
 require 'mutant/meta'
-Devtools.init_spec_helper
 
 $LOAD_PATH << File.join(TestApp.root, 'lib')
 

data/spec/unit/mutant/ast/named_children_spec.rb

@@ -42,8 +42,18 @@ RSpec.describe Mutant::AST::NamedChildren do
       end
 
       describe '#bar' do
-        it 'returns named child bar' do
-          expect(instance.bar).to be(node_bar)
+        context 'when node is present' do
+          it 'returns named child bar' do
+            expect(instance.bar).to be(node_bar)
+          end
+        end
+
+        context 'when node is NOT present' do
+          let(:node) { s(:node, node_foo) }
+
+          it 'returns nil' do
+            expect(instance.bar).to be(nil)
+          end
         end
       end
     end

data/spec/unit/mutant/context_spec.rb

@@ -1,5 +1,5 @@
 # rubocop:disable ClosingParenthesisIndentation
-RSpec.describe Mutant::Context::Scope do
+RSpec.describe Mutant::Context do
   describe '.wrap' do
     subject { described_class.wrap(scope, node) }
 
@@ -32,4 +32,88 @@ RSpec.describe Mutant::Context::Scope do
       it { should eql(expected) }
     end
   end
+
+  let(:object)      { described_class.new(scope, source_path) }
+  let(:scope_name)  { instance_double(String)                 }
+  let(:source_path) { instance_double(Pathname)               }
+  let(:scope)       { TestApp::Literal                        }
+
+  describe '#identification' do
+    subject { object.identification }
+
+    it { should eql(scope.name) }
+  end
+
+  describe '#root' do
+    subject { object.root(node) }
+
+    let(:node) { s(:sym, :node) }
+
+    let(:expected_source) do
+      generate(parse(<<-RUBY))
+        module TestApp
+          class Literal
+            :node
+          end
+        end
+      RUBY
+    end
+
+    let(:generated_source) do
+      Unparser.unparse(subject)
+    end
+
+    let(:round_tripped_source) do
+      Unparser.unparse(parse(expected_source))
+    end
+
+    it 'should create correct source' do
+      expect(generated_source).to eql(expected_source)
+    end
+  end
+
+  describe '#unqualified_name' do
+    subject { object.unqualified_name }
+
+    let(:path) { instance_double(Pathname) }
+
+    context 'with top level constant name' do
+      let(:scope) { TestApp }
+
+      it 'should return the unqualified name' do
+        should eql('TestApp')
+      end
+
+      it_should_behave_like 'an idempotent method'
+    end
+
+    context 'with scoped constant name' do
+      it 'should return the unqualified name' do
+        should eql('Literal')
+      end
+
+      it_should_behave_like 'an idempotent method'
+    end
+  end
+
+  describe '#match_expressions' do
+    subject { object.match_expressions }
+
+    context 'on toplevel scope' do
+      let(:scope) { TestApp }
+
+      it { should eql([parse_expression('TestApp*')]) }
+    end
+
+    context 'on nested scope' do
+      specify do
+        should eql(
+          [
+            parse_expression('TestApp::Literal*'),
+            parse_expression('TestApp*')
+          ]
+        )
+      end
+    end
+  end
 end