mutant 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9b76361ec8efbc895effb134fd49fed9c74f95
-  data.tar.gz: 84bfbbd7a7c0ac6bf4151ef447ba0ee591b7985c
+  metadata.gz: e280c60019ecc32329702fe88d92f9d4b3cecee3
+  data.tar.gz: b50a351a93d04b9edad1aa75f4e90778009abd21
 SHA512:
-  metadata.gz: fd5e5ff8101043f82f93129ccbdbb1dab5dd444604c751f0bf1ba0ad8b6737549b78dc2c3bf0c05023bf79c4a08dbb07a52777a97b44b6b50ea36c8058128e3f
-  data.tar.gz: 1ddedaa3396804ab9fba9c6cd62892624a8a45a1a7bc5054227ec53ff625ad56274dfae803de5fa47e63f0cf4483cbfcea307660c0e51ffce9c44a3b4066a138
+  metadata.gz: a5d1a4c2c5906b2444e1133cf31b057a570258d5fa32ee4cc08642ddf74111ef8f860ea2d9bd8f1a8e0f7d9e97f88c5671ea928c3e81ba7cbf650c1588ef4de8
+  data.tar.gz: c285616c375874b12af6097e12b6e6386b83c0c70faf8e409f63a03ba9c7f9140f5bd14ce3491439e0c161d17f739d91ac96abc6628d62bff20d673098a72da5

data/Changelog.md

@@ -1,3 +1,12 @@
+# v0.3.2 2013-12-31
+
+Bugfixes:
+
+* Fix crash on until nodes: https://github.com/mbj/mutant/issues/143
+* Fix missing requires: https://github.com/mbj/mutant/issues/141
+* Fix crash on unknown nodes, fixes #143
+* Use more durable unparser version 0.1.6
+
 # v0.3.1 2013-12-19
 
 Bugfixes:

data/Gemfile

@@ -2,11 +2,9 @@
 
 source 'https://rubygems.org'
 
-gemspec
-
 gem 'mutant', path: '.'
 
-group :development, :test do
-  gem 'triage',      git: 'https://github.com/rom-rb/devtools.git', branch: 'triage-rename'
-  gem 'triage-deps', git: 'https://github.com/rom-rb/devtools.git', branch: 'triage-rename'
-end
+gemspec
+
+gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
+eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+group :development do
+  gem 'rake',  '~> 10.1.0'
+  gem 'rspec', '~> 2.14.1'
+  gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
+end
+
+group :yard do
+  gem 'kramdown', '~> 1.3.0'
+end
+
+group :guard do
+  gem 'guard',         '~> 2.2.4'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
+
+  # file system change event handling
+  gem 'listen',     '~> 2.4.0'
+  gem 'rb-fchange', '~> 0.0.6', require: false
+  gem 'rb-fsevent', '~> 0.9.3', require: false
+  gem 'rb-inotify', '~> 0.9.0', require: false
+
+  # notification handling
+  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'rb-notifu',               '~> 0.0.4', require: false
+  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
+end
+
+group :metrics do
+  gem 'coveralls', '~> 0.7.0'
+  gem 'flay',      '~> 2.4.0'
+  gem 'flog',      '~> 4.2.0'
+  gem 'reek',      '~> 1.3.2'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+
+  platforms :ruby_19, :ruby_20 do
+    gem 'yard-spellcheck', '~> 0.1.5'
+  end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4.10'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
+end
+
+group :benchmarks do
+  gem 'rbench', '~> 0.2.3'
+end
+
+platform :jruby do
+  group :jruby do
+    gem 'jruby-openssl', '~> 0.8.5'
+  end
+end

data/Rakefile

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-require 'triage'
+require 'devtools'
 
-Triage.init_rake_tasks
+Devtools.init_rake_tasks
 
 Rake.application.load_imports
 task('metrics:mutant').clear

data/config/devtools.yml

@@ -0,0 +1,2 @@
+---
+unit_test_timeout: 10

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 791
+total_score: 788

data/config/rubocop.yml

@@ -31,15 +31,6 @@ CollectionMethods:
     find:     'detect'
     find_all: 'select'
 
-# Do not force public/protected/private keyword to be indented at the same
-# level as the def keyword. My personal preference is to outdent these keywords
-# because I think when scanning code it makes it easier to identify the
-# sections of code and visually separate them. When the keyword is at the same
-# level I think it sort of blends in with the def keywords and makes it harder
-# to scan the code and see where the sections are.
-AccessControl:
-  Enabled: false
-
 MethodLength:
   CountComments: false
   Max: 17 # TODO: Bring down to 10
@@ -104,3 +95,11 @@ ClassLength:
 # I align private keywords with class body
 IndentationWidth:
   Enabled: false
+
+# I like to have an empty line before closing the currently opened body
+EmptyLinesAroundBody:
+  Enabled: false
+
+# I like my style more
+AccessModifierIndentation:
+  Enabled: false

data/lib/mutant.rb

@@ -22,6 +22,30 @@ require 'anima'
 require 'concord'
 require 'rspec'
 
+# Monkeypatch on parser with a list of allowed nodes.
+# Will be pushed upstream once turning out to be correct.
+module Parser
+  module Meta
+    NODE_TYPES =
+      %w(
+        true false nil int float str dstr str
+        sym dsym xstr regopt regexp array splat
+        array pair kwsplat hash irange erange self
+        lvar ivar cvar gvar const defined? lvasgn
+        ivasgn cvasgn gvasgn casgn mlhs masgn op_asgn
+        op_asgn and_asgn ensure rescue arg_expr
+        or_asgn and_asgn or_asgn back_ref nth_ref
+        match_with_lvasgn match_current_line
+        module class sclass def defs undef alias args
+        cbase arg optarg restarg blockarg block_pass args def kwarg kwoptarg
+        kwrestarg send super zsuper yield block send
+        and not or if when case while until while_post
+        until_post for break next redo return resbody
+        kwbegin begin retry preexe postexe iflipflop eflipflop
+      ).map(&:to_sym).to_set.freeze
+  end # Meta
+end # Parser
+
 # Library namespace
 module Mutant
   # The empty string used within this namespace
@@ -33,7 +57,6 @@ require 'mutant/cache'
 require 'mutant/node_helpers'
 require 'mutant/singleton_methods'
 require 'mutant/constants'
-require 'mutant/support/method_object'
 require 'mutant/random'
 require 'mutant/predicate'
 require 'mutant/predicate/attribute'
@@ -65,7 +88,7 @@ require 'mutant/mutator/node/argument'
 require 'mutant/mutator/node/arguments'
 require 'mutant/mutator/node/blockarg'
 require 'mutant/mutator/node/begin'
-require 'mutant/mutator/node/connective/binary'
+require 'mutant/mutator/node/binary'
 require 'mutant/mutator/node/const'
 require 'mutant/mutator/node/dstr'
 require 'mutant/mutator/node/dsym'
@@ -76,7 +99,7 @@ require 'mutant/mutator/node/named_value/variable_assignment'
 require 'mutant/mutator/node/loop_control'
 require 'mutant/mutator/node/noop'
 require 'mutant/mutator/node/op_asgn'
-require 'mutant/mutator/node/while'
+require 'mutant/mutator/node/conditional_loop'
 require 'mutant/mutator/node/yield'
 require 'mutant/mutator/node/super'
 require 'mutant/mutator/node/zsuper'

data/lib/mutant/cli/builder.rb

@@ -84,17 +84,6 @@ module Mutant
 
       private
 
-        # Set rspec level
-        #
-        # @return [self]
-        #
-        # @api private
-        #
-        def set_level(level)
-          @level = level
-          self
-        end
-
         # Add cli options
         #
         # @param [OptionParser] parser

data/lib/mutant/constants.rb

@@ -35,25 +35,19 @@ module Mutant
     METHOD_OPERATORS + INDEX_OPERATORS + UNARY_METHOD_OPERATORS
   ).to_set.freeze
 
-  # Hopefully all node types parser does generate.
+  # Nodes that are NOT handled by mutant.
   #
-  # FIXME: Maintain this list only in unparser / parser!
+  # not - 1.8 only, mutant does not support 1.8
   #
-  NODE_TYPES = [
-    :lvasgn, :ivasgn, :cvasgn, :gvasgn,
-    :casgn, :masgn, :mlhs, :break, :rescue,
-    :ensure, :resbody, :begin, :retry, :arg_expr,
-    :args, :blockarg, :optarg, :kwrestarg, :kwoptarg,
-    :kwarg, :restarg, :arg, :block_pass, :or, :and,
-    :next, :undef, :if, :module, :cbase, :block, :send,
-    :zsuper, :super, :empty, :alias, :for, :redo,
-    :return, :splat, :defined?, :op_asgn, :self,
-    :true, :false, :nil, :dstr, :dsym, :regexp,
-    :regopt, :int, :str, :float, :sym, :pair, :hash, :array,
-    :xstr, :def, :defs, :case, :when, :ivar, :lvar, :cvar, :gvar,
-    :back_ref, :const, :nth_ref, :class, :sclass, :yield,
-    :match_with_lvasgn, :match_current_line, :irange, :erange,
-    :or_asgn, :kwbegin, :and_asgn, :while
-  ].to_set.freeze
+  NODE_BLACKLIST = %w(
+    not
+  ).map(&:to_sym).freeze
+
+  # Nodes that are NOT generated by parser but used by mutant / unparser.
+  NODE_EXTRA = %w(
+    empty
+  ).map(&:to_sym).freeze
+
+  NODE_TYPES = ((Parser::Meta::NODE_TYPES + NODE_EXTRA) - NODE_BLACKLIST).to_set.freeze
 
 end # Mutant

data/lib/mutant/loader.rb

@@ -4,17 +4,7 @@ module Mutant
   # Base class for code loaders
   class Loader
     include AbstractType
-    extend MethodObject
-
-  private
-
-    # Run the loader
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    abstract_method :run
+    include Procto.call
 
     # Initialize and insert mutation into vm
     #
@@ -27,29 +17,29 @@ module Mutant
     #
     def initialize(root, subject)
       @root, @subject = root, subject
-      run
     end
 
     # Eval based loader
     class Eval < self
 
-    private
-
-      # Run loader
+      # Call loader
       #
       # @return [undefined]
       #
       # @api private
       #
-      def run
+      def call
         eval(
           source,
           TOPLEVEL_BINDING,
           @subject.source_path.to_s,
           @subject.source_line
         )
+        nil
       end
 
+    private
+
       # Return source
       #
       # @return [String]
@@ -59,6 +49,7 @@ module Mutant
       def source
         Unparser.unparse(@root)
       end
+
     end # Eval
 
   end # Loader

data/lib/mutant/mutation.rb

@@ -43,7 +43,7 @@ module Mutant
     #
     def insert
       subject.public?
-      Loader::Eval.run(root, subject)
+      Loader::Eval.call(root, subject)
       self
     end
 

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

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+module Mutant
+  class Mutator
+    class Node
+      # Mutation emitter to handle binary connectives
+      class Binary < self
+
+        INVERSE = {
+          and: :or,
+          or:  :and
+        }.freeze
+
+        handle(*INVERSE.keys)
+
+        children :left, :right
+
+      private
+
+        # Emit mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          emit_nil
+          emit(left)
+          emit(right)
+          mutate_operator
+          mutate_operands
+        end
+
+        # Emit operator mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mutate_operator
+          emit(s(INVERSE.fetch(node.type), left, right))
+        end
+
+        # Emit condition mutations
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def mutate_operands
+          emit(s(node.type, n_not(left), right))
+          emit(n_not(node))
+        end
+
+      end # Binary
+    end # Node
+  end # Mutator
+end # Mutant

data/lib/mutant/mutator/node/{while.rb → conditional_loop.rb}

@@ -5,9 +5,9 @@ module Mutant
     class Node
 
       # Mutator for while expressions
-      class While < self
+      class ConditionalLoop < self
 
-        handle(:while)
+        handle(:until, :while)
 
         children :condition, :body
 

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

@@ -15,7 +15,8 @@ module Mutant
           :regopt, :retry, :arg_expr,
           :kwrestarg, :kwoptarg, :kwarg, :undef, :module, :empty,
           :alias, :for, :xstr, :back_ref, :class,
-          :sclass, :match_with_lvasgn, :match_current_line
+          :sclass, :match_with_lvasgn, :match_current_line, :while_post,
+          :until_post, :preexe, :postexe, :iflipflop, :eflipflop, :kwsplat
         )
 
       private

data/lib/mutant/node_helpers.rb

@@ -13,7 +13,7 @@ module Mutant
     # @api private
     #
     def s(type, *children)
-      Parser::AST::Node.new(type, children)
+      ::Parser::AST::Node.new(type, children)
     end
     module_function :s
 

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # The current mutant version
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end # Mutant

data/lib/mutant/zombifier.rb

@@ -16,6 +16,7 @@ module Mutant
       rspec
       diff/lcs
       diff/lcs/hunk
+      unparser
       parser
       parser/all
       parser/current
@@ -71,7 +72,7 @@ module Mutant
       #
       def zombify
         $stderr.puts("Zombifying #{context.source_path}")
-        Loader::Eval.run(zombified_root, self)
+        Loader::Eval.call(zombified_root, self)
         self
       end
       memoize :zombify