modwhich.rb: Fix for verbosity when used in conjunction with recursion.

Author: blackwinter

modwhich.rb

@@ -64,7 +64,9 @@ def require(mod, verbose = verbose?)
         @load_order << mod
         current_paths = loaded_paths
 
-        ret = _modwhich_original_require(mod)
+        ret = recursive_verbose(verbose) {
+          _modwhich_original_require(mod)
+        }
 
         @added_paths.concat(loaded_paths - current_paths)
         @which[mod] = @added_paths.pop || gemwhich(mod)
@@ -87,6 +89,21 @@ def recursive?
       @recursive
     end
 
+    def recursive_verbose?(verbose)
+      recursive? && !verbose.nil? && verbose != verbose?
+    end
+
+    def recursive_verbose(verbose)
+      recursive_verbose = recursive_verbose?(verbose)
+      self.verbose = verbose if recursive_verbose
+
+      ret = yield
+
+      self.verbose = !verbose if recursive_verbose
+
+      ret
+    end
+
     def include?(mod)
       !to_a.assoc(mod).nil?
     end
@@ -156,16 +173,15 @@ def require(*args) ModWhich.require(*args) end
 
   abort usage if help || ARGV.empty?
 
-  ModWhich.verbose = verbose
   ModWhich.init(ARGV, recursive)
 
-  ARGV.each { |mod| require mod }
+  ARGV.each { |mod| require mod, verbose }
 else
   ModWhich.init
 end
 
 at_exit {
   ModWhich.each { |mod, path|
     warn "require '#{mod}' => #{path || 'NOT FOUND'}"
-  } unless ModWhich.verbose?
+  } unless verbose || ModWhich.verbose?
 }