mutant 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9905b0bf6ff92620afd6cbef3c9286a1521f28
-  data.tar.gz: 6f78e44b45a05bab109e9f92720eaaf79aa83895
+  metadata.gz: ee4fb487c413c8106f0b826458a2914efa842775
+  data.tar.gz: 005c891d8fbcd19a1e4ec806ce39a2d05defcdd3
 SHA512:
-  metadata.gz: 0da2bfbf865e7a50b9841d58762e094e4d19086af88ab8fb87458480306e229c301c5c0d8027b9644e6a1f03f958bbb4271307efea5280661baec583a9d89b59
-  data.tar.gz: 404636cb866a23785a453878afcafdc9387173e2609a6bebf759bf60954933356fbd5962b84903e3f41cb51c724b70a14a194a5b87f2f92b02f0a46433363883
+  metadata.gz: 537342f44d70f3c23696de4962157ec74b7a0383f587c6db897bf216b7e2fe7f22572e84a54e3c055434a5bb5cbd061109655f25d1e3d2418643f9ec716cb147
+  data.tar.gz: 77045f8132668b54c86989ff3c0fa8e75615ebd555bbba305d7da26bded1c7414d6503d0ef16a5ae52547a3fa0a92f142f01f43678762d46dccf57d1bb9e1318

data/.travis.yml

@@ -6,11 +6,11 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.1.3
   - rbx-2
 matrix:
   allow_failures:
-    - rvm: 2.1.2 # still segfaults on stack overflow on define_method
-    - rvm: rbx-2 # Travis does not take care about RBX
+    - rvm: rbx-2 # travis does not maintain rbx setup correctly
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,9 @@
+# v0.6.4 2014-10-xx
+
+* Do not buffer report prints, speedup large report generation.
+* Fix some cases where --fail-fast semantics stopped far to late.
+* Fix crashing / stuckage from using parallel in a nested way.
+
 # v0.6.3 2014-09-22
 
 * Add support for rspec-3.1.

data/Gemfile.devtools

@@ -38,7 +38,7 @@ group :metrics do
   gem 'flay',      '~> 2.5.0'
   gem 'flog',      '~> 4.2.1'
   gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.23.0'
+  gem 'rubocop',   '~> 0.26.1'
   gem 'simplecov', '~> 0.7.1'
   gem 'yardstick', '~> 0.9.9'
 

data/bin/mutant

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 trap('INT') do |status|
-  exit! 128 + status
+  effective_status = status ? status + 128 : 128
+  exit! effective_status
 end
 
 require 'mutant'

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 1105
+total_score: 1126

data/config/reek.yml

@@ -64,6 +64,7 @@ NestedIterators:
   - Mutant#self.singleton_subclass_instance
   - Mutant::CLI#parse
   - Mutant::Integration::Rspec#run
+  - Mutant::Isolation::Fork#self.call
   - Mutant::Mutator::Util::Array::Element#dispatch
   - Mutant::Mutator::Node::Resbody#mutate_captures
   - Mutant::Mutator::Node::Arguments#emit_argument_mutations
@@ -95,6 +96,7 @@ TooManyMethods:
   - Mutant::Subject
   - Mutant::Mutator::Node
   - Mutant::Reporter::CLI
+  - Mutant::Runner
   - Mutant::Meta::Example::Verification
   max_methods: 10
 TooManyStatements:
@@ -102,6 +104,7 @@ TooManyStatements:
   exclude:
   - Mutant#self.singleton_subclass_instance
   - Mutant::Integration::Rspec#run
+  - Mutant::Isolation::Fork#self.call
   - Mutant::Reporter::CLI#colorized_diff
   - Mutant::Reporter::CLI::Printer::EnvProgress#run
   - Mutant::Reporter::CLI::Printer::Config#run

data/lib/mutant.rb

@@ -5,10 +5,8 @@ require 'ice_nine'
 require 'abstract_type'
 require 'equalizer'
 require 'digest/sha1'
-require 'inflecto'
 require 'parser'
 require 'parser/current'
-require 'parser_extensions'
 require 'unparser'
 require 'ice_nine'
 require 'diff/lcs'
@@ -19,6 +17,10 @@ require 'morpher'
 require 'parallel'
 require 'open3'
 
+# This setting is done to make errors within the parallel
+# reporter / execution visible in the main thread.
+Thread.abort_on_exception = true
+
 # Library namespace
 module Mutant
   # The frozen empty string used within mutant
@@ -221,7 +223,7 @@ module Mutant
       isolation:         Mutant::Isolation::Fork,
       reporter:          Reporter::CLI.build($stdout),
       zombie:            false,
-      processes:         Mutant.ci? ? CI_DEFAULT_PROCESSOR_COUNT : Parallel.processor_count,
+      jobs:              Mutant.ci? ? CI_DEFAULT_PROCESSOR_COUNT : Parallel.processor_count,
       expected_coverage: 100.0
     )
   end # Config

data/lib/mutant/cli.rb

@@ -112,8 +112,8 @@ module Mutant
       opts.on('-r', '--require NAME', 'Require file with NAME') do |name|
         add(:requires, name)
       end
-      opts.on('-j', '--jobs NUMBER', 'Number of kill processes. Defaults to number of processors.') do |number|
-        update(processes: Integer(number))
+      opts.on('-j', '--jobs NUMBER', 'Number of kill jobs. Defaults to number of processors.') do |number|
+        update(jobs: Integer(number))
       end
     end
 

data/lib/mutant/config.rb

@@ -10,7 +10,7 @@ module Mutant
       :reporter,
       :isolation,
       :fail_fast,
-      :processes,
+      :jobs,
       :zombie,
       :expected_coverage
     )

data/lib/mutant/diff.rb

@@ -64,7 +64,7 @@ module Mutant
     # @api private
     #
     def self.lines(source)
-      source.lines.map { |line| line.chomp }
+      source.lines.map(&:chomp)
     end
     private_class_method :lines
 

data/lib/mutant/env.rb

@@ -115,7 +115,7 @@ module Mutant
     def expression(scope)
       name = scope_name(scope) or return
 
-      unless name.kind_of?(String)
+      unless name.is_a?(String)
         warn("#{scope.class}#name from: #{scope.inspect} did not return a String or nil. Fix your lib to support normal ruby semantics!")
         return
       end

data/lib/mutant/expression/methods.rb

@@ -25,6 +25,22 @@ module Mutant
         MATCHERS.fetch(scope_symbol).new(env, scope)
       end
 
+      # Return length of match
+      #
+      # @param [Expression] expression
+      #
+      # @return [Fixnum]
+      #
+      # @api private
+      #
+      def match_length(expression)
+        if expression.syntax.start_with?(syntax)
+          syntax.length
+        else
+          0
+        end
+      end
+
     private
 
       # Return scope name

data/lib/mutant/isolation.rb

@@ -38,8 +38,22 @@ module Mutant
       # @api private
       #
       def self.call(&block)
-        Parallel.map([block], in_processes: 1, &block.method(:call)).first
-      rescue Parallel::DeadWorker => exception
+        reader, writer = IO.pipe
+
+        pid = fork do
+          File.open('/dev/null', 'w') do |file|
+            $stderr.reopen(file)
+            reader.close
+            writer.write(Marshal.dump(block.call))
+            writer.close
+          end
+        end
+
+        writer.close
+        result = Marshal.load(reader.read)
+        Process.waitpid(pid)
+        result
+      rescue => exception
         fail Error, exception
       end
 

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

@@ -19,7 +19,7 @@ module Mutant
           emit_singletons unless parent_node && n_const?(parent_node)
           emit_type(nil, *children.drop(1))
           children.each_with_index do |child, index|
-            mutate_child(index) if child.kind_of?(Parser::AST::Node)
+            mutate_child(index) if child.is_a?(Parser::AST::Node)
           end
         end
 

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

@@ -26,7 +26,7 @@ module Mutant
         #
         def dispatch
           children.each_with_index do |child, index|
-            mutate_child(index) if child.kind_of?(Parser::AST::Node)
+            mutate_child(index) if child.is_a?(Parser::AST::Node)
           end
         end
 

data/lib/mutant/mutator/registry.rb

@@ -64,7 +64,7 @@ module Mutant
       # @api private
       #
       def self.assert_valid_type(type)
-        unless AST::Types::ALL.include?(type) || type.kind_of?(Class)
+        unless AST::Types::ALL.include?(type) || type.is_a?(Class)
           raise InvalidTypeError, "invalid type registration: #{type}"
         end
       end

data/lib/mutant/reporter/cli.rb

@@ -71,7 +71,7 @@ module Mutant
       # @api private
       #
       def report(env)
-        write(format.report(env))
+        Printer::EnvResult.run(output, env)
         self
       end
 

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

@@ -25,18 +25,6 @@ module Mutant
         #
         abstract_method :progress
 
-        # Format result
-        #
-        # @param [Result::Env] env
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def report(env)
-          format(Printer::EnvResult, env)
-        end
-
         # Output abstraction to decouple tty? from buffer
         class Output
           include Concord.new(:tty, :buffer)

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

@@ -177,7 +177,7 @@ module Mutant
             info 'Matcher:            %s',      object.matcher_config.inspect
             info 'Integration:        %s',      object.integration.name
             info 'Expect Coverage:    %0.2f%%', object.expected_coverage.inspect
-            info 'Processes:          %d',      object.processes
+            info 'Jobs:               %d',      object.jobs
             info 'Includes:           %s',      object.includes.inspect
             info 'Requires:           %s',      object.requires.inspect
             self

data/lib/mutant/result.rb

@@ -105,7 +105,7 @@ module Mutant
 
     # Env result object
     class Env
-      include Coverage, Result, Anima.new(:runtime, :env, :subject_results, :done)
+      include Coverage, Result, Anima.new(:runtime, :env, :subject_results)
 
       COVERAGE_PRECISION = 1
 

data/lib/mutant/runner.rb

@@ -12,19 +12,21 @@ module Mutant
     def initialize(env)
       super
 
-      @collector   = Collector.new(env)
-      @mutex       = Mutex.new
-      @mutations   = env.mutations.dup
+      @collector = Collector.new(env)
+      @mutex     = Mutex.new
+      @mutations = env.mutations.dup
+      @index     = 0
+      @continue  = true
 
       config.integration.setup
 
-      config.reporter.start(env)
+      reporter.start(env)
 
       run
 
-      @result = @collector.result.update(done: true)
+      @result = @collector.result
 
-      config.reporter.report(result)
+      reporter.report(result)
     end
 
     # Return result
@@ -45,14 +47,36 @@ module Mutant
     #
     def run
       Parallel.map(
-        @mutations,
-        in_processes: config.processes,
-        finish:       method(:finish),
-        start:        method(:start),
+        method(:next),
+        in_threads: config.jobs,
+        finish:     method(:finish),
+        start:      method(:start),
         &method(:run_mutation)
       )
     end
 
+    # Return next mutation or stop
+    #
+    # @return [Mutation]
+    #   in case there is a next mutation
+    #
+    # @return [Parallel::Stop]
+    #   in case there is no next mutation or runner should stop early
+    #
+    #
+    # @api private
+    def next
+      @mutex.synchronize do
+        mutation = @mutations.at(@index)
+        if @continue && mutation
+          @index += 1
+          mutation
+        else
+          Parallel::Stop
+        end
+      end
+    end
+
     # Handle started mutation
     #
     # @param [Mutation] mutation
@@ -79,7 +103,7 @@ module Mutant
     # @api private
     #
     def finish(mutation, index, result)
-      return unless result.kind_of?(Mutant::Result::Mutation)
+      return unless result.is_a?(Mutant::Result::Mutation)
 
       test_results = result.test_results.zip(mutation.subject.tests).map do |test_result, test|
         test_result.update(test: test, mutation: mutation) if test_result
@@ -100,22 +124,9 @@ module Mutant
     #
     def process_result(result)
       @collector.finish(result)
-      config.reporter.progress(@collector)
-      handle_exit(result)
-    end
-
-    # Handle exit if needed
-    #
-    # @param [Result::Mutation] result
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def handle_exit(result)
-      return if !config.fail_fast || result.success?
-
-      @mutations.clear
+      reporter.progress(@collector)
+      return unless config.fail_fast && !result.success?
+      @continue = false
     end
 
     # Run mutation
@@ -175,13 +186,23 @@ module Mutant
       end
     rescue Isolation::Error => exception
       Result::Test.new(
-        test:     nil,
-        mutation: nil,
+        test:     test,
+        mutation: mutation,
         runtime:  Time.now - time,
         output:   exception.message,
         passed:   false
       )
     end
 
+    # Return reporter
+    #
+    # @return [Reporter]
+    #
+    # @api private
+    #
+    def reporter
+      config.reporter
+    end
+
   end # Runner
 end # Mutant

data/lib/mutant/runner/collector.rb

@@ -14,7 +14,7 @@ module Mutant
         super
         @start                = Time.now
         @aggregate            = Hash.new { |hash, key| hash[key] = [] }
-        @activity             = Hash.new(0)
+        @active               = Set.new
         @last_mutation_result = nil
       end
 
@@ -50,12 +50,11 @@ module Mutant
         Result::Env.new(
           env:             env,
           runtime:         Time.now - @start,
-          subject_results: subject_results,
-          done:            false
+          subject_results: subject_results
         )
       end
 
-      # Handle mutation start
+      # Register mutation start
       #
       # @param [Mutation] mutation
       #
@@ -64,7 +63,7 @@ module Mutant
       # @api private
       #
       def start(mutation)
-        @activity[mutation.subject] += 1
+        @active << mutation
         self
       end
 
@@ -79,10 +78,10 @@ module Mutant
       def finish(mutation_result)
         @last_mutation_result = mutation_result
 
-        subject = mutation_result.mutation.subject
+        mutation = mutation_result.mutation
+        @active.delete(mutation)
 
-        @activity[subject] -= 1
-        @aggregate[subject] << mutation_result
+        @aggregate[mutation.subject] << mutation_result
 
         self
       end
@@ -106,9 +105,9 @@ module Mutant
       # @api private
       #
       def active_subjects
-        @activity.select do |_subject, count|
-          count > 0
-        end.map(&:first)
+        @active.each_with_object(Set.new) do |mutation, subjects|
+          subjects << mutation.subject
+        end.sort_by(&:identification)
       end
 
       # Return current subject result