From f9521fe0feea48096338ccee47cb05aae04ea906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81my=20Coutable?= Date: Fri, 16 Sep 2011 01:26:27 +0200 Subject: [PATCH] nil is not accepted for catch's arg in other implementation than 1.9.2 --- lib/guard.rb | 2 +- man/guard | 119 +++++++++++++++++++++ man/guard.html | 277 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 397 insertions(+), 1 deletion(-) diff --git a/lib/guard.rb b/lib/guard.rb index 995b3ad..459f2ac 100644 --- a/lib/guard.rb +++ b/lib/guard.rb @@ -96,7 +96,7 @@ module Guard def execute_supervised_task_for_all_guards(task, files = nil) groups.each do |group_hash| - catch group_hash[:options][:halt_on_fail] == true ? :task_has_failed : nil do + catch group_hash[:options][:halt_on_fail] == true ? :task_has_failed : :no_catch do guards.find_all { |guard| guard.group == group_hash[:name] }.each do |guard| paths = Watcher.match_files(guard, files) if files if paths && !paths.empty? diff --git a/man/guard b/man/guard index b1a93f0..0973f56 100644 --- a/man/guard +++ b/man/guard @@ -17,6 +17,89 @@ . .nf +NAME +NAME +NAME +. +.fi +. +.IP "" 0 +. +.P +. +.P +. +.IP "" 4 +. +.nf + +
  • guard
    • +
  • +
  • guard
    • +. +.fi +. +.IP "" 0 +. +.P +. +.P +. +.P +\fBguard\fR +. +.P +\fI!DOCTYPE html\fR +. +.P +. +.P +. +.IP "" 4 +. +.nf + +NAME +NAME +. +.fi +. +.IP "" 0 +. +.P +. +.P +. +.IP "" 4 +. +.nf + +
  • guard
    • +
  • +
  • guard
    • +. +.fi +. +.IP "" 0 +. +.P +. +.P +. +.P +\fBguard\fR +. +.P +\fI!DOCTYPE html\fR +. +.P +. +.P +. +.IP "" 4 +. +.nf + NAME . .fi @@ -66,4 +149,40 @@ .P . .P +. +.P +. +.IP "" 4 +. +.nf + +
  • +
  • September 2011
    • +
  • guard
    • +. +.fi +. +.IP "" 0 +. +.P +. +.P +. +.P +. +.IP "" 4 +. +.nf + +
  • +
  • September 2011
    • +
  • guard
    • +. +.fi +. +.IP "" 0 +. +.P +. +.P diff --git a/man/guard.html b/man/guard.html index ecd1ac7..1c7dd12 100644 --- a/man/guard.html +++ b/man/guard.html @@ -55,6 +55,8 @@
      @@ -127,6 +129,8 @@