Instantiate strategies

Doing that stuff on singletons is wired. Future strategies will have a
state.

lib/mutant/cli.rb

@@ -241,7 +241,7 @@ module Mutant
     #
     def add_strategies(opts)
       opts.on('--rspec', 'kills mutations with rspec') do
-        set_strategy Strategy::Rspec
+        set_strategy Strategy::Rspec.new
       end
     end
 

lib/mutant/strategy.rb

@@ -4,24 +4,22 @@ module Mutant
   class Strategy
     include AbstractType, Adamantium::Flat
 
-    # Perform setup
+    # Perform strategy setup
     #
     # @return [self]
     #
     # @api private
     #
-    def self.setup
+    def setup
-      self
     end
 
-    # Perform teardown
+    # Perform strategy teardown
     #
     # @return [self]
     #
     # @api private
     #
-    def self.teardown
+    def teardown
-      self
     end
 
     # Kill mutation
@@ -32,18 +30,20 @@ module Mutant
     #
     # @api private
     #
-    def self.kill(mutation)
+    def kill(mutation)
       killer.new(self, mutation)
     end
 
+  private
+
     # Return killer
     #
     # @return [Class:Killer]
     #
     # @api private
     #
-    def self.killer
+    def killer
-      self::KILLER
+      self.class::KILLER
     end
 
   end # Strategy

lib/mutant/strategy/rspec.rb

@@ -2,6 +2,7 @@ module Mutant
   class Strategy
     # Rspec killer strategy
     class Rspec < self
+      include Equalizer.new
 
       KILLER = Killer::Forking.new(Killer::Rspec)
 
@@ -11,7 +12,7 @@ module Mutant
       #
       # @api private
       #
-      def self.setup
+      def setup
         self
       end
 

spec/unit/mutant/cli/class_methods/new_spec.rb

@@ -25,7 +25,7 @@ describe Mutant::CLI, '.new' do
 
   # Defaults
   let(:expected_filter)   { Mutant::Mutation::Filter::ALL      }
-  let(:expected_strategy) { Mutant::Strategy::Rspec            }
+  let(:expected_strategy) { Mutant::Strategy::Rspec.new        }
   let(:expected_reporter) { Mutant::Reporter::CLI.new($stdout) }
 
   let(:cli) { object.new(arguments) }