added --no-color flag

diff --git a/lib/leap_cli/commands/pre.rb b/lib/leap_cli/commands/pre.rb
index 318282de35df2c9bf24833c0bb77bf6defd2ac08..4b62b5be4a9ade2159ab4c2c8bfa23c3160f5c86 100644 (file)
--- a/lib/leap_cli/commands/pre.rb
+++ b/lib/leap_cli/commands/pre.rb
@@ -23,6 +23,10 @@ module LeapCli; module Commands
   desc 'Enable debugging library (leap_cli development only)'
   switch :debug, :negatable => false
 
+  desc 'Disable colors in output'
+  default_value true
+  switch 'color', :negatable => true
+
   pre do |global,command,options,args|
     #
     # set verbosity
@@ -62,6 +66,7 @@ module LeapCli; module Commands
     LeapCli.log_file = global[:log] || LeapCli.leapfile.log
     LeapCli::Util.log_raw(:log) { $0 + ' ' + ORIGINAL_ARGV.join(' ')}
     log_version
+    LeapCli.log_in_color = global[:color]
 
     #
     # load all the nodes everything

diff --git a/lib/leap_cli/log.rb b/lib/leap_cli/log.rb
index 4bdcc33c5332913c317ba3174405af40ccfdaf56..69e9f67835a44a8ac2d4f4ae2a67001a733dd6de 100644 (file)
--- a/lib/leap_cli/log.rb
+++ b/lib/leap_cli/log.rb
@@ -9,6 +9,8 @@ require 'paint'
 module LeapCli
   extend self
 
+  attr_accessor :log_in_color
+
   # logging options
   def log_level
     @log_level ||= 1
@@ -112,8 +114,12 @@ module LeapCli
         message = LeapCli::Path.relative_path(message)
       end
 
-      log_raw(:log, nil)                 { [clear_prefix, message].join }
-      log_raw(:stdout, options[:indent]) { [colored_prefix, message].join }
+      log_raw(:log, nil)                   { [clear_prefix, message].join }
+      if LeapCli.log_in_color
+        log_raw(:stdout, options[:indent]) { [colored_prefix, message].join }
+      else
+        log_raw(:stdout, options[:indent]) { [clear_prefix, message].join }
+      end
 
       # run block, if given
       if block_given?