Start working on helpers--still playing. No tests yet

pragdave · Dec 29, 2009 · d57234b · d57234b
1 parent c9e5250
commit d57234b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/wanna/log.rb b/lib/wanna/log.rb
@@ -29,7 +29,11 @@ def self.log_with_timestamp(color, msg)
 
   private
     def self.colorize(color, msg)
-      "\033[3#{COLOR_MAP[color]}m#{msg}\033[39m"
+      if Wanna::Options[:colorize]
+        "\033[3#{COLOR_MAP[color]}m#{msg}\033[39m"
+      else
+        msg
+      end
     end
   end
 end
diff --git a/lib/wanna/option_store.rb b/lib/wanna/option_store.rb
@@ -29,7 +29,8 @@ def validate(option, value)
 
     VALID_OPTIONS = {
       :tracing       => OneOf.new(*Wanna::Log::LEVELS),
-      :show_commands => Boolean.new
+      :show_commands => Boolean.new,
+      :colorize      => Boolean.new,
     } unless defined?(VALID_OPTIONS)
 
 
@@ -88,6 +89,8 @@ def initialize
       # Set the default options. We could just use a hash literal, but this
       # way we get parameter checking
       set_default_option(:tracing, :errors)
+      set_default_option(:show_commands, true)
+      set_default_option(:colorize, !!(ENV['TERM'] && ENV['TERM'] =~ /color/i))
     end