mutant 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607569850361ac4088176c89f75ac7f7d732d8f0
-  data.tar.gz: 3247e38171198bf00c53341447881cb76fa44a3f
+  metadata.gz: 90851c1c4c4d7c0f23438bae72fe95f70a680514
+  data.tar.gz: 7ac31c28d9329ec976bfac638a48a8fe515e3604
 SHA512:
-  metadata.gz: 888a9f29aa202635ece333e17c514ca52c7a28660e0ab8cd7f4397f4f108be3a8d91477812ad48ae970f2808b1516de084f44ff02f743b21174ad2504fb4cdae
-  data.tar.gz: 5e3faa4096046383aa51274b6f201fb3f1eb416d7f8ca8049505fcf823fd994f051c34dd159256a6926e56401f5270d859b0bad0f13b645101442bfff5e80ef6
+  metadata.gz: ab96c53e2d7ded947c58742c06bb5934b1b0f17437fefbe9e510d9ce25a7aea422d115aa420fc0538bd23260b2fd85c20d4aa25cb84e8f82362f08d8156f28c5
+  data.tar.gz: db2ace76cbabbb97d18a0a32cfc75f7ad3a014424bf4b3ae52b566f38bf47fe3ff8929edcaf31776390fc52bc9c5a2d42323c6be26fc8c617067179977edeb9a

data/.travis.yml

@@ -3,7 +3,6 @@ script: "bundle exec rake ci"
 env:
   - TRAVIS=true
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.4
   - rbx-2

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.7.2 2014-12-08
+
+* Fix synthetic race conditon in actor implementation
+* Fix progressive reporter slowdown
+
 # v0.7.1 2014-12-04
 
 * Fix invalid dependencies on rspec for mutant-rspec

data/TODO

@@ -1,23 +1,15 @@
 Code:
   * Test mutant with dynamically created zombie.
-  * Log all warnings through reporter, so remove random $stderr.puts calls
 
 Mutations:
   * Add true masgn mutations
-  * Add binary operator specific mutations (YAY, finally reached this point)
   * Add some kind of a "do not touch me object" that raises on all messages.
     It can be used to make sure each literal value is touched.
   * Replace nil or add "do not touch me object" to literal mutations.
   * Mutate options on Regexp literals
   * Add mutations for dynamic regexp symbol and string literals
-  * Mutate Block catch "def foo(&block)" and block pass "foo(&block)"
-  * Binary operator mutations
   * Add timeout to terminate infinite loops
 
-    Example of a negative mutation:
-      Mutations on local variables and arguments prefixed with an underscore would be emitted as
-      negative mutations that must be alive.
-
 Loader:
   * Make sure loader does not change visibility of injected mutants
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 1141
+total_score: 1200

data/config/reek.yml

@@ -37,6 +37,7 @@ FeatureEnvy:
   - Mutant::Runner::Master#stop_worker
   - Mutant::Runner::Worker#run_mutation
   - Mutant::Runner::Worker#handle
+  - Mutant::Subject#source_lines
 IrresponsibleModule:
   enabled: true
   exclude: []
@@ -136,9 +137,11 @@ UnusedParameters:
 UtilityFunction:
   enabled: true
   exclude:
+  - Mutant::Actor::Env#new_mailbox
   - Mutant::AST::Sexp#s
   - Mutant::CLI#reporter
   - Mutant::Integration::Rspec#parse_example
-  - Mutant::Meta::Example::Verification#format_mutation # False positive, its a utility
+  - Mutant::Meta::Example::Verification#format_mutation
   - Mutant::Reporter::CLI::Format::Progressive#new_buffer
+  - Mutant::Reporter::CLI::Printer::StatusProgressive#object # False positive calls super
   max_helper_calls: 0

data/lib/mutant.rb

@@ -104,7 +104,6 @@ require 'mutant/actor'
 require 'mutant/actor/receiver'
 require 'mutant/actor/sender'
 require 'mutant/actor/mailbox'
-require 'mutant/actor/actor'
 require 'mutant/actor/env'
 require 'mutant/cache'
 require 'mutant/delegator'
@@ -212,6 +211,7 @@ require 'mutant/reporter/cli'
 require 'mutant/reporter/cli/printer'
 require 'mutant/reporter/cli/tput'
 require 'mutant/reporter/cli/format'
+require 'mutant/line_trace'
 require 'mutant/zombifier'
 require 'mutant/zombifier/file'
 

data/lib/mutant/actor/env.rb

@@ -11,23 +11,23 @@ module Mutant
       # @api private
       #
       def spawn
-        mailbox = Mailbox.new
+        mailbox = new_mailbox
 
-        thread = thread_root.new do
-          yield mailbox.actor(thread_root.current)
+        thread_root.new do
+          yield mailbox
         end
 
-        mailbox.sender(thread)
+        mailbox.sender
       end
 
-      # Return an private actor for current thread
+      # Return new unbound mailbox
       #
-      # @return [Actor::Private]
+      # @return [Mailbox]
       #
       # @api private
       #
-      def current
-        Mailbox.new.actor(thread_root.current)
+      def new_mailbox
+        Mailbox.new
       end
 
     end # Env

data/lib/mutant/actor/mailbox.rb

@@ -2,50 +2,35 @@ module Mutant
   module Actor
     # Unbound mailbox
     class Mailbox
+      include Adamantium::Flat, Concord::Public.new(:receiver, :sender)
 
-      # Initialize new unbound mailbox
+      # Return new mailbox
       #
-      # @return [undefined]
+      # @return [Mailbox]
       #
       # @api private
       #
-      def initialize
-        @mutex    = Mutex.new
-        @messages = []
-        @receiver = Receiver.new(@mutex, @messages)
-        freeze
-      end
-
-      # Return receiver
-      #
-      # @return [Receiver]
-      #
-      # @api private
-      #
-      attr_reader :receiver
+      def self.new
+        mutex              = Mutex.new
+        condition_variable = ConditionVariable.new
+        messages           = []
 
-      # Return actor that is able to read mailbox
-      #
-      # @param [Thread] thread
-      #
-      # @return [Actor]
-      #
-      # @api private
-      #
-      def actor(thread)
-        Actor.new(thread, self)
+        super(
+          Receiver.new(condition_variable, mutex, messages),
+          Sender.new(condition_variable, mutex, messages)
+        )
       end
 
-      # Return sender to mailbox
+      # Return binding for RPC to other actors
       #
-      # @param [Thread] thread
+      # @param [Actor::Sender] other
       #
-      # @return [Sender]
+      # @return [Binding]
       #
       # @api private
       #
-      def sender(thread)
-        Sender.new(thread, @mutex, @messages)
+      def bind(other)
+        Binding.new(self, other)
       end
 
     end # Mailbox

data/lib/mutant/actor/receiver.rb

@@ -2,7 +2,7 @@ module Mutant
   module Actor
     # Receiver side of an actor
     class Receiver
-      include Concord.new(:mutex, :mailbox)
+      include Adamantium::Flat, Concord.new(:condition_variable, :mutex, :messages)
 
       # Receives a message, blocking
       #
@@ -31,14 +31,12 @@ module Mutant
       # @api private
       #
       def try_blocking_receive
-        mutex.lock
-        if mailbox.empty?
-          mutex.unlock
-          Thread.stop
-          Undefined
-        else
-          mailbox.shift.tap do
-            mutex.unlock
+        mutex.synchronize do
+          if messages.empty?
+            condition_variable.wait(mutex)
+            Undefined
+          else
+            messages.shift
           end
         end
       end

data/lib/mutant/actor/sender.rb

@@ -3,7 +3,7 @@ module Mutant
 
     # Sender for messages to acting thread
     class Sender
-      include Concord.new(:thread, :mutex, :mailbox)
+      include Adamantium::Flat, Concord.new(:condition_variable, :mutex, :messages)
 
       # Send a message to actor
       #
@@ -15,8 +15,8 @@ module Mutant
       #
       def call(message)
         mutex.synchronize do
-          mailbox << message
-          thread.run
+          messages << message
+          condition_variable.signal
         end
 
         self

data/lib/mutant/line_trace.rb

@@ -0,0 +1,34 @@
+module Mutant
+  # Line tracer
+  class LineTrace
+    include Adamantium::Flat, Concord.new(:contents)
+
+    private_class_method :new
+
+    # Test if trace coveres file at lineno
+    #
+    # @param [String] file
+    # @param [Fixnum] lineno
+    #
+    # @return [Boolean]
+    #
+    def cover?(file, lineno)
+      contents.fetch(file) { return false }.include?(lineno)
+    end
+
+    # Run block
+    #
+    # @return [Traces]
+    #
+    # @api private
+    #
+    def self.call(&block)
+      traces = Hash.new { |hash, file| hash[file] = Set.new }
+      TracePoint.trace(:return, :line) do |point|
+        traces[point.path] << point.lineno
+      end.tap(&block).disable
+      new(IceNine.deep_freeze(traces))
+    end
+
+  end # LineTrace
+end # Mutant

data/lib/mutant/reporter/cli.rb

@@ -51,6 +51,23 @@ module Mutant
         self
       end
 
+      # Return report delay in seconds
+      #
+      # TODO: Move this to a callback registration
+      #
+      #   Reporters other than CLI that might exist in futures
+      #   may only the final report. So providing a noop callback
+      #   registration makes more sense than. As only CLI reporters
+      #   exist currently I do not really care right now.
+      #
+      # @return [Float]
+      #
+      # @api private
+      #
+      def delay
+        format.delay
+      end
+
       # Report warning
       #
       # @param [String] message

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

@@ -25,6 +25,16 @@ module Mutant
         #
         abstract_method :progress
 
+        # Return report delay in seconds
+        #
+        # @return [Float]
+        #
+        # @api private
+        #
+        def delay
+          self.class::REPORT_DELAY
+        end
+
         # Output abstraction to decouple tty? from buffer
         class Output
           include Concord.new(:tty, :buffer)
@@ -67,17 +77,8 @@ module Mutant
         # Format for progressive non rewindable output
         class Progressive < self
 
-          # Initialize object
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def initialize(*)
-            @seen = Set.new
-
-            super
-          end
+          REPORT_FREQUENCY = 1.0
+          REPORT_DELAY     = 1 / REPORT_FREQUENCY
 
           # Return start representation
           #
@@ -96,12 +97,7 @@ module Mutant
           # @api private
           #
           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)
+            format(Printer::StatusProgressive, status)
           end
 
         private
@@ -124,6 +120,9 @@ module Mutant
 
           BUFFER_FLAGS = 'a+'.freeze
 
+          REPORT_FREQUENCY = 20.0
+          REPORT_DELAY     = 1 / REPORT_FREQUENCY
+
           # Format start
           #
           # @param [Env] env

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

@@ -147,7 +147,7 @@ module Mutant
           #
           def run
             visit(EnvProgress, object.env_result)
-            info('Active subjects:    %d', active_subject_results.length)
+            info('Active subjects: %d', active_subject_results.length)
             visit_collection(SubjectProgress, active_subject_results)
             job_status
             self
@@ -198,12 +198,12 @@ module Mutant
           #
           def run
             info 'Mutant configuration:'
-            info 'Matcher:            %s',      object.matcher_config.inspect
-            info 'Integration:        %s',      object.integration.name
-            info 'Expect Coverage:    %0.2f%%', object.expected_coverage.inspect
-            info 'Jobs:               %d',      object.jobs
-            info 'Includes:           %s',      object.includes.inspect
-            info 'Requires:           %s',      object.requires.inspect
+            info 'Matcher:         %s',      object.matcher_config.inspect
+            info 'Integration:     %s',      object.integration.name
+            info 'Expect Coverage: %0.2f%%', object.expected_coverage.inspect
+            info 'Jobs:            %d',      object.jobs
+            info 'Includes:        %s',      object.includes.inspect
+            info 'Requires:        %s',      object.requires.inspect
             self
           end
 
@@ -232,16 +232,15 @@ module Mutant
           #
           def run
             visit(Config, env.config)
-            info 'Available Subjects: %s',        amount_subjects
-            info 'Subjects:           %s',        amount_subjects
-            info 'Mutations:          %s',        amount_mutations
-            info 'Kills:              %s',        amount_mutations_killed
-            info 'Alive:              %s',        amount_mutations_alive
-            info 'Runtime:            %0.2fs',    runtime
-            info 'Killtime:           %0.2fs',    killtime
-            info 'Overhead:           %0.2f%%',   overhead_percent
-            status 'Coverage:           %0.2f%%', coverage_percent
-            status 'Expected:           %0.2f%%', env.config.expected_coverage
+            info 'Subjects:        %s',        amount_subjects
+            info 'Mutations:       %s',        amount_mutations
+            info 'Kills:           %s',        amount_mutations_killed
+            info 'Alive:           %s',        amount_mutations_alive
+            info 'Runtime:         %0.2fs',    runtime
+            info 'Killtime:        %0.2fs',    killtime
+            info 'Overhead:        %0.2f%%',   overhead_percent
+            status 'Coverage:        %0.2f%%', coverage_percent
+            status 'Expected:        %0.2f%%', env.config.expected_coverage
             self
           end
 
@@ -342,6 +341,54 @@ module Mutant
 
         end # MutationProgressResult
 
+        # Reporter for progressive output format on scheduler Status objects
+        class StatusProgressive < self
+
+          FORMAT = '(%02d/%02d) %3d%% - killtime: %0.02fs runtime: %0.02fs overhead: %0.02fs'.freeze
+
+          delegate(
+            :coverage,
+            :runtime,
+            :amount_mutations_killed,
+            :amount_mutations,
+            :amount_mutation_results,
+            :killtime,
+            :overhead
+          )
+
+          # Run printer
+          #
+          # @return [self]
+          #
+          # @api private
+          #
+          def run
+            status(
+              FORMAT,
+              amount_mutations_killed,
+              amount_mutations,
+              coverage * 100,
+              killtime,
+              runtime,
+              overhead
+            )
+
+            self
+          end
+
+        private
+
+          # Return object being printed
+          #
+          # @return [Result::Env]
+          #
+          # @api private
+          #
+          def object
+            super().env_result
+          end
+        end
+
         # Reporter for subject progress
         class SubjectProgress < self