mutant 0.3.0.rc1 → 0.3.0.rc2

data/lib/mutant/cli.rb

@@ -19,7 +19,7 @@ module Mutant
     # @param [Array<String>] arguments
     #
     # @return [Fixnum]
-    #   returns exit status
+    #   the exit status
     #
     # @api private
     #
@@ -42,12 +42,11 @@ module Mutant
     #
     def initialize(arguments = [])
       @filters, @matchers = [], []
-
+      @debug = @fail_fast = @zombie = false
       @cache = Mutant::Cache.new
-
+      @strategy_builder = nil
       parse(arguments)
-      strategy
-      matcher
+      config # trigger lazyness now
     end
 
     # Return config
@@ -58,60 +57,20 @@ module Mutant
     #
     def config
       Config.new(
-        :cache     => @cache,
-        :zombie    => @zombie,
-        :debug     => debug?,
-        :matcher   => matcher,
-        :filter    => filter,
-        :fail_fast => !!@fail_fast,
-        :strategy  => strategy,
-        :reporter  => reporter
+        cache:             @cache,
+        zombie:            @zombie,
+        debug:             @debug,
+        matcher:           matcher,
+        subject_predicate: @subject_predicate.output,
+        strategy:          @strategy.output,
+        fail_fast:         @fail_fast,
+        reporter:          reporter
       )
     end
     memoize :config
 
   private
 
-    # Test for running in debug mode
-    #
-    # @return [true]
-    #   if debug mode is active
-    #
-    # @return [false]
-    #   otherwise
-    #
-    # @api private
-    #
-    def debug?
-      !!@debug
-    end
-
-    # Return mutation filter
-    #
-    # @return [Mutant::Matcher]
-    #
-    # @api private
-    #
-    def filter
-      if @filters.empty?
-        Mutation::Filter::ALL
-      else
-        Mutation::Filter::Whitelist.new(@filters)
-      end
-    end
-    memoize :filter
-
-    # Return stratety
-    #
-    # @return [Strategy]
-    #
-    # @api private
-    #
-    def strategy
-      @strategy or raise(Error, 'No strategy was set!')
-    end
-    memoize :strategy
-
     # Return reporter
     #
     # @return [Mutant::Reporter::CLI]
@@ -121,7 +80,6 @@ module Mutant
     def reporter
       Reporter::CLI.new($stdout)
     end
-    memoize :reporter
 
     # Return matcher
     #
@@ -134,37 +92,22 @@ module Mutant
     #
     def matcher
       if @matchers.empty?
-        raise Error, 'No matchers given'
+        raise(Error, 'No matchers given')
       end
 
       Matcher::Chain.build(@matchers)
     end
-    memoize :matcher
 
     # Add mutation filter
     #
-    # @param [Class<Mutant::Filter>] klass
-    #
-    # @param [String] filter
+    # @param [Class<Predicate>] klass
     #
     # @return [undefined]
     #
     # @api private
     #
-    def add_filter(klass, filter)
-      @filters << klass.new(filter)
-    end
-
-    # Set strategy
-    #
-    # @param [Strategy] strategy
-    #
-    # @api private
-    #
-    # @return [undefined]
-    #
-    def set_strategy(strategy)
-      @strategy = strategy
+    def add_filter(klass, *arguments)
+      @filters << klass.new(*arguments)
     end
 
     # Parse the command-line options
@@ -182,22 +125,20 @@ module Mutant
     def parse(arguments)
       opts = OptionParser.new do |builder|
         builder.banner = 'usage: mutant STRATEGY [options] MATCHERS ...'
-        builder.separator ''
-        builder.separator 'Strategies:'
-
+        builder.separator('')
         add_strategies(builder)
         add_environmental_options(builder)
         add_options(builder)
       end
 
-      matchers =
+      patterns =
         begin
           opts.parse!(arguments)
         rescue OptionParser::ParseError => error
           raise(Error, error.message, error.backtrace)
         end
 
-      parse_matchers(matchers)
+      parse_matchers(patterns)
     end
 
     # Parse matchers
@@ -210,31 +151,29 @@ module Mutant
     #
     def parse_matchers(patterns)
       patterns.each do |pattern|
-        matcher = Classifier.build(@cache, pattern)
+        matcher = Classifier.run(@cache, pattern)
         @matchers << matcher if matcher
       end
     end
 
     # Add strategies
     #
-    # @param [Object] opts
+    # @param [OptionParser] parser
     #
     # @return [undefined]
     #
     # @api private
     #
-    def add_strategies(opts)
-      opts.separator ''
-      opts.separator 'Strategies:'
+    def add_strategies(parser)
+      parser.separator(EMPTY_STRING)
+      parser.separator('Strategies:')
 
-      opts.on('--static-success', 'does succeed on all mutations') do
-        set_strategy Strategy::Static::Success.new
-      end
-      opts.on('--static-fail', 'does fail on all mutations') do
-        set_strategy Strategy::Static::Fail.new
-      end
-      opts.on('--rspec', 'kills mutations with rspec') do
-        set_strategy Strategy::Rspec.new
+      {
+        Builder::Rspec              => :@strategy,
+        Builder::Predicate::Subject => :@subject_predicate,
+      }.each do |builder, instance_variable_name|
+        builder = builder.new(@cache, parser)
+        instance_variable_set(instance_variable_name, builder)
       end
     end
 
@@ -249,10 +188,10 @@ module Mutant
     def add_environmental_options(opts)
       opts.on('--zombie', 'Run mutant zombified') do
         @zombie = true
-      end.on('-I', 'Add directory to $LOAD_PATH') do |directory|
+      end.on('-I', '--include DIRECTORY', 'Add DIRECTORY to $LOAD_PATH') do |directory|
         $LOAD_PATH << directory
-      end.on('-r', '--require NAME', 'Require file with NAME') do |name|
-        require name
+      end.on('-require', '--require NAME', 'Require file with NAME') do |name|
+        require(name)
       end
     end
 
@@ -272,7 +211,7 @@ module Mutant
         puts("mutant-#{Mutant::VERSION}")
         Kernel.exit(0)
       end.on('--code FILTER', 'Adds a code filter') do |filter|
-        add_filter(Mutation::Filter::Code, filter)
+        add_filter(Predicate::Attribute, :code, filter)
       end.on('--fail-fast', 'Fail fast') do
         @fail_fast = true
       end.on('-d', '--debug', 'Enable debugging output') do
@@ -282,6 +221,5 @@ module Mutant
         exit
       end
     end
-
   end # CLI
 end # Mutant

data/lib/mutant/color.rb

@@ -36,7 +36,7 @@ module Mutant
       # @param [String] text
       #
       # @return [String]
-      #   returns the argument string
+      #   the argument string
       #
       # @api private
       #

data/lib/mutant/config.rb

@@ -4,8 +4,14 @@ module Mutant
   # The configuration of a mutator run
   class Config
     include Adamantium::Flat, Anima.new(
-      :cache, :debug, :strategy, :matcher, :filter,
-      :reporter, :fail_fast, :zombie
+      :cache,
+      :debug,
+      :strategy,
+      :matcher,
+      :subject_predicate,
+      :reporter,
+      :fail_fast,
+      :zombie
     )
 
     # Enumerate subjects
@@ -22,7 +28,7 @@ module Mutant
     #
     def subjects(&block)
       return to_enum(__method__) unless block_given?
-      matcher.each(&block)
+      Matcher::Filter.new(matcher, subject_predicate).each(&block)
       self
     end
 

data/lib/mutant/constants.rb

@@ -15,7 +15,7 @@ module Mutant
 
   # Set of op assign types
   OP_ASSIGN = [
-    :or_asgn, :and_asgn
+    :or_asgn, :and_asgn, :op_asgn
   ].to_set.freeze
 
   # Set of node types that are not valid when emitted standalone

data/lib/mutant/context/scope.rb

@@ -96,8 +96,8 @@ module Mutant
       # @api private
       #
       def match_prefixes
-        name_nesting.length.downto(1).map do |last|
-          name_nesting[0...last].join('::')
+        name_nesting.each_index.reverse_each.map do |index|
+          name_nesting.take(index.succ).join('::')
         end
       end
       memoize :match_prefixes

data/lib/mutant/differ.rb

@@ -108,7 +108,6 @@ module Mutant
     # @param [String] line
     #
     # @return [String]
-    #   returns colorized line
     #
     # @api private
     #

data/lib/mutant/killer/rspec.rb

@@ -23,13 +23,13 @@ module Mutant
         groups = example_groups
 
         unless groups
-          $stderr.puts "No rspec example groups found for: #{match_prefixes.join(', ')}"
+          $stderr.puts("No rspec example groups found for: #{match_prefixes.join(', ')}")
           return false
         end
 
         reporter = RSpec::Core::Reporter.new
 
-        example_groups.each do |group|
+        groups.each do |group|
           return true unless group.run(reporter)
         end
 
@@ -53,12 +53,7 @@ module Mutant
       # @api private
       #
       def example_groups
-        match_prefixes.each do |match_expression|
-          example_groups = find_with(match_expression)
-          return example_groups unless example_groups.empty?
-        end
-
-        nil
+        match_prefixes.flat_map { |prefix| find_with(prefix) }.compact.uniq
       end
 
       # Return example groups that match expression

data/lib/mutant/killer.rb

@@ -33,7 +33,7 @@ module Mutant
     #
     def initialize(strategy, mutation)
       @strategy, @mutation = strategy, mutation
-      run_with_benchmark
+      @killed = run
     end
 
     # Test for kill failure
@@ -65,14 +65,6 @@ module Mutant
       @killed
     end
 
-    # Return runtime of killer
-    #
-    # @return [Float]
-    #
-    # @api private
-    #
-    attr_reader :runtime
-
     # Return mutated source
     #
     # @return [String]
@@ -85,19 +77,6 @@ module Mutant
 
   private
 
-    # Run with taking the time
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def run_with_benchmark
-      times = Benchmark.measure do
-        @killed = run
-      end
-      @runtime = times.real
-    end
-
     # Return subject
     #
     # @return [Subject]

data/lib/mutant/matcher/chain.rb

@@ -9,10 +9,10 @@ module Mutant
       # Enumerate subjects
       #
       # @return [Enumerator<Subject]
-      #   returns subject enumerator if no block given
+      #   if no block given
       #
       # @return [self]
-      #   returnns self otherwise
+      #   otherwise
       #
       # @api private
       #

data/lib/mutant/matcher/filter.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+module Mutant
+  class Matcher
+    # Matcher filter
+    class Filter < self
+      include Concord.new(:matcher, :filter)
+
+      # Enumerate matches
+      #
+      # @return [self]
+      #   if block given
+      #
+      # @return [Enumerator<Subject>]
+      #   otherwise
+      #
+      # @api private
+      #
+      def each
+        return to_enum unless block_given?
+
+        matcher.each do |subject|
+          next if filter.match?(subject)
+          yield subject
+        end
+
+        self
+      end
+
+    end # Filter
+  end # Matcher
+end # Mutant

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

@@ -45,10 +45,10 @@ module Mutant
         # @param [Parser::AST::Node] node
         #
         # @return [true]
-        #   returns true if node matches method
+        #   if node matches method
         #
         # @return [false]
-        #   returns false if node NOT matches method
+        #   otherwise
         #
         # @api private
         #

data/lib/mutant/matcher/method.rb

@@ -14,10 +14,10 @@ module Mutant
       # Enumerate matches
       #
       # @return [Enumerable<Subject>]
-      #   returns enumerable when no block given
+      #   if no block given
       #
       # @return [self]
-      #   returns self when block given
+      #   otherwise
       #
       # @api private
       #
@@ -129,7 +129,7 @@ module Mutant
       # Return subject
       #
       # @return [Subject]
-      #   returns subject if there is a matched node
+      #   if there is a matched node
       #
       # @return [nil]
       #   otherwise

data/lib/mutant/matcher/methods.rb

@@ -117,7 +117,7 @@ module Mutant
         def candidate_scope
           scope.singleton_class
         end
-        memoize :candidate_scope, :freezer => :noop
+        memoize :candidate_scope, freezer: :noop
 
       end # Singleton
 

data/lib/mutant/matcher.rb

@@ -14,6 +14,7 @@ module Mutant
     #   if block given
     #
     # @return [Enumerable<Subject>]
+    #   otherwise
     #
     # @api private
     #

data/lib/mutant/mutation/evil.rb

@@ -32,16 +32,6 @@ module Mutant
         killer.killed?
       end
 
-      # Indicate if a killer should treat a kill as problematic
-      #
-      # @return [false] Killing evil mutants is not problematic
-      #
-      # @api private
-      #
-      def should_survive?
-        false
-      end
-
     end # Evil
   end # Mutation
 end # Mutant

data/lib/mutant/mutation/neutral.rb

@@ -12,19 +12,6 @@ module Mutant
 
         SYMBOL = 'noop'
 
-        # Indicate if a killer should treat a kill as problematic
-        #
-        # @return [false] Killing noop mutants is a serious problem. Failures
-        #   in noop may indicate a broken test suite, but they can also be an
-        #   indication  mutant has altered the runtime environment in a subtle
-        #   way and tickled an odd bug
-        #
-        # @api private
-        #
-        def should_survive?
-          false
-        end
-
       end
 
       # Return identification
@@ -54,16 +41,6 @@ module Mutant
         !killer.killed?
       end
 
-      # Indicate if a killer should treat a kill as problematic
-      #
-      # @return [true] Neutral mutants must die
-      #
-      # @api private
-      #
-      def should_survive?
-        false
-      end
-
     end # Neutral
   end # Mutation
 end # Mutant

data/lib/mutant/mutation.rb

@@ -31,18 +31,6 @@ module Mutant
     #
     abstract_method :success?
 
-    # Indicate if a killer should treat a kill as problematic
-    #
-    # @return [true]
-    #   if killing is unexpected
-    #
-    # @return [false]
-    #   if killing is expected
-    #
-    # @api private
-    #
-    abstract_method :should_survive?
-
     # Insert mutated node
     #
     # FIXME: Cache subject visibility in a better way! Ideally dont mutate it
@@ -81,17 +69,6 @@ module Mutant
     end
     memoize :code
 
-    # Return sha1 sum of source and subject identification
-    #
-    # @return [String]
-    #
-    # @api private
-    #
-    def sha1
-      Digest::SHA1.hexdigest(subject.identification + 0.chr + source)
-    end
-    memoize :sha1
-
     # Return source
     #
     # @return [String]
@@ -113,5 +90,18 @@ module Mutant
       subject.source
     end
 
+  private
+
+    # Return sha1 sum of source and subject identification
+    #
+    # @return [String]
+    #
+    # @api private
+    #
+    def sha1
+      Digest::SHA1.hexdigest(subject.identification + 0.chr + source)
+    end
+    memoize :sha1
+
   end # Mutation
 end # Mutant

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

@@ -19,9 +19,7 @@ module Mutant
         #
         def dispatch
           Util::Array.each(children, self) do |children|
-            if children.length > 1
-              emit_self(*children)
-            end
+            emit_child_subset(children)
           end
           children.each_with_index do |child, index|
             mutate_child(index)
@@ -29,18 +27,22 @@ module Mutant
           end
         end
 
-        # Test if parent input is a send
+        # Emit child subset
         #
-        # @return [true]
-        #   if parent input is a send node
+        # @param [Array<Parser::AST::Node>] nodes
         #
-        # @return [false]
-        #   otherwise
+        # @return [undefined]
         #
         # @api private
         #
-        def parent_send?
-          parent && parent.input.type == :send
+        def emit_child_subset(children)
+          case children.length
+          when 0
+          when 1
+            emit(children.first)
+          else
+            emit_self(*children)
+          end
         end
 
       end # Block

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

@@ -26,6 +26,7 @@ module Mutant
           end
           emit_body(nil)
           emit_body(RAISE)
+          emit_nil
         end
 
       end # Block

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

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module Mutant
+  class Mutator
+    class Node
+
+      # Blockarg mutator
+      class Blockarg < Generic
+
+        handle(:blockarg)
+
+      end # Blockarg
+    end # Node
+  end # Mutator
+end # Mutant

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

@@ -23,6 +23,7 @@ module Mutant
           emit_condition_mutations
           emit_when_mutations
           emit_else_mutations
+          emit_nil
         end
 
         # Emit when mutations

data/lib/mutant/mutator/node/connective/binary.rb

@@ -9,8 +9,8 @@ module Mutant
         class Binary < Node
 
           INVERSE = {
-            :and => :or,
-            :or  => :and,
+            and: :or,
+            or:  :and
           }.freeze
 
           handle(*INVERSE.keys)

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

@@ -18,7 +18,8 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_nil unless parent_type == :const
+          emit_self(nil, *children.drop(1))
           children.each_with_index do |child, index|
             mutate_child(index) if child.kind_of?(Parser::AST::Node)
           end