mutant 0.9.9 → 0.9.10

data/lib/mutant.rb

@@ -165,8 +165,6 @@ require 'mutant/selector/expression'
 require 'mutant/selector/null'
 require 'mutant/config'
 require 'mutant/cli'
-require 'mutant/color'
-require 'mutant/diff'
 require 'mutant/runner'
 require 'mutant/runner/sink'
 require 'mutant/result'

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

@@ -23,7 +23,7 @@ module Mutant
             emit_singletons
             emit_inverse
             emit_lower_bound_mutations
-            emit_upper_bound_mutations
+            emit_upper_bound_mutations if upper_bound
           end
 
           def emit_inverse

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

@@ -45,7 +45,7 @@ module Mutant
       private
 
         def status_color
-          success? ? Color::GREEN : Color::RED
+          success? ? Unparser::Color::GREEN : Unparser::Color::RED
         end
 
         def visit_collection(printer, collection)
@@ -71,7 +71,7 @@ module Mutant
         end
 
         def colorize(color, message)
-          color = Color::NONE unless tty?
+          color = Unparser::Color::NONE unless tty?
           color.format(message)
         end
 

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

@@ -67,7 +67,7 @@ module Mutant
           end
 
           def evil_details
-            diff = Diff.build(mutation.original_source, mutation.source)
+            diff = Unparser::Diff.build(mutation.original_source, mutation.source)
             diff = color? ? diff.colorized_diff : diff.diff
             if diff
               output.write(diff)

data/lib/mutant/subject/method/instance.rb

@@ -23,18 +23,57 @@ module Mutant
         class Memoized < self
           include AST::Sexp
 
+          FREEZER_OPTION_VALUES = {
+            Adamantium::Freezer::Deep => :deep,
+            Adamantium::Freezer::Flat => :flat,
+            Adamantium::Freezer::Noop => :noop
+          }.freeze
+
+          private_constant(*constants(false))
+
           # Prepare subject for mutation insertion
           #
           # @return [self]
           def prepare
-            scope.__send__(:memoized_methods).instance_variable_get(:@memory).delete(name)
+            memory.delete(name)
             super()
           end
 
         private
 
           def wrap_node(mutant)
-            s(:begin, mutant, s(:send, nil, :memoize, s(:args, s(:sym, name))))
+            s(:begin, mutant, s(:send, nil, :memoize, s(:args, s(:sym, name), *options)))
+          end
+
+          # The optional AST node for adamantium memoization options
+          #
+          # @return [Array(Parser::AST::Node), nil]
+          def options
+            # rubocop:disable Style/GuardClause
+            if FREEZER_OPTION_VALUES.key?(freezer)
+              [
+                s(:hash,
+                  s(:pair,
+                    s(:sym, :freezer),
+                    s(:sym, FREEZER_OPTION_VALUES.fetch(freezer))))
+              ]
+            end
+            # rubocop:enable Style/GuardClause
+          end
+
+          # The freezer used for memoization
+          #
+          # @return [Object]
+          def freezer
+            memory.fetch(name).instance_variable_get(:@freezer)
+          end
+          memoize :freezer, freezer: :noop
+
+          # The memory used for memoization
+          #
+          # @return [ThreadSafe::Cache]
+          def memory
+            scope.__send__(:memoized_methods).instance_variable_get(:@memory)
           end
 
         end # Memoized

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end # Mutant

data/meta/range.rb

@@ -37,3 +37,29 @@ Mutant::Meta::Example.add :erange do
   mutation '1...101'
   mutation '1...-100'
 end
+
+unless RUBY_VERSION.start_with?('2.5')
+  Mutant::Meta::Example.add :erange do
+    source '1...'
+
+    singleton_mutations
+    mutation '-1...'
+    mutation '0...'
+    mutation '1..'
+    mutation '2...'
+    mutation 'nil...'
+    mutation 'self...'
+  end
+
+  Mutant::Meta::Example.add :irange do
+    source '1..'
+
+    singleton_mutations
+    mutation '-1..'
+    mutation '0..'
+    mutation '1...'
+    mutation '2..'
+    mutation 'nil..'
+    mutation 'self..'
+  end
+end

data/mutant.gemspec

@@ -26,16 +26,19 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('anima',         '~> 0.3.1')
   gem.add_runtime_dependency('ast',           '~> 2.2')
   gem.add_runtime_dependency('concord',       '~> 0.1.5')
-  gem.add_runtime_dependency('diff-lcs',      '= 1.3')
+  gem.add_runtime_dependency('diff-lcs',      '~> 1.3')
   gem.add_runtime_dependency('equalizer',     '~> 0.0.9')
   gem.add_runtime_dependency('ice_nine',      '~> 0.11.1')
   gem.add_runtime_dependency('memoizable',    '~> 0.4.2')
   gem.add_runtime_dependency('mprelude',      '~> 0.1.0')
   gem.add_runtime_dependency('parser',        '~> 2.7.1')
   gem.add_runtime_dependency('procto',        '~> 0.0.2')
-  gem.add_runtime_dependency('unparser',      '~> 0.4.6')
+  gem.add_runtime_dependency('unparser',      '~> 0.4.8')
   gem.add_runtime_dependency('variable',      '~> 0.0.1')
 
-  gem.add_development_dependency('devtools', '~> 0.1.25')
-  gem.add_development_dependency('parallel', '~> 1.3')
+  gem.add_development_dependency('parallel',   '~> 1.3')
+  gem.add_development_dependency('rspec',      '~> 3.9')
+  gem.add_development_dependency('rspec-core', '~> 3.9')
+  gem.add_development_dependency('rspec-its',  '~> 1.2.0')
+  gem.add_development_dependency('rubocop',    '~> 0.79.0')
 end

data/spec/spec_helper.rb

@@ -1,31 +1,24 @@
 # frozen_string_literal: true
 
-if ENV['COVERAGE'] == 'true'
-  require 'simplecov'
-
-  SimpleCov.start do
-    command_name 'spec:unit'
-
-    add_filter 'config'
-    add_filter 'spec'
-    add_filter 'vendor'
-    add_filter 'test_app'
-    add_filter 'lib/mutant.rb' # simplecov bug not seeing default block is executed
-
-    minimum_coverage 100
-  end
-end
-
-require 'tempfile'
-require 'concord'
-require 'anima'
 require 'adamantium'
-require 'devtools/spec_helper'
-require 'unparser/cli'
+require 'anima'
+require 'concord'
 require 'mutant'
 require 'mutant/meta'
+require 'rspec/its'
+require 'timeout'
+require 'tempfile'
+require 'tmpdir'
+
+require './spec/shared/framework_integration_behavior'
+require './spec/shared/method_matcher_behavior'
+require './spec/support/corpus'
+require './spec/support/file_system'
+require './spec/support/ruby_vm'
+require './spec/support/shared_context'
+require './spec/support/xspec'
 
-$LOAD_PATH << File.join(TestApp.root, 'lib')
+$LOAD_PATH << File.expand_path('../test_app/lib', __dir__)
 
 require 'test_app'
 
@@ -67,6 +60,28 @@ module XSpecHelper
   end
 end # XSpecHelper
 
+RSpec.configuration.around(file_path: %r{spec/unit}) do |example|
+  Timeout.timeout(1, &example)
+end
+
+RSpec.shared_examples_for 'a command method' do
+  it 'returns self' do
+    should equal(object)
+  end
+end
+
+RSpec.shared_examples_for 'an idempotent method' do
+  it 'is idempotent' do
+    first = subject
+    fail 'RSpec not configured for threadsafety' unless RSpec.configuration.threadsafe?
+    mutex    = __memoized.instance_variable_get(:@mutex)
+    memoized = __memoized.instance_variable_get(:@memoized)
+
+    mutex.synchronize { memoized.delete(:subject) }
+    should equal(first)
+  end
+end
+
 RSpec.configure do |config|
   config.extend(SharedContext)
   config.include(ParserHelper)

data/spec/unit/mutant/reporter/cli/printer/env_result_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Mutant::Reporter::CLI::Printer::EnvResult do
       subject-a
       - test-a
       evil:subject-a:d27d2
-      @@ -1,2 +1,2 @@
+      @@ -1 +1 @@
       -true
       +false
       -----------------------

data/spec/unit/mutant/reporter/cli/printer/mutation_progress_result_spec.rb

@@ -13,13 +13,13 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationProgressResult do
     context 'on killed mutant' do
       with(:mutation_a_test_result) { { passed: true } }
 
-      it_reports Mutant::Color::RED.format('F')
+      it_reports Unparser::Color::RED.format('F')
     end
 
     context 'on alive mutant' do
       with(:mutation_a_test_result) { { passed: false } }
 
-      it_reports Mutant::Color::GREEN.format('.')
+      it_reports Unparser::Color::GREEN.format('.')
     end
   end
 end

data/spec/unit/mutant/reporter/cli/printer/mutation_result_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationResult do
 
       it_reports(<<~'REPORT')
         evil:subject-a:d27d2
-        @@ -1,2 +1,2 @@
+        @@ -1 +1 @@
         -true
         +false
         -----------------------
@@ -42,16 +42,16 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationResult do
 
             it_reports(
               [
-                [Mutant::Color::NONE,  "evil:subject-a:d27d2\n"],
-                [Mutant::Color::NONE,  "@@ -1,2 +1,2 @@\n"],
-                [Mutant::Color::RED,   "-true\n"],
-                [Mutant::Color::GREEN, "+false\n"],
-                [Mutant::Color::NONE,  "-----------------------\n"],
-                [Mutant::Color::NONE,  "- 1 @ runtime: 1.0\n"],
-                [Mutant::Color::NONE,  "  - test-a\n"],
-                [Mutant::Color::NONE,  "Test Output:\n"],
-                [Mutant::Color::NONE,  "mutation a test result output\n"],
-                [Mutant::Color::NONE,  "-----------------------\n"]
+                [Unparser::Color::NONE,  "evil:subject-a:d27d2\n"],
+                [Unparser::Color::NONE,  "@@ -1 +1 @@\n"],
+                [Unparser::Color::RED,   "-true\n"],
+                [Unparser::Color::GREEN, "+false\n"],
+                [Unparser::Color::NONE,  "-----------------------\n"],
+                [Unparser::Color::NONE,  "- 1 @ runtime: 1.0\n"],
+                [Unparser::Color::NONE,  "  - test-a\n"],
+                [Unparser::Color::NONE,  "Test Output:\n"],
+                [Unparser::Color::NONE,  "mutation a test result output\n"],
+                [Unparser::Color::NONE,  "-----------------------\n"]
               ].map { |color, text| color.format(text) }.join
             )
           end
@@ -59,7 +59,7 @@ RSpec.describe Mutant::Reporter::CLI::Printer::MutationResult do
           context 'on non tty' do
             it_reports(<<~'STR')
               evil:subject-a:d27d2
-              @@ -1,2 +1,2 @@
+              @@ -1 +1 @@
               -true
               +false
               -----------------------

data/spec/unit/mutant/reporter/cli/printer/subject_result_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Mutant::Reporter::CLI::Printer::SubjectResult do
         subject-a
         - test-a
         evil:subject-a:d27d2
-        @@ -1,2 +1,2 @@
+        @@ -1 +1 @@
         -true
         +false
         -----------------------

data/spec/unit/mutant/reporter/cli/printer_spec.rb

@@ -64,12 +64,12 @@ RSpec.describe Mutant::Reporter::CLI::Printer do
 
     context 'on tty' do
       context 'on success' do
-        it_reports Mutant::Color::GREEN.format('foo bar') + "\n"
+        it_reports Unparser::Color::GREEN.format('foo bar') + "\n"
       end
 
       context 'on failure' do
         let(:success?) { false }
-        it_reports Mutant::Color::RED.format('foo bar') + "\n"
+        it_reports Unparser::Color::RED.format('foo bar') + "\n"
       end
     end
 
@@ -146,13 +146,13 @@ RSpec.describe Mutant::Reporter::CLI::Printer do
     let(:class_under_test) do
       Class.new(described_class) do
         def run
-          puts(colorize(Mutant::Color::RED, 'foo'))
+          puts(colorize(Unparser::Color::RED, 'foo'))
         end
       end
     end
 
     context 'when output is a tty?' do
-      it_reports Mutant::Color::RED.format('foo') + "\n"
+      it_reports Unparser::Color::RED.format('foo') + "\n"
     end
 
     context 'when output is NOT a tty?' do

data/spec/unit/mutant/reporter/cli_spec.rb

@@ -116,7 +116,7 @@ RSpec.describe Mutant::Reporter::CLI do
       let(:tty?) { true }
 
       # rubocop:disable Metrics/LineLength
-      it_reports Mutant::Color::GREEN.format('progress: 00/02 alive: 0 runtime: 4.00s killtime: 0.00s mutations/s: 0.00') + "\n"
+      it_reports Unparser::Color::GREEN.format('progress: 00/02 alive: 0 runtime: 4.00s killtime: 0.00s mutations/s: 0.00') + "\n"
       # rubocop:enable Metrics/LineLength
     end
 

data/spec/unit/mutant/subject/method/instance_spec.rb

@@ -62,10 +62,6 @@ RSpec.describe Mutant::Subject::Method::Instance do
   end
 
   describe '#prepare' do
-    let(:context) do
-      Mutant::Context.new(scope, instance_double(Pathname))
-    end
-
     subject { object.prepare }
 
     it 'undefines method on scope' do
@@ -104,7 +100,10 @@ RSpec.describe Mutant::Subject::Method::Instance::Memoized do
     )
   end
 
-  let(:context)  { double('Context')                 }
+  let(:context) do
+    Mutant::Context.new(scope, double('Source Path'))
+  end
+
   let(:warnings) { instance_double(Mutant::Warnings) }
 
   let(:node) do
@@ -115,12 +114,7 @@ RSpec.describe Mutant::Subject::Method::Instance::Memoized do
     allow(warnings).to receive(:call).and_yield
   end
 
-  describe '#prepare' do
-
-    let(:context) do
-      Mutant::Context.new(scope, double('Source Path'))
-    end
-
+  shared_context 'memoizable scope setup' do
     let(:scope) do
       Class.new do
         include Memoizable
@@ -128,6 +122,23 @@ RSpec.describe Mutant::Subject::Method::Instance::Memoized do
         memoize :foo
       end
     end
+  end
+
+  shared_context 'adamantium scope setup' do
+    let(:scope) do
+      memoize_options  = self.memoize_options
+      memoize_provider = self.memoize_provider
+
+      Class.new do
+        include memoize_provider
+        def foo; end
+        memoize :foo, **memoize_options
+      end
+    end
+  end
+
+  describe '#prepare' do
+    include_context 'memoizable scope setup'
 
     subject { object.prepare }
 
@@ -142,40 +153,124 @@ RSpec.describe Mutant::Subject::Method::Instance::Memoized do
     it_should_behave_like 'a command method'
   end
 
-  describe '#mutations', mutant_expression: 'Mutant::Subject#mutations' do
+  describe '#mutations' do
     subject { object.mutations }
 
     let(:expected) do
       [
         Mutant::Mutation::Neutral.new(
           object,
-          s(:begin,
-            s(:def, :foo, s(:args)), s(:send, nil, :memoize, s(:args, s(:sym, :foo))))
+          s(:begin, s(:def, :foo, s(:args)), memoize_node)
         ),
         Mutant::Mutation::Evil.new(
           object,
-          s(:begin,
-            s(:def, :foo, s(:args), s(:send, nil, :raise)), s(:send, nil, :memoize, s(:args, s(:sym, :foo))))
+          s(:begin, s(:def, :foo, s(:args), s(:send, nil, :raise)), memoize_node)
         ),
         Mutant::Mutation::Evil.new(
           object,
-          s(:begin,
-            s(:def, :foo, s(:args), s(:zsuper)), s(:send, nil, :memoize, s(:args, s(:sym, :foo))))
+          s(:begin, s(:def, :foo, s(:args), s(:zsuper)), memoize_node)
         ),
         Mutant::Mutation::Evil.new(
           object,
-          s(:begin,
-            s(:def, :foo, s(:args), nil), s(:send, nil, :memoize, s(:args, s(:sym, :foo))))
+          s(:begin, s(:def, :foo, s(:args), nil), memoize_node)
         )
       ]
     end
 
-    it { should eql(expected) }
+    let(:memoize_node) do
+      s(:send, nil, :memoize, s(:args, s(:sym, :foo), *options_node))
+    end
+
+    let(:options_node) { nil }
+
+    context 'when Memoizable is included in scope' do
+      include_context 'memoizable scope setup'
+
+      it { should eql(expected) }
+    end
+
+    context 'when Adamantium is included in scope' do
+      include_context 'adamantium scope setup'
+
+      {
+        Adamantium       => :deep,
+        Adamantium::Flat => :flat
+      }.each do |memoize_provider, default_freezer_option|
+        context "as include #{memoize_provider}" do
+          let(:memoize_provider)       { memoize_provider       }
+          let(:default_freezer_option) { default_freezer_option }
+
+          let(:options_node) do
+            [s(:hash, s(:pair, s(:sym, :freezer), s(:sym, freezer_option)))]
+          end
+
+          context 'when no memoize options are given' do
+            let(:memoize_options) { Mutant::EMPTY_HASH     }
+            let(:freezer_option)  { default_freezer_option }
+
+            it { should eql(expected) }
+          end
+
+          context 'when memoize options are given' do
+            let(:memoize_options) { { freezer: freezer_option } }
+
+            %i[deep flat noop].each do |option|
+              context "as #{option.inspect}" do
+                let(:freezer_option) { option }
+
+                it { should eql(expected) }
+              end
+            end
+          end
+        end
+      end
+    end
   end
 
   describe '#source' do
     subject { object.source }
 
-    it { should eql("def foo\nend\nmemoize(:foo)") }
+    context 'when Memoizable is included in scope' do
+      include_context 'memoizable scope setup'
+
+      let(:source) { "def foo\nend\nmemoize(:foo)" }
+
+      it { should eql(source) }
+    end
+
+    context 'when Adamantium is included in scope' do
+      include_context 'adamantium scope setup'
+
+      let(:source) do
+        "def foo\nend\nmemoize(:foo, { freezer: #{freezer_option.inspect} })"
+      end
+
+      {
+        Adamantium       => :deep,
+        Adamantium::Flat => :flat
+      }.each do |memoize_provider, default_freezer_option|
+        context "as include #{memoize_provider}" do
+          let(:memoize_provider) { memoize_provider }
+
+          context 'when no memoize options are given' do
+            let(:memoize_options) { Mutant::EMPTY_HASH     }
+            let(:freezer_option)  { default_freezer_option }
+
+            it { should eql(source) }
+          end
+
+          context 'when memoize options are given' do
+            %i[deep flat noop].each do |freezer_option|
+              context "as #{freezer_option.inspect}" do
+                let(:memoize_options) { { freezer: freezer_option } }
+                let(:freezer_option)  { freezer_option              }
+
+                it { should eql(source) }
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end