guard 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b526a83a981a77336113761579089329aad8a71
-  data.tar.gz: 66bee09b0f816bbd18092b115ca7e402c6df6382
+  metadata.gz: eba722e0d98149098d042a096e5df4dc7abd495b
+  data.tar.gz: 76421bb7bdc9c176c22ba3207460104d37090439
 SHA512:
-  metadata.gz: 2845651127734112e666e48c11dbeba3d1a2b88ac350441f9b5fc9a40213bbfc3c9307a8982cf57a522001d8567a6ca14e5b419736806bcaa365d58135712ac1
-  data.tar.gz: 023b5f58b9a20b19d566b49e413b71b12195c4432bba7bb66321f98e3aa1a146235e20ce6ae9fbd5aa9c4349ae6b8d68bd1962f979bacfb4313bf061c1af13b4
+  metadata.gz: c4f95478bc1293ff711721d8d8ed42b6a81b15daf2d17a3dcffa4f72dca1e6bbdfdbdf881e5f6993b3c5955bf08a5b8d608f3985650ad39248dfd2bf28e59b2c
+  data.tar.gz: 7a8cdcd97b6619ddc3c9ecf219229710107bf5fb58ebccbd457888711af57053f424998a82d5ffe92de72f3c40658535edd396890c64a948ef09390ed785f833

data/lib/guard/internals/debugging.rb

@@ -0,0 +1,66 @@
+# Because it's used by Sheller
+require "open3"
+
+require "guard/ui"
+
+require "guard/internals/tracing"
+
+module Guard
+  # @private api
+  module Internals
+    class Debugging
+      class << self
+        TRACES = [
+          [Kernel, :system],
+          [Kernel, :`],
+          [Open3, :popen3]
+        ]
+
+        # Sets up debugging:
+        #
+        # * aborts on thread exceptions
+        # * Set the logging level to `:debug`
+        # * traces execution of Kernel.system and backtick calls
+        def start
+          return if @started ||= false
+          @started = true
+
+          Thread.abort_on_exception = true
+
+          ::Guard::UI.level = Logger::DEBUG
+
+          TRACES.each { |mod, meth| _trace(mod, meth, &method(:_notify)) }
+          @traced = true
+        end
+
+        def stop
+          return unless @started ||= false
+          ::Guard::UI.level = Logger::INFO
+          _reset
+        end
+
+        private
+
+        def _notify(*args)
+          ::Guard::UI.debug "Command execution: #{args.join(" ")}"
+        end
+
+        # reset singleton - called by tests
+        def _reset
+          @started = false
+          return unless @traced
+          TRACES.each { |mod, meth| _untrace(mod, meth) }
+          @traced = false
+        end
+
+        def _trace(mod, meth, &block)
+          ::Guard::Internals::Tracing.trace(mod, meth, &block)
+        end
+
+        def _untrace(mod, meth)
+          ::Guard::Internals::Tracing.untrace(mod, meth)
+        end
+      end
+    end
+  end
+end

data/lib/guard/internals/tracing.rb

@@ -0,0 +1,33 @@
+module Guard
+  module Internals
+    module Tracing
+      def self.trace(mod, meth)
+        meta = (class << mod; self; end)
+        original_meth = "original_#{meth}".to_sym
+
+        if mod.respond_to?(original_meth)
+          fail "ALREADY TRACED: #{mod}.#{meth}"
+        end
+
+        meta.send(:alias_method, original_meth, meth)
+        meta.send(:define_method, meth) do |*args, &block|
+          yield(*args) if block_given?
+          mod.send original_meth, *args, &block
+        end
+      end
+
+      def self.untrace(mod, meth)
+        meta = (class << mod; self; end)
+        original_meth = "original_#{meth}".to_sym
+
+        unless mod.respond_to?(original_meth)
+          fail "NOT TRACED: #{mod}.#{meth} (no method: #{original_meth})"
+        end
+
+        meta.send(:remove_method, meth)
+        meta.send(:alias_method, meth, original_meth)
+        meta.send(:undef_method, original_meth)
+      end
+    end
+  end
+end

data/lib/guard/runner.rb

@@ -55,7 +55,6 @@ module Guard
 
           next unless (task = tasks.detect { |meth| plugin.respond_to?(meth) })
           _supervise(plugin, task, match_result)
-          ::Guard::UI.clearable
         end
       end
     end

data/lib/guard/setuper.rb

@@ -2,6 +2,8 @@ require "thread"
 require "listen"
 require "guard/options"
 
+require "guard/internals/debugging"
+
 module Guard
   # Sets up initial variables and options
   module Setuper
@@ -43,16 +45,20 @@ module Guard
     # so ideally there should be a guard "instance"
     # object that can be created anew between tests
     def setup(opts = {})
+      # NOTE: must be set before anything calls Guard.options
       reset_options(opts)
+
+      # NOTE: must be set before anything calls Guard::UI.debug
+      ::Guard::Internals::Debugging.start if options[:debug]
+
       reset_evaluator(opts)
 
       @queue = Queue.new
       @runner = ::Guard::Runner.new
       @watchdirs = _setup_watchdirs
 
-      ::Guard::UI.setup(options)
+      ::Guard::UI.reset_and_clear
 
-      _setup_debug if options[:debug]
       @listener = _setup_listener
       _setup_signal_traps
 
@@ -174,20 +180,6 @@ module Guard
 
     private
 
-    # Sets up various debug behaviors:
-    #
-    # * Abort threads on exception;
-    # * Set the logging level to `:debug`;
-    # * Modify the system and ` methods to log themselves before being executed
-    #
-    # @see #_debug_command_execution
-    #
-    def _setup_debug
-      Thread.abort_on_exception = true
-      ::Guard::UI.options[:level] = :debug
-      _debug_command_execution
-    end
-
     # Initializes the listener and registers a callback for changes.
     #
     def _setup_listener
@@ -252,23 +244,6 @@ module Guard
       end
     end
 
-    # Adds a command logger in debug mode. This wraps common command
-    # execution functions and logs the executed command before execution.
-    #
-    def _debug_command_execution
-      Kernel.send(:alias_method, :original_system, :system)
-      Kernel.send(:define_method, :system) do |command, *args|
-        ::Guard::UI.debug "Command execution: #{ command } #{ args.join(" ") }"
-        Kernel.send :original_system, command, *args
-      end
-
-      Kernel.send(:alias_method, :original_backtick, :'`')
-      Kernel.send(:define_method, :'`') do |command|
-        ::Guard::UI.debug "Command execution: #{ command }"
-        Kernel.send :original_backtick, command
-      end
-    end
-
     # TODO: Guard::Watch or Guard::Scope should provide this
     def _scoped_watchers
       watchers = []

data/lib/guard/ui.rb

@@ -53,10 +53,16 @@ module Guard
       # @option options [String] template the logger template
       # @option options [String] time_format the time format
       #
+      # TODO: deprecate?
       def options=(options)
         @options = ::Guard::Options.new(options)
       end
 
+      # Assigns a log level
+      def level=(new_level)
+        logger.level = new_level
+      end
+
       # Show an info message.
       #
       # @param [String] message the message to show
@@ -135,7 +141,8 @@ module Guard
       end
 
       # TODO: arguments: UI uses Guard::options anyway
-      def setup(_options)
+      # @private api
+      def reset_and_clear
         @clearable = false
         clear(force: true)
       end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -129,6 +129,10 @@ files:
 - lib/guard/guardfile/evaluator.rb.orig
 - lib/guard/guardfile/generator.rb
 - lib/guard/interactor.rb
+- lib/guard/internals/debugging.rb
+- lib/guard/internals/debugging.rb.orig
+- lib/guard/internals/tracing.rb
+- lib/guard/internals/tracing.rb.orig
 - lib/guard/jobs/base.rb
 - lib/guard/jobs/pry_wrapper.rb
 - lib/guard/jobs/sleep.rb