guard 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949af1dc04bc3ed850cf0b63fd523bc1ddb3316a
-  data.tar.gz: a200da636376286362b7c8c06bfe48586c52124b
+  metadata.gz: e0397104f7cae5c27eb8622dce9e0bc6ed87aee5
+  data.tar.gz: cd203c2e48e94275ea4216ae408ff674a6585175
 SHA512:
-  metadata.gz: 409a80a8cf1172d1d077e5a147d26a2dc91f4d90e0adcb17b1fbbe183e6404b087e91294536c3d94448ed0cc59f63bd2b30f2c21275e80fea34bd4ab17c7bece
-  data.tar.gz: 6642c59beed12c1b3bddd5eb93b3e8579a56a85f4c531ede1c193811feb1b3d32f96b0164b4c982c467dba2f3fbc15a4b1ee8b5508006c6f7af48398f8fd6b4f
+  metadata.gz: ccfc1e22709ef26e1c904956c9925058fac6d791ea9123dabbde1df189f0de9fda9b38bb87ac7ac3db36ed4bd93b8ec6f8ea4fe371e7e0efbd6b81dfb5559089
+  data.tar.gz: d7aeedb746d432f07b701c70e78814e445e4800d2ca0b59692ed4f652f6659022589a06627f0424ff1c0697dd280ddcb0433233ad216aa5270f97022eddd963b

data/README.md

@@ -785,7 +785,7 @@ Please try to follow these simple rules:
 
 #### Core Team
 
-* [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [flinkfinger.com](http://www.flinkfinger.com))
+* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [flinkfinger.com](http://www.flinkfinger.com))
 * [Rémy Coutable](https://github.com/rymai)
 * [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/))
 

data/lib/guard.rb

@@ -46,7 +46,7 @@ module Guard
     #   Guard.plugins(name: 'rspec', group: 'backend')
     #
     # @param [String, Symbol, Regexp, Hash] filter the filter to apply to the plugins
-    # @return [Plugin, Array<Plugin>] the filtered plugin(s)
+    # @return [Array<Plugin>] the filtered plugin(s)
     #
     def plugins(filter = nil)
       @plugins ||= []

data/lib/guard/notifiers/notifysend.rb

@@ -87,7 +87,7 @@ module Guard
       # @return [String] the notify-send urgency
       #
       def _notifysend_urgency(type)
-        { 'failed' => 'normal', 'pending' => 'low' }.fetch(type, 'low')
+        { failed: 'normal', pending: 'low' }.fetch(type, 'low')
       end
 
       # Builds a shell command out of a command string and option hash.

data/lib/guard/notifiers/tmux.rb

@@ -102,7 +102,7 @@ module Guard
           color = tmux_color(opts[:type], opts)
 
           color_locations.each do |color_location|
-            _run_client "set","-q #{ color_location } #{ color }"
+            _run_client "set","#{_quiet_option}#{ color_location } #{ color }"
           end
         end
 
@@ -137,11 +137,7 @@ module Guard
         teaser_message = message.split("\n").first
         display_title  = title_format % [title, teaser_message]
 
-        if _tmux_version >= 1.7
-          _run_client "set-option", "-q set-titles-string '#{ display_title }'"
-        else
-          _run_client "set-option", "set-titles-string '#{ display_title }'"
-        end
+        _run_client "set-option", "#{_quiet_option}set-titles-string '#{ display_title }'"
       end
 
       # Displays a message in the status bar of tmux.
@@ -182,11 +178,11 @@ module Guard
         formatted_message = message.split("\n").join(separator)
         display_message = message_format % [title, formatted_message]
 
-        _run_client "set", "-q display-time #{ display_time * 1000 }"
-        _run_client "set", "-q message-fg #{ message_color }"
-        _run_client "set", "-q message-bg #{ color }"
+        _run_client "set", "#{_quiet_option}display-time #{ display_time * 1000 }"
+        _run_client "set", "#{_quiet_option}message-fg #{ message_color }"
+        _run_client "set", "#{_quiet_option}message-bg #{ color }"
         _run_client "display-message", "'#{ display_message }'"
-     end
+      end
 
       # Get the Tmux color for the notification type.
       # You can configure your own color by overwriting the defaults.
@@ -251,11 +247,13 @@ module Guard
       end
 
       def self._clients
-        `#{ DEFAULTS[:client] } list-clients -F '\#{ client_tty }'`.split(/\n/)
+        ttys = `#{ DEFAULTS[:client] } list-clients -F '\#{client_tty}'`.split(/\n/)
+        ttys.delete('(null)') #if user is running 'tmux -C' remove this client from list
+        ttys
       end
 
       def _clients
-        self.class._client
+        self.class._clients
       end
 
       def _run_client(cmd, args)
@@ -298,6 +296,10 @@ module Guard
         @tmux_version ||= `tmux -V`.chomp.gsub(/[^0-9.]/, '').to_f
       end
 
+      def _quiet_option
+        '-q ' if _tmux_version >= 1.7
+      end
+
     end
 
   end

data/lib/guard/runner.rb

@@ -37,6 +37,12 @@ module Guard
     #
     def run_on_changes(modified, added, removed)
       ::Guard::UI.clearable
+
+      #TODO: this should be handled like every other plugin
+      if ::Guard::Watcher.match_guardfile?(modified)
+        ::Guard.evaluator.reevaluate_guardfile
+      end
+
       _scoped_plugins do |guard|
         modified_paths = ::Guard::Watcher.match_files(guard, modified)
         added_paths    = ::Guard::Watcher.match_files(guard, added)
@@ -64,7 +70,11 @@ module Guard
       begin
         catch self.class.stopping_symbol_for(guard) do
           guard.hook("#{ task }_begin", *args)
-          result = guard.send(task, *args)
+          begin
+            result = guard.send(task, *args)
+          rescue Interrupt
+            throw(:task_has_failed)
+          end
           guard.hook("#{ task }_end", result)
           result
         end

data/lib/guard/setuper.rb

@@ -120,6 +120,8 @@ module Guard
       @scope = { groups: [], plugins: [] }
     end
 
+    attr_reader :watchdirs
+
     # Stores the scopes defined by the user via the `--group` / `-g` option (to run
     # only a specific group) or the `--plugin` / `-P` option (to run only a
     # specific plugin).
@@ -172,35 +174,15 @@ module Guard
     # Initializes the listener and registers a callback for changes.
     #
     def _setup_listener
-      listener_callback = lambda do |modified, added, removed|
-        # Convert to relative paths (respective to the watchdir it came from)
-        @watchdirs.each do |watchdir|
-          [modified, added, removed].each do |paths|
-            paths.map! do |path|
-              if path.start_with? watchdir
-                path.sub "#{watchdir}#{File::SEPARATOR}", ''
-              else
-                path
-              end
-            end
-          end
-        end
-        evaluator.reevaluate_guardfile if ::Guard::Watcher.match_guardfile?(modified)
-
-        within_preserved_state do
-          runner.run_on_changes(modified, added, removed)
-        end
-      end
-
       if options[:listen_on]
-        @listener = Listen.on(options[:listen_on], &listener_callback)
+        @listener = Listen.on(options[:listen_on], &_listener_callback)
       else
         listener_options = {}
         [:latency, :force_polling, :wait_for_delay].each do |option|
           listener_options[option] = options[option] if options[option]
         end
-        listen_args = @watchdirs + [listener_options]
-        @listener = Listen.to(*listen_args, &listener_callback)
+        listen_args = watchdirs + [listener_options]
+        @listener = Listen.to(*listen_args, &_listener_callback)
       end
     end
 
@@ -214,11 +196,19 @@ module Guard
     def _setup_signal_traps
       unless defined?(JRUBY_VERSION)
         if Signal.list.keys.include?('USR1')
-          Signal.trap('USR1') { ::Guard.pause unless listener.paused? }
+          Signal.trap('USR1') do
+            unless listener.paused?
+              Thread.new { within_preserved_state { ::Guard.pause } }
+            end
+          end
         end
 
         if Signal.list.keys.include?('USR2')
-          Signal.trap('USR2') { ::Guard.pause if listener.paused? }
+          Signal.trap('USR2') do
+            if listener.paused?
+              Thread.new { within_preserved_state { ::Guard.pause } }
+            end
+          end
         end
 
         if Signal.list.keys.include?('INT')
@@ -260,5 +250,53 @@ module Guard
       end
     end
 
+    # Check if any of the changes are actually watched for
+    #
+    # NOTE: this is called from the listen thread - be careful to not
+    # modify any state
+    #
+    # TODO: move this to watcher class?
+    #
+    def _relevant_changes?(changes)
+      # TODO: make a Guardfile reloader "plugin" instead of a special case
+      return true if ::Guard::Watcher.match_guardfile?(changes[:modified])
+
+      # TODO: ignoring irrelevant files should be Listen's responsibility
+      all_files = changes.values.flatten(1)
+      runner.send(:_scoped_plugins) do |guard|
+        return true if ::Guard::Watcher.match_files?([guard], all_files)
+      end
+      false
+    end
+
+    def _relative_paths(changes)
+      # Convert to relative paths (respective to the watchdir it came from)
+      watchdirs.each do |watchdir|
+        changes.each do |type, paths|
+          paths.each do |path|
+            if path.start_with? watchdir
+              path.sub! "#{watchdir}#{File::SEPARATOR}", ''
+            end
+          end
+        end
+      end
+    end
+
+    def _listener_callback
+      lambda do |modified, added, removed|
+        all_changes = { modified: modified.dup,
+                        added: added.dup,
+                        removed: removed.dup }
+
+        # TODO: this should be Listen's responsibility
+        _relative_paths(all_changes)
+
+        if _relevant_changes?(all_changes)
+          within_preserved_state do
+            runner.run_on_changes(*all_changes.values)
+          end
+        end
+      end
+    end
   end
 end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications