mutant 0.5.24 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af74623c08acfc217b54ebc8701ac11c122f243
-  data.tar.gz: c9899c8efaad75e829ebf634095a4e88ca72e693
+  metadata.gz: 8b47d52ad659d548654d47fb3905ad423021b7a2
+  data.tar.gz: b3e197edb631419fbe793d8477b2cb9e0975cf0d
 SHA512:
-  metadata.gz: 9f0f560faa4d8771649af1baef4ff2dd56c6d1a618ad7e4c640dbfcfc2f4e80b6c7963474e89f799a0f2ba1446a14a55dcab35c62653ce34462d042ca653d9dd
-  data.tar.gz: b2d1eb8f58ce5b1a9278e11456742853940c44c4cad7bb5ecaabb01e411576beab12fcdcc419899a2b8a33bd7afa36ea4b7eedc16995728861d38a580e6f13c5
+  metadata.gz: 7c52c83d2d637d3f6f6baa01da3f5536d513b57247fce771af24a75e46a83eda62b94ab222075fc4908becf899ab33bb5def7c96c68453ccc6226545bb376fb2
+  data.tar.gz: d856b74e68b9c588a8fd518738fe237ab1ba4887da2bcf6346ad17b8329981e9d8f818d45383e5b6ea64118b8c8b6c6a722a6587d30d1cf9c68baded825d073a

data/Changelog.md

@@ -1,3 +1,11 @@
+# v0.5.25 2014-07-07
+
+* Make ordering of subjects and tests deterministic
+* Fix performance of subject selection
+* Improve noop and neutral reporting.
+* Rename noop mutations to neutral mutations
+* Simplify code nuked around 1kloc.
+
 # v0.5.24 2014-06-30
 
 * Fix invalid AST on op_assign mutations

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 973
+total_score: 1040

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 29.6
+threshold: 29.3

data/config/reek.yml

@@ -25,19 +25,20 @@ DuplicateMethodCall:
 FeatureEnvy:
   enabled: true
   exclude:
+  # Nature of OptionParser :(
+  - Mutant::CLI#add_environment_options
+  - Mutant::Env#scope_name
+  - Mutant::Integration::Rspec#run
   - Mutant::Integration::Rspec2#full_description
   - Mutant::Integration::Rspec3#full_description
   - Mutant::Matcher::Method::Instance#match?
   - Mutant::Matcher::Method::Singleton#receiver?
-  - Mutant::Matcher::Namespace#scope_name
   - Mutant::Mutation::Evil#success?
   - Mutant::Mutation::Neutral#success?
-  - Mutant::Reporter::CLI#subject_results
-  # Nature of OptionParser :(
-  - Mutant::CLI#add_environmental_options
-  - Mutant::CLI#parse
   # False positive, its a utility
   - Mutant::Meta::Example::Verification#format_mutation
+  - Mutant::Reporter::CLI#subject_results
+  - Mutant::Runner#run_mutation_test
 IrresponsibleModule:
   enabled: true
   exclude: []
@@ -56,14 +57,15 @@ NestedIterators:
   exclude:
   - Mutant#self.singleton_subclass_instance
   - Mutant::CLI#parse
+  - Mutant::Integration::Rspec#run
   - Mutant::Mutator::Util::Array::Element#dispatch
   - Mutant::Mutator::Node::Resbody#mutate_captures
   - Mutant::Mutator::Node::Arguments#emit_argument_mutations
-  - Mutant::Reporter::CLI::Report::Config#generic_stats
+  - Mutant::Reporter::CLI::Report::Env#generic_stats
   - Mutant::RequireHighjack#infect
   - Mutant::RequireHighjack#desinfect
   - Mutant::Reporter::CLI::Registry#included
-  - Mutant::Config#tests
+  - Mutant::Subject#tests
   - Parser::Lexer#self.new
   max_allowed_nesting: 1
   ignore_iterators: []
@@ -82,12 +84,12 @@ TooManyInstanceVariables:
   - Mutant::CLI     # 4 vars
   - Mutant::Killer  # 4 vars
   - Mutant::Mutator # 4 vars
-  - Mutant::Runner  # 4 vars
   max_instance_variables: 3
 TooManyMethods:
   enabled: true
   exclude:
   - Mutant::CLI
+  - Mutant::Subject
   - Mutant::Mutator::Node
   - Mutant::Reporter::CLI
   - Mutant::Meta::Example::Verification
@@ -96,7 +98,8 @@ TooManyStatements:
   enabled: true
   exclude:
   - Mutant#self.singleton_subclass_instance
-  - Mutant::Reporter::CLI::Report::Config#run
+  - Mutant::Integration::Rspec#run
+  - Mutant::Reporter::CLI::Report::Env#run
   - Mutant::Reporter::CLI::Registry#included
   - Mutant::Reporter::CLI#colorized_diff
   - Mutant::RequireHighjack#infect
@@ -105,10 +108,8 @@ TooManyStatements:
   - Mutant::Runner#initialize
   - Mutant::Runner::Mutation#run
   - Mutant::Zombifier::File#self.find
-  # How mutant does CLI parsing is shit
-  - Mutant::CLI#parse
-  - Mutant::CLI#initialize
   - Mutant::CLI#add_debug_options
+  - Mutant::CLI#add_environment_options
   max_statements: 7
 UncommunicativeMethodName:
   enabled: true
@@ -151,6 +152,7 @@ UnusedParameters:
 UtilityFunction:
   enabled: true
   exclude:
+  - Mutant::AST::Sexp#s
   - Mutant::CLI#reporter
   - Mutant::Integration::Rspec#configuration
   - Mutant::Integration::Rspec#options
@@ -160,5 +162,5 @@ UtilityFunction:
   - Mutant::Meta::Example::Verification#format_mutation
   - Mutant::Mutation::Evil#success?
   - Mutant::Mutation::Neutral#success?
-  - Mutant::AST::Sexp#s
+  - Mutant::Runner#run_mutation_test
   max_helper_calls: 0

data/lib/mutant.rb

@@ -96,8 +96,6 @@ require 'mutant/require_highjack'
 require 'mutant/isolation'
 require 'mutant/mutator'
 require 'mutant/mutation'
-require 'mutant/mutation/evil'
-require 'mutant/mutation/neutral'
 require 'mutant/mutator/registry'
 require 'mutant/mutator/util'
 require 'mutant/mutator/util/array'
@@ -165,7 +163,8 @@ require 'mutant/subject/method'
 require 'mutant/subject/method/instance'
 require 'mutant/subject/method/singleton'
 require 'mutant/matcher'
-require 'mutant/matcher/builder'
+require 'mutant/matcher/config'
+require 'mutant/matcher/compiler'
 require 'mutant/matcher/chain'
 require 'mutant/matcher/method'
 require 'mutant/matcher/method/finder'
@@ -180,18 +179,12 @@ require 'mutant/expression'
 require 'mutant/expression/method'
 require 'mutant/expression/methods'
 require 'mutant/expression/namespace'
-require 'mutant/killer'
 require 'mutant/test'
-require 'mutant/test/report'
 require 'mutant/integration'
-require 'mutant/runner'
-require 'mutant/runner/config'
-require 'mutant/runner/subject'
-require 'mutant/runner/mutation'
-require 'mutant/runner/killer'
 require 'mutant/cli'
 require 'mutant/color'
 require 'mutant/diff'
+require 'mutant/result'
 require 'mutant/reporter'
 require 'mutant/reporter/null'
 require 'mutant/reporter/trace'
@@ -199,13 +192,36 @@ require 'mutant/reporter/cli'
 require 'mutant/reporter/cli/registry'
 require 'mutant/reporter/cli/printer'
 require 'mutant/reporter/cli/report'
-require 'mutant/reporter/cli/report/config'
+require 'mutant/reporter/cli/report/env'
 require 'mutant/reporter/cli/report/subject'
 require 'mutant/reporter/cli/report/mutation'
+require 'mutant/reporter/cli/report/test'
 require 'mutant/reporter/cli/progress'
+require 'mutant/reporter/cli/progress/env'
 require 'mutant/reporter/cli/progress/config'
 require 'mutant/reporter/cli/progress/subject'
-require 'mutant/reporter/cli/progress/mutation'
 require 'mutant/reporter/cli/progress/noop'
+require 'mutant/reporter/cli/progress/result'
+require 'mutant/reporter/cli/progress/result/mutation'
+require 'mutant/reporter/cli/progress/result/subject'
+require 'mutant/runner'
 require 'mutant/zombifier'
 require 'mutant/zombifier/file'
+
+module Mutant
+  # Repoen class to initialize constant to avoid dep circle
+  class Config
+    DEFAULT = new(
+      debug:             false,
+      fail_fast:         false,
+      integration:       Integration::Null.new,
+      matcher_config:    Matcher::Config::DEFAULT,
+      includes:          [],
+      requires:          [],
+      isolation:         Mutant::Isolation::Fork,
+      reporter:          Reporter::CLI.new($stdout),
+      zombie:            false,
+      expected_coverage: 100.0
+    )
+  end # Config
+end # Mutant

data/lib/mutant/ast/meta.rb

@@ -76,16 +76,6 @@ module Mutant
           arguments.one? && Types::BINARY_METHOD_OPERATORS.include?(selector)
         end
 
-        # Test if node is part of an mlhs
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        #
-        def mlhs?
-          (index_assignment_selector? && arguments.one?) || (arguments.empty? && attribute_assignment_selector?)
-        end
-
       private
 
         # Test for index assignment operator

data/lib/mutant/ast/named_children.rb

@@ -14,6 +14,7 @@ module Mutant
       #
       def self.included(host)
         super
+
         host.class_eval do
           include InstanceMethods
           extend ClassMethods

data/lib/mutant/ast/types.rb

@@ -24,13 +24,13 @@ module Mutant
         >> ** * % / | ^ & < > + - ~@ +@ -@ !
       ])
 
-      BINARY_METHOD_OPERATORS = (
+      BINARY_METHOD_OPERATORS = symbolset.(
         METHOD_OPERATORS - (INDEX_OPERATORS + UNARY_METHOD_OPERATORS)
-      ).to_set.freeze
+      )
 
-      OPERATOR_METHODS = (
+      OPERATOR_METHODS = symbolset.(
         METHOD_OPERATORS + INDEX_OPERATORS + UNARY_METHOD_OPERATORS
-      ).to_set.freeze
+      )
 
       # Nodes that are NOT handled by mutant.
       #
@@ -42,7 +42,7 @@ module Mutant
       EXTRA = symbolset.(%w[empty])
 
       # All node types mutant handles
-      ALL = ((Parser::Meta::NODE_TYPES + EXTRA) - BLACKLIST).to_set.freeze
+      ALL = symbolset.((Parser::Meta::NODE_TYPES + EXTRA) - BLACKLIST)
     end # Types
   end # AST
 end # Mutant

data/lib/mutant/cli.rb

@@ -4,9 +4,9 @@ module Mutant
 
   # Comandline parser
   class CLI
-    include Adamantium::Flat, Equalizer.new(:config)
+    include Adamantium::Flat, Equalizer.new(:config), Procto.call(:config)
 
-    # Error raised when CLI argv is invalid
+    # Error faild when CLI argv is invalid
     Error = Class.new(RuntimeError)
 
     EXIT_FAILURE = 1
@@ -22,9 +22,7 @@ module Mutant
     # @api private
     #
     def self.run(arguments)
-      config = new(arguments).config
-      runner = Runner::Config.run(config)
-      runner.success? ? EXIT_SUCCESS : EXIT_FAILURE
+      Env.call(call(arguments)).success? ? EXIT_SUCCESS : EXIT_FAILURE
     rescue Error => exception
       $stderr.puts(exception.message)
       EXIT_FAILURE
@@ -38,21 +36,10 @@ module Mutant
     #
     # @api private
     #
-    def initialize(arguments = [])
-      @builder = Matcher::Builder.new(Env::Boot.new(Reporter::CLI.new($stderr), Cache.new))
-      @debug = @fail_fast = @zombie = false
-      @expected_coverage = 100.0
-      @integration = Integration::Null.new
+    def initialize(arguments)
+      @config = Config::DEFAULT
+
       parse(arguments)
-      @config  = Config.new(
-        zombie:            @zombie,
-        debug:             @debug,
-        matcher:           @builder.matcher,
-        integration:       @integration,
-        fail_fast:         @fail_fast,
-        reporter:          Reporter::CLI.new($stdout),
-        expected_coverage: @expected_coverage
-      )
     end
 
     # Return config
@@ -70,7 +57,7 @@ module Mutant
     # @param [Array<String>] arguments
     #   Command-line options and arguments to be parsed.
     #
-    # @raise [Error]
+    # @fail [Error]
     #   An error occurred while parsing the options.
     #
     # @return [undefined]
@@ -79,22 +66,15 @@ module Mutant
     #
     def parse(arguments)
       opts = OptionParser.new do |builder|
-        builder.banner = 'usage: mutant STRATEGY [options] PATTERN ...'
-        builder.separator('')
-        add_environmental_options(builder)
-        add_mutation_options(builder)
-        add_filter_options(builder)
-        add_debug_options(builder)
-      end
-
-      patterns =
-        begin
-          opts.parse!(arguments)
-        rescue OptionParser::ParseError => error
-          raise(Error, error.message, error.backtrace)
+        builder.banner = 'usage: mutant [options] MATCH_EXPRESSION ...'
+        %w[add_environment_options add_mutation_options add_filter_options add_debug_options].each do |name|
+          send(name, builder)
         end
+      end
 
-      parse_matchers(patterns)
+      parse_match_expressions(opts.parse!(arguments))
+    rescue OptionParser::ParseError => error
+      fail(Error, error.message, error.backtrace)
     end
 
     # Parse matchers
@@ -105,10 +85,11 @@ module Mutant
     #
     # @api private
     #
-    def parse_matchers(patterns)
-      raise Error, 'No patterns given' if patterns.empty?
-      patterns.each do |pattern|
-        @builder.add_match_expression(Expression.parse(pattern))
+    def parse_match_expressions(expressions)
+      fail Error, 'No expressions given' if expressions.empty?
+
+      expressions.map(&Expression.method(:parse)).each do |expression|
+        add_matcher(:match_expressions, expression)
       end
     end
 
@@ -120,21 +101,20 @@ module Mutant
     #
     # @api private
     #
-    def add_environmental_options(opts)
-      opts.separator('')
+    def add_environment_options(opts)
       opts.separator('Environment:')
       opts.on('--zombie', 'Run mutant zombified') do
-        @zombie = true
-      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)
+        update(zombie: true)
+      end
+      opts.on('-I', '--include DIRECTORY', 'Add DIRECTORY to $LOAD_PATH') do |directory|
+        add(:includes, directory)
+      end
+      opts.on('-r', '--require NAME', 'Require file with NAME') do |name|
+        add(:requires, name)
       end
     end
 
-    # Use plugin
-    #
-    # FIXME: For now all plugins are strategies. Later they could be anything that allows "late integration".
+    # Use integration
     #
     # @param [String] name
     #
@@ -142,12 +122,9 @@ module Mutant
     #
     # @api private
     #
-    def use(name)
+    def setup_integration(name)
       require "mutant/integration/#{name}"
-      @integration = Integration.lookup(name).new
-    rescue LoadError
-      $stderr.puts("Cannot load plugin: #{name.inspect}")
-      raise
+      update(integration: Integration.lookup(name).new)
     end
 
     # Add options
@@ -163,10 +140,8 @@ module Mutant
       opts.separator('Options:')
 
       opts.on('--score COVERAGE', 'Fail unless COVERAGE is not reached exactly') do |coverage|
-        @expected_coverage = Float(coverage)
-      end.on('--use STRATEGY', 'Use STRATEGY for killing mutations') do |runner|
-        use(runner)
-      end
+        update(expected_coverage: Float(coverage))
+      end.on('--use STRATEGY', 'Use STRATEGY for killing mutations', &method(:setup_integration))
     end
 
     # Add filter options
@@ -179,10 +154,10 @@ module Mutant
     #
     def add_filter_options(opts)
       opts.on('--ignore-subject PATTERN', 'Ignore subjects that match PATTERN') do |pattern|
-        @builder.add_subject_ignore(Expression.parse(pattern))
+        add_matcher(:subject_ignores, Expression.parse(pattern))
       end
       opts.on('--code CODE', 'Scope execution to subjects with CODE') do |code|
-        @builder.add_subject_selector(:code, code)
+        add_matcher(:subject_selects, [:code, code])
       end
     end
 
@@ -196,16 +171,61 @@ module Mutant
     #
     def add_debug_options(opts)
       opts.on('--fail-fast', 'Fail fast') do
-        @fail_fast = true
+        update(fail_fast: true)
       end.on('--version', 'Print mutants version') do
         puts("mutant-#{Mutant::VERSION}")
-        Kernel.exit(0)
+        Kernel.exit(EXIT_SUCCESS)
       end.on('-d', '--debug', 'Enable debugging output') do
-        @debug = true
+        update(debug: true)
       end.on_tail('-h', '--help', 'Show this message') do
-        puts(opts)
-        exit
+        puts(opts.to_s)
+        Kernel.exit(EXIT_SUCCESS)
       end
     end
+
+    # Update configuration
+    #
+    # @param [Hash<Symbol, Object>] attributes
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def update(attributes)
+      @config = @config.update(attributes)
+    end
+
+    # Add configuration
+    #
+    # @param [Symbol] attribute
+    #   the attribute to add to
+    #
+    # @param [Object] value
+    #   the value to add
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def add(attribute, value)
+      update(attribute => config.public_send(attribute).dup << value)
+    end
+
+    # Add matcher configuration
+    #
+    # @param [Symbol] attribute
+    #   the attribute to add to
+    #
+    # @param [Object] value
+    #   the value to add
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def add_matcher(attribute, value)
+      update(matcher_config: config.matcher_config.add(attribute, value))
+    end
+
   end # CLI
 end # Mutant