Support removing rake monkey patch

lib/airbrussh/configuration.rb

@@ -1,7 +1,12 @@
 module Airbrussh
   class Configuration
-    attr_accessor :log_file, :monkey_patch_rake, :color, :truncate, :banner,
-                  :command_output
+    class << self
+      extend Forwardable
+      attr_writer :current_formatter
+      delegate :current_rake_task= => :@current_formatter
+    end
+
+    attr_accessor :log_file, :color, :truncate, :banner, :command_output
 
     def initialize
       self.log_file = nil
@@ -20,6 +25,23 @@ def command_output_stderr?
       command_output_include?(:stderr)
     end
 
+    def monkey_patch_rake=(should_patch)
+      ::Rake::Task.class_eval do
+        patched = instance_methods(false).include?(:_original_execute_airbrussh)
+        if should_patch && !patched
+          define_method(:_original_execute_airbrussh, instance_method(:execute))
+          def execute(args=nil)
+            Airbrussh::Configuration.current_rake_task = name
+            _original_execute_airbrussh(args)
+            Airbrussh::Configuration.current_rake_task = nil
+          end
+        elsif !should_patch && patched
+          define_method(:execute, instance_method(:_original_execute_airbrussh))
+          remove_method :_original_execute_airbrussh
+        end
+      end
+    end
+
     private
 
     def command_output_include?(sym)

lib/airbrussh/formatter.rb

@@ -7,31 +7,12 @@
 
 module Airbrussh
   class Formatter < SSHKit::Formatter::Abstract
-    class << self
-      attr_accessor :current_rake_task
-
-      def monkey_patch_rake_task!
-        return unless Airbrussh.configuration.monkey_patch_rake
-        return if @rake_patched
-
-        eval(<<-EVAL)
-          class ::Rake::Task
-            alias_method :_original_execute_airbrussh, :execute
-            def execute(args=nil)
-              #{name}.current_rake_task = name
-              _original_execute_airbrussh(args)
-            end
-          end
-        EVAL
-
-        @rake_patched = true
-      end
-    end
+    attr_writer :current_rake_task
 
     def initialize(io)
       super
 
-      self.class.monkey_patch_rake_task!
+      config.class.current_formatter = self
 
       @tasks = {}
 
@@ -151,7 +132,7 @@ def print_task_if_changed
     end
 
     def current_task_status
-      task = self.class.current_rake_task.to_s
+      task = @current_rake_task.to_s
       if @tasks[task]
         changed = false
       else