mutant 0.5.17 → 0.5.18

data/meta/string.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source '"foo"'
+
+  mutation 'nil'
+end

data/meta/super.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source 'super'
+
+  mutation 'nil'
+end
+
+Mutant::Meta::Example.add do
+  source 'super()'
+
+  mutation 'super'
+  mutation 'nil'
+end
+
+Mutant::Meta::Example.add do
+  source 'super(foo, bar)'
+
+  mutation 'super'
+  mutation 'super()'
+  mutation 'super(foo)'
+  mutation 'super(bar)'
+  mutation 'super(foo, nil)'
+  mutation 'super(nil, bar)'
+  mutation 'nil'
+end

data/meta/symbol.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source ':foo'
+
+  mutation 'nil'
+  mutation ':foo__mutant__'
+end

data/meta/unless.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source 'until true; foo; bar; end'
+
+  mutation 'until true; bar; end'
+  mutation 'until true; foo; end'
+  mutation 'until true; end'
+  mutation 'until false; foo; bar; end'
+  mutation 'until nil;   foo; bar; end'
+  mutation 'until true;  foo; nil; end'
+  mutation 'until true;  nil; bar; end'
+  mutation 'until true;  raise; end'
+  mutation 'nil'
+end

data/meta/while.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source 'while true; foo; bar; end'
+
+  mutation 'while true; bar; end'
+  mutation 'while true; foo; end'
+  mutation 'while true; end'
+  mutation 'while false; foo; bar; end'
+  mutation 'while nil;   foo; bar; end'
+  mutation 'while true;  foo; nil; end'
+  mutation 'while true;  nil; bar; end'
+  mutation 'while true;  raise; end'
+  mutation 'nil'
+end
+
+Mutant::Meta::Example.add do
+  source 'while true; end'
+
+  mutation 'while true; raise; end'
+  mutation 'while false; end'
+  mutation 'while nil; end'
+  mutation 'nil'
+end

data/meta/yield.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+Mutant::Meta::Example.add do
+  source 'yield true'
+
+  mutation 'yield false'
+  mutation 'yield nil'
+  mutation 'yield'
+  mutation 'nil'
+end

data/mutant.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
 
   gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
+  gem.add_development_dependency('parallel', '~> 1.0.0')
 end

data/spec/integration/mutant/corpus_spec.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'parallel'
 require 'spec_helper'
 
 describe 'Mutant on ruby corpus' do
@@ -12,6 +13,8 @@ describe 'Mutant on ruby corpus' do
     pending 'Corpus test is deactivated on 1.9.3' if RUBY_VERSION.eql?('1.9.3')
   end
 
+  MUTEX = Mutex.new
+
   class Project
     include Anima.new(:name, :repo_uri, :exclude)
 
@@ -26,41 +29,28 @@ describe 'Mutant on ruby corpus' do
     # rubocop:disable MethodLength
     def verify
       checkout
-      total = 0
-      parse_errors = []
       start = Time.now
-      Pathname.glob(repo_path.join('**/*.rb')).sort.each do |path|
-        puts "Generating mutations for: #{path}"
-        begin
-          node = Parser::CurrentRuby.parse(path.read)
-        # Ignore known parser bugs
-        rescue ArgumentError, EncodingError
-          parse_errors << path
-          next
-        end
-        next if node.nil?
+      total = Parallel.map(Pathname.glob(repo_path.join('**/*.rb')).sort_by(&:size).reverse, finish: method(:progress)) do |path|
         count = 0
-        Mutant::Mutator::Node.each(node) do
-          count += 1
-          if (count % 1000).zero?
-            puts count
+        node =
+          begin
+            Parser::CurrentRuby.parse(path.read)
+          rescue EncodingError, ArgumentError
+          end
+        unless node.nil?
+          Mutant::Mutator::Node.each(node) do
+            count += 1
           end
         end
-        puts "Mutations: #{count}"
-        total += count
-      end
+        count
+      end.inject(0, :+)
       took = Time.now - start
       puts format(
-        'Total Mutations/Time/Parse-Errors: %s/%0.2fs/%i - %0.2f/s',
+        'Total Mutations/Time/Parse-Errors: %s/%0.2fs - %0.2f/s',
         total,
         took,
-        parse_errors.size,
         total / took
       )
-      if parse_errors.any?
-        puts 'Files with parse errors:'
-        parse_errors.each(&method(:puts))
-      end
       self
     end
 
@@ -95,6 +85,20 @@ describe 'Mutant on ruby corpus' do
       TMP.join(name)
     end
 
+    # Print progress
+    #
+    # @param [Pathname] path
+    # @param [Fixnum] _index
+    # @param [Fixnum] count
+    #
+    # @return [undefined]
+    #
+    def progress(path, _index, count)
+      MUTEX.synchronize do
+        puts 'Mutations - %4i - %s' % [count, path]
+      end
+    end
+
     # Helper method to execute system commands
     #
     # @param [Array<String>] arguments

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ if ENV['COVERAGE'] == 'true'
     add_filter 'spec'
     add_filter 'vendor'
     add_filter 'test_app'
+    add_filter 'lib/mutant/meta/**/*.rb'
 
     minimum_coverage 89.77  # TODO: raise this to 100, then mutation test
   end
@@ -24,6 +25,7 @@ require 'adamantium'
 require 'devtools/spec_helper'
 require 'unparser/cli'
 require 'mutant'
+require 'mutant/meta'
 
 $LOAD_PATH << File.join(TestApp.root, 'lib')
 

data/spec/support/mutation_verifier.rb

@@ -92,4 +92,5 @@ private
     Unparser::CLI::Source::Node.new(Unparser::Preprocessor.run(original_node))
   end
   memoize :unparser
+
 end # MutationVerifier

data/spec/unit/mutant/cli_new_spec.rb

@@ -80,9 +80,9 @@ describe Mutant::CLI, '.new' do
   end
 
   context 'with debug flag' do
-    let(:pattern)          { '::TestApp*'           }
+    let(:pattern)          { 'TestApp*'           }
     let(:arguments)        { %W[--debug #{pattern}] }
-    let(:expected_matcher) { ns::Namespace.new(cache, TestApp) }
+    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
 
     it_should_behave_like 'a cli parser'
 
@@ -92,9 +92,9 @@ describe Mutant::CLI, '.new' do
   end
 
   context 'with zombie flag' do
-    let(:pattern)          { '::TestApp*'            }
+    let(:pattern)          { 'TestApp*'            }
     let(:arguments)        { %W[--zombie #{pattern}] }
-    let(:expected_matcher) { ns::Namespace.new(cache, TestApp) }
+    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
 
     it_should_behave_like 'a cli parser'
 
@@ -104,9 +104,9 @@ describe Mutant::CLI, '.new' do
   end
 
   context 'with namespace pattern' do
-    let(:pattern)          { '::TestApp*' }
+    let(:pattern)          { 'TestApp*' }
     let(:arguments)        { [pattern]    }
-    let(:expected_matcher) { ns::Namespace.new(cache, TestApp) }
+    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
 
     it_should_behave_like 'a cli parser'
   end

data/spec/unit/mutant/expression/method_spec.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mutant::Expression::Method do
+
+  let(:object)           { described_class.parse(input) }
+  let(:cache)            { Mutant::Cache.new            }
+  let(:instance_method)  { '::TestApp::Literal#string'  }
+  let(:singleton_method) { '::TestApp::Literal.string'  }
+
+  describe '#match_length' do
+    let(:input) { instance_method }
+
+    subject { object.match_length(other) }
+
+    context 'when other is an equivalent expression' do
+      let(:other) { described_class.parse(object.syntax) }
+
+      it { should be(object.syntax.length) }
+    end
+
+    context 'when other is an unequivalent expression' do
+      let(:other) { described_class.parse('Foo*') }
+
+      it { should be(0) }
+    end
+  end
+
+  describe '#matcher' do
+    subject { object.matcher(cache) }
+
+    context 'with an instance method' do
+      let(:input) { instance_method }
+
+      it 'returns correct matcher' do
+        should eql(Mutant::Matcher::Method::Instance.new(
+          cache,
+          TestApp::Literal, TestApp::Literal.instance_method(:string)
+        ))
+      end
+    end
+
+    context 'with a singleton method' do
+      let(:input) { singleton_method }
+
+      it { should eql(Mutant::Matcher::Method::Singleton.new(cache, TestApp::Literal, TestApp::Literal.method(:string))) }
+    end
+  end
+end

data/spec/unit/mutant/expression/namespace/flat_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mutant::Expression::Namespace::Exact do
+
+  let(:object)            { described_class.parse(input) }
+  let(:cache)             { Mutant::Cache.new            }
+  let(:input)             { '::TestApp::Literal'         }
+
+  describe '#matcher' do
+    subject { object.matcher(cache) }
+
+    it { should eql(Mutant::Matcher::Namespace::Scope.new(cache, TestApp::Literal)) }
+  end
+
+  describe '#match_length' do
+    subject { object.match_length(other) }
+
+    context 'when other is an equivalent expression' do
+      let(:other) { described_class.parse(object.syntax) }
+
+      it { should be(object.syntax.length) }
+    end
+
+    context 'when other is an unequivalent expression' do
+      let(:other) { described_class.parse('Foo*') }
+
+      it { should be(0) }
+    end
+  end
+end

data/spec/unit/mutant/expression/namespace/recursive_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mutant::Expression::Namespace::Recursive do
+
+  let(:object) { described_class.parse(input) }
+  let(:cache)  { Mutant::Cache.new            }
+  let(:input)  { '::TestApp::Literal*'        }
+
+  describe '#matcher' do
+    subject { object.matcher(cache) }
+    it { should eql(Mutant::Matcher::Namespace.new(cache, '::TestApp::Literal')) }
+  end
+
+  describe '#match_length' do
+    subject { object.match_length(other) }
+
+    context 'when other is an equivalent expression' do
+      let(:other) { described_class.parse(object.syntax) }
+
+      it { should be(0) }
+    end
+
+    context 'when other expression describes a shorter prefix' do
+      let(:other) { described_class.parse('::TestApp') }
+
+      it { should be(0) }
+    end
+
+    context 'when other expression describes a longer prefix' do
+      let(:other) { described_class.parse('::TestApp::Literal::Deep') }
+
+      it { should be(input[0..-2].length) }
+    end
+  end
+end

data/spec/unit/mutant/matcher/namespace_spec.rb

@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Mutant::Matcher::Namespace, '#each' do
   subject { object.each { |item| yields << item } }
 
-  let(:yields) { []                                           }
-  let(:object) { described_class.new(cache, TestApp::Literal) }
+  let(:yields) { []                                             }
+  let(:object) { described_class.new(cache, 'TestApp::Literal') }
 
   let(:cache) { Mutant::Cache.new }
 

data/spec/unit/mutant/mutation_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Mutant::Mutation do
 
   class TestMutation < Mutant::Mutation
-    SYMBOL = 'test'
+    SYMBOL = 'test'.freeze
   end
 
   let(:object)           { TestMutation.new(mutation_subject, Mutant::NodeHelpers::N_NIL)   }

data/spec/unit/mutant/mutator/node_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Mutant::Mutator::Node do
+  Mutant::Meta::Example::ALL.each do |example|
+    context "on #{example.node.type.inspect}" do
+      it 'generates the correct mutations' do
+        verification = example.verification
+        unless verification.success?
+          fail verification.error_report
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,231 +1,245 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: morpher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: abstract_type
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: memoizable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: anima
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Mutation testing for ruby
 email:
 - mbj@schirp-dso.com
@@ -236,11 +250,11 @@ extra_rdoc_files:
 - TODO
 - LICENSE
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-gemset
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
@@ -262,9 +276,6 @@ files:
 - lib/mutant.rb
 - lib/mutant/cache.rb
 - lib/mutant/cli.rb
-- lib/mutant/cli/classifier.rb
-- lib/mutant/cli/classifier/method.rb
-- lib/mutant/cli/classifier/namespace.rb
 - lib/mutant/color.rb
 - lib/mutant/config.rb
 - lib/mutant/constants.rb
@@ -272,6 +283,9 @@ files:
 - lib/mutant/context/scope.rb
 - lib/mutant/delegator.rb
 - lib/mutant/diff.rb
+- lib/mutant/expression.rb
+- lib/mutant/expression/method.rb
+- lib/mutant/expression/namespace.rb
 - lib/mutant/killer.rb
 - lib/mutant/loader.rb
 - lib/mutant/matcher.rb
@@ -285,6 +299,9 @@ files:
 - lib/mutant/matcher/namespace.rb
 - lib/mutant/matcher/null.rb
 - lib/mutant/matcher/scope.rb
+- lib/mutant/meta.rb
+- lib/mutant/meta/example.rb
+- lib/mutant/meta/example/dsl.rb
 - lib/mutant/mutation.rb
 - lib/mutant/mutation/evil.rb
 - lib/mutant/mutation/neutral.rb
@@ -326,6 +343,7 @@ files:
 - lib/mutant/mutator/node/noop.rb
 - lib/mutant/mutator/node/nthref.rb
 - lib/mutant/mutator/node/op_asgn.rb
+- lib/mutant/mutator/node/or_asgn.rb
 - lib/mutant/mutator/node/resbody.rb
 - lib/mutant/mutator/node/rescue.rb
 - lib/mutant/mutator/node/restarg.rb
@@ -378,6 +396,58 @@ files:
 - lib/mutant/zombifier.rb
 - lib/mutant/zombifier/file.rb
 - lib/parser_extensions.rb
+- meta/and.rb
+- meta/and_asgn.rb
+- meta/array.rb
+- meta/begin.rb
+- meta/binary.rb
+- meta/block.rb
+- meta/block_pass.rb
+- meta/blockarg.rb
+- meta/boolean.rb
+- meta/break.rb
+- meta/case.rb
+- meta/casgn.rb
+- meta/cbase.rb
+- meta/const.rb
+- meta/cvar.rb
+- meta/cvasgn.rb
+- meta/define.rb
+- meta/defined.rb
+- meta/dstr.rb
+- meta/dsym.rb
+- meta/ensure.rb
+- meta/fixnum.rb
+- meta/float.rb
+- meta/gvar.rb
+- meta/gvasgn.rb
+- meta/hash.rb
+- meta/if.rb
+- meta/ivasgn.rb
+- meta/kwbegin.rb
+- meta/lvar.rb
+- meta/lvasgn.rb
+- meta/masgn.rb
+- meta/match_current_line.rb
+- meta/next.rb
+- meta/nil.rb
+- meta/nthref.rb
+- meta/op_assgn.rb
+- meta/or_asgn.rb
+- meta/range.rb
+- meta/redo.rb
+- meta/regex.rb
+- meta/rescue.rb
+- meta/restarg.rb
+- meta/return.rb
+- meta/self.rb
+- meta/send.rb
+- meta/string.rb
+- meta/super.rb
+- meta/symbol.rb
+- meta/unless.rb
+- meta/while.rb
+- meta/yield.rb
 - mutant-rspec.gemspec
 - mutant.gemspec
 - spec/integration/mutant/corpus_spec.rb
@@ -395,16 +465,15 @@ files:
 - spec/support/mutation_verifier.rb
 - spec/support/rspec.rb
 - spec/support/test_app.rb
-- spec/unit/mutant/cli/classifier/method_spec.rb
-- spec/unit/mutant/cli/classifier/namespace/flat_spec.rb
-- spec/unit/mutant/cli/classifier/namespace/recursive_spec.rb
-- spec/unit/mutant/cli/classifier_spec.rb
 - spec/unit/mutant/cli_new_spec.rb
 - spec/unit/mutant/cli_run_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
 - spec/unit/mutant/context/scope/unqualified_name_spec.rb
 - spec/unit/mutant/diff_spec.rb
+- spec/unit/mutant/expression/method_spec.rb
+- spec/unit/mutant/expression/namespace/flat_spec.rb
+- spec/unit/mutant/expression/namespace/recursive_spec.rb
 - spec/unit/mutant/loader/eval_spec.rb
 - spec/unit/mutant/matcher/chain_spec.rb
 - spec/unit/mutant/matcher/method/instance_spec.rb
@@ -413,49 +482,7 @@ files:
 - spec/unit/mutant/matcher/methods/singleton_spec.rb
 - spec/unit/mutant/matcher/namespace_spec.rb
 - spec/unit/mutant/mutation_spec.rb
-- spec/unit/mutant/mutator/node/and_asgn_spec.rb
-- spec/unit/mutant/mutator/node/begin_spec.rb
-- spec/unit/mutant/mutator/node/binary_spec.rb
-- spec/unit/mutant/mutator/node/block_pass_spec.rb
-- spec/unit/mutant/mutator/node/block_spec.rb
-- spec/unit/mutant/mutator/node/blockarg_spec.rb
-- spec/unit/mutant/mutator/node/case_spec.rb
-- spec/unit/mutant/mutator/node/cbase_spec.rb
-- spec/unit/mutant/mutator/node/conditional_loop_spec.rb
-- spec/unit/mutant/mutator/node/const_spec.rb
-- spec/unit/mutant/mutator/node/define_spec.rb
-- spec/unit/mutant/mutator/node/defined_spec.rb
-- spec/unit/mutant/mutator/node/dstr_spec.rb
-- spec/unit/mutant/mutator/node/dsym_spec.rb
-- spec/unit/mutant/mutator/node/ensure_spec.rb
-- spec/unit/mutant/mutator/node/if_spec.rb
-- spec/unit/mutant/mutator/node/kwbegin_spec.rb
-- spec/unit/mutant/mutator/node/literal/array_spec.rb
-- spec/unit/mutant/mutator/node/literal/boolean_spec.rb
-- spec/unit/mutant/mutator/node/literal/fixnum_spec.rb
-- spec/unit/mutant/mutator/node/literal/float_spec.rb
-- spec/unit/mutant/mutator/node/literal/hash_spec.rb
-- spec/unit/mutant/mutator/node/literal/nil_spec.rb
-- spec/unit/mutant/mutator/node/literal/range_spec.rb
-- spec/unit/mutant/mutator/node/literal/regex_spec.rb
-- spec/unit/mutant/mutator/node/literal/string_spec.rb
-- spec/unit/mutant/mutator/node/literal/symbol_spec.rb
-- spec/unit/mutant/mutator/node/loop_ctrl_spec.rb
-- spec/unit/mutant/mutator/node/masgn_spec.rb
-- spec/unit/mutant/mutator/node/match_current_line_spec.rb
-- spec/unit/mutant/mutator/node/named_value/access_spec.rb
-- spec/unit/mutant/mutator/node/named_value/constant_assignment_spec.rb
-- spec/unit/mutant/mutator/node/named_value/variable_assignment_spec.rb
-- spec/unit/mutant/mutator/node/nthref_spec.rb
-- spec/unit/mutant/mutator/node/op_assgn_spec.rb
-- spec/unit/mutant/mutator/node/or_asgn_spec.rb
-- spec/unit/mutant/mutator/node/redo_spec.rb
-- spec/unit/mutant/mutator/node/rescue_spec.rb
-- spec/unit/mutant/mutator/node/restarg_spec.rb
-- spec/unit/mutant/mutator/node/return_spec.rb
-- spec/unit/mutant/mutator/node/send_spec.rb
-- spec/unit/mutant/mutator/node/super_spec.rb
-- spec/unit/mutant/mutator/node/yield_spec.rb
+- spec/unit/mutant/mutator/node_spec.rb
 - spec/unit/mutant/mutator_spec.rb
 - spec/unit/mutant/reporter/null_spec.rb
 - spec/unit/mutant/require_highjack_spec.rb
@@ -491,17 +518,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mutation testing tool for ruby under MRI and Rubinius
@@ -511,16 +538,15 @@ 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/cli/classifier/method_spec.rb
-- spec/unit/mutant/cli/classifier/namespace/flat_spec.rb
-- spec/unit/mutant/cli/classifier/namespace/recursive_spec.rb
-- spec/unit/mutant/cli/classifier_spec.rb
 - spec/unit/mutant/cli_new_spec.rb
 - spec/unit/mutant/cli_run_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
 - spec/unit/mutant/context/scope/unqualified_name_spec.rb
 - spec/unit/mutant/diff_spec.rb
+- spec/unit/mutant/expression/method_spec.rb
+- spec/unit/mutant/expression/namespace/flat_spec.rb
+- spec/unit/mutant/expression/namespace/recursive_spec.rb
 - spec/unit/mutant/loader/eval_spec.rb
 - spec/unit/mutant/matcher/chain_spec.rb
 - spec/unit/mutant/matcher/method/instance_spec.rb
@@ -529,49 +555,7 @@ test_files:
 - spec/unit/mutant/matcher/methods/singleton_spec.rb
 - spec/unit/mutant/matcher/namespace_spec.rb
 - spec/unit/mutant/mutation_spec.rb
-- spec/unit/mutant/mutator/node/and_asgn_spec.rb
-- spec/unit/mutant/mutator/node/begin_spec.rb
-- spec/unit/mutant/mutator/node/binary_spec.rb
-- spec/unit/mutant/mutator/node/block_pass_spec.rb
-- spec/unit/mutant/mutator/node/block_spec.rb
-- spec/unit/mutant/mutator/node/blockarg_spec.rb
-- spec/unit/mutant/mutator/node/case_spec.rb
-- spec/unit/mutant/mutator/node/cbase_spec.rb
-- spec/unit/mutant/mutator/node/conditional_loop_spec.rb
-- spec/unit/mutant/mutator/node/const_spec.rb
-- spec/unit/mutant/mutator/node/define_spec.rb
-- spec/unit/mutant/mutator/node/defined_spec.rb
-- spec/unit/mutant/mutator/node/dstr_spec.rb
-- spec/unit/mutant/mutator/node/dsym_spec.rb
-- spec/unit/mutant/mutator/node/ensure_spec.rb
-- spec/unit/mutant/mutator/node/if_spec.rb
-- spec/unit/mutant/mutator/node/kwbegin_spec.rb
-- spec/unit/mutant/mutator/node/literal/array_spec.rb
-- spec/unit/mutant/mutator/node/literal/boolean_spec.rb
-- spec/unit/mutant/mutator/node/literal/fixnum_spec.rb
-- spec/unit/mutant/mutator/node/literal/float_spec.rb
-- spec/unit/mutant/mutator/node/literal/hash_spec.rb
-- spec/unit/mutant/mutator/node/literal/nil_spec.rb
-- spec/unit/mutant/mutator/node/literal/range_spec.rb
-- spec/unit/mutant/mutator/node/literal/regex_spec.rb
-- spec/unit/mutant/mutator/node/literal/string_spec.rb
-- spec/unit/mutant/mutator/node/literal/symbol_spec.rb
-- spec/unit/mutant/mutator/node/loop_ctrl_spec.rb
-- spec/unit/mutant/mutator/node/masgn_spec.rb
-- spec/unit/mutant/mutator/node/match_current_line_spec.rb
-- spec/unit/mutant/mutator/node/named_value/access_spec.rb
-- spec/unit/mutant/mutator/node/named_value/constant_assignment_spec.rb
-- spec/unit/mutant/mutator/node/named_value/variable_assignment_spec.rb
-- spec/unit/mutant/mutator/node/nthref_spec.rb
-- spec/unit/mutant/mutator/node/op_assgn_spec.rb
-- spec/unit/mutant/mutator/node/or_asgn_spec.rb
-- spec/unit/mutant/mutator/node/redo_spec.rb
-- spec/unit/mutant/mutator/node/rescue_spec.rb
-- spec/unit/mutant/mutator/node/restarg_spec.rb
-- spec/unit/mutant/mutator/node/return_spec.rb
-- spec/unit/mutant/mutator/node/send_spec.rb
-- spec/unit/mutant/mutator/node/super_spec.rb
-- spec/unit/mutant/mutator/node/yield_spec.rb
+- spec/unit/mutant/mutator/node_spec.rb
 - spec/unit/mutant/mutator_spec.rb
 - spec/unit/mutant/reporter/null_spec.rb
 - spec/unit/mutant/require_highjack_spec.rb