mutant 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19cc50cff5125bbeef98eb0511a7c02c7154b4d5
-  data.tar.gz: 153344653cd236a26f822ea809333a881b66491b
+  metadata.gz: 2af74623c08acfc217b54ebc8701ac11c122f243
+  data.tar.gz: c9899c8efaad75e829ebf634095a4e88ca72e693
 SHA512:
-  metadata.gz: 1b3b1a8e57fcfc7c5423e16b1c7a375ef26494e1d6df55c12e458efcf7cc4f26be1681c379b7ce110d91f3c7179f43f294d099b1ce41203a162043ce893ba505
-  data.tar.gz: 43b9c7b3c628cf529316433463083163ec8ae83911575df994cdc71d604b34a6e05872be557cef18150c78c20015973bd5db37fd81ec170b377f02b220264bc0
+  metadata.gz: 9f0f560faa4d8771649af1baef4ff2dd56c6d1a618ad7e4c640dbfcfc2f4e80b6c7963474e89f799a0f2ba1446a14a55dcab35c62653ce34462d042ca653d9dd
+  data.tar.gz: b2d1eb8f58ce5b1a9278e11456742853940c44c4cad7bb5ecaabb01e411576beab12fcdcc419899a2b8a33bd7afa36ea4b7eedc16995728861d38a580e6f13c5

data/Changelog.md

@@ -1,3 +1,13 @@
+# v0.5.24 2014-06-30
+
+* Fix invalid AST on op_assign mutations
+* Make subject matching result order deterministic
+* Improve internals a bit for more consistency.
+* Add instance methods expression 'Foo#'
+* Add singleton methods expression 'Foo.'
+* Split rspec2 and rspec3 integration with minimal duplication
+* Move test matching outside of integrations.
+
 # v0.5.23 2014-06-15
 
 * Propagate exceptions from child-isolation-killforks to master

data/config/flay.yml

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

data/config/reek.yml

@@ -25,12 +25,14 @@ DuplicateMethodCall:
 FeatureEnvy:
   enabled: true
   exclude:
+  - 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
-  - Mutant::Rspec::Strategy#options
   # Nature of OptionParser :(
   - Mutant::CLI#add_environmental_options
   - Mutant::CLI#parse
@@ -61,7 +63,7 @@ NestedIterators:
   - Mutant::RequireHighjack#infect
   - Mutant::RequireHighjack#desinfect
   - Mutant::Reporter::CLI::Registry#included
-  - Mutant::Strategy#tests
+  - Mutant::Config#tests
   - Parser::Lexer#self.new
   max_allowed_nesting: 1
   ignore_iterators: []
@@ -71,7 +73,6 @@ RepeatedConditional:
   enabled: true
   exclude:
   - Mutant::Mutator
-  - Mutant::Rspec::Strategy
   - Mutant::Reporter::CLI
   - Mutant::Meta::Example::DSL
   max_ifs: 1
@@ -95,18 +96,15 @@ TooManyStatements:
   enabled: true
   exclude:
   - Mutant#self.singleton_subclass_instance
-  - Mutant::Isolation#self.call
-  - Mutant::Rspec::Killer#run
-  - Mutant::Reporter::CLI#colorized_diff
   - Mutant::Reporter::CLI::Report::Config#run
+  - Mutant::Reporter::CLI::Registry#included
+  - Mutant::Reporter::CLI#colorized_diff
+  - Mutant::RequireHighjack#infect
+  - Mutant::Rspec::Killer#run
   - Mutant::Runner#visit_collection
   - Mutant::Runner#initialize
   - Mutant::Runner::Mutation#run
   - Mutant::Zombifier::File#self.find
-  - Mutant::RequireHighjack#infect
-  - Mutant::Reporter::CLI::Registry#included
-  - Mutant::Rspec::Strategy#new_reporter
-  - Mutant::Rspec::Strategy#run
   # How mutant does CLI parsing is shit
   - Mutant::CLI#parse
   - Mutant::CLI#initialize
@@ -116,7 +114,7 @@ UncommunicativeMethodName:
   enabled: true
   exclude:
   - Mutant::Mutation#sha1
-  - Mutant::NodeHelpers#s
+  - Mutant::AST::Sexp#s
   reject:
   - !ruby/regexp /^[a-z]$/
   - !ruby/regexp /[0-9]$/
@@ -124,7 +122,9 @@ UncommunicativeMethodName:
   accept: []
 UncommunicativeModuleName:
   enabled: true
-  exclude: []
+  exclude:
+  - Rspec2
+  - Rspec3
   reject:
   - !ruby/regexp /^.$/
   - !ruby/regexp /[0-9]$/
@@ -152,13 +152,13 @@ UtilityFunction:
   enabled: true
   exclude:
   - Mutant::CLI#reporter
+  - Mutant::Integration::Rspec#configuration
+  - Mutant::Integration::Rspec#options
+  - Mutant::Integration::Rspec2#full_description
+  - Mutant::Integration::Rspec2#new_reporter
+  - Mutant::Integration::Rspec3#full_description
+  - Mutant::Meta::Example::Verification#format_mutation
   - Mutant::Mutation::Evil#success?
   - Mutant::Mutation::Neutral#success?
-  - Mutant::NodeHelpers#s
-  - Mutant::Rspec::Strategy#configuration
-  - Mutant::Rspec::Strategy#example_groups
-  - Mutant::Rspec::Strategy#options
-  - Mutant::Rspec::Strategy#world
-  - Mutant::Rspec::Strategy#rspec2
-  - Mutant::Meta::Example::Verification#format_mutation
+  - Mutant::AST::Sexp#s
   max_helper_calls: 0

data/lib/mutant.rb

@@ -25,45 +25,8 @@ module Mutant
   # The frozen empty array used within mutant
   EMPTY_ARRAY = [].freeze
 
-  symbolset = ->(strings) { strings.map(&:to_sym).to_set.freeze }
-
   SCOPE_OPERATOR = '::'.freeze
 
-  # Set of nodes that cannot be on the LHS of an assignment
-  NOT_ASSIGNABLE         = symbolset.(%w[int float str dstr class module self nil])
-  # Set of op-assign types
-  OP_ASSIGN              = symbolset.call(%w[or_asgn and_asgn op_asgn])
-  # Set of node types that are not valid when emitted standalone
-  NOT_STANDALONE         = symbolset.(%w[splat restarg block_pass])
-  INDEX_OPERATORS        = symbolset.(%w[[] []=])
-  UNARY_METHOD_OPERATORS = symbolset.(%w[~@ +@ -@ !])
-
-  # Operators ruby implementeds as methods
-  METHOD_OPERATORS = symbolset.(%w[
-    <=> === []= [] <= >= == !~ != =~ <<
-    >> ** * % / | ^ & < > + - ~@ +@ -@ !
-  ])
-
-  BINARY_METHOD_OPERATORS = (
-    METHOD_OPERATORS - (INDEX_OPERATORS + UNARY_METHOD_OPERATORS)
-  ).to_set.freeze
-
-  OPERATOR_METHODS = (
-    METHOD_OPERATORS + INDEX_OPERATORS + UNARY_METHOD_OPERATORS
-  ).to_set.freeze
-
-  # Nodes that are NOT handled by mutant.
-  #
-  # not - 1.8 only, mutant does not support 1.8
-  #
-  NODE_BLACKLIST = symbolset.(%w[not])
-
-  # Nodes that are NOT generated by parser but used by mutant / unparser.
-  NODE_EXTRA = symbolset.(%w[empty])
-
-  # All node types mutant handles
-  NODE_TYPES = ((Parser::Meta::NODE_TYPES + NODE_EXTRA) - NODE_BLACKLIST).to_set.freeze
-
   # Lookup constant for location
   #
   # @param [String] location
@@ -116,9 +79,16 @@ module Mutant
 end # Mutant
 
 require 'mutant/version'
+require 'mutant/env'
+require 'mutant/ast'
+require 'mutant/ast/sexp'
+require 'mutant/ast/types'
+require 'mutant/ast/nodes'
+require 'mutant/ast/named_children'
+require 'mutant/ast/node_predicates'
+require 'mutant/ast/meta'
 require 'mutant/cache'
 require 'mutant/delegator'
-require 'mutant/node_helpers'
 require 'mutant/warning_filter'
 require 'mutant/warning_expectation'
 require 'mutant/walker'
@@ -195,6 +165,7 @@ require 'mutant/subject/method'
 require 'mutant/subject/method/instance'
 require 'mutant/subject/method/singleton'
 require 'mutant/matcher'
+require 'mutant/matcher/builder'
 require 'mutant/matcher/chain'
 require 'mutant/matcher/method'
 require 'mutant/matcher/method/finder'
@@ -207,10 +178,12 @@ require 'mutant/matcher/filter'
 require 'mutant/matcher/null'
 require 'mutant/expression'
 require 'mutant/expression/method'
+require 'mutant/expression/methods'
 require 'mutant/expression/namespace'
 require 'mutant/killer'
 require 'mutant/test'
-require 'mutant/strategy'
+require 'mutant/test/report'
+require 'mutant/integration'
 require 'mutant/runner'
 require 'mutant/runner/config'
 require 'mutant/runner/subject'

data/lib/mutant/ast.rb

@@ -0,0 +1,5 @@
+module Mutant
+  # AST helpers
+  module AST
+  end # AST
+end # Mutant

data/lib/mutant/ast/meta.rb

@@ -0,0 +1,131 @@
+module Mutant
+  module AST
+    # Node meta information mixin
+    module Meta
+
+      REGISTRY = {}
+
+      # Return meta for node
+      #
+      # @param [Parser::AST::Node] node
+      #
+      # @return [Meta]
+      #
+      # @api private
+      #
+      def self.for(node)
+        REGISTRY.fetch(node.type, Generic).new(node)
+      end
+
+      # Generic metadata for send nodes
+      class Send
+        include Concord.new(:node), NamedChildren
+
+        children :receiver, :selector
+
+        REGISTRY[:send] = self
+
+        INDEX_ASSIGNMENT_SELECTOR            = :[]=
+        ATTRIBUTE_ASSIGNMENT_SELECTOR_SUFFIX = '='.freeze
+
+        # Return arguments
+        #
+        # @return [Enumerable<Parser::AST::Node>]
+        #
+        # @api private
+        #
+        alias_method :arguments, :remaining_children
+
+        # Test if AST node is a valid assignment target
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def assignment?
+          index_assignment? || attribute_assignment?
+        end
+
+        # Test if AST node is an attribute assignment?
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def attribute_assignment?
+          arguments.one? && attribute_assignment_selector?
+        end
+
+        # Test if AST node is an index assign
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def index_assignment?
+          arguments.length.equal?(2) && index_assignment_selector?
+        end
+
+        # Test for binary operator implemented as method
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def binary_method_operator?
+          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
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def index_assignment_selector?
+          selector.equal?(INDEX_ASSIGNMENT_SELECTOR)
+        end
+
+        # Test for attribute assignment selector
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def attribute_assignment_selector?
+          !Types::METHOD_OPERATORS.include?(selector) && selector.to_s.end_with?(ATTRIBUTE_ASSIGNMENT_SELECTOR_SUFFIX)
+        end
+
+      end # Send
+
+      # Generic node metatada
+      class Generic
+        include Adamantium, Concord.new(:node)
+
+        # Test if AST node is a valid assign target
+        #
+        # @return [Boolean]
+        #
+        # @api private
+        #
+        def assignment?
+          Types::ASSIGNABLE_VARIABLES.include?(node.type)
+        end
+
+      end # Generic
+
+    end #
+  end # AST
+end # Mutant

data/lib/mutant/ast/named_children.rb

@@ -0,0 +1,98 @@
+module Mutant
+  module AST
+
+    # Helper methods to define named children
+    module NamedChildren
+
+      # Hook called when module gets included
+      #
+      # @param [Class, Module] host
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def self.included(host)
+        super
+        host.class_eval do
+          include InstanceMethods
+          extend ClassMethods
+        end
+      end
+
+      # Methods mixed int ot instance level
+      module InstanceMethods
+
+      private
+
+        # Return children
+        #
+        # @return [Array<Parser::AST::Node]
+        #
+        # @api private
+        #
+        def children
+          node.children
+        end
+
+      end # InstanceMethods
+
+      # Methods mixed in at class level
+      module ClassMethods
+
+      private
+
+        # Define named child
+        #
+        # @param [Symbol] name
+        # @param [Fixnum] index
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def define_named_child(name, index)
+          define_method(name) do
+            children.at(index)
+          end
+        end
+
+        # Define remaining children
+        #
+        # @param [Array<Symbol>] names
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def define_remaining_children(names)
+          define_method(:remaining_children_with_index) do
+            children.each_with_index.drop(names.length)
+          end
+
+          define_method(:remaining_children_indices) do
+            children.each_index.drop(names.length)
+          end
+
+          define_method(:remaining_children) do
+            children.drop(names.length)
+          end
+        end
+
+        # Create name helpers
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def children(*names)
+          names.each_with_index do |name, index|
+            define_named_child(name, index)
+          end
+          define_remaining_children(names)
+        end
+
+      end # ClassMethods
+    end # NamedChildren
+  end # AST
+end # Mutant