colorlog 0.0.2 → 0.0.3

data/bin/colorlog

@@ -2,32 +2,74 @@
 
 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
+
+}
+CONFIG_FILE = File.join(ENV['HOME'], '.colorlog.rc.yaml')
+if File.exists? CONFIG_FILE
+  config_options = YAML.load_file(CONFIG_FILE)
+  options.merge!(config_options)
+else
+  File.open(CONFIG_FILE, 'w') { |file| YAML::dump(options, file) }
+  STDERR.puts "Initialized configuration file in #{CONFIG_FILE}"
+end
 
-options = {}
 option_parser = OptionParser.new do |opts|
   executable_name = File.basename($PROGRAM_NAME)
   opts.banner = "Read a file and color the lines in " +
-      "green".foreground(:green) + ", " +
-      "yellow".foreground(:yellow) + " or " +
-      "red".foreground(:red) + " based on the content of the line
+      "different color depending on the content of the line matching different Regexp.
 
 Usage: #{executable_name} [options] filename
 
 "
 
-  options[:green] = "success"
-  opts.on('-g', '--green RegExp', 'RegExp that matched will turn the line green') do |green|
-    options[:green] = green
+  COLORS = [
+      :black,
+      :red,
+      :green,
+      :yellow,
+      :blue,
+      :magenta,
+      :cyan,
+      :white,
+      :default
+  ]
+
+  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
+  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
+  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
+  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
+  end
+
+  opts.on('-s', '--success REGEXP', Regexp, 'RegExp that matched will turn the line green  (default ' + options[:success].inspect + ')') do |success|
+    options[:success] = success
   end
 
-  options[:yellow] = "warning"
-  opts.on('-y','--yellow RegExp', 'RegExp that matched will turn the line yellow') do |yellow|
-    options[:yellow] = yellow
+  opts.on('-w', '--warning REGEXP', Regexp, 'RegExp that matched will turn the line yellow (default ' + options[:warning].inspect + ')') do |warning|
+    options[:warning] = warning
   end
 
-  options[:red] = /^(?:(?!\bTests\b).)*(?:failure|error).*$/i
-  opts.on('-r', '--red RedExp', 'RegExp that matched will turn the line red') do |red|
-    options[:red] = red
+  opts.on('-e', '--error REGEXP', Regexp, 'RegExp that matched will turn the line red    (default ' + options[:error].inspect + ')') do |error|
+    options[:error] = error
   end
 
 end
@@ -36,20 +78,20 @@ option_parser.parse!
 
 def color_print(line, options)
 
-  success_check = Regexp.new(options[:green], Regexp::IGNORECASE)
-  warning_check = Regexp.new(options[:yellow], Regexp::IGNORECASE)
-  error_check = Regexp.new(options[:red])
+  success_check = Regexp.new(options[:success])
+  warning_check = Regexp.new(options[:warning])
+  error_check = Regexp.new(options[:error])
 
-  color = :default
+  color = options[:default_color]
 
   if line =~ success_check
-    color = :green
+    color = options[:success_color]
   end
   if  line =~ warning_check
-    color = :yellow
+    color = options[:warning_color]
   end
   if  line =~ error_check
-    color = :red
+    color = options[:error_color]
   end
   printf("%s".foreground(color), line)
 
@@ -57,19 +99,19 @@ end
 
 filename = ARGV.shift
 
-if (filename.nil?)
+if filename.nil?
   if STDIN.tty?
     puts "You should provide a file"
     exit 1
   end
 
   ARGF.each do |line|
-    color_print(line,options)
+    color_print(line, options)
   end
 else
   File.open(File.expand_path(filename), 'r') do |file|
     file.readlines.each do |line|
-      color_print(line,options)
+      color_print(line, options)
     end
   end
 end

metadata

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