colorlog 0.0.3 → 0.0.4

data/bin/colorlog

@@ -4,16 +4,51 @@ require 'optparse'
 require 'rainbow'
 require 'yaml'
 
-options = {
-    success_color: :green,
-    warning_color: :yellow,
-    error_color: :red,
-    default_color: :default,
-    success: /success/i,
-    warning: /warning/i,
-    error: /^(?:(?!\bTests\b).)*(?:failure|error).*$/i
+COLORS = [
+    :black,
+    :red,
+    :green,
+    :yellow,
+    :blue,
+    :magenta,
+    :cyan,
+    :white,
+    :default
+]
 
+options = {
+    colors: {
+        default: {
+            color: :default,
+            regex: //
+        },
+        success: {
+            color: :green,
+            regex: /success/i
+        },
+        warning: {
+            color: :yellow,
+            regex: /warning/i
+        },
+        error: {
+            color: :red,
+            regex: /^(?:(?!\bTests\b).)*(?:failure|error).*$/i
+        },
+        custom1: {
+            color: :blue,
+            regex: /custom1/
+        },
+        custom2: {
+            color: :magenta,
+            regex: /custom2/
+        },
+        custom3: {
+            color: :cyan,
+            regex: /custom3/
+        }
+    }
 }
+
 CONFIG_FILE = File.join(ENV['HOME'], '.colorlog.rc.yaml')
 if File.exists? CONFIG_FILE
   config_options = YAML.load_file(CONFIG_FILE)
@@ -29,47 +64,61 @@ option_parser = OptionParser.new do |opts|
       "different color depending on the content of the line matching different Regexp.
 
 Usage: #{executable_name} [options] filename
+       possible colors are: " + COLORS.map { |color| color.id2name }.to_s+"
+       You can change the default values by editing "+CONFIG_FILE+"
+
+  "
+
+  opts.on('--default-color COLOR', COLORS, 'color to use when no match is found (' + options[:colors][:default][:color].id2name + ')') do |default_color|
+    options[:colors][:default][:color] = default_color
+  end
+
+  opts.on('-s', '--success REGEXP', Regexp, 'RegExp that matched will turn the line in --success-color  (' + options[:colors][:success][:regex].inspect + ')') do |success|
+    options[:colors][:success][:regex] = success
+  end
+
+  opts.on('--success-color COLOR', COLORS, 'color to use when line matches success (' + options[:colors][:success][:color].id2name + ')') do |success_color|
+    options[:colors][:success][:color] = success_color
+  end
 
-"
+  opts.on('-w', '--warning REGEXP', Regexp, 'RegExp that matched will turn the line in --warning-color (' + options[:colors][:warning][:regex].inspect + ')') do |warning|
+    options[:colors][:warning][:regex] = warning
+  end
 
-  COLORS = [
-      :black,
-      :red,
-      :green,
-      :yellow,
-      :blue,
-      :magenta,
-      :cyan,
-      :white,
-      :default
-  ]
+  opts.on('--warning-color COLOR', COLORS, 'color to use when line matches warning (' + options[:colors][:warning][:color].id2name + ')') do |warning_color|
+    options[:colors][:warning][:color] = warning_color
+  end
 
-  opts.on('--success-color COLOR', COLORS, 'color to use when success matches ' + COLORS.map { |color| color.id2name }.to_s) do |success_color|
-    options[:success_color] = success_color
+  opts.on('-e', '--error REGEXP', Regexp, 'RegExp that matched will turn the line in --error-color    (' + options[:colors][:error][:regex].inspect + ')') do |error|
+    options[:colors][:error][:regex] = error
   end
 
-  opts.on('--warning-color COLOR', COLORS, 'color to use when warning matches ' + COLORS.map { |color| color.id2name }.to_s) do |warning_color|
-    options[:warning_color] = warning_color
+  opts.on('--error-color COLOR', COLORS, 'color to use when line matches error (' + options[:colors][:error][:color].id2name + ')') do |error_color|
+    options[:colors][:error][:color] = error_color
   end
 
-  opts.on('--error-color COLOR', COLORS, 'color to use when error matches ' + COLORS.map { |color| color.id2name }.to_s) do |error_color|
-    options[:error_color] = error_color
+  opts.on('--custom1 REGEXP', Regexp, 'RegExp that matched will turn the line in --custom-color1  (' + options[:colors][:custom1][:regex].inspect + ')') do |custom|
+    options[:colors][:custom1][:regex] = custom
   end
 
-  opts.on('--default-color COLOR', COLORS, 'color to use when no match is found ' + COLORS.map { |color| color.id2name }.to_s) do |default_color|
-    options[:default_color] = default_color
+  opts.on('--custom1-color COLOR', COLORS, 'color to use when line matches custom1 (' + options[:colors][:custom1][:color].id2name + ')') do |custom_color|
+    options[:colors][:custom1][:color] = custom_color
   end
 
-  opts.on('-s', '--success REGEXP', Regexp, 'RegExp that matched will turn the line green  (default ' + options[:success].inspect + ')') do |success|
-    options[:success] = success
+  opts.on('--custom2 REGEXP', Regexp, 'RegExp that matched will turn the line in --custom-color2  (' + options[:colors][:custom2][:regex].inspect + ')') do |custom|
+    options[:colors][:custom2][:regex] = custom
   end
 
-  opts.on('-w', '--warning REGEXP', Regexp, 'RegExp that matched will turn the line yellow (default ' + options[:warning].inspect + ')') do |warning|
-    options[:warning] = warning
+  opts.on('--custom2-color COLOR', COLORS, 'color to use when line matches custom2 (' + options[:colors][:custom2][:color].id2name + ')') do |custom_color|
+    options[:colors][:custom2][:color] = custom_color
   end
 
-  opts.on('-e', '--error REGEXP', Regexp, 'RegExp that matched will turn the line red    (default ' + options[:error].inspect + ')') do |error|
-    options[:error] = error
+  opts.on('--custom3 REGEXP', Regexp, 'RegExp that matched will turn the line in --custom-color3  (' + options[:colors][:custom3][:regex].inspect + ')') do |custom|
+    options[:colors][:custom3][:regex] = custom
+  end
+
+  opts.on('--custom3-color COLOR', COLORS, 'color to use when line matches custom3 (' + options[:colors][:custom3][:color].id2name + ')') do |custom_color|
+    options[:colors][:custom3][:color] = custom_color
   end
 
 end
@@ -77,23 +126,17 @@ end
 option_parser.parse!
 
 def color_print(line, options)
+  actual_color = options[:colors][:default][:color]
 
-  success_check = Regexp.new(options[:success])
-  warning_check = Regexp.new(options[:warning])
-  error_check = Regexp.new(options[:error])
-
-  color = options[:default_color]
-
-  if line =~ success_check
-    color = options[:success_color]
-  end
-  if  line =~ warning_check
-    color = options[:warning_color]
-  end
-  if  line =~ error_check
-    color = options[:error_color]
+  options[:colors].each do |key, value|
+    regexp = Regexp.new(value[:regex])
+    color = value[:color]
+    if line =~ regexp
+      actual_color = color
+    end
   end
-  printf("%s".foreground(color), line)
+
+  printf("%s".foreground(actual_color), line)
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colorlog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -59,8 +59,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-description: colorlog allow you to read a file with some lines colored in red, green
-  and yellow based on regexp
+description: colorlog allow you to read a file with some lines colored based on regexp
+  three different regexp
 email: 
 executables:
 - colorlog
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1041857608372163492
+      hash: 3221968240800879847
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1041857608372163492
+      hash: 3221968240800879847
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24