mutant 0.5.23 → 0.5.24

data/lib/mutant/runner/killer.rb

@@ -28,6 +28,7 @@ module Mutant
       # @return [Boolean]
       #
       # @api private
+      #
       def success?
         @report.success?
       end
@@ -36,6 +37,8 @@ module Mutant
       #
       # @return [Boolean]
       #
+      # @api private
+      #
       def mutation_dead?
         test_report = report.test_report
         killer.mutation.should_fail? && test_report.failed?
@@ -59,6 +62,8 @@ module Mutant
 
       # Run killer
       #
+      # @return [undefined]
+      #
       # @api private
       #
       def run

data/lib/mutant/runner/subject.rb

@@ -64,7 +64,7 @@ module Mutant
       # @api private
       #
       def tests
-        config.strategy.tests(subject)
+        config.tests(subject)
       end
       memoize :tests
 

data/lib/mutant/subject.rb

@@ -54,7 +54,7 @@ module Mutant
     # @api private
     #
     def identification
-      "#{match_expression}:#{source_path}:#{source_line}"
+      "#{expression.syntax}:#{source_path}:#{source_line}"
     end
     memoize :identification
 
@@ -94,22 +94,22 @@ module Mutant
 
     # Return match expression
     #
-    # @return [String]
+    # @return [Expression]
     #
     # @api private
     #
-    abstract_method :match_expression
+    abstract_method :expression
 
-    # Return match prefixes
+    # Return match expressions
     #
-    # @return [Enumerable<String>]
+    # @return [Enumerable<Expression>]
     #
     # @api private
     #
-    def match_prefixes
-      [match_expression].concat(context.match_prefixes)
+    def match_expressions
+      [expression].concat(context.match_expressions)
     end
-    memoize :match_prefixes
+    memoize :match_expressions
 
   private
 

data/lib/mutant/subject/method.rb

@@ -27,9 +27,10 @@ module Mutant
       #
       # @api private
       #
-      def match_expression
-        "#{context.identification}#{self.class::SYMBOL}#{name}"
+      def expression
+        Expression.parse("#{context.identification}#{self.class::SYMBOL}#{name}")
       end
+      memoize :expression
 
     private
 

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

@@ -39,7 +39,7 @@ module Mutant
 
         # Mutator for memoized instance methods
         class Memoized < self
-          include NodeHelpers
+          include AST::Sexp
 
           # Return source
           #

data/lib/mutant/test.rb

@@ -1,65 +1,7 @@
 module Mutant
   # Abstract base class for test that might kill a mutation
   class Test
-    include AbstractType, Adamantium::Flat
-
-    # Object to report test status
-    class Report
-      include Adamantium::Flat, Anima::Update, Anima.new(
-        :test,
-        :output,
-        :success
-      )
-
-      alias_method :success?, :success
-
-      # Test if test failed
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def failed?
-        !success?
-      end
-
-      # Return marshallable data
-      #
-      # NOTE:
-      #
-      #  The test is intentionally NOT part of the mashalled data.
-      #  In rspec the example group cannot deterministically being marshalled, because
-      #  they reference a crazy mix of IO objects, global objects etc.
-      #
-      # @return [Array]
-      #
-      # @api private
-      #
-      def marshal_dump
-        [@output, @success]
-      end
-
-      # Load marshalled data
-      #
-      # @param [Array] arry
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def marshal_load(array)
-        @output, @success = array
-      end
-
-    end # Report
-
-    # Run tests
-    #
-    # @return [Test::Result]
-    #
-    # @api private
-    #
-    abstract_method :run
+    include Adamantium::Flat, Concord::Public.new(:integration, :expression)
 
     # Return test identification
     #
@@ -68,19 +10,19 @@ module Mutant
     # @api private
     #
     def identification
-      "#{self.class::PREFIX}:#{subject_identification}"
+      "#{integration.name}:#{expression.syntax}"
     end
     memoize :identification
 
-    # Return subject identification
+    # Run test, return report
     #
-    # This method is used for current mutants primitive test selection.
-    #
-    # @return [String]
+    # @return [Report]
     #
     # @api private
     #
-    abstract_method :subject_identification
+    def run
+      integration.run(self)
+    end
 
   end # Test
 end # Mutant

data/lib/mutant/test/report.rb

@@ -0,0 +1,59 @@
+module Mutant
+  class Test
+    # Object to report test status
+    class Report
+      include Adamantium::Flat, Anima::Update, Anima.new(
+        :test,
+        :output,
+        :success
+      )
+
+      # Test if test was successful
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      #
+      alias_method :success?, :success
+
+      # Test if test failed
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      #
+      def failed?
+        !success?
+      end
+
+      # Return marshallable data
+      #
+      # NOTE:
+      #
+      #  The test is intentionally NOT part of the mashalled data.
+      #  In rspec the example group cannot deterministically being marshalled, because
+      #  they reference a crazy mix of IO objects, global objects etc.
+      #
+      # @return [Array]
+      #
+      # @api private
+      #
+      def marshal_dump
+        [@output, @success]
+      end
+
+      # Load marshalled data
+      #
+      # @param [Array] arry
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def marshal_load(array)
+        @output, @success = array
+      end
+
+    end # Report
+  end # Test
+end # Mutant

data/lib/mutant/version.rb

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

data/lib/mutant/warning_filter.rb

@@ -45,6 +45,8 @@ module Mutant
     #
     # @return [self]
     #
+    # @api private
+    #
     def write(message)
       if WARNING_PATTERN =~ message
         warnings << message

data/lib/mutant/zombifier.rb

@@ -34,10 +34,13 @@ module Mutant
     # @param [String] logical_name
     # @param [Symbol] namespace
     #
+    # @return [self]
+    #
     # @api private
     #
     def self.run(logical_name, namespace)
       new(namespace).run(logical_name)
+      self
     end
 
     # Run zombifier

data/lib/mutant/zombifier/file.rb

@@ -2,7 +2,7 @@ module Mutant
   class Zombifier
     # File containing source beeing zombified
     class File
-      include NodeHelpers, Adamantium::Flat, Concord::Public.new(:path)
+      include Adamantium::Flat, Concord::Public.new(:path), AST::Sexp
 
       # Zombify contents of file
       #

data/meta/or_asgn.rb

@@ -22,3 +22,14 @@ Mutant::Meta::Example.add do
   mutation '@a ||= -1'
   mutation '@a ||= 2'
 end
+
+Mutant::Meta::Example.add do
+  source 'foo[:bar] ||= 1'
+
+  singleton_mutations
+  mutation 'foo[:bar] ||= nil'
+  mutation 'foo[:bar] ||= self'
+  mutation 'foo[:bar] ||= 0'
+  mutation 'foo[:bar] ||= -1'
+  mutation 'foo[:bar] ||= 2'
+end

data/meta/send.rb

@@ -259,7 +259,7 @@ Mutant::Meta::Example.add do
   mutation 'self[*bar]'
 end
 
-(Mutant::BINARY_METHOD_OPERATORS - [:==, :eql?]).each do |operator|
+(Mutant::AST::Types::BINARY_METHOD_OPERATORS - [:==, :eql?]).each do |operator|
   Mutant::Meta::Example.add do
     source "true #{operator} false"
 

data/mutant-rspec.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
-  gem.files            = `git ls-files -- lib/mutant/rspec.rb lib/mutant/rspec`.split("\n")
+  gem.files            = `git ls-files -- lib/mutant/integration/rspec{,2,3}.rb`.split("\n")
   gem.test_files       = `git ls-files -- spec/{unit/mutant/rspec,integration/rspec}`.split("\n")
   gem.extra_rdoc_files = %w[TODO LICENSE]
 

data/mutant.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.require_paths    = %w[lib]
 
-  mutant_rspec_files = `git ls-files -- lib/mutant{-,/}rspec.rb lib/mutant/rspec`.split("\n")
+  mutant_rspec_files   = `git ls-files -- lib/mutant/integration/rspec{,2,3}.rb`.split("\n")
 
   gem.files            = `git ls-files`.split("\n") - mutant_rspec_files
   gem.test_files       = `git ls-files -- spec/{unit,integration}`.split("\n")

data/spec/integration/mutant/corpus_spec.rb

@@ -42,6 +42,8 @@ describe 'Mutant on ruby corpus' do
         devtools << "gem 'mutant', path: '#{relative}'\n"
         devtools << "gem 'mutant-rspec', path: '#{relative}'\n"
         File.write(repo_path.join('Gemfile.devtools'), devtools)
+        lockfile = repo_path.join('Gemfile.lock')
+        lockfile.delete if lockfile.exist?
         Bundler.with_clean_env do
           system('bundle install')
           system(%W[bundle exec mutant -I lib -r #{name} --score #{expect_coverage} --use rspec #{namespace}*])

data/spec/integration/mutant/test_mutator_handles_types_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe do
 
   specify 'mutant should not crash for any node parser can generate' do
-    Mutant::NODE_TYPES.each do |type|
-      Mutant::Mutator::Registry.lookup(Mutant::NodeHelpers.s(type))
+    Mutant::AST::Types::ALL.each do |type|
+      Mutant::Mutator::Registry.lookup(s(type))
     end
   end
 end

data/spec/spec_helper.rb

@@ -30,8 +30,8 @@ $LOAD_PATH << File.join(TestApp.root, 'lib')
 require 'test_app'
 
 module Fixtures
-  AST_CACHE = Mutant::Cache.new
-end
+  BOOT_ENV = Mutant::Env::Boot.new(Mutant::Reporter::CLI.new(STDERR), Mutant::Cache.new)
+end # Fixtures
 
 module ParserHelper
   def generate(node)
@@ -46,7 +46,8 @@ end
 RSpec.configure do |config|
   config.include(CompressHelper)
   config.include(ParserHelper)
-  config.include(Mutant::NodeHelpers)
+  config.include(Mutant::AST::Sexp)
+
   config.expect_with :rspec do |rspec|
     rspec.syntax = :expect
   end

data/spec/unit/mutant/cli_new_spec.rb

@@ -11,7 +11,7 @@ end
 shared_examples_for 'a cli parser' do
   subject { cli.config }
 
-  it { expect(subject.strategy).to eql(expected_strategy) }
+  it { expect(subject.integration).to eql(expected_integration) }
   it { expect(subject.reporter).to eql(expected_reporter) }
   it { expect(subject.matcher).to eql(expected_matcher)   }
 end
@@ -25,12 +25,12 @@ describe Mutant::CLI, '.new' do
   end
 
   # Defaults
-  let(:expected_filter)   { Morpher.evaluator(s(:true))        }
-  let(:expected_strategy) { Mutant::Strategy::Null.new         }
-  let(:expected_reporter) { Mutant::Reporter::CLI.new($stdout) }
+  let(:expected_filter)      { Morpher.evaluator(s(:true))        }
+  let(:expected_integration) { Mutant::Integration::Null.new      }
+  let(:expected_reporter)    { Mutant::Reporter::CLI.new($stdout) }
 
-  let(:ns)    { Mutant::Matcher   }
-  let(:cache) { Mutant::Cache.new }
+  let(:ns)    { Mutant::Matcher    }
+  let(:env)   { Fixtures::BOOT_ENV }
 
   let(:cli) { object.new(arguments) }
 
@@ -71,7 +71,7 @@ describe Mutant::CLI, '.new' do
     let(:arguments)        { %w[TestApp::Literal#float] }
 
     let(:expected_matcher) do
-      ns::Method::Instance.new(cache, TestApp::Literal, TestApp::Literal.instance_method(:float))
+      ns::Method::Instance.new(env, TestApp::Literal, TestApp::Literal.instance_method(:float))
     end
 
     it_should_behave_like 'a cli parser'
@@ -80,7 +80,7 @@ describe Mutant::CLI, '.new' do
   context 'with debug flag' do
     let(:pattern)          { 'TestApp*'           }
     let(:arguments)        { %W[--debug #{pattern}] }
-    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
+    let(:expected_matcher) { ns::Namespace.new(env, Mutant::Expression.parse(pattern)) }
 
     it_should_behave_like 'a cli parser'
 
@@ -92,7 +92,7 @@ describe Mutant::CLI, '.new' do
   context 'with zombie flag' do
     let(:pattern)          { 'TestApp*'            }
     let(:arguments)        { %W[--zombie #{pattern}] }
-    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
+    let(:expected_matcher) { ns::Namespace.new(env, Mutant::Expression.parse(pattern)) }
 
     it_should_behave_like 'a cli parser'
 
@@ -104,7 +104,7 @@ describe Mutant::CLI, '.new' do
   context 'with namespace pattern' do
     let(:pattern)          { 'TestApp*' }
     let(:arguments)        { [pattern]    }
-    let(:expected_matcher) { ns::Namespace.new(cache, 'TestApp') }
+    let(:expected_matcher) { ns::Namespace.new(env, Mutant::Expression.parse(pattern)) }
 
     it_should_behave_like 'a cli parser'
   end
@@ -124,7 +124,7 @@ describe Mutant::CLI, '.new' do
 
     let(:expected_matcher) do
       matcher = ns::Method::Instance.new(
-        cache,
+        env,
         TestApp::Literal, TestApp::Literal.instance_method(:float)
       )
       predicate = Morpher.compile(