mutant 0.2.20 → 0.3.0.beta2

data/lib/mutant/helper.rb

@@ -19,20 +19,5 @@ module Mutant
       Marshal.load(Marshal.dump(object))
     end
 
-    # Extract option from options hash
-    #
-    # @param [Hash] options
-    # @param [Object] key
-    #
-    # @return [Object] value
-    # 
-    # @api private
-    #
-    def self.extract_option(options, key)
-      options.fetch(key) do
-        raise ArgumentError,"Missing #{key.inspect} in options"
-      end
-    end
-
-  end
-end
+  end # Helper
+end # Mutant

data/lib/mutant/killer/forked.rb

@@ -0,0 +1,44 @@
+module Mutant
+  class Killer
+
+    # Killer that executes other killer in forked environment
+    class Forked < self
+
+      # Initialize object
+      #
+      # @param [Killer] killer
+      # @param [Strategy] strategy
+      # @param [Mutation] mutation
+      #
+      # @api private
+      #
+      def initialize(killer, strategy, mutation)
+        @killer = killer
+        super(strategy, mutation)
+      end
+
+    private
+
+      # Run killer
+      #
+      # @return [true]
+      #   if mutant was killed
+      #
+      # @return [false]
+      #   otherwise
+      #
+      # @api private
+      #
+      def run
+        pid = fork do
+          killer = @killer.new(strategy, mutation)
+          exit(killer.success? ? CLI::EXIT_SUCCESS : CLI::EXIT_FAILURE)
+        end
+
+        status = Process.wait2(pid).last
+        status.exited? && status.success?
+      end
+
+    end # Forked
+  end # Killer
+end # Mutant

data/lib/mutant/killer/forking.rb

@@ -1,59 +1,6 @@
 module Mutant
   class Killer
 
-    # Killer that executes other killer in forked environment
-    class Forked < self
-
-      # Initialize object
-      #
-      # @param [Killer] killer
-      # @param [Strategy] strategy
-      # @param [Mutation] mutation
-      #
-      # @api private
-      #
-      def initialize(killer, strategy, mutation)
-        @killer = killer
-        super(strategy, mutation)
-      end
-
-      # Return killer type
-      #
-      # @return [String]
-      #
-      # @api private
-      #
-      def type
-        @killer.type
-      end
-
-    private
-
-      # Run killer
-      #
-      # @return [true] 
-      #   if mutant was killed
-      #
-      # @return [false]
-      #   otherwise
-      #
-      # @api private
-      #
-      def run
-        fork do
-          begin
-            killer = @killer.new(strategy, mutation)
-            Kernel.exit(killer.fail? ? 1 : 0)
-          rescue
-            Kernel.exit(1)
-          end
-        end
-
-        status = Process.wait2.last
-        status.exitstatus.zero?
-      end
-    end
-
     # A killer that executes other killer in forked environemnts
     class Forking < self
       include Equalizer.new(:killer)
@@ -92,7 +39,6 @@ module Mutant
         Forked.new(killer, strategy, mutation)
       end
 
-    end
-
-  end
-end
+    end # Forking
+  end # Killer
+end # Mutant

data/lib/mutant/killer/rspec.rb

@@ -2,36 +2,31 @@ module Mutant
   class Killer
     # Runner for rspec tests
     class Rspec < self
-      TYPE = 'rspec'.freeze
 
     private
 
-      # Initialize rspec runner
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def initialize(*)
-        @error_stream, @output_stream = StringIO.new, StringIO.new
-        super
-      end
-
       # Run rspec test
       #
       # @return [true]
-      #   returns true when test is NOT successful and the mutant was killed
+      #   when test is NOT successful
       #
       # @return [false]
-      #   returns false otherwise
+      #   otherwise
       #
       # @api private
       #
       def run
         mutation.insert
-        !::RSpec::Core::Runner.run(command_line_arguments, strategy.error_stream, strategy.output_stream).zero?
+        # TODO: replace with real streams from configuration
+        require 'stringio'
+        null = StringIO.new
+        args = command_line_arguments
+        begin
+          !::RSpec::Core::Runner.run(args, null, null).zero?
+        rescue StandardError
+          true
+        end
       end
-      memoize :run
 
       # Return command line arguments
       #
@@ -42,8 +37,9 @@ module Mutant
       def command_line_arguments
         %W(
           --fail-fast
-        ) + strategy.spec_files(mutation)
+        ) + strategy.spec_files(mutation.subject)
       end
-    end
-  end
-end
+
+    end # Rspec
+  end # Killer
+end # Mutant

data/lib/mutant/killer/static.rb

@@ -19,15 +19,14 @@ module Mutant
 
       # Killer that is always successful
       class Success < self
-        TYPE = 'success'.freeze
         RESULT = true
-      end
+      end # Success
 
       # Killer that always fails
       class Fail < self
-        TYPE = 'fail'.freeze
         RESULT = false
-      end
-    end
-  end
-end
+      end # Fail
+
+    end # Static
+  end # Killer
+end # Mutant

data/lib/mutant/killer.rb

@@ -1,113 +1,87 @@
 module Mutant
   # Abstract base class for mutant killers
   class Killer
-    include Adamantium::Flat, AbstractType
-    
-    # Test for kill failure
-    #
-    # @return [true]
-    #   returns true when mutant was killed
-    #
-    # @return [false]
-    #   returns false otherwise
-    #
-    # @api private
-    #
-    def fail?
-      !@killed
-    end
+    include Adamantium::Flat, AbstractType, Equalizer.new(:strategy, :mutation, :killed?)
 
-    # Return runtime of killer
+    # Return strategy
     #
-    # @return [Float]
+    # @return [Strategy]
     #
     # @api private
     #
-    attr_reader :runtime
+    attr_reader :strategy
 
-    # Return original source
+    # Return mutation to kill
     #
-    # @return [String]
+    # @return [Mutation]
     #
     # @api private
     #
-    def original_source
-      mutation.original_source
-    end
+    attr_reader :mutation
 
-    # Return mutated source
+    # Initialize killer object
     #
-    # @return [String]
+    # @param [Strategy] strategy
+    # @param [Mutation] mutation
+    #
+    # @return [undefined]
     #
     # @api private
     #
-    def mutation_source
-      mutation.source
+    def initialize(strategy, mutation)
+      @strategy, @mutation = strategy, mutation
+      run_with_benchmark
     end
 
-    # Return strategy
-    #
-    # @return [Strategy]
-    #
-    # @api private
+    # Test for kill failure
     #
-    attr_reader :strategy
-
-    # Return name of killer
+    # @return [true]
+    #   when killer succeeded
     #
-    # @return [String]
+    # @return [false]
+    #   otherwise
     #
     # @api private
     #
-    def self.type
-      self::TYPE
+    def success?
+      mutation.success?(self)
     end
+    memoize :success?
 
-    # Return identification
-    #
-    # @return [String]
+    # Test if mutant was killed
     #
-    # @api private
-    # 
-    def identification
-      "#{type}:#{mutation.identification}".freeze
-    end
-    memoize :identification
-
-    # Return mae of killer
+    # @return [true]
+    #   if mutant was killed
     #
-    # @return [String]
+    # @return [false]
+    #   otherwise
     #
     # @api private
     #
-    def type
-      self.class.type
+    def killed?
+      @killed
     end
 
-    # Return mutation to kill
+    # Return runtime of killer
     #
-    # @return [Mutation]
+    # @return [Float]
     #
     # @api private
     #
-    attr_reader :mutation
-
-  private
+    attr_reader :runtime
 
-    # Initialize killer object
-    #
-    # @param [Mutation] mutation
+    # Return mutated source
     #
-    # @return [undefined]
+    # @return [String]
     #
     # @api private
     #
-    def initialize(strategy, mutation)
-      @strategy, @mutation = strategy, mutation
-
-      run_with_benchmark
+    def mutation_source
+      mutation.source
     end
 
+  private
+
     # Run with taking the time
     #
     # @return [undefined]
@@ -115,23 +89,23 @@ module Mutant
     # @api private
     #
     def run_with_benchmark
-      start_time = Time.now
-      @killed = run
-      end_time = Time.now
-      @runtime = end_time - start_time 
+      times = Benchmark.measure do
+        @killed = run
+      end
+      @runtime = times.real
     end
 
-    # Run test
+    # Run killer
     #
     # @return [true]
-    #   returns true when mutant was killed
+    #   when mutant was killed
     #
     # @return [false]
-    #   returns false otherwise
+    #   otherwise
     #
     # @api private
     #
     abstract_method :run
 
-  end
-end
+  end # Killer
+end # Mutant

data/lib/mutant/loader.rb

@@ -16,7 +16,7 @@ module Mutant
 
     # Initialize and insert mutation into vm
     #
-    # @param [Rubinius::AST::Script] root
+    # @param [Parser::AST::Node] root
     # @param [Subject] subject
     #
     # @return [undefined]
@@ -40,7 +40,7 @@ module Mutant
       # @api private
       #
       def run
-        Kernel.eval(source, TOPLEVEL_BINDING, @subject.source_path, @subject.source_line)
+        eval(source, TOPLEVEL_BINDING, @subject.source_path, @subject.source_line)
       end
 
       # Return source
@@ -50,9 +50,9 @@ module Mutant
       # @api private
       #
       def source
-        ToSource.to_source(@root)
+        Unparser.unparse(@root)
       end
-    end
+    end # Eval
 
-  end
-end
+  end # Loader
+end # Mutant

data/lib/mutant/matcher/chain.rb

@@ -2,7 +2,7 @@ module Mutant
   class Matcher
     # A chain of matchers
     class Chain < self
-      include Equalizer.new(:matchers)
+      include Concord::Public.new(:matchers)
 
       # Enumerate subjects
       #
@@ -24,14 +24,6 @@ module Mutant
         self
       end
 
-      # Return the chain of matchers
-      #
-      # @return [Enumerable<Chain>]
-      #
-      # @api private
-      #
-      attr_reader :matchers
-
       # Build matcher chain
       #
       # @param [Enumerable<Matcher>] matchers
@@ -48,19 +40,6 @@ module Mutant
         new(matchers)
       end
 
-    private
-
-      # Initialize chain matcher
-      #
-      # @param [Enumerable<Matcher>] matchers
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def initialize(matchers)
-        @matchers = matchers
-      end
-    end
-  end
-end
+    end # Chain
+  end # Matcher
+end # Mutant

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

@@ -1,9 +1,9 @@
 module Mutant
   class Matcher
-    class Method < self
+    class Method
       # Matcher for instance methods
       class Instance < self
-
+        SUBJECT_CLASS = Subject::Method::Instance
 
         # Return identification
         #
@@ -14,27 +14,15 @@ module Mutant
         def identification
           "#{scope.name}##{method_name}"
         end
+        memoize :identification
 
-        # Test if method is public
-        #
-        # @return [true]
-        #   if method is public
-        #
-        # @return [false]
-        #   otherwise
-        #
-        # @api private
-        #
-        def public?
-          scope.public_method_defined?(method_name)
-        end
-        memoize :public?
+        NAME_INDEX = 0
 
       private
 
         # Check if node is matched
         #
-        # @param [Rubinius::AST::Node] node
+        # @param [Parser::AST::Node] node
         #
         # @return [true]
         #   returns true if node matches method
@@ -45,12 +33,14 @@ module Mutant
         # @api private
         #
         def match?(node)
-          node.line  == source_line &&
-          node.class == Rubinius::AST::Define  &&
-          node.name  == method_name
+          location                  = node.location       || return
+          expression                = location.expression || return
+          expression.line           == source_line &&
+          node.type                 == :def        &&
+          node.children[NAME_INDEX] == method_name
         end
 
-      end
-    end
-  end
-end
+      end # Instance
+    end # Method
+  end # Matcher
+end # Mutant