mutant 0.7.4 → 0.7.5

data/lib/mutant/expression.rb

@@ -37,6 +37,33 @@ module Mutant
       @inspect = format(INSPECT_FORMAT, syntax)
     end
 
+    # Return marshallable representation
+    #
+    # FIXME: Remove the need for this.
+    #
+    #   Refactoring Expression objects not to reference a MatchData instance.
+    #   This will make this hack unneeded.
+    #
+    # @return [String]
+    #
+    # @api private
+    #
+    def _dump(_level)
+      syntax
+    end
+
+    # Load serializable representation
+    #
+    # @return [String]
+    #
+    # @return [Expression]
+    #
+    # @api private
+    #
+    def self._load(syntax)
+      parse(syntax)
+    end
+
     # Return inspection
     #
     # @return [String]

data/lib/mutant/expression/namespace.rb

@@ -37,7 +37,7 @@ module Mutant
 
         # Return matcher
         #
-        # @param [Env] env
+        # @param [Env::Bootstrap] env
         #
         # @return [Matcher]
         #
@@ -74,7 +74,7 @@ module Mutant
 
         # Return matcher
         #
-        # @param [Cache] env
+        # @param [Env::Bootstrap] env
         #
         # @return [Matcher]
         #

data/lib/mutant/matcher/method.rb

@@ -123,7 +123,7 @@ module Mutant
       def subject
         node = matched_node_path.last
         return unless node
-        self.class::SUBJECT_CLASS.new(env.config, context, node)
+        self.class::SUBJECT_CLASS.new(context, node)
       end
       memoize :subject
 

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

@@ -7,7 +7,7 @@ module Mutant
 
         # Dispatching builder, detects memoizable case
         #
-        # @param [Env] env
+        # @param [Env::Boostrap] env
         # @param [Class, Module] scope
         # @param [UnboundMethod] method
         #

data/lib/mutant/mutation.rb

@@ -7,34 +7,6 @@ module Mutant
     CODE_DELIMITER = "\0".freeze
     CODE_RANGE     = (0..4).freeze
 
-    # Kill mutation under isolation with integration
-    #
-    # @param [Isolation] isolation
-    # @param [Integration] integration
-    #
-    # @return [Result::Test]
-    #
-    # @api private
-    #
-    # rubocop:disable MethodLength
-    #
-    def kill(isolation, integration)
-      start = Time.now
-      tests = subject.tests
-
-      isolation.call do
-        insert
-        integration.call(tests)
-      end.update(tests: tests)
-    rescue Isolation::Error => error
-      Result::Test.new(
-        tests:   tests,
-        output:  error.message,
-        runtime: Time.now - start,
-        passed:  false
-      )
-    end
-
     # Return identification
     #
     # @return [String]
@@ -90,8 +62,6 @@ module Mutant
       self::TEST_PASS_SUCCESS.equal?(test_result.passed)
     end
 
-  private
-
     # Insert mutated node
     #
     # FIXME: Cache subject visibility in a better way! Ideally dont mutate it
@@ -109,6 +79,8 @@ module Mutant
       self
     end
 
+  private
+
     # Return sha1 sum of source and subject identification
     #
     # @return [String]

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

@@ -16,9 +16,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          Util::Array.each(children, self) do |children|
-            emit_child_subset(children)
-          end
+          Util::Array.each(children, self, &method(:emit_child_subset))
           children.each_with_index do |child, index|
             mutate_child(index)
             emit(child) unless children.eql?([child])

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

@@ -30,8 +30,8 @@ module Mutant
         # @api private
         #
         def mutate_condition
-          emit_condition_mutations do |condition|
-            !n_self?(condition)
+          emit_condition_mutations do |node|
+            !n_self?(node)
           end
           emit_type(n_not(condition), if_branch, else_branch) unless n_match_current_line?(condition)
           emit_type(N_TRUE,  if_branch, else_branch)

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

@@ -201,7 +201,7 @@ module Mutant
           #
           def run
             info 'Mutant configuration:'
-            info 'Matcher:         %s',      object.matcher_config.inspect
+            info 'Matcher:         %s',      object.matcher.inspect
             info 'Integration:     %s',      object.integration.name
             info 'Expect Coverage: %0.2f%%', object.expected_coverage.inspect
             info 'Jobs:            %d',      object.jobs
@@ -295,7 +295,7 @@ module Mutant
         # Subject report printer
         class SubjectResult < self
 
-          delegate :subject, :failed_mutations
+          delegate :subject, :failed_mutations, :tests
 
           # Run report printer
           #
@@ -305,7 +305,7 @@ module Mutant
           #
           def run
             status(subject.identification)
-            subject.tests.each do |test|
+            tests.each do |test|
               puts("- #{test.identification}")
             end
             visit_collection(MutationResult, object.alive_mutation_results)
@@ -400,6 +400,7 @@ module Mutant
           FORMAT = '(%02d/%02d) %3d%% - killtime: %0.02fs runtime: %0.02fs overhead: %0.02fs'.freeze
 
           delegate(
+            :tests,
             :subject,
             :coverage,
             :runtime,
@@ -452,7 +453,7 @@ module Mutant
           # @api private
           #
           def print_tests
-            subject.tests.each do |test|
+            tests.each do |test|
               puts "- #{test.identification}"
             end
           end

data/lib/mutant/result.rb

@@ -147,7 +147,7 @@ module Mutant
 
     # Subject result
     class Subject
-      include Coverage, Result, Anima.new(:subject, :mutation_results)
+      include Coverage, Result, Anima.new(:subject, :tests, :mutation_results)
 
       sum :killtime, :mutation_results
       sum :runtime,  :mutation_results

data/lib/mutant/runner.rb

@@ -72,11 +72,11 @@ module Mutant
     #
     def mutation_test_config
       Parallel::Config.new(
-        env:       config.actor_env,
+        env:       env.actor_env,
         jobs:      config.jobs,
         source:    Parallel::Source::Array.new(env.mutations),
-        sink:      Sink.new(env),
-        processor: env.method(:kill_mutation)
+        sink:      Sink::Mutation.new(env),
+        processor: env.method(:kill)
       )
     end
 

data/lib/mutant/runner/sink.rb

@@ -1,82 +1,115 @@
 module Mutant
   class Runner
-    # Mutation result sink
+    # Abstract base class for computation sinks
     class Sink
-      include Concord.new(:env)
+      include AbstractType
 
-      # Initialize object
+      # Return sink status
       #
-      # @return [undefined]
+      # @return [Object]
       #
       # @api private
       #
-      def initialize(*)
-        super
-        @start           = Time.now
-        @subject_results = Hash.new do |_hash, subject|
-          Result::Subject.new(
-            subject:          subject,
-            mutation_results: []
-          )
-        end
-      end
-
-      # Return runner status
-      #
-      # @return [Status]
-      #
-      # @api private
-      #
-      def status
-        env_result
-      end
+      abstract_method :status
 
-      # Test if scheduling stopped
+      # Test if computation should be stopped
       #
       # @return [Boolean]
       #
       # @api private
       #
-      def stop?
-        env.config.fail_fast && !env_result.subject_results.all?(&:success?)
-      end
+      abstract_method :stop?
 
-      # Handle mutation finish
+      # Consume result
       #
-      # @param [Result::Mutation] mutation_result
+      # @param [Object] result
       #
       # @return [self]
       #
       # @api private
       #
-      def result(mutation_result)
-        mutation = mutation_result.mutation
+      abstract_method :result
 
-        original = @subject_results[mutation.subject]
+      # Mutation result sink
+      class Mutation < self
+        include Concord.new(:env)
 
-        @subject_results[mutation.subject] = original.update(
-          mutation_results: (original.mutation_results.dup << mutation_result)
-        )
+        # Initialize object
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def initialize(*)
+          super
+          @start           = Time.now
+          @subject_results = Hash.new do |_hash, subject|
+            Result::Subject.new(
+              subject:          subject,
+              tests:            [],
+              mutation_results: []
+            )
+          end
+        end
 
-        self
-      end
+        # Return runner status
+        #
+        # @return [Status]
+        #
+        # @api private
+        #
+        def status
+          env_result
+        end
 
-    private
+        # Test if scheduling stopped
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def stop?
+          env.config.fail_fast && !env_result.subject_results.all?(&:success?)
+        end
 
-      # Return current result
-      #
-      # @return [Result::Env]
-      #
-      # @api private
-      #
-      def env_result
-        Result::Env.new(
-          env:             env,
-          runtime:         Time.now - @start,
-          subject_results: @subject_results.values
-        )
-      end
+        # Handle mutation finish
+        #
+        # @param [Result::Mutation] mutation_result
+        #
+        # @return [self]
+        #
+        # @api private
+        #
+        def result(mutation_result)
+          mutation = mutation_result.mutation
+
+          original = @subject_results[mutation.subject]
+
+          @subject_results[mutation.subject] = original.update(
+            mutation_results: (original.mutation_results.dup << mutation_result),
+            tests:            mutation_result.test_result.tests
+          )
+
+          self
+        end
+
+      private
+
+        # Return current result
+        #
+        # @return [Result::Env]
+        #
+        # @api private
+        #
+        def env_result
+          Result::Env.new(
+            env:             env,
+            runtime:         Time.now - @start,
+            subject_results: @subject_results.values
+          )
+        end
 
-    end # Scheduler
+      end # Mutation
+    end # Sink
   end # Runner
 end # Mutant

data/lib/mutant/selector.rb

@@ -0,0 +1,17 @@
+module Mutant
+  # Abstract base class for test selectors
+  class Selector
+    include AbstractType, Adamantium::Flat
+
+    # Return tests for subject
+    #
+    # @param [Subject] subjecto
+    #
+    # @return [Enumerable<Test>]
+    #
+    # @api private
+    #
+    abstract_method :call
+
+  end # Selector
+end # Mutant

data/lib/mutant/selector/expression.rb

@@ -0,0 +1,28 @@
+module Mutant
+  class Selector
+    # Expression based test selector
+    class Expression < self
+      include Concord.new(:integration)
+
+      # Return tests for subject
+      #
+      # @param [Subject] subject
+      #
+      # @return [Enumerable<Test>]
+      #
+      # @api private
+      #
+      def call(subject)
+        subject.match_expressions.each do |match_expression|
+          subject_tests = integration.all_tests.select do |test|
+            match_expression.prefix?(test.expression)
+          end
+          return subject_tests if subject_tests.any?
+        end
+
+        EMPTY_ARRAY
+      end
+
+    end # Expression
+  end # Selector
+end # Mutant

data/lib/mutant/subject.rb

@@ -2,7 +2,7 @@ module Mutant
   # Subject of a mutation
   class Subject
     include AbstractType, Adamantium::Flat, Enumerable
-    include Concord::Public.new(:config, :context, :node)
+    include Concord::Public.new(:context, :node)
 
     # Return mutations
     #
@@ -30,24 +30,6 @@ module Mutant
       context.source_path
     end
 
-    # Return tests for mutation
-    #
-    # @return [Array<Test>]
-    #
-    # @api private
-    #
-    def tests
-      match_expressions.each do |match_expression|
-        tests = config.integration.all_tests.select do |test|
-          match_expression.prefix?(test.expression)
-        end
-        return tests if tests.any?
-      end
-
-      EMPTY_ARRAY
-    end
-    memoize :tests
-
     # Prepare the subject for the insertion of mutation
     #
     # @return [self]