mutant 0.3.0.rc1 → 0.3.0.rc2

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

@@ -20,14 +20,7 @@ module Mutant
           #
           def self.build(runner, output)
             mutation = runner.mutation
-            case mutation
-            when Mutant::Mutation::Neutral::Noop
-              Noop
-            when Mutant::Mutation::Evil, Mutant::Mutation::Neutral
-              Diff
-            else
-              raise "Unknown mutation: #{mutation}"
-            end.new(runner, output)
+            lookup(mutation.class).new(runner, output)
           end
 
           # Run mutation printer
@@ -56,12 +49,14 @@ module Mutant
           # Reporter for noop mutations
           class Noop < self
 
-          MESSAGE = [
-            'Parsed subject AST:',
-            '%s',
-            'Unparsed source:',
-            '%s',
-          ].join("\n")
+            handle(Mutant::Mutation::Neutral::Noop)
+
+            MESSAGE = [
+              'Parsed subject AST:',
+              '%s',
+              'Unparsed source:',
+              '%s',
+            ].join("\n")
 
           private
 
@@ -84,6 +79,9 @@ module Mutant
           # Reporter for neutral and evil mutations
           class Diff < self
 
+            handle(Mutant::Mutation::Neutral)
+            handle(Mutant::Mutation::Evil)
+
             # Return diff
             #
             # @return [String]

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

@@ -8,9 +8,7 @@ module Mutant
         # Subject results printer
         class Subject < self
 
-          handle(Mutant::Subject::Method::Instance)
-          handle(Mutant::Subject::Method::Instance::Memoized)
-          handle(Mutant::Subject::Method::Singleton)
+          handle(Mutant::Subject)
 
           # Run subject results printer
           #

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

@@ -63,10 +63,34 @@ module Mutant
         # @api private
         #
         def self.visit(object, output)
-          printer = REGISTRY.fetch(object.class)
+          printer = lookup(object.class)
           printer.run(object, output)
         end
 
+        # Lookup printer class
+        #
+        # @param [Class] klass
+        #
+        # @return [Class:Printer]
+        #   if found
+        #
+        # @raise [RuntimeError]
+        #   otherwise
+        #
+        # @api private
+        #
+        def self.lookup(klass)
+          current = klass
+          until current == Object
+            if REGISTRY.key?(current)
+              return REGISTRY.fetch(current)
+            end
+            current = current.superclass
+          end
+          raise "No printer for: #{klass}"
+        end
+        private_class_method :lookup
+
         abstract_method :run
 
       private
@@ -140,10 +164,10 @@ module Mutant
         # Test for colored output
         #
         # @return [true]
-        #   returns true if output is colored
+        #   if output is colored
         #
         # @return [false]
-        #   returns false otherwise
+        #   otherwise
         #
         # @api private
         #
@@ -159,8 +183,8 @@ module Mutant
         # @api private
         #
         # @return [String]
-        #   returns colorized string if color is enabled
-        #   returns unmodified message otherwise
+        #   if color is enabled
+        #   unmodified message otherwise
         #
         def colorize(color, message)
           color = Color::NONE unless tty?
@@ -170,10 +194,10 @@ module Mutant
         # Test for output to tty
         #
         # @return [true]
-        #   returns true if output is a tty
+        #   if output is a tty
         #
         # @return [false]
-        #   returns false otherwise
+        #   otherwise
         #
         # @api private
         #

data/lib/mutant/runner/mutation.rb

@@ -4,10 +4,18 @@ module Mutant
   class Runner
     # Mutation runner
     class Mutation < self
-      include Concord::Public.new(:config, :mutation)
+      include Equalizer.new(:config, :mutation)
 
       register Mutant::Mutation
 
+      # Return mutation
+      #
+      # @return [Mutation]
+      #
+      # @api private
+      #
+      attr_reader :mutation
+
       # Return killer instance
       #
       # @return [Killer]

data/lib/mutant/runner/subject.rb

@@ -4,7 +4,15 @@ module Mutant
   class Runner
     # Subject specific runner
     class Subject < self
-      include Concord::Public.new(:config, :subject)
+      include Equalizer.new(:config, :subject)
+
+      # Return subject
+      #
+      # @return [Subject]
+      #
+      # @api private
+      #
+      attr_reader :subject
 
       register Mutant::Subject
 

data/lib/mutant/runner.rb

@@ -71,7 +71,8 @@ module Mutant
     #
     def initialize(config)
       @config = config
-      @start = Time.now
+      @stop   = false
+      @start  = Time.now
       run
       @end = Time.now
     end
@@ -87,7 +88,7 @@ module Mutant
     # @api private
     #
     def stop?
-      !!@stop
+      @stop
     end
 
     # Return runtime
@@ -155,10 +156,8 @@ module Mutant
       input.each do |object|
         runner = visit(object)
         collection << runner
-        if runner.stop?
-          @stop = true
-          break
-        end
+        @stop = runner.stop?
+        break if @stop
       end
       collection
     end

data/lib/mutant/strategy/rspec.rb

@@ -4,7 +4,7 @@ module Mutant
   class Strategy
     # Rspec killer strategy
     class Rspec < self
-      include Equalizer.new
+      include Concord.new(:level)
 
       KILLER = Killer::Forking.new(Killer::Rspec)
 
@@ -33,7 +33,7 @@ module Mutant
       def configuration
         RSpec::Core::Configuration.new
       end
-      memoize :configuration, :freezer => :noop
+      memoize :configuration, freezer: :noop
 
       # Return example groups
       #
@@ -56,7 +56,7 @@ module Mutant
       def world
         RSpec.world
       end
-      memoize :world, :freezer => :noop
+      memoize :world, freezer: :noop
 
       # Return options
       #
@@ -69,7 +69,7 @@ module Mutant
         options.parse_options
         options
       end
-      memoize :options, :freezer => :noop
+      memoize :options, freezer: :noop
 
     end # Rspec
   end # Strategy

data/lib/mutant/strategy.rb

@@ -13,6 +13,7 @@ module Mutant
     # @api private
     #
     def setup
+      self
     end
 
     # Perform strategy teardown
@@ -22,6 +23,7 @@ module Mutant
     # @api private
     #
     def teardown
+      self
     end
 
     # Kill mutation

data/lib/mutant/support/method_object.rb

@@ -23,7 +23,6 @@ module Mutant
     # Not aliased to prevent problems from inheritance
     #
     # @return [Objecct]
-    #   returns the created object
     #
     # @api private
     #

data/lib/mutant/version.rb

@@ -2,6 +2,5 @@
 
 module Mutant
   # The current mutant version
-  VERSION = '0.3.0.rc1'.freeze
+  VERSION = '0.3.0.rc2'.freeze
 end # Mutant
-

data/lib/mutant/zombifier.rb

@@ -11,7 +11,7 @@ module Mutant
     # * Toplevel reference/cbase nodes in code (rspec)
     # * Creates useless toplevel modules that get vendored under ::Zombie (set)
     #
-    STOP = %w(
+    IGNORE = %w(
       set
       rspec
       diff/lcs
@@ -31,6 +31,7 @@ module Mutant
     #
     def self.zombify
       run('mutant')
+      self
     end
 
     # Zombify gem
@@ -43,6 +44,7 @@ module Mutant
     #
     def self.run(name)
       Gem.new(name).zombify
+      self
     end
 
     # Zombifier subject, compatible with mutants loader
@@ -68,7 +70,7 @@ module Mutant
       # @api private
       #
       def zombify
-        $stderr.puts "Zombifying #{context.source_path}"
+        $stderr.puts("Zombifying #{context.source_path}")
         Loader::Eval.run(zombified_root, self)
         self
       end
@@ -109,6 +111,7 @@ module Mutant
         end
         self
       end
+      memoize :zombify
 
       # Find file
       #
@@ -123,7 +126,7 @@ module Mutant
       # @api private
       #
       def self.find(logical_name)
-        return if STOP.include?(logical_name)
+        return if IGNORE.include?(logical_name)
         CACHE.fetch(logical_name) do
           CACHE[logical_name] = find_uncached(logical_name)
         end

data/lib/mutant.rb

@@ -34,13 +34,15 @@ require 'mutant/singleton_methods'
 require 'mutant/constants'
 require 'mutant/support/method_object'
 require 'mutant/random'
+require 'mutant/predicate'
+require 'mutant/predicate/attribute'
+require 'mutant/predicate/whitelist'
+require 'mutant/predicate/blacklist'
+require 'mutant/predicate/matcher'
 require 'mutant/mutator'
 require 'mutant/mutation'
 require 'mutant/mutation/evil'
 require 'mutant/mutation/neutral'
-require 'mutant/mutation/filter'
-require 'mutant/mutation/filter/code'
-require 'mutant/mutation/filter/whitelist'
 require 'mutant/mutator/registry'
 require 'mutant/mutator/util'
 require 'mutant/mutator/util/array'
@@ -60,16 +62,21 @@ require 'mutant/mutator/node/literal/regex'
 require 'mutant/mutator/node/literal/nil'
 require 'mutant/mutator/node/argument'
 require 'mutant/mutator/node/arguments'
+require 'mutant/mutator/node/blockarg'
 require 'mutant/mutator/node/begin'
 require 'mutant/mutator/node/connective/binary'
 require 'mutant/mutator/node/const'
+require 'mutant/mutator/node/dstr'
+require 'mutant/mutator/node/dsym'
 require 'mutant/mutator/node/named_value/access'
 require 'mutant/mutator/node/named_value/constant_assignment'
 require 'mutant/mutator/node/named_value/variable_assignment'
 require 'mutant/mutator/node/noop'
+require 'mutant/mutator/node/op_asgn'
 require 'mutant/mutator/node/while'
 require 'mutant/mutator/node/super'
 require 'mutant/mutator/node/zsuper'
+require 'mutant/mutator/node/restarg'
 require 'mutant/mutator/node/send'
 require 'mutant/mutator/node/send/binary'
 require 'mutant/mutator/node/when'
@@ -99,13 +106,13 @@ require 'mutant/matcher/method/instance'
 require 'mutant/matcher/methods'
 require 'mutant/matcher/namespace'
 require 'mutant/matcher/scope'
+require 'mutant/matcher/filter'
 require 'mutant/killer'
 require 'mutant/killer/static'
 require 'mutant/killer/rspec'
 require 'mutant/killer/forking'
 require 'mutant/killer/forked'
 require 'mutant/strategy'
-require 'mutant/strategy/static'
 require 'mutant/strategy/rspec'
 require 'mutant/runner'
 require 'mutant/runner/config'
@@ -115,6 +122,7 @@ require 'mutant/cli'
 require 'mutant/cli/classifier'
 require 'mutant/cli/classifier/namespace'
 require 'mutant/cli/classifier/method'
+require 'mutant/cli/builder'
 require 'mutant/color'
 require 'mutant/differ'
 require 'mutant/reporter'

data/mutant.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[TODO LICENSE]
   gem.executables      = %w[mutant]
 
-  gem.add_runtime_dependency('parser',              '~> 2.0.0.pre6')
-  gem.add_runtime_dependency('unparser',            '~> 0.0.14')
-  gem.add_runtime_dependency('ice_nine',            '~> 0.8.0')
+  gem.add_runtime_dependency('parser',              '~> 2.0.0.pre7')
+  gem.add_runtime_dependency('unparser',            '~> 0.1.1')
+  gem.add_runtime_dependency('ice_nine',            '~> 0.8')
   gem.add_runtime_dependency('descendants_tracker', '~> 0.0.1')
-  gem.add_runtime_dependency('adamantium',          '~> 0.0.10')
-  gem.add_runtime_dependency('equalizer',           '~> 0.0.5')
+  gem.add_runtime_dependency('adamantium',          '~> 0.1.0')
+  gem.add_runtime_dependency('equalizer',           '~> 0.0.7')
   gem.add_runtime_dependency('inflecto',            '~> 0.0.2')
-  gem.add_runtime_dependency('anima',               '~> 0.0.6')
-  gem.add_runtime_dependency('concord',             '~> 0.1.3')
+  gem.add_runtime_dependency('anima',               '~> 0.1.1')
+  gem.add_runtime_dependency('concord',             '~> 0.1.4')
   gem.add_runtime_dependency('rspec',               '~> 2.14.1')
 
   gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')

data/spec/integration/mutant/rspec_spec.rb

@@ -10,17 +10,24 @@ describe Mutant, 'rspec integration' do
     end
   end
 
+  let(:base_cmd) { 'bundle exec mutant -I lib --require test_app --rspec' }
+
   specify 'it allows to kill mutations' do
-    Kernel.system('bundle exec mutant --rspec ::TestApp::Literal#string').should be(true)
+    Kernel.system("#{base_cmd} ::TestApp::Literal#string').should be(true)")
+  end
+
+  specify 'it allows to exclude mutations' do
+    cli = "#{base_cmd} ::TestApp::Literal#string --ignore-subject ::TestApp::Literal#uncovered_string"
+    Kernel.system(cli).should be(true)
   end
 
-  pending 'fails to kill mutations when they are not covered' do
-    cli = 'bundle exec mutant --rspec ::TestApp::Literal#uncovered_string'
+  specify 'fails to kill mutations when they are not covered' do
+    cli = "#{base_cmd} ::TestApp::Literal#uncovered_string"
     Kernel.system(cli).should be(false)
   end
 
-  pending 'fails when some mutations when are not covered' do
-    cli = 'bundle exec mutant --rspec ::TestApp::Literal'
+  specify 'fails when some mutations are not covered' do
+    cli = "#{base_cmd} ::TestApp::Literal"
     Kernel.system(cli).should be(false)
   end
 end

data/spec/shared/mutator_behavior.rb

@@ -86,8 +86,9 @@ shared_examples_for 'a mutator' do
       if message.any?
 
         message = sprintf(
-          "Original:\n%s\n-----\n%s",
+          "Original:\n%s\n%s\n-----\n%s",
           generate(node),
+          node.inspect,
           message.join("\n-----\n")
         )
 

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
 
-require 'equalizer'
-require 'devtools/spec_helper'
-
 if ENV['COVERAGE'] == 'true'
   require 'simplecov'
   require 'coveralls'
@@ -13,14 +10,19 @@ if ENV['COVERAGE'] == 'true'
  ]
 
   SimpleCov.start do
-    command_name     'spec:unit'
-    add_filter       'config'
-    add_filter       'spec'
-    add_filter       'test_app'
-    minimum_coverage 89.56  # TODO: raise this to 100, then mutation test
+    command_name 'spec:unit'
+
+    add_filter 'config'
+    add_filter 'spec'
+    add_filter 'vendor'
+    add_filter 'test_app'
+
+    minimum_coverage 90.1  # TODO: raise this to 100, then mutation test
   end
 end
 
+require 'equalizer'
+require 'devtools/spec_helper'
 require 'mutant'
 
 $LOAD_PATH << File.join(TestApp.root, 'lib')
@@ -45,7 +47,7 @@ RSpec.configure do |config|
   config.include(CompressHelper)
   config.include(ParserHelper)
   config.include(Mutant::NodeHelpers)
-  config.mock_with :rspec do |rspec|
+  config.expect_with :rspec do |rspec|
     rspec.syntax = [:expect, :should]
   end
 end

data/spec/unit/mutant/cli/builder/rspec_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mutant::CLI::Builder::Rspec do
+
+  let(:option_parser) { OptionParser.new }
+
+  let(:cache)  { Mutant::Cache.new                         }
+  let(:object) { described_class.new(cache, option_parser) }
+  let(:level)  { double('Level')                           }
+
+  let(:default_strategy) do
+    Mutant::Strategy::Rspec.new(0)
+  end
+
+  let(:altered_strategy) do
+    Mutant::Strategy::Rspec.new(1)
+  end
+
+  describe 'default' do
+    specify do
+      object
+      option_parser.parse!(%w[--rspec])
+      expect(object.output).to eql(default_strategy)
+    end
+  end
+
+  describe 'parsing a level' do
+
+    specify do
+      object
+      option_parser.parse!(%w[--rspec --rspec-level 1])
+      expect(object.output).to eql(altered_strategy)
+    end
+  end
+
+end

data/spec/unit/mutant/cli/classifier/{method/each_spec.rb → method_spec.rb}

@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 describe Mutant::CLI::Classifier::Method, '#each' do
-  let(:object)           { described_class.build(cache, input) }
+
+  let(:object)           { described_class.run(cache, input) }
   let(:cache)            { Mutant::Cache.new                   }
   let(:instance_method)  { '::TestApp::Literal#string'         }
   let(:singleton_method) { '::TestApp::Literal.string'         }
@@ -72,18 +73,5 @@ describe Mutant::CLI::Classifier::Method, '#each' do
           .to yield_with_args(Mutant::Subject::Method::Singleton)
       end
     end
-
-    context 'with an unknown method' do
-      let(:input) { unknown_method }
-
-      it 'returns an enumerator' do
-        should be_instance_of(to_enum.class)
-      end
-
-      it 'raises an exception when #each is called' do
-        expect { subject.each {} }
-          .to raise_error(NameError, "Cannot find method #{input}")
-      end
-    end
   end
 end

data/spec/unit/mutant/cli/classifier/namespace/{flat/each_spec.rb → flat_spec.rb}

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Mutant::CLI::Classifier::Namespace::Flat, '#each' do
-  let(:object)            { described_class.build(cache, input) }
+  let(:object)            { described_class.run(cache, input) }
   let(:cache)             { Mutant::Cache.new                   }
   let(:known_namespace)   { '::TestApp::Literal'                }
   let(:unknown_namespace) { '::TestApp::Object'                 }

data/spec/unit/mutant/cli/classifier/namespace/{recursive/each_spec.rb → recursive_spec.rb}

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Mutant::CLI::Classifier::Namespace::Recursive, '#each' do
-  let(:object)            { described_class.build(cache, "#{input}*") }
+  let(:object)            { described_class.run(cache, "#{input}*") }
   let(:cache)             { Mutant::Cache.new                         }
   let(:known_namespace)   { '::TestApp::Literal'                      }
   let(:unknown_namespace) { '::TestApp::Object'                       }

data/spec/unit/mutant/cli/classifier_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mutant::CLI::Classifier, '.run' do
+  subject { described_class.run(cache, input) }
+
+  let(:cache) { double('Cache') }
+
+  this_spec = 'Mutant::CLI::Classifier.build'
+
+  shared_examples_for this_spec do
+    it 'shoud return expected instance' do
+      should eql(expected_matcher)
+    end
+
+    let(:expected_class) { Mutant::CLI::Classifier::Method }
+  end
+
+  context 'with explicit toplevel scope' do
+
+    let(:input) { '::TestApp::Literal#string' }
+
+    let(:expected_matcher) do
+      Mutant::Matcher::Method::Instance.new(cache, TestApp::Literal, TestApp::Literal.instance_method(:string))
+    end
+
+    include_examples this_spec
+  end
+
+  context 'with instance method notation' do
+
+    let(:input) { 'TestApp::Literal#string' }
+
+    let(:expected_matcher) do
+      Mutant::Matcher::Method::Instance.new(cache, TestApp::Literal, TestApp::Literal.instance_method(:string))
+    end
+
+    include_examples this_spec
+  end
+
+  context 'with singleton method notation' do
+    let(:input) { 'TestApp::Literal.string' }
+
+    let(:expected_matcher) do
+      Mutant::Matcher::Method::Singleton.new(cache, TestApp::Literal, TestApp::Literal.method(:string))
+    end
+
+    include_examples this_spec
+  end
+
+  context 'with invalid notation' do
+    let(:input) { '::' }
+
+    it 'should return nil' do
+      expect { subject }.to raise_error(Mutant::CLI::Error, "No matcher handles: #{input.inspect}")
+    end
+  end
+end