mutant 0.6.7 → 0.7.1

data/lib/mutant/actor/sender.rb

@@ -0,0 +1,27 @@
+module Mutant
+  module Actor
+
+    # Sender for messages to acting thread
+    class Sender
+      include Concord.new(:thread, :mutex, :mailbox)
+
+      # Send a message to actor
+      #
+      # @param [Object] message
+      #
+      # @return [self]
+      #
+      # @api private
+      #
+      def call(message)
+        mutex.synchronize do
+          mailbox << message
+          thread.run
+        end
+
+        self
+      end
+
+    end # Sender
+  end # Actor
+end # Mutant

data/lib/mutant/ast/types.rb

@@ -18,7 +18,7 @@ module Mutant
       INDEX_OPERATORS        = symbolset.(%w[[] []=])
       UNARY_METHOD_OPERATORS = symbolset.(%w[~@ +@ -@ !])
 
-      # Operators ruby implementeds as methods
+      # Operators ruby implements as methods
       METHOD_OPERATORS = symbolset.(%w[
         <=> === []= [] <= >= == !~ != =~ <<
         >> ** * % / | ^ & < > + - ~@ +@ -@ !

data/lib/mutant/cli.rb

@@ -128,6 +128,8 @@ module Mutant
     def setup_integration(name)
       require "mutant/integration/#{name}"
       update(integration: Integration.lookup(name))
+    rescue LoadError
+      fail Error, "Could not load integration #{name.inspect} (you may want to try installing the gem mutant-#{name})"
     end
 
     # Add options

data/lib/mutant/config.rb

@@ -12,7 +12,8 @@ module Mutant
       :fail_fast,
       :jobs,
       :zombie,
-      :expected_coverage
+      :expected_coverage,
+      :actor_env
     )
 
     [:fail_fast, :zombie, :debug].each do |name|

data/lib/mutant/env.rb

@@ -3,6 +3,10 @@ module Mutant
   class Env
     include Adamantium::Flat, Concord::Public.new(:config, :cache)
 
+    SEMANTICS_MESSAGE =
+      "Fix your lib to follow normal ruby semantics!\n" \
+      '{Module,Class}#name should return resolvable constant name as String or nil'.freeze
+
     # Return new env
     #
     # @param [Config] config
@@ -86,7 +90,7 @@ module Mutant
     def scope_name(scope)
       scope.name
     rescue => exception
-      warn("#{scope.class}#name from: #{scope.inspect} raised an error: #{exception.inspect} fix your lib to follow normal ruby semantics!")
+      warn("#{scope.class}#name from: #{scope.inspect} raised an error: #{exception.inspect}. #{SEMANTICS_MESSAGE}")
       nil
     end
 
@@ -106,7 +110,7 @@ module Mutant
       name = scope_name(scope) or return
 
       unless name.is_a?(String)
-        warn("#{scope.class}#name from: #{scope.inspect} returned #{name.inspect} instead String or nil. Fix your lib to follow normal ruby semantics!")
+        warn("#{scope.class}#name from: #{scope.inspect} returned #{name.inspect}. #{SEMANTICS_MESSAGE}")
         return
       end
 

data/lib/mutant/expression/methods.rb

@@ -1,7 +1,7 @@
 module Mutant
   class Expression
 
-    # Abstrat base class for methods expression
+    # Abstract base class for methods expression
     class Methods < self
 
       MATCHERS = IceNine.deep_freeze(

data/lib/mutant/integration.rb

@@ -16,7 +16,7 @@ module Mutant
     # @api private
     #
     def self.lookup(name)
-      REGISTRY.fetch(name).build
+      REGISTRY.fetch(name).new
     end
 
     # Register integration
@@ -44,6 +44,16 @@ module Mutant
       self
     end
 
+    # Return test result for tests
+    #
+    # @param [Enumerable<Test>] tests
+    #
+    # @return [Result::Test]
+    #
+    # @api private
+    #
+    abstract_method :call
+
     # Return all available tests by integration
     #
     # @return [Enumerable<Test>]

data/lib/mutant/isolation.rb

@@ -50,8 +50,7 @@ module Mutant
         end
 
         writer.close
-        result = Marshal.load(reader.read)
-        result
+        Marshal.load(reader.read)
       rescue => exception
         fail Error, exception
       ensure

data/lib/mutant/meta/example.rb

@@ -66,7 +66,7 @@ module Mutant
 
       private
 
-        # Return unexpected mutationso
+        # Return unexpected mutations
         #
         # @return [Array<Parser::AST::Node>]
         #

data/lib/mutant/mutation.rb

@@ -7,21 +7,30 @@ module Mutant
     CODE_DELIMITER = "\0".freeze
     CODE_RANGE     = (0..4).freeze
 
-    # Insert mutated node
+    # Kill mutation under isolation with integration
     #
-    # FIXME: Cache subject visibility in a better way! Ideally dont mutate it
-    #   implicitly. Also subject.public? should NOT be a public interface it
-    #   is a detail of method mutations.
+    # @param [Isolation] isolation
+    # @param [Integration] integration
     #
-    # @return [self]
+    # @return [Result::Test]
     #
     # @api private
     #
-    def insert
-      subject.public?
-      subject.prepare
-      Loader::Eval.call(root, subject)
-      self
+    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
@@ -67,20 +76,37 @@ module Mutant
       subject.source
     end
 
-    # Test if mutation is killed by test report
+    # Test if mutation is killed by test reports
     #
-    # @param [Report::Test] test_report
+    # @param [Array<Report::Test>] test_reports
     #
     # @return [Boolean]
     #
     # @api private
     #
-    def killed_by?(test_report)
-      self.class::SHOULD_PASS.equal?(test_report.passed)
+    def self.success?(test_result)
+      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
+    #   implicitly. Also subject.public? should NOT be a public interface it
+    #   is a detail of method mutations.
+    #
+    # @return [self]
+    #
+    # @api private
+    #
+    def insert
+      subject.public?
+      subject.prepare
+      Loader::Eval.call(root, subject)
+      self
+    end
+
     # Return sha1 sum of source and subject identification
     #
     # @return [String]
@@ -105,24 +131,24 @@ module Mutant
     # Evil mutation that should case mutations to fail tests
     class Evil < self
 
-      SHOULD_PASS = false
-      SYMBOL      = 'evil'.freeze
+      SYMBOL            = 'evil'.freeze
+      TEST_PASS_SUCCESS = false
 
     end # Evil
 
     # Neutral mutation that should not cause mutations to fail tests
     class Neutral < self
 
-      SYMBOL      = 'neutral'.freeze
-      SHOULD_PASS = true
+      SYMBOL            = 'neutral'.freeze
+      TEST_PASS_SUCCESS = true
 
     end # Neutral
 
     # Noop mutation, special case of neutral
-    class Noop < self
+    class Noop < Neutral
 
-      SYMBOL      = 'noop'.freeze
-      SHOULD_PASS = true
+      SYMBOL            = 'noop'.freeze
+      TEST_PASS_SUCCESS = true
 
     end # Noop
 

data/lib/mutant/mutator/node.rb

@@ -219,7 +219,7 @@ module Mutant
       #
       # @return [Enumerable<Fixnum>]
       #
-      # @api pirvate
+      # @api private
       #
       def children_indices(range)
         range_end = range.end

data/lib/mutant/mutator/node/literal/symbol.rb

@@ -13,7 +13,7 @@ module Mutant
 
         private
 
-          # Emit mutatns
+          # Emit mutants
           #
           # @return [undefined]
           #

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

@@ -17,7 +17,8 @@ module Mutant
           reverse_each:  [:each],
           reverse_merge: [:merge],
           map:           [:each],
-          send:          [:public_send],
+          send:          [:public_send, :__send__],
+          __send__:      [:public_send],
           gsub:          [:sub],
           eql?:          [:equal?],
           to_s:          [:to_str],
@@ -26,8 +27,8 @@ module Mutant
           :== =>         [:eql?, :equal?],
           :>= =>         [:>, :==, :eql?, :equal?],
           :<= =>         [:<, :==, :eql?, :equal?],
-          :> =>          [:==, :eql?, :equal?],
-          :< =>          [:==, :eql?, :equal?]
+          :> =>          [:==, :>=, :eql?, :equal?],
+          :< =>          [:==, :<=, :eql?, :equal?]
         )
 
       private

data/lib/mutant/reporter/cli.rb

@@ -28,6 +28,8 @@ module Mutant
       #
       # @param [Env] env
       #
+      # @return [self]
+      #
       # @api private
       #
       def start(env)

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

@@ -17,7 +17,7 @@ module Mutant
 
         # Return progress representation
         #
-        # @param [Runner::Collector] collector
+        # @param [Runner::Status] status
         #
         # @return [String]
         #
@@ -67,6 +67,18 @@ module Mutant
         # Format for progressive non rewindable output
         class Progressive < self
 
+          # Initialize object
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def initialize(*)
+            @seen = Set.new
+
+            super
+          end
+
           # Return start representation
           #
           # @return [String]
@@ -83,10 +95,13 @@ module Mutant
           #
           # @api private
           #
-          def progress(collector)
-            last_mutation_result = collector.last_mutation_result
-            return EMPTY_STRING unless last_mutation_result
-            format(Printer::MutationProgressResult, last_mutation_result)
+          def progress(status)
+            current = status.env_result.subject_results.flat_map(&:mutation_results)
+            new = current.reject(&@seen.method(:include?))
+            @seen = current.to_set
+            new.map do |mutation_result|
+              format(Printer::MutationProgressResult, mutation_result)
+            end.join(EMPTY_STRING)
           end
 
         private
@@ -109,20 +124,6 @@ module Mutant
 
           BUFFER_FLAGS = 'a+'.freeze
 
-          # Rate per second progress report fires
-          OUTPUT_RATE = 1.0 / 20
-
-          # Initialize object
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def initialize(*)
-            super
-            @last_frame = nil
-          end
-
           # Format start
           #
           # @param [Env] env
@@ -137,16 +138,14 @@ module Mutant
 
           # Format progress
           #
-          # @param [Runner::Collector] collector
+          # @param [Runner::Status] status
           #
           # @return [String]
           #
           # @api private
           #
-          def progress(collector)
-            throttle do
-              format(Printer::Collector, collector)
-            end.to_s
+          def progress(status)
+            format(Printer::Status, status)
           end
 
         private
@@ -166,18 +165,6 @@ module Mutant
             buffer << tput.restore
           end
 
-          # Call block throttled
-          #
-          # @return [self]
-          #
-          # @api private
-          #
-          def throttle
-            now = Time.now
-            return if @last_frame && (now - @last_frame) < OUTPUT_RATE
-            yield.tap { @last_frame = now }
-          end
-
         end # Framed
       end # Format
     end # CLI

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

@@ -5,6 +5,8 @@ module Mutant
       class Printer
         include AbstractType, Delegator, Adamantium::Flat, Concord.new(:output, :object)
 
+        delegate(:success?)
+
         NL = "\n".freeze
 
         # Run printer on object to output
@@ -98,16 +100,6 @@ module Mutant
           output.puts(string)
         end
 
-        # Test if runner was successful
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        #
-        def success?
-          object.success?
-        end
-
         # Colorize message
         #
         # @param [Color] color
@@ -142,8 +134,10 @@ module Mutant
         #
         alias_method :color?, :tty?
 
-        # Printer for run collector
-        class Collector < self
+        # Printer for runner status
+        class Status < self
+
+          delegate(:active_jobs, :env_result)
 
           # Print progress for collector
           #
@@ -152,14 +146,44 @@ module Mutant
           # @api private
           #
           def run
-            visit(EnvProgress, object.result)
-            active_subject_results = object.active_subject_results
+            visit(EnvProgress, object.env_result)
             info('Active subjects:    %d', active_subject_results.length)
             visit_collection(SubjectProgress, active_subject_results)
+            job_status
             self
           end
 
-        end # Collector
+        private
+
+          # Print worker status
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          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)
+            end
+          end
+
+          # Return active subject results
+          #
+          # @return [Array<Result::Subject>]
+          #
+          # @api private
+          #
+          def active_subject_results
+            active_subjects = active_jobs.map(&:mutation).flat_map(&:subject).to_set
+
+            env_result.subject_results.select do |subject_result|
+              active_subjects.include?(subject_result.subject)
+            end
+          end
+
+        end # Status
 
         # Progress printer for configuration
         class Config < self
@@ -406,9 +430,9 @@ module Mutant
         # Reporter for mutation results
         class MutationResult < self
 
-          delegate :mutation, :failed_test_results
+          delegate :mutation, :test_result
 
-          DIFF_ERROR_MESSAGE = 'BUG: Mutation NOT resulted in exactly one diff. 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,
@@ -424,13 +448,13 @@ module Mutant
             "%s\n" \
             "Unparsed Source:\n" \
             "%s\n" \
-            "Test Reports: %d\n"
+            "Test Result:\n".freeze
 
           NOOP_MESSAGE    =
             "---- Noop failure -----\n" \
             "No code was inserted. And the test did NOT PASS.\n" \
             "This is typically a problem of your specs not passing unmutated.\n" \
-            "Test Reports: %d\n"
+            "Test Result:\n".freeze
 
           FOOTER = '-----------------------'.freeze
 
@@ -479,8 +503,8 @@ module Mutant
           # @api private
           #
           def noop_details
-            info(NOOP_MESSAGE, failed_test_results.length)
-            visit_failed_test_results
+            info(NOOP_MESSAGE)
+            visit_test_result
           end
 
           # Neutral details
@@ -490,8 +514,8 @@ module Mutant
           # @api private
           #
           def neutral_details
-            info(NEUTRAL_MESSAGE, mutation.subject.node.inspect, mutation.source, failed_test_results.length)
-            visit_failed_test_results
+            info(NEUTRAL_MESSAGE, mutation.subject.node.inspect, mutation.source)
+            visit_test_result
           end
 
           # Visit failed test results
@@ -500,8 +524,8 @@ module Mutant
           #
           # @api private
           #
-          def visit_failed_test_results
-            visit_collection(TestResult, failed_test_results)
+          def visit_test_result
+            visit(TestResult, test_result)
           end
 
         end # MutationResult
@@ -509,7 +533,7 @@ module Mutant
         # Test result reporter
         class TestResult < self
 
-          delegate :test, :runtime
+          delegate :tests, :runtime
 
           # Run test result reporter
           #
@@ -518,11 +542,26 @@ module Mutant
           # @api private
           #
           def run
-            status('- %s / runtime: %s', test.identification, object.runtime)
+            status('- %d @ runtime: %s', tests.length, runtime)
+            tests.each do |test|
+              puts("  - #{test.identification}")
+            end
             puts('Test Output:')
             puts(object.output)
           end
 
+          # Test if test result is successful
+          #
+          # Only used to determine color.
+          #
+          # @return [false]
+          #
+          # @api private
+          #
+          def success?
+            false
+          end
+
         end # TestResult
       end # Printer
     end # CLI