mutant 0.7.3 → 0.7.4

data/lib/mutant/{runner → parallel}/worker.rb

@@ -1,27 +1,23 @@
 module Mutant
-  class Runner
-    # Mutation killing worker receiving work from parent
+  module Parallel
+    # Parallel execution worker
     class Worker
-      include Adamantium::Flat, Anima.new(:config, :id, :parent)
-
-      private_class_method :new
+      include Adamantium::Flat, Anima.new(:actor, :processor, :parent)
 
       # Run worker
       #
       # @param [Hash<Symbol, Object] attributes
       #
-      # @return [Actor::Sender]
+      # @return [self]
       #
       # @api private
       #
       def self.run(attributes)
-        attributes.fetch(:config).actor_env.spawn do |actor|
-          worker = new(attributes)
-          worker.__send__(:run, actor)
-        end
+        new(attributes).run
+        self
       end
 
-    private
+      private_class_method :new
 
       # Worker loop
       #
@@ -31,12 +27,14 @@ module Mutant
       #
       # rubocop:disable Lint/Loop
       #
-      def run(actor)
+      def run
         begin
           parent.call(Actor::Message.new(:ready, actor.sender))
         end until handle(actor.receiver.call)
       end
 
+    private
+
       # Handle job
       #
       # @param [Message] message
@@ -67,25 +65,10 @@ module Mutant
       # @api private
       #
       def handle_job(job)
-        parent.call(Actor::Message.new(:result, JobResult.new(job: job, result: run_mutation(job.mutation))))
-      end
-
-      # Run mutation
-      #
-      # @param [Mutation] mutation
-      #
-      # @return [Result::Mutation]
-      #
-      # @api private
-      #
-      def run_mutation(mutation)
-        test_result = mutation.kill(config.isolation, config.integration)
-        Result::Mutation.new(
-          mutation:    mutation,
-          test_result: test_result
-        )
+        result = processor.call(job.payload)
+        parent.call(Actor::Message.new(:result, JobResult.new(job: job, payload: result)))
       end
 
     end # Worker
-  end # Runner
+  end # Parallel
 end # Mutant

data/lib/mutant/reporter/cli.rb

@@ -14,13 +14,11 @@ module Mutant
       #
       def self.build(output)
         tty = output.respond_to?(:tty?) && output.tty?
-        format =
-          if !Mutant.ci? && tty && Tput::INSTANCE.available
-            Format::Framed.new(tty:  tty, tput: Tput::INSTANCE)
-          else
-            Format::Progressive.new(tty: tty)
-          end
-
+        format = if !Mutant.ci? && tty && Tput::INSTANCE.available
+          Format::Framed.new(tty:  tty, tput: Tput::INSTANCE)
+        else
+          Format::Progressive.new(tty: tty)
+        end
         new(output, format)
       end
 
@@ -39,15 +37,14 @@ module Mutant
 
       # Report progress object
       #
-      # @param [Runner::Collector] collector
+      # @param [Parallel::Status] status
       #
       # @return [self]
       #
       # @api private
       #
-      def progress(collector)
-        write(format.progress(collector))
-
+      def progress(status)
+        write(format.progress(status))
         self
       end
 

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

@@ -137,7 +137,7 @@ module Mutant
         # Printer for runner status
         class Status < self
 
-          delegate(:active_jobs, :env_result)
+          delegate(:active_jobs, :payload)
 
           # Print progress for collector
           #
@@ -146,7 +146,7 @@ module Mutant
           # @api private
           #
           def run
-            visit(EnvProgress, object.env_result)
+            visit(EnvProgress, payload)
             info('Active subjects: %d', active_subject_results.length)
             visit_collection(SubjectProgress, active_subject_results)
             job_status
@@ -164,8 +164,8 @@ module Mutant
           def job_status
             return if active_jobs.empty?
             info('Active Jobs:')
-            object.active_jobs.sort_by(&:index).each do |job|
-              info('%d: %s', job.index, job.mutation.identification)
+            active_jobs.sort_by(&:index).each do |job|
+              info('%d: %s', job.index, job.payload.identification)
             end
           end
 
@@ -176,9 +176,10 @@ module Mutant
           # @api private
           #
           def active_subject_results
-            active_subjects = active_jobs.map(&:mutation).flat_map(&:subject).to_set
+            active_mutation_jobs = active_jobs.select { |job| job.payload.kind_of?(Mutant::Mutation) }
+            active_subjects = active_mutation_jobs.map(&:payload).flat_map(&:subject).to_set
 
-            env_result.subject_results.select do |subject_result|
+            payload.subject_results.select do |subject_result|
               active_subjects.include?(subject_result.subject)
             end
           end
@@ -196,6 +197,8 @@ module Mutant
           #
           # @api private
           #
+          # rubocop:disable AbcSize
+          #
           def run
             info 'Mutant configuration:'
             info 'Matcher:         %s',      object.matcher_config.inspect
@@ -230,6 +233,8 @@ module Mutant
           #
           # @api private
           #
+          # rubocop:disable MethodLength
+          #
           def run
             visit(Config, env.config)
             info 'Subjects:        %s',        amount_subjects
@@ -385,7 +390,7 @@ module Mutant
           # @api private
           #
           def object
-            super().env_result
+            super().payload
           end
         end
 
@@ -479,7 +484,8 @@ module Mutant
 
           delegate :mutation, :test_result
 
-          DIFF_ERROR_MESSAGE = 'BUG: Mutation NOT resulted in exactly one diff hunk. Please report a reproduction!'.freeze
+          DIFF_ERROR_MESSAGE =
+            'BUG: Mutation NOT resulted in exactly one diff hunk. Please report a reproduction!'.freeze
 
           MAP = {
             Mutant::Mutation::Evil    => :evil_details,

data/lib/mutant/result.rb

@@ -98,16 +98,6 @@ module Mutant
       end
       memoize :success?
 
-      # Test if runner should continue on env
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def continue?
-        !env.config.fail_fast || subject_results.all?(&:success?)
-      end
-
       # Return failed subject results
       #
       # @return [Array<Result::Subject>]

data/lib/mutant/runner.rb

@@ -3,25 +3,6 @@ module Mutant
   class Runner
     include Adamantium::Flat, Concord.new(:env), Procto.call(:result)
 
-    # Status of the runner execution
-    class Status
-      include Adamantium, Anima::Update, Anima.new(
-        :env_result,
-        :active_jobs,
-        :done
-      )
-    end # Status
-
-    # Job to push to workers
-    class Job
-      include Adamantium::Flat, Anima.new(:index, :mutation)
-    end # Job
-
-    # Job result object received from workers
-    class JobResult
-      include Adamantium::Flat, Anima.new(:job, :result)
-    end
-
     # Initialize object
     #
     # @return [undefined]
@@ -32,37 +13,72 @@ module Mutant
       super
 
       reporter.start(env)
+
+      run_mutation_analysis
+    end
+
+    # Return result
+    #
+    # @return [Result::Env]
+    #
+    # @api private
+    #
+    attr_reader :result
+
+  private
+
+    # Run mutation analysis
+    #
+    #  @return [undefined]
+    #
+    #  @api private
+    #
+    def run_mutation_analysis
       config.integration.setup
 
-      @master = config.actor_env.new_mailbox.bind(Master.call(env))
+      @result = run_driver(Parallel.async(mutation_test_config))
+      reporter.report(@result)
+    end
 
+    # Run driver
+    #
+    # @param [Driver] driver
+    #
+    # @return [Object]
+    #   the last returned status payload
+    #
+    # @api private
+    #
+    def run_driver(driver)
       status = nil
 
       loop do
-        status = current_status
-        break if status.done
+        status = driver.status
         reporter.progress(status)
+        break if status.done
         Kernel.sleep(reporter.delay)
       end
 
-      reporter.progress(status)
-
-      @master.call(:stop)
-
-      @result = status.env_result
+      driver.stop
 
-      reporter.report(@result)
+      status.payload
     end
 
-    # Return result
+    # Return mutation test config
     #
-    # @return [Result::Env]
+    # @return [Parallell::Config]
     #
     # @api private
     #
-    attr_reader :result
-
-  private
+    def mutation_test_config
+      Parallel::Config.new(
+        env:       config.actor_env,
+        jobs:      config.jobs,
+        source:    Parallel::Source::Array.new(env.mutations),
+        sink:      Sink.new(env),
+        processor: env.method(:kill_mutation)
+      )
+    end
 
     # Return reporter
     #
@@ -84,15 +100,5 @@ module Mutant
       env.config
     end
 
-    # Return current status
-    #
-    # @return [Status]
-    #
-    # @api private
-    #
-    def current_status
-      @master.call(:status)
-    end
-
   end # Runner
 end # Mutant

data/lib/mutant/runner/{scheduler.rb → sink.rb}

@@ -1,7 +1,7 @@
 module Mutant
   class Runner
-    # Job scheduler
-    class Scheduler
+    # Mutation result sink
+    class Sink
       include Concord.new(:env)
 
       # Initialize object
@@ -12,9 +12,7 @@ module Mutant
       #
       def initialize(*)
         super
-        @index           = 0
         @start           = Time.now
-        @active_jobs     = Set.new
         @subject_results = Hash.new do |_hash, subject|
           Result::Subject.new(
             subject:          subject,
@@ -30,58 +28,17 @@ module Mutant
       # @api private
       #
       def status
-        Status.new(
-          env_result:  env_result,
-          done:        done?,
-          active_jobs: @active_jobs.dup
-        )
-      end
-
-      # Return next job
-      #
-      # @return [Job]
-      #   in case there is a next job
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      def next_job
-        return unless next_mutation?
-
-        Job.new(
-          mutation: mutations.fetch(@index),
-          index:    @index
-        ).tap do |job|
-          @index += 1
-          @active_jobs << job
-        end
+        env_result
       end
 
-      # Consume job result
-      #
-      # @param [JobResult] job_result
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def job_result(job_result)
-        @active_jobs.delete(job_result.job)
-        mutation_result(job_result.result)
-        self
-      end
-
-    private
-
-      # Test if mutation run is done
+      # Test if scheduling stopped
       #
       # @return [Boolean]
       #
       # @api private
       #
-      def done?
-        !env_result.continue? || (!next_mutation? && @active_jobs.empty?)
+      def stop?
+        env.config.fail_fast && !env_result.subject_results.all?(&:success?)
       end
 
       # Handle mutation finish
@@ -92,7 +49,7 @@ module Mutant
       #
       # @api private
       #
-      def mutation_result(mutation_result)
+      def result(mutation_result)
         mutation = mutation_result.mutation
 
         original = @subject_results[mutation.subject]
@@ -100,27 +57,11 @@ module Mutant
         @subject_results[mutation.subject] = original.update(
           mutation_results: (original.mutation_results.dup << mutation_result)
         )
-      end
 
-      # Test if a next mutation exist
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def next_mutation?
-        mutations.length > @index
+        self
       end
 
-      # Return mutations
-      #
-      # @return [Array<Mutation>]
-      #
-      # @api private
-      #
-      def mutations
-        env.mutations
-      end
+    private
 
       # Return current result
       #