Merge branch 'master' into flexible-rspec

Conflicts:
	lib/mutant/strategy/method_expansion.rb
	lib/mutant/strategy/rspec/dm2.rb
	lib/mutant/strategy/rspec/dm2/lookup.rb
	lib/mutant/strategy/rspec/dm2/lookup/method.rb
	spec/unit/mutant/strategy/method_expansion/class_methods/run_spec.rb
	spec/unit/mutant/strategy/rspec/dm2/lookup/method/instance/spec_files_spec.rb
	spec/unit/mutant/strategy/rspec/dm2/lookup/method/singleton/spec_files_spec.rb

.rspec

@@ -1,3 +1,5 @@
 --color
 --format progress
+--profile
+--warnings
 --order random

.travis.yml

@@ -1,20 +1,25 @@
 language: ruby
-script: 'bundle exec rake ci'
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
-  - rbx-19mode
-  - ruby-head
-  - jruby-19mode
+before_install: gem install bundler
+bundler_args: --without yard guard benchmarks
+script: "bundle exec rake ci"
 matrix:
+  include:
+    - rvm: 1.9.3
+    - rvm: 2.0.0
+    - rvm: ruby-head
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-head
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
   allow_failures:
-    - rvm: jruby-19mode # No fork(2) support, workaround planned
-    - rvm: ruby-head # Broken at this time, bundler issue on travis
-    - rvm: rbx-19mode # Broken at this time, yard/yardstick issue
+    - rvm: ruby-head     # Broken at this time, rvm issue on travis
+    - rvm: rbx-19mode    # Broken at this time, yard/yardstick issue
+    - rvm: jruby-19mode  # No fork(2) support, workaround planned
+    - rvm: jruby-head    # No fork(2) support, workaround planned
 notifications:
   irc:
     channels:
-      - irc.freenode.org#rom-rb
+      - irc.freenode.org#mutant
     on_success: never
     on_failure: change

README.md

@@ -153,7 +153,8 @@ Your options:
 
 * GitHub Issues https://github.com/mbj/mutant/issues
 * Ping me on https://twitter.com/_m_b_j_
-* #rom-rb channel on freenode, I hang around on CET daytimes. (nick mbj)
+* #mutant channel on freenode, I hang around on CET daytimes. (nick mbj)
+  You'll also find others [ROM](https://github.com/rom-rb) team members here that can answer questions.
 
 Credits
 -------

Rakefile

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'devtools'
+
 Devtools.init_rake_tasks
 
 Rake.application.load_imports

bin/mutant

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 trap('INT') do |status|
   exit! 128 + status

config/devtools.yml

@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 1.0
+unit_test_timeout: 5.0

config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 16
-total_score: 773
+total_score: 764

config/rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - '../**/*.rake'
     - 'Gemfile'
     - 'Gemfile.devtools'
+    - 'mutant.gemspec'
   Excludes:
     - '**/vendor/**'
     - '**/benchmarks/**'

lib/mutant.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'benchmark'
 require 'set'
 require 'adamantium'

lib/mutant/cache.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # An AST cache
   class Cache

lib/mutant/cli.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'optparse'
 
 module Mutant

lib/mutant/cli/classifier.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class CLI
     # A classifier for input strings
@@ -6,15 +8,19 @@ module Mutant
 
       include Equalizer.new(:identifier)
 
-      SCOPE_NAME_PATTERN  = /[A-Za-z][A-Za-z_0-9]*/.freeze
-      OPERATOR_PATTERN    = Regexp.union(*OPERATOR_METHODS.map(&:to_s)).freeze
-      METHOD_NAME_PATTERN =
-        /([_A-Za-z][A-Za-z0-9_]*[!?=]?|#{OPERATOR_PATTERN})/.freeze
-      SCOPE_PATTERN =
-        /(?:::)?#{SCOPE_NAME_PATTERN}(?:::#{SCOPE_NAME_PATTERN})*/.freeze
-      CBASE_PATTERN       = /\A::/.freeze
-      SCOPE_OPERATOR      = '::'.freeze
-      SINGLETON_PATTERN   = /\A(#{SCOPE_PATTERN})\z/.freeze
+      SCOPE_NAME_PATTERN = /[A-Za-z][A-Za-z\d_]*/.freeze
+      SCOPE_OPERATOR     = '::'.freeze
+      CBASE_PATTERN      = /\A#{SCOPE_OPERATOR}/.freeze
+
+      METHOD_NAME_PATTERN = Regexp.union(
+        /[A-Za-z_][A-Za-z\d_]*[!?=]?/,
+        *OPERATOR_METHODS.map(&:to_s)
+      ).freeze
+
+      SCOPE_PATTERN = /
+        (?:#{SCOPE_OPERATOR})?#{SCOPE_NAME_PATTERN}
+        (?:#{SCOPE_OPERATOR}#{SCOPE_NAME_PATTERN})*
+      /x.freeze
 
       REGISTRY = []
 
@@ -39,10 +45,10 @@ module Mutant
       #
       def self.constant_lookup(location)
         location
-          .gsub(CBASE_PATTERN, EMPTY_STRING)
+          .sub(CBASE_PATTERN, EMPTY_STRING)
           .split(SCOPE_OPERATOR)
           .reduce(Object) do |parent, name|
-            parent.const_get(name)
+            parent.const_get(name, nil)
           end
       end
 
@@ -124,6 +130,7 @@ module Mutant
       # @api private
       #
       abstract_method :matcher
+      private         :matcher
 
     end # Classifier
   end # CLI

lib/mutant/cli/classifier/method.rb

@@ -1,23 +1,33 @@
+# encoding: utf-8
+
 module Mutant
   class CLI
     class Classifier
+
       # Explicit method classifier
       class Method < self
         register
 
         TABLE = {
           '.' => Matcher::Methods::Singleton,
-          '#' => Matcher::Methods::Instance
+          '#' => Matcher::Methods::Instance,
         }.freeze
 
-        REGEXP =
-          %r(\A(#{SCOPE_PATTERN})([.#])(#{METHOD_NAME_PATTERN}\z)).freeze
+        REGEXP = /
+          \A
+            (#{SCOPE_PATTERN})
+            ([.#])
+            (#{METHOD_NAME_PATTERN})
+          \z
+        /x.freeze
 
         # Positions of captured regexp groups
         SCOPE_NAME_POSITION   = 1
         SCOPE_SYMBOL_POSITION = 2
         METHOD_NAME_POSITION  = 3
 
+      private
+
         # Return method matcher
         #
         # @return [Matcher::Method]
@@ -29,18 +39,6 @@ module Mutant
         end
         memoize :matcher
 
-        # Return identification
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def identification
-          match.to_s
-        end
-
-      private
-
         # Return method
         #
         # @return [Method, UnboundMethod]
@@ -50,7 +48,7 @@ module Mutant
         def method
           methods_matcher.methods.detect do |method|
             method.name == method_name
-          end or raise("Cannot find method #{identification}")
+          end or raise NameError, "Cannot find method #{identifier}"
         end
         memoize :method, :freezer => :noop
 

lib/mutant/cli/classifier/namespace.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class CLI
     class Classifier
@@ -29,15 +31,17 @@ module Mutant
 
         # Recursive namespace classifier
         class Recursive < self
-          REGEXP = /\A(#{SCOPE_PATTERN})\*\z/.freeze
+          REGEXP  = /\A(#{SCOPE_PATTERN})\*\z/.freeze
           MATCHER = Matcher::Namespace
+
           register
         end # Recursive
 
         # Recursive namespace classifier
         class Flat < self
-          REGEXP = /\A(#{SCOPE_PATTERN})\z/.freeze
+          REGEXP  = /\A(#{SCOPE_PATTERN})\z/.freeze
           MATCHER = Matcher::Scope
+
           register
         end # Flat
 

lib/mutant/cli/classifier/scope.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class CLI
     class Classifier

lib/mutant/color.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Class to colorize strings
   class Color

lib/mutant/config.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # The configuration of a mutator run
   class Config

lib/mutant/constants.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
 
   METHOD_POSTFIX_EXPANSIONS = {

lib/mutant/context.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # An abstract context where mutations can be appied to.
   class Context

lib/mutant/context/scope.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Context
     # Scope context for mutation (Class or Module)

lib/mutant/differ.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Class to create diffs from source code
   class Differ

lib/mutant/killer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Abstract base class for mutant killers
   class Killer

lib/mutant/killer/forked.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Killer
 

lib/mutant/killer/forking.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Killer
 

lib/mutant/killer/rspec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Killer
     # Runner for rspec tests

lib/mutant/killer/static.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Killer
     # Abstract base class for killer with static result

lib/mutant/loader.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Base class for code loaders
   class Loader

lib/mutant/matcher.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Abstract matcher to find subjects to mutate
   class Matcher

lib/mutant/matcher/chain.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     # A chain of matchers

lib/mutant/matcher/method.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     # Matcher for subjects that are a specific method
@@ -52,16 +54,16 @@ module Mutant
       #
       def skip?
         location = source_location
-        if location.nil? or BLACKLIST.match(location.first)
+        if location.nil? || BLACKLIST.match(location.first)
           message = sprintf(
             '%s does not have valid source location unable to emit matcher',
             method.inspect
           )
           $stderr.puts(message)
-          return true
+          true
+        else
+          false
         end
-
-        false
       end
 
       # Return method name

lib/mutant/matcher/method/finder.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     class Method

lib/mutant/matcher/method/instance.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     class Method

lib/mutant/matcher/method/singleton.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     class Method

lib/mutant/matcher/methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     # Abstract base class for matcher that returns method subjects from scope

lib/mutant/matcher/namespace.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
 

lib/mutant/matcher/scope.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Matcher
     # Matcher for specific namespace

lib/mutant/mutation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Represent a mutated node with its subject
   class Mutation

lib/mutant/mutation/evil.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     # Evul mutation

lib/mutant/mutation/filter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     # Abstract filter for mutations

lib/mutant/mutation/filter/code.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     class Filter

lib/mutant/mutation/filter/regexp.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     class Filter

lib/mutant/mutation/filter/whitelist.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     class Filter

lib/mutant/mutation/neutral.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutation
     # Neutral mutation

lib/mutant/mutator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Generator for mutations
   class Mutator

lib/mutant/mutator/node.rb

@@ -1,6 +1,10 @@
+# encoding: utf-8
+
 module Mutant
+
   # Generator for mutations
   class Mutator
+
     # Abstract base class for node mutators
     class Node < self
       include AbstractType, NodeHelpers, Unparser::Constants

lib/mutant/mutator/node/argument.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/arguments.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/begin.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/block.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/case.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/connective/binary.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/const.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/define.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/generic.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/if.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/array.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/dynamic.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/fixnum.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/float.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/hash.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/nil.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/range.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/regex.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/string.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/literal/symbol.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/masgn.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/mlhs.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/named_value/access.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/named_value/constant_assignment.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/noop.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/return.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/send.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/splat.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/super.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/when.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/while.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/node/zsuper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Node

lib/mutant/mutator/registry.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     # Registry for mutators

lib/mutant/mutator/util.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     # Namespace for utility mutators

lib/mutant/mutator/util/array.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Util

lib/mutant/mutator/util/symbol.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Mutator
     class Util

lib/mutant/node_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Mixin for node helpers
   module NodeHelpers

lib/mutant/random.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Module for generating random values
   module Random

lib/mutant/reporter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Abstract base class for reporters
   class Reporter

lib/mutant/reporter/cli.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     # Reporter that reports in human readable format

lib/mutant/reporter/cli/printer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     class CLI

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     class CLI

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     class CLI

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     class CLI

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
     class CLI

lib/mutant/reporter/null.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Reporter
 

lib/mutant/runner.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   # Runner baseclass
   class Runner

lib/mutant/runner/config.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Runner
     # Runner for object config

lib/mutant/runner/mutation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Runner
     # Mutation runner

lib/mutant/runner/subject.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mutant
   class Runner
     # Subject specific runner

lib/mutant/singleton_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Singleton methods are defined here so zombie can pick them up
 module Mutant