Pulled verbose calculation into its own private method in file_utils.

zimbatm · May 25, 2009 · 34ddd30 · 34ddd30
1 parent 6afd6fa
commit 34ddd30
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/rake/file_utils.rb b/lib/rake/file_utils.rb
@@ -37,11 +37,7 @@ def sh(*cmd, &block)
         ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
       }
     end
-    if RakeFileUtils.verbose_flag == :default && options[:verbose].nil?
-      options[:verbose] = true
-    elsif options[:verbose].nil?
-      options[:verbose] ||= RakeFileUtils.verbose_flag
-    end
+    set_verbose_option(options)
     options[:noop]    ||= RakeFileUtils.nowrite_flag
     rake_check_options options, :noop, :verbose
     rake_output_message cmd.join(" ") if options[:verbose]
@@ -53,6 +49,15 @@ def sh(*cmd, &block)
     end
   end
 
+  def set_verbose_option(options)
+    if RakeFileUtils.verbose_flag.nil? && options[:verbose].nil?
+      options[:verbose] = true
+    elsif options[:verbose].nil?
+      options[:verbose] ||= RakeFileUtils.verbose_flag
+    end
+  end
+  private :set_verbose_option
+
   def rake_system(*cmd)
     Rake::AltSystem.system(*cmd)
   end

diff --git a/lib/rake/rake_file_utils.rb b/lib/rake/rake_file_utils.rb
@@ -10,7 +10,7 @@ module RakeFileUtils
   class << self
     attr_accessor :verbose_flag, :nowrite_flag
   end
-  RakeFileUtils.verbose_flag = :default
+  RakeFileUtils.verbose_flag = nil
   RakeFileUtils.nowrite_flag = false
 
   $fileutils_verbose = true