mutant 0.8.19 → 0.8.20

data/lib/mutant.rb

@@ -4,15 +4,15 @@ require 'abstract_type'
 require 'adamantium'
 require 'anima'
 require 'concord'
-require 'digest/sha1'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
+require 'digest/sha1'
+require 'etc'
 require 'equalizer'
 require 'ice_nine'
 require 'morpher'
 require 'open3'
 require 'optparse'
-require 'parallel'
 require 'parser'
 require 'parser/current'
 require 'pathname'
@@ -177,6 +177,7 @@ require 'mutant/expression/method'
 require 'mutant/expression/methods'
 require 'mutant/expression/namespace'
 require 'mutant/test'
+require 'mutant/timer'
 require 'mutant/integration'
 require 'mutant/selector'
 require 'mutant/selector/expression'
@@ -228,7 +229,7 @@ module Mutant
         marshal: Marshal,
         process: Process
       ),
-      jobs:              ::Parallel.processor_count,
+      jobs:              Etc.nprocessors,
       kernel:            Kernel,
       load_path:         $LOAD_PATH,
       matcher:           Matcher::Config::DEFAULT,

data/lib/mutant/env.rb

@@ -42,7 +42,7 @@ module Mutant
     #
     # rubocop:disable MethodLength
     def run_mutation_tests(mutation)
-      start = Time.now
+      start = Timer.now
       tests = selector.call(mutation.subject)
 
       config.isolation.call do
@@ -53,7 +53,7 @@ module Mutant
       Result::Test.new(
         output:  error.message,
         passed:  false,
-        runtime: Time.now - start,
+        runtime: Timer.now - start,
         tests:   tests
       )
     end

data/lib/mutant/expression/namespace.rb

@@ -44,7 +44,9 @@ module Mutant
         #
         # @return [Integer]
         def match_length(expression)
-          if @recursion_pattern.match?(expression.syntax)
+          if eql?(expression)
+            syntax.length
+          elsif @recursion_pattern.match?(expression.syntax)
             scope_name.length
           else
             0

data/lib/mutant/runner/sink.rb

@@ -10,7 +10,7 @@ module Mutant
       # @return [undefined]
       def initialize(*)
         super
-        @start           = Time.now
+        @start           = Timer.now
         @subject_results = {}
       end
 
@@ -20,7 +20,7 @@ module Mutant
       def status
         Result::Env.new(
           env:             env,
-          runtime:         Time.now - @start,
+          runtime:         Timer.now - @start,
           subject_results: @subject_results.values
         )
       end

data/lib/mutant/timer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Mutant
+  module Timer
+    # Monotonic elapsed time of block execution
+    #
+    # @return [Float]
+    def self.elapsed
+      start = now
+      yield
+      now - start
+    end
+
+    # The now monotonic time
+    #
+    # @return [Float]
+    def self.now
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+  end # Timer
+end # Mutant

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.8.19'.freeze
+  VERSION = '0.8.20'.freeze
 end # Mutant

data/mutant-minitest.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require File.expand_path('lib/mutant/version', __dir__)
+
+Gem::Specification.new do |gem|
+  gem.name        = 'mutant-minitest'
+  gem.version     = Mutant::VERSION.dup
+  gem.authors     = ['Markus Schirp']
+  gem.email       = %w[mbj@schirp-dso.com]
+  gem.description = 'Minitest integration for mutant'
+  gem.summary     = gem.description
+  gem.homepage    = 'https://github.com/mbj/mutant'
+  gem.license     = 'MIT'
+
+  gem.require_paths    = %w[lib]
+  gem.files            = `git ls-files -- lib/mutant/{minitest,/integration/minitest.rb}`.split("\n")
+  gem.test_files       = `git ls-files -- spec/integration/mutant/minitest.rb`.split("\n")
+  gem.extra_rdoc_files = %w[LICENSE]
+
+  gem.add_runtime_dependency('minitest', '~> 5.11')
+  gem.add_runtime_dependency('mutant',   "~> #{gem.version}")
+end

data/mutant.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |gem|
 
   gem.require_paths = %w[lib]
 
-  mutant_integration_files = `git ls-files -- lib/mutant/integration/*.rb`.split("\n")
+  exclusion = `git ls-files -- lib/mutant/{minitest,integration}`.split("\n")
 
-  gem.files            = `git ls-files`.split("\n") - mutant_integration_files
+  gem.files            = `git ls-files`.split("\n") - exclusion
   gem.test_files       = `git ls-files -- spec/{unit,integration}`.split("\n")
   gem.extra_rdoc_files = %w[LICENSE]
   gem.executables      = %w[mutant]
@@ -33,13 +33,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('ice_nine',      '~> 0.11.1')
   gem.add_runtime_dependency('memoizable',    '~> 0.4.2')
   gem.add_runtime_dependency('morpher',       '~> 0.2.6')
-  gem.add_runtime_dependency('parallel',      '~> 1.3')
   gem.add_runtime_dependency('parser',        '~> 2.5.1')
   gem.add_runtime_dependency('procto',        '~> 0.0.2')
   gem.add_runtime_dependency('regexp_parser', '~> 1.2')
-  gem.add_runtime_dependency('unparser',      '~> 0.2.5')
+  gem.add_runtime_dependency('unparser',      '~> 0.3.0')
 
   gem.add_development_dependency('bundler',  '~> 1.10')
   gem.add_development_dependency('devtools', '~> 0.1.21')
-  gem.add_development_dependency('ffi',      '~> 1.9.6')
+  gem.add_development_dependency('parallel', '~> 1.3')
 end

data/spec/integration/mutant/corpus_spec.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Mutant on ruby corpus', mutant: false do
-
-  before do
-    skip 'Corpus test is deactivated on < 2.1' if RUBY_VERSION < '2.1'
-    skip 'Corpus test is deactivated on RBX' if RUBY_ENGINE.eql?('rbx')
-  end
-
   MutantSpec::Corpus::Project::ALL.select(&:mutation_generation).each do |project|
     specify "#{project.name} does not fail on mutation generation" do
       project.verify_mutation_generation
@@ -14,7 +8,7 @@ RSpec.describe 'Mutant on ruby corpus', mutant: false do
   end
 
   MutantSpec::Corpus::Project::ALL.select(&:mutation_coverage).each do |project|
-    specify "#{project.name} does have expected mutation coverage" do
+    specify "#{project.name} (#{project.integration}) does have expected mutation coverage" do
       project.verify_mutation_coverage
     end
   end

data/spec/integration/mutant/minitest_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe 'minitest integration', mutant: false do
+
+  let(:base_cmd) { 'bundle exec mutant -I test -I lib --require test_app --use minitest' }
+
+  let(:gemfile) { 'Gemfile.minitest' }
+
+  it_behaves_like 'framework integration'
+end

data/spec/integration/mutant/rspec_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe 'rspec integration', mutant: false do
 
   let(:base_cmd) { 'bundle exec mutant -I lib --require test_app --use rspec' }
 
-  %w[3.4 3.5 3.6 3.7].each do |version|
+  %w[3.7 3.8].each do |version|
     context "RSpec #{version}" do
       let(:gemfile) { "Gemfile.rspec#{version}" }
 

data/spec/integrations.yml

@@ -3,6 +3,7 @@
   namespace: Rubyspec
   repo_uri: 'https://github.com/ruby/rubyspec.git'
   repo_ref: 'origin/master'
+  integration: mspec
   ruby_glob_pattern: '**/*_spec.rb'
   mutation_coverage: false
   mutation_generation: true
@@ -24,6 +25,7 @@
   namespace: Regexp
   repo_uri: 'https://github.com/ammar/regexp_parser.git'
   repo_ref: 'v1.2.0'
+  integration: rspec
   ruby_glob_pattern: '**/*.rb'
   mutation_coverage: false
   mutation_generation: true
@@ -34,6 +36,17 @@
   repo_uri: 'https://github.com/mbj/auom.git'
   repo_ref: 'origin/master'
   ruby_glob_pattern: '**/*.rb'
+  integration: rspec
+  mutation_coverage: true
+  mutation_generation: true
+  expected_errors: {}
+  exclude: []
+- name: auom
+  namespace: AUOM
+  repo_uri: 'https://github.com/mbj/auom.git'
+  repo_ref: 'origin/master'
+  ruby_glob_pattern: '**/*.rb'
+  integration: minitest
   mutation_coverage: true
   mutation_generation: true
   expected_errors: {}
@@ -43,6 +56,7 @@
   repo_uri: 'https://github.com/dkubb/axiom.git'
   repo_ref: 'origin/master'
   ruby_glob_pattern: '**/*.rb'
+  integration: rspec
   mutation_coverage: false
   mutation_generation: true
   expected_errors: {}

data/spec/shared/framework_integration_behavior.rb

@@ -6,22 +6,25 @@ RSpec.shared_examples_for 'framework integration' do
   end
 
   around do |example|
-    Dir.chdir(TestApp.root) do
-      Kernel.system('bundle', 'install', '--gemfile', gemfile) || fail('Bundle install failed!')
-      example.run
+    Bundler.with_clean_env do
+      Dir.chdir(TestApp.root) do
+        Kernel.system('bundle', 'install', '--gemfile', gemfile) || fail('Bundle install failed!')
+        example.run
+      end
     end
   end
 
   specify 'it allows to kill mutations' do
-    expect(Kernel.system("#{base_cmd} TestApp::Literal#string")).to be(true)
+    expect(system_with_gemfile("#{base_cmd} TestApp::Literal#string")).to be(true)
   end
 
   specify 'it allows to exclude mutations' do
     cli = <<-CMD.split("\n").join(' ')
       #{base_cmd}
+      --ignore-subject TestApp::Literal#uncovered_string
+      --
       TestApp::Literal#string
       TestApp::Literal#uncovered_string
-        --ignore-subject TestApp::Literal#uncovered_string
     CMD
     expect(system_with_gemfile(cli)).to be(true)
   end

data/spec/support/corpus.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'morpher'
 require 'anima'
+require 'morpher'
 require 'mutant'
+require 'parallel'
 
 # @api private
 module MutantSpec
@@ -36,6 +37,7 @@ module MutantSpec
         :expected_errors,
         :mutation_coverage,
         :mutation_generation,
+        :integration,
         :name,
         :namespace,
         :repo_uri,
@@ -53,16 +55,18 @@ module MutantSpec
       def verify_mutation_coverage
         checkout
         Dir.chdir(repo_path) do
-          install_mutant
-          system(
-            %W[
-              bundle exec mutant
-              --use rspec
-              --include lib
-              --require #{name}
-              #{namespace}*
-            ]
-          )
+          Bundler.with_clean_env do
+            install_mutant
+            system(
+              %W[
+                bundle exec mutant
+                --use #{integration}
+                --include lib
+                --require #{name}
+                #{namespace}*
+              ]
+            )
+          end
         end
       end
 
@@ -75,7 +79,7 @@ module MutantSpec
       #   otherwise
       def verify_mutation_generation
         checkout
-        start = Time.now
+        start = Mutant::Timer.now
 
         options = {
           finish:       method(:finish),
@@ -86,7 +90,7 @@ module MutantSpec
         total = Parallel.map(effective_ruby_paths, options, &method(:count_mutations_and_check_errors))
           .inject(DEFAULT_MUTATION_COUNT, :+)
 
-        took = Time.now - start
+        took = Mutant::Timer.now - start
         puts MUTATION_GENERATION_MESSAGE % [total, took, total / took]
         self
       end
@@ -163,6 +167,7 @@ module MutantSpec
         repo_path.join('Gemfile').open('a') do |file|
           file << "gem 'mutant', path: '#{relative}'\n"
           file << "gem 'mutant-rspec', path: '#{relative}'\n"
+          file << "gem 'mutant-minitest', path: '#{relative}'\n"
           file << "eval_gemfile File.expand_path('#{relative.join('Gemfile.shared')}')\n"
         end
         lockfile = repo_path.join('Gemfile.lock')
@@ -188,7 +193,7 @@ module MutantSpec
         if ENV.key?('CI')
           CIRCLE_CI_CONTAINER_PROCESSES
         else
-          Parallel.processor_count
+          Etc.nprocessors
         end
       end
 
@@ -312,6 +317,7 @@ module MutantSpec
                 s(:key_symbolize, :ruby_glob_pattern,   s(:guard, s(:primitive, String))),
                 s(:key_symbolize, :name,                s(:guard, s(:primitive, String))),
                 s(:key_symbolize, :namespace,           s(:guard, s(:primitive, String))),
+                s(:key_symbolize, :integration,         s(:guard, s(:primitive, String))),
                 s(:key_symbolize, :mutation_coverage,
                   s(:guard, s(:or, s(:primitive, TrueClass), s(:primitive, FalseClass)))),
                 s(:key_symbolize, :mutation_generation,

data/spec/unit/mutant/clock_monotonic_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+RSpec.describe Mutant::Timer do
+  let(:events) { [] }
+
+  let(:times) { [1.0, 2.0] }
+
+  before do
+    allow(Process).to receive(:clock_gettime) do |argument|
+      expect(argument).to be(Process::CLOCK_MONOTONIC)
+
+      events << :clock_gettime
+
+      times.fetch(events.count(:clock_gettime).pred)
+    end
+  end
+
+  describe '.elapsed' do
+    def apply
+      described_class.elapsed { events << :yield }
+    end
+
+    it 'executes events in expected sequence' do
+      expect { apply }
+        .to change(events, :to_a)
+        .from([])
+        .to(%i[clock_gettime yield clock_gettime])
+    end
+
+    it 'returns elapsed time' do
+      expect(apply).to be(1.0)
+    end
+  end
+
+  describe '.now' do
+    def apply
+      described_class.now
+    end
+
+    it 'returns current monotonic time' do
+      expect(apply).to be(1.0)
+      expect(apply).to be(2.0)
+    end
+
+    it 'calls expected system API' do
+      expect { apply }
+        .to change(events, :to_a)
+        .from([])
+        .to(%i[clock_gettime])
+    end
+  end
+end

data/spec/unit/mutant/env_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Mutant::Env do
         .with(mutation_subject)
         .and_return(tests)
 
-      allow(Time).to receive_messages(now: Time.at(0))
+      allow(Mutant::Timer).to receive(:now).and_return(2.0, 3.0)
     end
 
     context 'when isolation does not raise error' do
@@ -91,7 +91,7 @@ RSpec.describe Mutant::Env do
         Mutant::Result::Test.new(
           output:  'test-error',
           passed:  false,
-          runtime: 0.0,
+          runtime: 1.0,
           tests:   tests
         )
       end

data/spec/unit/mutant/expression/namespace/recursive_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Mutant::Expression::Namespace::Recursive do
     context 'when other is an equivalent expression' do
       let(:other) { parse_expression(object.syntax) }
 
-      it { should be(0) }
+      it { should be(object.syntax.length) }
     end
 
     context 'when other expression describes a shorter prefix' do