mutant 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c622c635f57a57ea3d7463d71da71c84450a8e
-  data.tar.gz: 4147047e1dd38d1115f415e5cb8e2eebba932c6d
+  metadata.gz: 001bd8f243257cdce0da86ebe626d0e1efbef248
+  data.tar.gz: 9b1bc583e1321da8437ec18716a6e9b5911018dc
 SHA512:
-  metadata.gz: fd80ff4f0469e2bf182c5060fe4696ce48373c014dd76dc083fc1a210812908c201c344afa6f34ec066c5714e0ad1a6f94ca436eb5c31fb9cf92d76b072c8467
-  data.tar.gz: 54779c5e90ebc0f5f909ae8b485eecb92da095e0abaf9f28d214d500ee2f0ea4d8e836b8cc17d9abe8a9b034b89de5651487ceeb25dd347c1e0a9864d5c444cb
+  metadata.gz: 006d6d7657e04e6e23fdaef408516abf6119ce24c1eaaacda8f2f8d3e20993168c450391adf8f9bda5e78f13d6ca9e765a2a83db04db1fcf4c233389e4585727
+  data.tar.gz: 343f8f579a4db3aa5b49c96b2e16a61cf963f92dc7781a7d1ef514a670885f745912450ec264659a46e96ae471772366f36ae6f92ee4389a428f63d6df92dcd3

data/Changelog.md

@@ -1,4 +1,14 @@
-# v0.6.0 2014-07-17
+# v0.6.2 2014-08-16
+
+* Fix matcher to ignore metaprogrammed defines [#254](https://github.com/mbj/mutant/issues/254)
+* Add rescue resbody body concat-promotion mutation
+* Add rescue else body concat-promotion mutation #245
+
+# v0.6.1 2014-08-16
+
+* Incorrectly released on partial state. Yanked.
+
+# v0.6.0 2014-08-11
 
 * Parallel execution / reporting.
 * Add -j, --jobs flag to control concurrency.

data/README.md

@@ -7,19 +7,27 @@ mutant
 [![Inline docs](http://inch-ci.org/github/mbj/mutant.png)](http://inch-ci.org/github/mbj/mutant)
 [![Gem Version](https://img.shields.io/gem/v/mutant.svg)](https://rubygems.org/gems/mutant)
 
-Mutant is a mutation testing tool for ruby.
+Mutant is a mutation testing tool for Ruby.
 
 The idea is that if code can be changed and your tests do not notice, either that code isn't being covered
 or it does not have a speced side effect.
 
-Mutant supports MRI and RBX 1.9, 2.0 and 2.1, while support for jruby is planned.
-It should also work under any ruby engine that supports POSIX-fork(2) semantics.
+Mutant supports MRI and RBX 1.9, 2.0 and 2.1, while support for JRuby is planned.
+It should also work under any Ruby engine that supports POSIX-fork(2) semantics.
 
-Mutant uses a pure ruby [parser](https://github.com/whitequark/parser) and an [unparser](https://github.com/mbj/unparser)
+Mutant uses a pure Ruby [parser](https://github.com/whitequark/parser) and an [unparser](https://github.com/mbj/unparser)
 to do its magic.
 
 Mutant does not have really good "getting started" documentation currently so please refer to presentations and blog posts below.
 
+Mutation-Operators:
+-------------------
+
+Mutant supports a wide range of mutation operators. An exhaustive list can be found in the [mutant-meta](https://github.com/mbj/mutant/tree/master/meta).
+The `mutant-meta` is arranged to the AST-Node-Types of parser. Refer to parsers [AST documentation](https://github.com/whitequark/parser/blob/master/doc/AST_FORMAT.md) in doubt.
+
+There is no easy and universal way to count the number of mutation operators a tool supports.
+
 Presentations
 -------------
 
@@ -39,7 +47,7 @@ Blog-Posts
 Projects using Mutant
 ---------------------
 
-The following projects adopted mutant, and aim 100% mutation coverage:
+The following projects adopted mutant, and aim for 100% mutation coverage:
 
 * [axiom](https://github.com/dkubb/axiom)
 * [axiom-types](https://github.com/dkubb/axiom-types)
@@ -65,8 +73,8 @@ Install the gem `mutant` via your preferred method.
 gem install mutant
 ```
 
-If you plan to use the rspec integration you'll have to install `mutant-rspec` also. 
-Please add an explicit dependency to `rspec-core` for the rspec version you want to use.
+If you plan to use the RSpec integration you'll have to install `mutant-rspec` also. 
+Please add an explicit dependency to `rspec-core` for the RSpec version you want to use.
 
 ```ruby
 gem install mutant-rspec
@@ -74,38 +82,6 @@ gem install mutant-rspec
 
 The minitest integration is still in the works.
 
-Mutations
----------
-
-Mutant supports a very wide range of mutation operators. Listing them all in detail would blow this document up.
-
-It is planned to parse a list of mutation operators from the source. In the meantime please refer to the
-[code](https://github.com/mbj/mutant/tree/master/lib/mutant/mutator/node) each subclass of `Mutant::Mutator::Node`
-emits around 3-6 mutations.
-
-Currently mutant covers the majority of ruby's complex nodes that often occur in method bodies.
-
-NOTE: The textbook examples you find on mutation testing are intentionally not implemented. This is subjected to change.
-
-Some stats from the [axiom](https://github.com/dkubb/axiom) library:
-
-```
-Subjects:  424       # Amount of subjects being mutated (currently only methods)
-Mutations: 6760      # Amount of mutations mutant generated (~13 mutations per method)
-Kills:     6664      # Amount of successfully killed mutations
-Runtime:   5123.13s  # Total runtime
-Killtime:  5092.63s  # Time spend killing mutations
-Overhead:  0.60%
-Coverage:  98.58%    # Coverage score
-Alive:     96        # Amount of alive mutations.
-```
-
-
-Nodes still missing a dedicated mutator are handled via the
-[Generic](https://github.com/mbj/mutant/blob/master/lib/mutant/mutator/node/generic.rb) mutator.
-The goal is to remove this mutator and have dedicated mutator for every type of node and removing
-the Generic handler altogether.
-
 Examples
 --------
 
@@ -139,6 +115,24 @@ Example for a subject like `Foo::Bar#baz` it will run all example groups with de
 `Foo::Bar#baz`, `Foo::Bar` and `Foo`. The order is important, so if mutant finds example groups in the
 current prefix level, these example groups *must* kill the mutation.
 
+Rails
+-------
+
+Assuming you are using rspec, you can mutation test Rails models by adding the following lines to your Gemfile:
+
+```ruby
+group :test do
+  gem 'mutant'
+  gem 'mutant-rspec'
+end  
+```
+
+Next, run bundle and comment out ```require 'rspec/autorun'``` from your spec_helper.rb file.  Having done so you should be able to use commands like the following:
+
+```sh
+RAILS_ENV=test bundle exec mutant -r ./config/environment --use rspec User
+```
+
 Support
 -------
 
@@ -150,7 +144,7 @@ Your options:
 * Ping me on [twitter](https://twitter.com/_m_b_j_)
 
 There is also the [#mutant] channel on freenode. As my OSS time budged is very limited I cannot
-join it often. Please prefer to use github issues with a 'Question: ' prefix in title.
+join it often. Please prefer to use GitHub issues with a 'Question: ' prefix in title.
 
 Credits
 -------

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 1069
+total_score: 1098

data/config/reek.yml

@@ -37,6 +37,7 @@ FeatureEnvy:
   - Mutant::Matcher::Method::Singleton#receiver?
   - Mutant::Mutation::Evil#success?
   - Mutant::Mutation::Neutral#success?
+  - Mutant::Mutator::Node#children_indices
   # False positive, its a utility
   - Mutant::Meta::Example::Verification#format_mutation
   - Mutant::Reporter::CLI#subject_results
@@ -67,7 +68,7 @@ NestedIterators:
   - Mutant::Mutator::Node::Resbody#mutate_captures
   - Mutant::Mutator::Node::Arguments#emit_argument_mutations
   - Mutant::RequireHighjack#infect
-  - Mutant::RequireHighjack#desinfect
+  - Mutant::RequireHighjack#disinfect
   - Mutant::Subject#tests
   - Parser::Lexer#self.new
   max_allowed_nesting: 1

data/lib/mutant/ast.rb

@@ -4,7 +4,8 @@ module Mutant
 
     # Walk all ast nodes
     #
-    # @param [Parser::AST::Node]
+    # @param [Parser::AST::Node] root
+    # @param [Array<Parser::AST::Node>] stack
     #
     # @yield [Parser::AST::Node]
     #   all nodes recursively including root
@@ -13,21 +14,24 @@ module Mutant
     #
     # @api private
     #
-    def self.walk(node, &block)
+    def self.walk(node, stack, &block)
       raise ArgumentError, 'block expected' unless block_given?
 
-      block.call(node)
+      block.call(node, stack)
       node.children.grep(Parser::AST::Node).each do |child|
-        walk(child, &block)
+        stack.push(child)
+        walk(child, stack, &block)
+        stack.pop
       end
 
       self
     end
+    private_class_method :walk
 
-    # Find last node satisfing predicate (as block)
+    # Find last node satisfying predicate (as block)
     #
     # @return [Parser::AST::Node]
-    #   if satisfing node is found
+    #   if satisfying node is found
     #
     # @yield [Parser::AST::Node]
     #
@@ -39,13 +43,15 @@ module Mutant
     #
     # @api private
     #
-    def self.find_last(node, &predicate)
+    def self.find_last_path(node, &predicate)
       raise ArgumentError, 'block expected' unless block_given?
-      neddle = nil
-      walk(node) do |candidate|
-        neddle = candidate if predicate.call(candidate, &predicate)
+      path = []
+      walk(node, [node]) do |candidate, stack|
+        if predicate.call(candidate, &predicate)
+          path = stack.dup
+        end
       end
-      neddle
+      path
     end
 
   end # AST

data/lib/mutant/ast/meta.rb

@@ -17,14 +17,42 @@ module Mutant
         REGISTRY.fetch(node.type, Generic).new(node)
       end
 
-      # Generic metadata for send nodes
+      # Mixin to define meta nodes
+      class Node < Module
+        include Concord.new(:type)
+
+        CONCORD = Concord.new(:node)
+
+        # Hook called when module gets included
+        #
+        # @param [Class, Module] host
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def included(host)
+          REGISTRY[type] = host
+          host.class_eval do
+            include CONCORD, NamedChildren
+          end
+        end
+
+      end # Node
+
+      # Metadata for resbody nods
+      class Resbody
+        include Node.new(:resbody)
+
+        children :captures, :assignment, :body
+      end # Resbody
+
+      # Metadata for send nodes
       class Send
-        include Concord.new(:node), NamedChildren
+        include Node.new(:send)
 
         children :receiver, :selector
 
-        REGISTRY[:send] = self
-
         INDEX_ASSIGNMENT_SELECTOR            = :[]=
         ATTRIBUTE_ASSIGNMENT_SELECTOR_SUFFIX = '='.freeze
 
@@ -100,7 +128,7 @@ module Mutant
 
       end # Send
 
-      # Generic node metatada
+      # Generic node metadata
       class Generic
         include Adamantium, Concord.new(:node)
 

data/lib/mutant/diff.rb

@@ -99,7 +99,7 @@ module Mutant
     # @api private
     #
     def minimized_hunks
-      head, *tail = hunks()
+      head, *tail = hunks
 
       tail.each_with_object([head]) do |right, aggregate|
         left = aggregate.last

data/lib/mutant/matcher/method.rb

@@ -2,8 +2,8 @@ module Mutant
   class Matcher
     # Matcher for subjects that are a specific method
     class Method < self
-      include Adamantium::Flat, Concord::Public.new(:env, :scope, :method)
-      include Equalizer.new(:identification)
+      include Adamantium::Flat, Concord::Public.new(:env, :scope, :target_method)
+      include AST::NodePredicates, Equalizer.new(:identification)
 
       # Methods within rbx kernel directory are precompiled and their source
       # cannot be accessed via reading source location. Same for methods created by eval.
@@ -40,7 +40,10 @@ module Mutant
       def skip?
         location = source_location
         if location.nil? || BLACKLIST.match(location.first)
-          env.warn(format('%s does not have valid source location unable to emit matcher', method.inspect))
+          env.warn(format('%s does not have valid source location unable to emit subject', target_method.inspect))
+          true
+        elsif matched_node_path.any?(&method(:n_block?))
+          env.warn(format('%s is defined from a 3rd party lib unable to emit subject', target_method.inspect))
           true
         else
           false
@@ -54,7 +57,7 @@ module Mutant
       # @api private
       #
       def method_name
-        method.name
+        target_method.name
       end
 
       # Return context
@@ -104,7 +107,7 @@ module Mutant
       # @api private
       #
       def source_location
-        method.source_location
+        target_method.source_location
       end
 
       # Return subject
@@ -118,27 +121,22 @@ module Mutant
       # @api private
       #
       def subject
-        node = matched_node
+        node = matched_node_path.last
         return unless node
         self.class::SUBJECT_CLASS.new(env.config, context, node)
       end
       memoize :subject
 
-      # Return matched node
-      #
-      # @return [Parser::AST::Node]
-      #   if node could be found
+      # Return matched node path
       #
-      # @return [nil]
-      #   otherwise
+      # @return [Array<Parser::AST::Node>]
       #
       # @api private
       #
-      def matched_node
-        AST.find_last(ast) do |node|
-          match?(node)
-        end
+      def matched_node_path
+        AST.find_last_path(ast, &method(:match?))
       end
+      memoize :matched_node_path
 
     end # Method
   end # Matcher

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

@@ -15,10 +15,10 @@ module Mutant
         #
         # @api private
         #
-        def self.build(env, scope, method)
-          name = method.name
+        def self.build(env, scope, target_method)
+          name = target_method.name
           if scope.ancestors.include?(::Memoizable) && scope.memoized?(name)
-            return Memoized.new(env, scope, method)
+            return Memoized.new(env, scope, target_method)
           end
           super
         end
@@ -68,7 +68,7 @@ module Mutant
           # @api private
           #
           def source_location
-            scope.unmemoized_instance_method(method.name).source_location
+            scope.unmemoized_instance_method(method_name).source_location
           end
 
         end # Memoized

data/lib/mutant/matcher/namespace.rb

@@ -29,7 +29,7 @@ module Mutant
 
     private
 
-      # Test scope if name matches expresion
+      # Test scope if name matches expression
       #
       # @param [Module, Class] scope
       #

data/lib/mutant/meta.rb

@@ -16,7 +16,8 @@ module Mutant
       # @api private
       #
       def self.add(&block)
-        ALL << DSL.run(block)
+        file = caller.first.split(':in', 2).first
+        ALL << DSL.run(file, block)
       end
 
       Pathname.glob(Pathname.new(__FILE__).parent.parent.parent.join('meta', '**/*.rb'))

data/lib/mutant/meta/example.rb

@@ -1,7 +1,7 @@
 module Mutant
   module Meta
     class Example
-      include Adamantium, Concord::Public.new(:node, :mutations)
+      include Adamantium, Concord::Public.new(:file, :node, :mutations)
 
       # Return a verification instance
       #
@@ -26,7 +26,7 @@ module Mutant
 
       # Return generated mutations
       #
-      # @return [Emumerable<Mutant::Mutation>]
+      # @return [Enumerable<Mutant::Mutation>]
       #
       # @api private
       #
@@ -97,7 +97,7 @@ module Mutant
         def mutation_report
           original_node = example.node
           [
-            'Original-AST:',
+            "#{example.file}, Original-AST:",
             original_node.inspect,
             'Original-Source:',
             example.source,

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

@@ -12,8 +12,8 @@ module Mutant
         #
         # @api private
         #
-        def self.run(block)
-          instance = new
+        def self.run(file, block)
+          instance = new(file)
           instance.instance_eval(&block)
           instance.example
         end
@@ -24,7 +24,8 @@ module Mutant
         #
         # @api private
         #
-        def initialize
+        def initialize(file)
+          @file = file
           @source = nil
           @expected = []
         end
@@ -40,7 +41,7 @@ module Mutant
         #
         def example
           raise 'source not defined' unless @source
-          Example.new(@source, @expected)
+          Example.new(@file, @source, @expected)
         end
 
       private

data/lib/mutant/mutator/node.rb

@@ -8,6 +8,8 @@ module Mutant
       include AbstractType, Unparser::Constants
       include AST::NamedChildren, AST::NodePredicates, AST::Sexp, AST::Nodes
 
+      TAUTOLOGY = ->(_input) { true }
+
       # Helper to define a named child
       #
       # @param [Parser::AST::Node] node
@@ -79,7 +81,7 @@ module Mutant
       # @api private
       #
       def mutate_child(index, mutator = Mutator, &block)
-        block ||= ->(_node) { true }
+        block ||= TAUTOLOGY
         child = children.at(index)
         mutator.each(child, self) do |mutation|
           next unless block.call(mutation)
@@ -211,6 +213,20 @@ module Mutant
         AST::Types::OP_ASSIGN.include?(parent_type) && parent.node.children.first.equal?(node)
       end
 
+      # Return children indices
+      #
+      # @param [Range] range
+      #
+      # @return [Enumerable<Fixnum>]
+      #
+      # @api pirvate
+      #
+      def children_indices(range)
+        range_end = range.end
+        last_index = range_end >= 0 ? range_end : children.length + range_end
+        range.begin.upto(last_index)
+      end
+
     end # Node
   end # Mutator
 end # Mutant

data/lib/mutant/mutator/node/literal/boolean.rb

@@ -28,5 +28,5 @@ module Mutant
         end # Boolean
       end # Literal
     end # Node
-  end # Mutatork
+  end # Mutator
 end # Mutant

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

@@ -2,10 +2,86 @@ module Mutant
   class Mutator
     class Node
       # Mutator for rescue nodes
-      class Rescue < Generic
+      class Rescue < self
 
         handle :rescue
 
+        children :body
+
+        define_named_child(:else_body, -1)
+
+        RESCUE_INDICES = (1..-2).freeze
+
+        # Emit mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          mutate_body
+          mutate_rescue_bodies
+          mutate_else_body
+        end
+
+      private
+
+        # Mutate child by name
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mutate_rescue_bodies
+          children_indices(RESCUE_INDICES).each do |index|
+            rescue_body = children.at(index)
+            next unless rescue_body
+            mutate_child(index)
+            resbody_body = AST::Meta.for(rescue_body).body
+            emit_concat(resbody_body) if resbody_body
+          end
+        end
+
+        # Emit concatenation with body
+        #
+        # @param [Parser::AST::Node] child
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_concat(child)
+          if body
+            emit(s(:begin, body, child))
+          else
+            emit(child)
+          end
+        end
+
+        # Emit body mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mutate_body
+          return unless body
+          emit_body_mutations
+          emit(body)
+        end
+
+        # Emit else body mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mutate_else_body
+          return unless else_body
+          emit_else_body_mutations
+          emit_concat(else_body)
+        end
+
       end # Rescue
     end # Node
   end # Mutator

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

@@ -35,7 +35,7 @@ module Mutant
             # @api private
             #
             def mutate_indices
-              INDEX_RANGE.begin.upto(children.length + INDEX_RANGE.end).each do |index|
+              children_indices(INDEX_RANGE).each do |index|
                 delete_child(index)
                 mutate_child(index)
               end

data/lib/mutant/require_highjack.rb

@@ -22,7 +22,7 @@ module Mutant
       yield
       self
     ensure
-      desinfect
+      disinfect
     end
 
     # Infect kernel with highjack
@@ -43,13 +43,13 @@ module Mutant
       end
     end
 
-    # Imperfectly desinfect kernel from highjack
+    # Imperfectly disinfect kernel from highjack
     #
     # @return [self]
     #
     # @api private
     #
-    def desinfect
+    def disinfect
       original = @original
       target.module_eval do
         undef :require

data/lib/mutant/runner.rb

@@ -106,7 +106,7 @@ module Mutant
 
     # Handle exit if needed
     #
-    # @param [Result::Mutation] mutation
+    # @param [Result::Mutation] result
     #
     # @return [undefined]
     #

data/lib/mutant/subject.rb

@@ -30,10 +30,6 @@ module Mutant
 
     # Return tests for mutation
     #
-    # TODO: This logic is now centralized but still fucked.
-    #
-    # @param [Mutation] mutation
-    #
     # @return [Array<Test>]
     #
     # @api private

data/lib/mutant/version.rb

@@ -1,4 +1,4 @@
 module Mutant
   # The current mutant version
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.2'.freeze
 end # Mutant

data/meta/def.rb

@@ -13,6 +13,36 @@ Mutant::Meta::Example.add do
   mutation 'def foo; nil; rescue; end'
   mutation 'def foo; self; rescue; end'
   mutation 'def foo; end'
+
+  # Promote rescue resbody bodies
+  mutation 'def foo; foo; end'
+end
+
+Mutant::Meta::Example.add do
+  source 'def a; foo; rescue; bar; else; baz; end'
+
+  # Mutate all bodies
+  mutation 'def a; nil;  rescue; bar; else; baz; end'
+  mutation 'def a; self; rescue; bar; else; baz; end'
+  mutation 'def a; foo; rescue; nil;  else; baz; end'
+  mutation 'def a; foo; rescue; self; else; baz; end'
+  mutation 'def a; foo; rescue; bar; else; nil; end'
+  mutation 'def a; foo; rescue; bar; else; self; end'
+
+  # Promote and concat rescue resbody bodies
+  mutation 'def a; foo; bar; end'
+
+  # Promote and concat else body
+  mutation 'def a; foo; baz; end'
+
+  # Promote rescue body
+  mutation 'def a; foo; end'
+
+  # Empty body
+  mutation 'def a; end'
+
+  # Failing body
+  mutation 'def a; raise; end'
 end
 
 Mutant::Meta::Example.add do

data/meta/if.rb

@@ -14,7 +14,7 @@ Mutant::Meta::Example.add do
   # Deleted else branch
   mutation 'if condition; true end'
 
-  # Deleted if branch resuting in unless rendering
+  # Deleted if branch resulting in unless rendering
   mutation 'unless condition; false; end'
 
   # Deleted if branch with promoting else branch to if branch

data/meta/rescue.rb

@@ -9,6 +9,8 @@ Mutant::Meta::Example.add do
   mutation 'begin; rescue ExceptionA, self => error; true; end'
   mutation 'begin; rescue ExceptionA, ExceptionB => error; false; end'
   mutation 'begin; rescue ExceptionA, ExceptionB => error; nil; end'
+  mutation 'begin; true; end'
+
 end
 
 Mutant::Meta::Example.add do
@@ -19,6 +21,7 @@ Mutant::Meta::Example.add do
   mutation 'begin; rescue SomeException => error; false; end'
   mutation 'begin; rescue SomeException => error; nil; end'
   mutation 'begin; rescue self => error; true; end'
+  mutation 'begin; true; end'
 end
 
 Mutant::Meta::Example.add do
@@ -28,6 +31,7 @@ Mutant::Meta::Example.add do
   mutation 'begin; rescue => error; false; end'
   mutation 'begin; rescue => error; nil; end'
   mutation 'begin; rescue; true; end'
+  mutation 'begin; true; end'
 end
 
 Mutant::Meta::Example.add do
@@ -36,4 +40,5 @@ Mutant::Meta::Example.add do
   singleton_mutations
   mutation 'begin; rescue; false; end'
   mutation 'begin; rescue; nil; end'
+  mutation 'begin; true end'
 end

data/meta/super.rb

@@ -10,7 +10,7 @@ Mutant::Meta::Example.add do
   source 'super()'
 
   singleton_mutations
-  # this is zsuper a totally differend node thant super()
+  # this is zsuper a totally different node than super()
   mutation 'super'
 end
 

data/mutant.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('parser',        '~> 2.1')
   gem.add_runtime_dependency('ast',           '~> 2.0')
   gem.add_runtime_dependency('diff-lcs',      '~> 1.2')
+  gem.add_runtime_dependency('parallel',      '~> 1.3')
   gem.add_runtime_dependency('morpher',       '~> 0.2.3')
   gem.add_runtime_dependency('procto',        '~> 0.0.2')
   gem.add_runtime_dependency('abstract_type', '~> 0.0.7')
@@ -37,7 +38,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('inflecto',      '~> 0.0.2')
   gem.add_runtime_dependency('anima',         '~> 0.2.0')
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
-  gem.add_runtime_dependency('parallel',      '~> 1.2.0')
 
   gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
 end

data/spec/shared/method_matcher_behavior.rb

@@ -17,7 +17,7 @@ RSpec.shared_examples_for 'a method matcher' do
   end
 
   it 'should have correct line number' do
-    expect(node.location.expression.line - base).to eql(method_line)
+    expect(node.location.expression.line).to eql(method_line)
   end
 
   it 'should have correct arity' do

data/spec/unit/mutant/ast_spec.rb

@@ -0,0 +1,38 @@
+RSpec.describe Mutant::AST do
+  let(:object) { described_class }
+
+  describe '.find_last_path' do
+    subject { object.find_last_path(root, &block) }
+
+    let(:root)    { s(:root, parent)             }
+    let(:child_a) { s(:child_a)                  }
+    let(:child_b) { s(:child_b)                  }
+    let(:parent)  { s(:parent, child_a, child_b) }
+
+    def path
+      subject.map(&:type)
+    end
+
+    context 'when no node matches' do
+      let(:block) { ->(_) { false } }
+
+      it { should eql([]) }
+    end
+
+    context 'when one node matches' do
+      let(:block) { ->(node) { node.equal?(child_a) } }
+
+      it 'returns the full path' do
+        expect(path).to eql([:root, :parent, :child_a])
+      end
+    end
+
+    context 'when two nodes match' do
+      let(:block) { ->(node) { node.equal?(child_a) || node.equal?(child_b) } }
+
+      it 'returns the last full path' do
+        expect(path).to eql([:root, :parent, :child_b])
+      end
+    end
+  end
+end

data/spec/unit/mutant/matcher/method/instance_spec.rb

@@ -11,10 +11,10 @@ RSpec.describe Mutant::Matcher::Method::Instance do
     let(:method)       { scope.instance_method(method_name)        }
     let(:yields)       { []                                        }
     let(:namespace)    { self.class                                }
-    let(:scope)        { self.class::Foo                           }
     let(:type)         { :def                                      }
-    let(:method_name)  { :bar                                      }
+    let(:method_name)  { :foo                                      }
     let(:method_arity) { 0                                         }
+    let(:base)         { TestApp::InstanceMethodTests              }
 
     def name
       node.children[0]
@@ -36,109 +36,79 @@ RSpec.describe Mutant::Matcher::Method::Instance do
       it 'does warn' do
         subject
         expect(reporter.warn_calls.last).to(
-          eql("#{method.inspect} does not have valid source location unable to emit matcher")
+          eql("#{method.inspect} does not have valid source location unable to emit subject")
         )
       end
     end
 
     context 'when method is defined once' do
-      let(:base) { __LINE__ }
-      class self::Foo
-        def bar; end
-      end
-
-      let(:method_line) { 2 }
+      let(:scope)       { base::DefinedOnce }
+      let(:method_line) { 7                 }
 
       it_should_behave_like 'a method matcher'
     end
 
     context 'when method is defined once with a memoizer' do
-      let(:base) { __LINE__ }
-      class self::Foo
-        def bar; end
-        include Adamantium
-        memoize :bar
-      end
-
-      let(:method_line) { 2 }
+      let(:scope)       { base::WithMemoizer }
+      let(:method_line) { 12                 }
 
       it_should_behave_like 'a method matcher'
     end
 
     context 'when method is defined multiple times' do
       context 'on different lines' do
-        let(:base) { __LINE__ }
-        class self::Foo
-          def bar
-          end
-
-          def bar(_arg)
-          end
-        end
-
-        let(:method_line)  { 5 }
-        let(:method_arity) { 1 }
+        let(:scope)        { base::DefinedMultipleTimes::DifferentLines }
+        let(:method_line)  { 21                                         }
+        let(:method_arity) { 1                                          }
 
         it_should_behave_like 'a method matcher'
       end
 
       context 'on the same line' do
-        let(:base) { __LINE__ }
-        class self::Foo
-          def bar; end; def bar(_arg); end
-        end
-
-        let(:method_line)  { 2 }
-        let(:method_arity) { 1 }
+        let(:scope)        { base::DefinedMultipleTimes::SameLineSameScope }
+        let(:method_line)  { 26                                            }
+        let(:method_arity) { 1                                             }
 
         it_should_behave_like 'a method matcher'
       end
 
       context 'on the same line with different scope' do
-        let(:base) { __LINE__ }
-        class self::Foo
-          def self.bar; end; def bar(_arg); end
-        end
-
-        let(:method_line)  { 2 }
-        let(:method_arity) { 1 }
+        let(:scope)        { base::DefinedMultipleTimes::SameLineDifferentScope }
+        let(:method_line)  { 30                                                 }
+        let(:method_arity) { 1                                                  }
 
         it_should_behave_like 'a method matcher'
       end
 
-      context 'when nested' do
-        let(:pattern) { 'Foo::Bar#baz' }
+      context 'in module eval' do
+        let(:scope) { base::InModuleEval }
 
-        context 'in class' do
-          let(:base) { __LINE__ }
-          class self::Foo
-            class Bar
-              def baz
-              end
-            end
-          end
-
-          let(:method_line) { 3                    }
-          let(:method_name) { :baz                 }
-          let(:scope)       { self.class::Foo::Bar }
+        it 'does not emit matcher' do
+          subject
+          expect(yields.length).to be(0)
+        end
 
-          it_should_behave_like 'a method matcher'
+        it 'does warn' do
+          subject
+          expect(reporter.warn_calls.last).to(
+            eql("#{method.inspect} is defined from a 3rd party lib unable to emit subject")
+          )
         end
+      end
 
-        context 'in module' do
-          let(:base) { __LINE__ }
-          module self::Foo
-            class Bar
-              def baz
-              end
-            end
-          end
+      context 'in class eval' do
+        let(:scope) { base::InClassEval }
 
-          let(:method_line) { 3                    }
-          let(:method_name) { :baz                 }
-          let(:scope)       { self.class::Foo::Bar }
+        it 'does not emit matcher' do
+          subject
+          expect(yields.length).to be(0)
+        end
 
-          it_should_behave_like 'a method matcher'
+        it 'does warn' do
+          subject
+          expect(reporter.warn_calls.last).to(
+            eql("#{method.inspect} is defined from a 3rd party lib unable to emit subject")
+          )
         end
       end
     end

data/spec/unit/mutant/matcher/method/singleton_spec.rb

@@ -6,10 +6,10 @@ RSpec.describe Mutant::Matcher::Method::Singleton, '#each' do
   let(:method)       { scope.method(method_name)               }
   let(:env)          { Fixtures::TEST_ENV                      }
   let(:yields)       { []                                      }
-  let(:namespace)    { self.class                              }
-  let(:scope)        { self.class::Foo                         }
   let(:type)         { :defs                                   }
+  let(:method_name)  { :foo                                    }
   let(:method_arity) { 0                                       }
+  let(:base)         { TestApp::SingletonMethodTests           }
 
   def name
     node.children[1]
@@ -22,14 +22,8 @@ RSpec.describe Mutant::Matcher::Method::Singleton, '#each' do
   context 'on singleton methods' do
 
     context 'when also defined on lvar' do
-      let(:base) { __LINE__ }
-      class self::Foo
-        a = Object.new
-        def a.bar; end; def self.bar; end
-      end
-
-      let(:method_name) { :bar }
-      let(:method_line) { 3    }
+      let(:scope)       { base::AlsoDefinedOnLvar }
+      let(:method_line) { 63                      }
 
       it_should_behave_like 'a method matcher'
 
@@ -42,13 +36,8 @@ RSpec.describe Mutant::Matcher::Method::Singleton, '#each' do
     end
 
     context 'when defined on self' do
-      let(:base) { __LINE__ }
-      class self::Foo
-        def self.bar; end
-      end
-
-      let(:method_name) { :bar }
-      let(:method_line) { 2    }
+      let(:scope)       { base::DefinedOnSelf }
+      let(:method_line) { 58                  }
 
       it_should_behave_like 'a method matcher'
     end
@@ -56,34 +45,15 @@ RSpec.describe Mutant::Matcher::Method::Singleton, '#each' do
     context 'when defined on constant' do
 
       context 'inside namespace' do
-        let(:base) { __LINE__ }
-        module self::Namespace
-          class Foo
-            def Foo.bar
-            end
-          end
-        end
-
-        let(:scope)       { self.class::Namespace::Foo }
-        let(:method_name) { :bar                       }
-        let(:method_line) { 3                          }
+        let(:scope)       { base::DefinedOnConstant::InsideNamespace }
+        let(:method_line) { 68                                       }
 
         it_should_behave_like 'a method matcher'
       end
 
       context 'outside namespace' do
-        let(:base) { __LINE__ }
-        module self::Namespace
-          class Foo
-          end
-
-          def Foo.bar
-          end
-        end
-
-        let(:method_name) { :bar                       }
-        let(:method_line) { 5                          }
-        let(:scope)       { self.class::Namespace::Foo }
+        let(:method_line) { 75                                        }
+        let(:scope)       { base::DefinedOnConstant::OutsideNamespace }
 
         it_should_behave_like 'a method matcher'
       end
@@ -91,21 +61,9 @@ RSpec.describe Mutant::Matcher::Method::Singleton, '#each' do
 
     context 'when defined multiple times in the same line' do
       context 'with method on different scope' do
-        let(:base) { __LINE__ }
-        module self::Namespace
-          module Foo; end
-          module Bar
-            def self.baz
-            end
-            def Foo.baz(_arg)
-            end
-          end
-        end
-
-        let(:scope)        { self.class::Namespace::Bar }
-        let(:method_name)  { :baz                       }
-        let(:method_line)  { 4                          }
-        let(:method_arity) { 0                          }
+        let(:scope)        { base::DefinedMultipleTimes::SameLine::DifferentScope }
+        let(:method_line)  { 94                                                   }
+        let(:method_arity) { 1                                                    }
 
         it_should_behave_like 'a method matcher'
       end

data/test_app/lib/test_app.rb

@@ -2,6 +2,100 @@
 
 # Namespace for test application
 module TestApp
+  module InstanceMethodTests
+    module DefinedOnce
+      def foo; end
+    end
+
+    class WithMemoizer
+      include Adamantium
+      def foo; end
+      memoize :foo
+    end
+
+    module DefinedMultipleTimes
+      class DifferentLines
+        def foo
+        end
+
+        def foo(_arg)
+        end
+      end
+
+      class SameLineSameScope
+        def foo; end; def foo(_arg); end
+      end
+
+      class SameLineDifferentScope
+        def self.foo; end; def foo(_arg); end
+      end
+    end
+
+    class InClassEval
+      class_eval do
+        def foo
+        end
+      end
+    end
+
+    class InModuleEval
+      module_eval do
+        def foo
+        end
+      end
+    end
+
+    class InInstanceEval
+      module_eval do
+        def foo
+        end
+      end
+    end
+  end
+
+  module SingletonMethodTests
+    module DefinedOnSelf
+      def self.foo; end
+    end
+
+    module AlsoDefinedOnLvar
+      a = Object.new
+      def a.foo; end; def self.foo; end
+    end
+
+    module DefinedOnConstant
+      module InsideNamespace
+        def InsideNamespace.foo
+        end
+      end
+
+      module OutsideNamespace
+      end
+
+      def OutsideNamespace.foo
+      end
+    end
+
+    module DefinedMultipleTimes
+      module DifferentLines
+        def self.foo
+        end
+
+        def self.foo(_arg)
+        end
+      end
+
+      module SameLine
+        module SameScope
+          def self.foo; end; def self.foo(_arg); end;
+        end
+
+        module DifferentScope
+          def self.foo; end; def DifferentScope.foo(_arg); end
+        end
+      end
+    end
+  end
 end
 
 require 'test_app/literal'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: morpher
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -465,6 +465,7 @@ files:
 - spec/support/mutation_verifier.rb
 - spec/support/rspec.rb
 - spec/support/test_app.rb
+- spec/unit/mutant/ast_spec.rb
 - spec/unit/mutant/cli_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
@@ -541,6 +542,7 @@ test_files:
 - spec/integration/mutant/rspec_spec.rb
 - spec/integration/mutant/test_mutator_handles_types_spec.rb
 - spec/integration/mutant/zombie_spec.rb
+- spec/unit/mutant/ast_spec.rb
 - spec/unit/mutant/cli_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
@@ -578,4 +580,3 @@ test_files:
 - spec/unit/mutant/warning_expectation.rb
 - spec/unit/mutant/warning_filter_spec.rb
 - spec/unit/mutant_spec.rb
-has_rdoc: