mutant 0.10.11 → 0.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f812d15b5c09f8681cc6c75eb01bd00fffe412bc53397b9e13c29c7cad69db9a
-  data.tar.gz: 45c24afcbfbef29a50b90b81946e75391c58ecea7ac32b9545a5e7fdc22fd063
+  metadata.gz: 376273ed7dd5673bc6acc7d2393b3b9d05c5779a33b36fffce4a2fd93742e313
+  data.tar.gz: 186a12fae490b557d0f48f879017a2faf61b2edfef09cd44d8e11549c34a8526
 SHA512:
-  metadata.gz: fcb16a15ec71fe5dc51d07e08b426e8dc68e2f4bad2bd47f95a19b136cd06dbefdc9be44f4a7e0723b8a9450b4b924ab2744f8be05b09fbf1d6e9774431f2e97
-  data.tar.gz: b9213ce07ce70908f072b23d92bd86c86492ed8f348ae2c7419ed625989a36b7b2d1e110048e14364e044790e7e086894c124f081043d989844de02adcc81684
+  metadata.gz: 8f2a51ac2f6e515d9e4b96f3ede03773ae20c9038e9b4f31f639e733598cff0d86ed6d7020b727b167b5e518425ae90b97c1b53a5c3c26abbc6c417bf18eacd0
+  data.tar.gz: bd2084f932c8267845e0371ff267d0acd2c8085684fdb7acb718253777adcd1b8098c5288c6978c4542ca9327bba0f62d8206ec90c8baad73be3fad46e471808

data/bin/mutant

@@ -28,12 +28,14 @@ status =
         .call(Kernel),
       root_require:     'mutant',
       includes:         %w[
-        mutant
-        unparser
         adamantium
-        equalizer
         anima
         concord
+        equalizer
+        mprelude
+        mutant
+        unparser
+        variable
       ]
     )
 

data/lib/mutant.rb

@@ -226,7 +226,7 @@ module Mutant
   # Reopen class to initialize constant to avoid dep circle
   class Config
     DEFAULT = new(
-      coverage_criteria: Config::CoverageCriteria::DEFAULT,
+      coverage_criteria: Config::CoverageCriteria::EMPTY,
       expression_parser: Expression::Parser.new([
         Expression::Method,
         Expression::Methods,
@@ -245,4 +245,17 @@ module Mutant
       zombie:            false
     )
   end # Config
+
+  # Traverse values against action
+  #
+  # Specialized to Either. Its *always* traverse.
+  def self.traverse(action, values)
+    Either::Right.new(
+      values.map do |value|
+        action.call(value).from_right do |error|
+          return Either::Left.new(error)
+        end
+      end
+    )
+  end
 end # Mutant

data/lib/mutant/cli/command.rb

@@ -75,6 +75,18 @@ module Mutant
         self.class::SUBCOMMANDS
       end
 
+      def execute
+        action.either(
+          method(:fail_message),
+          ->(_) { true }
+        )
+      end
+
+      def fail_message(message)
+        world.stderr.puts(message)
+        false
+      end
+
       def parser
         OptionParser.new do |parser|
           parser.banner = "usage: #{banner}"

data/lib/mutant/cli/command/environment.rb

@@ -19,7 +19,7 @@ module Mutant
 
         def initialize(attributes)
           super(attributes)
-          @config = Config.env
+          @config = Config::DEFAULT
         end
 
         def bootstrap
@@ -29,27 +29,17 @@ module Mutant
         end
 
         def expand(file_config)
-          @config = file_config.merge(@config)
+          @config = Config.env.merge(file_config).merge(@config).expand_defaults
         end
 
         def parse_remaining_arguments(arguments)
-          traverse(@config.expression_parser.public_method(:apply), arguments)
+          Mutant.traverse(@config.expression_parser.public_method(:apply), arguments)
             .fmap do |match_expressions|
               matcher(match_expressions: match_expressions)
               self
             end
         end
 
-        def traverse(action, values)
-          Either::Right.new(
-            values.map do |value|
-              action.call(value).from_right do |error|
-                return Either::Left.new(error)
-              end
-            end
-          )
-        end
-
         def set(**attributes)
           @config = @config.with(attributes)
         end

data/lib/mutant/cli/command/environment/run.rb

@@ -25,12 +25,19 @@ module Mutant
 
         private
 
-          def execute
+          def action
             soft_fail(License.apply(world))
               .bind { bootstrap }
               .bind(&Runner.public_method(:apply))
-              .from_right { |error| world.stderr.puts(error); return false }
-              .success?
+              .bind(&method(:from_result))
+          end
+
+          def from_result(result)
+            if result.success?
+              Either::Right.new(nil)
+            else
+              Either::Left.new('Uncovered mutations detected, exiting nonzero!')
+            end
           end
 
           def soft_fail(result)

data/lib/mutant/cli/command/environment/show.rb

@@ -11,12 +11,9 @@ module Mutant
 
         private
 
-          def execute
-            Config.load_config_file(world)
-              .fmap(&method(:expand))
-              .bind { Bootstrap.apply(world, @config) }
+          def action
+            bootstrap
               .fmap(&method(:report_env))
-              .right?
           end
 
           def report_env(env)

data/lib/mutant/config.rb

@@ -40,6 +40,12 @@ module Mutant
     class CoverageCriteria
       include Anima.new(:process_abort, :test_result, :timeout)
 
+      EMPTY = new(
+        process_abort: nil,
+        test_result:   nil,
+        timeout:       nil
+      )
+
       DEFAULT = new(
         process_abort: false,
         test_result:   true,
@@ -61,6 +67,22 @@ module Mutant
             ->(value) { Either::Right.new(DEFAULT.with(**value)) }
           ]
         )
+
+      def merge(other)
+        self.class.new(
+          process_abort: overwrite(other, :process_abort),
+          test_result:   overwrite(other, :test_result),
+          timeout:       overwrite(other, :timeout)
+        )
+      end
+
+    private
+
+      def overwrite(other, attribute_name)
+        other_value = other.public_send(attribute_name)
+
+        other_value.nil? ? public_send(attribute_name) : other_value
+      end
     end # CoverageCriteria
 
     # Merge with other config
@@ -68,18 +90,24 @@ module Mutant
     # @param [Config] other
     #
     # @return [Config]
+    #
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def merge(other)
       other.with(
-        fail_fast:        fail_fast || other.fail_fast,
-        includes:         includes + other.includes,
-        jobs:             other.jobs || jobs,
-        integration:      other.integration || integration,
-        mutation_timeout: other.mutation_timeout || mutation_timeout,
-        matcher:          matcher.merge(other.matcher),
-        requires:         requires + other.requires,
-        zombie:           zombie || other.zombie
+        coverage_criteria: coverage_criteria.merge(other.coverage_criteria),
+        fail_fast:         fail_fast || other.fail_fast,
+        includes:          includes + other.includes,
+        jobs:              other.jobs || jobs,
+        integration:       other.integration || integration,
+        mutation_timeout:  other.mutation_timeout || mutation_timeout,
+        matcher:           matcher.merge(other.matcher),
+        requires:          requires + other.requires,
+        zombie:            zombie || other.zombie
       )
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     # Load config file
     #
@@ -100,6 +128,16 @@ module Mutant
       end
     end
 
+    # Expand config with defaults
+    #
+    # @return [Config]
+    def expand_defaults
+      with(
+        coverage_criteria: CoverageCriteria::DEFAULT.merge(coverage_criteria),
+        jobs:              jobs || 1
+      )
+    end
+
     def self.load_contents(path)
       Transform::Named
         .new(path.to_s, TRANSFORM)

data/lib/mutant/license.rb

@@ -3,7 +3,7 @@
 module Mutant
   module License
     NAME    = 'mutant-license'
-    VERSION = '~> 0.1.0'
+    VERSION = ['>= 0.1', '< 0.3'].freeze
 
     # Load license
     #
@@ -20,7 +20,7 @@ module Mutant
 
     def self.load_mutant_license(world)
       Either
-        .wrap_error(LoadError) { world.gem_method.call(NAME, VERSION) }
+        .wrap_error(LoadError) { world.gem_method.call(NAME, *VERSION) }
         .lmap(&:message)
         .lmap(&method(:check_for_rubygems_mutant_license))
     end

data/lib/mutant/meta.rb

@@ -17,8 +17,7 @@ module Mutant
       #
       # @return [undefined]
       def self.add(*types, &block)
-        file = caller.first.split(':in', 2).first
-        ALL << DSL.call(file, Set.new(types), block)
+        ALL << DSL.call(caller_locations(1).first, Set.new(types), block)
       end
 
       Pathname.glob(Pathname.new(__dir__).parent.parent.join('meta', '*.rb'))

data/lib/mutant/meta/example.rb

@@ -3,10 +3,11 @@
 module Mutant
   module Meta
     class Example
-      include Adamantium
+      include Adamantium::Flat
+
       include Anima.new(
         :expected,
-        :file,
+        :location,
         :lvars,
         :node,
         :original_source,
@@ -25,6 +26,23 @@ module Mutant
       end
       memoize :verification
 
+      # Example identification
+      #
+      # @return [String]
+      def identification
+        location.to_s
+      end
+
+      # Context of mutation
+      #
+      # @return [Context]
+      def context
+        Context.new(
+          Object,
+          location.path
+        )
+      end
+
       # Original source as generated by unparser
       #
       # @return [String]

data/lib/mutant/meta/example/dsl.rb

@@ -9,12 +9,12 @@ module Mutant
 
         # Run DSL on block
         #
-        # @param [Pathname] file
+        # @param [Thread::Backtrace::Location] location
         # @param [Set<Symbol>] types
         #
         # @return [Example]
-        def self.call(file, types, block)
-          instance = new(file, types)
+        def self.call(location, types, block)
+          instance = new(location, types)
           instance.instance_eval(&block)
           instance.example
         end
@@ -24,12 +24,12 @@ module Mutant
         # Initialize object
         #
         # @return [undefined]
-        def initialize(file, types)
-          @expected = []
-          @file     = file
-          @lvars    = []
-          @source   = nil
-          @types    = types
+        def initialize(location, types)
+          @expected    = []
+          @location    = location
+          @lvars       = []
+          @source      = nil
+          @types       = types
         end
 
         # Example captured by DSL
@@ -40,9 +40,10 @@ module Mutant
         #   in case example cannot be build
         def example
           fail 'source not defined' unless @source
+
           Example.new(
             expected:        @expected,
-            file:            @file,
+            location:        @location,
             lvars:           @lvars,
             node:            @node,
             original_source: @source,

data/lib/mutant/meta/example/verification.rb

@@ -28,7 +28,7 @@ module Mutant
       private
 
         def reports
-          reports = [example.file]
+          reports = [example.location]
           reports.concat(original)
           reports.concat(original_verification)
           reports.concat(make_report('Missing mutations:', missing))
@@ -94,7 +94,7 @@ module Mutant
 
         def missing
           (example.expected.map(&:node) - mutations.map(&:node)).map do |node|
-            Mutation::Evil.new(nil, node)
+            Mutation::Evil.new(example, node)
           end
         end
         memoize :missing

data/lib/mutant/mutation.rb

@@ -9,15 +9,7 @@ module Mutant
     CODE_DELIMITER = "\0"
     CODE_RANGE     = (0..4).freeze
 
-    # Identification string
-    #
-    # @return [String]
-    def identification
-      "#{self.class::SYMBOL}:#{subject.identification}:#{code}"
-    end
-    memoize :identification
-
-    # Mutation code
+    # Mutation identification code
     #
     # @return [String]
     def code
@@ -33,6 +25,14 @@ module Mutant
     end
     memoize :source
 
+    # Identification string
+    #
+    # @return [String]
+    def identification
+      "#{self.class::SYMBOL}:#{subject.identification}:#{code}"
+    end
+    memoize :identification
+
     # The monkeypatch to insert the mutation
     #
     # @return [String]
@@ -77,7 +77,6 @@ module Mutant
     def sha1
       Digest::SHA1.hexdigest(subject.identification + CODE_DELIMITER + source)
     end
-    memoize :sha1
 
     # Evil mutation that should case mutations to fail tests
     class Evil < self

data/lib/mutant/repository/diff.rb

@@ -23,39 +23,55 @@ module Mutant
       #   when git command failed
       def touches?(path, line_range)
         touched_paths
+          .from_right { |message| fail Error, message }
           .fetch(path) { return false }
           .touches?(line_range)
       end
 
     private
 
-      # rubocop:disable Metrics/MethodLength
+      def repository_root
+        world
+          .capture_stdout(%w[git rev-parse --show-toplevel])
+          .fmap(&:chomp)
+          .fmap(&world.pathname.public_method(:new))
+      end
+
       def touched_paths
-        pathname = world.pathname
-        work_dir = pathname.pwd
+        repository_root.bind(&method(:diff_index))
+      end
+      memoize :touched_paths
 
+      def diff_index(root)
         world
           .capture_stdout(%W[git diff-index #{to}])
-          .from_right
-          .lines
-          .map do |line|
-            path = parse_line(work_dir, line)
-            [path.path, path]
+          .fmap(&:lines)
+          .bind do |lines|
+            Mutant
+              .traverse(->(line) { parse_line(root, line) }, lines)
+              .fmap do |paths|
+                paths.map { |path| [path.path, path] }.to_h
+              end
           end
-          .to_h
       end
-      memoize :touched_paths
-      # rubocop:enable Metrics/MethodLength
-
-      def parse_line(work_dir, line)
-        match = FORMAT.match(line) or fail Error, "Invalid git diff-index line: #{line}"
 
-        Path.new(
-          path:  work_dir.join(match.captures.first),
-          to:    to,
-          world: world
-        )
+      # rubocop:disable Metrics/MethodLength
+      def parse_line(root, line)
+        match = FORMAT.match(line)
+
+        if match
+          Either::Right.new(
+            Path.new(
+              path:  root.join(match.captures.first),
+              to:    to,
+              world: world
+            )
+          )
+        else
+          Either::Left.new("Invalid git diff-index line: #{line}")
+        end
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Path touched by a diff
       class Path

data/lib/mutant/result.rb

@@ -276,7 +276,7 @@ module Mutant
       def process_abort?
         process_status = isolation_result.process_status or return false
 
-        !timeout? && !process_status.exited?
+        !timeout? && !process_status.success?
       end
 
     private

data/lib/mutant/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.10.16
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type