colortail 0.1.3 → 0.1.4

data/Changelog.markdown

@@ -1,4 +1,10 @@
-### colortail 0.1.2 2010-04-19
+### colortail 0.1.4 2010-04-21
+
+ * CTRL-C now properly caught
+ * Threads are now cleaned properly
+ * List available groupings from the command line
+
+### colortail 0.1.3 2010-04-19
 
  * BUGFIX: Ensure config file exists before sourcing it
 

data/README.markdown

@@ -31,7 +31,7 @@ The full list of choices for colors and combinations are listed below.
  * blue
  * magenta - (purple-ish)
  * cyan
- * white
+ * light gray
 
 #### Attributes ####
 
@@ -42,6 +42,19 @@ The full list of choices for colors and combinations are listed below.
  * reverse
  * hidden - simply don't show the text
 
+#### Additional Colors ####
+
+To get the additional colorset listed below, use the **bright** attribute.
+
+ * dark gray (bright black)
+ * light blue (bright blue)
+ * light green (bright green)
+ * light cyan (bright cyan)
+ * light red (bright red)
+ * light purple (bright purle)
+ * yellow (bright brown)
+ * white (bright light gray)
+
 ### Configuration Example ###
 
 The example given in the configuration file is good for tailing a syslog file that has lines that are naemd with their syslog level. There are a lot of potential uses.  Check the wiki page of [example groupings](http://www.codaset.com/elubow/colortail/wiki/example-groupings) to see how others are using ColorTail.
@@ -60,7 +73,7 @@ The command below will tail the **/var/log/messages** file using the syslog grou
 
 ColorTail intentionally does not die when a file specified on the command line doesn't exist.
 
-## Additionial Information ##
+## Additional Information ##
 
   * Homepage: [http://www.codaset.com/elubow/colortail](http://www.codaset.com/elubow/colortail)
   * Wiki: [Home](http://www.codaset.com/elubow/colortail/wiki)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/colortail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{colortail}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Lubow"]
-  s.date = %q{2010-04-19}
+  s.date = %q{2010-04-21}
   s.default_executable = %q{colortail}
   s.description = %q{Tail a file and color lines based on regular expressions within that line. By setting up multiple expression and color groups in the configuration file, you can apply highlighting to a file while its being tailed.}
   s.email = %q{eric@lubow.org}

data/lib/colortail/application.rb

@@ -25,7 +25,13 @@ module ColorTail
                        @match_group = config.load_opts(options[:group])
                    else
                        # Create this to ensure we always have a value for this array
-                       @match_group = Array.new
+                       @match_group = Array.push( 'default' => [] )
+                   end
+
+                   # Display the list of available groups and exit
+                   if options[:list]
+                       config.display_match_groups()
+                       return 1
                    end
     
                    logger = ColorTail::Colorize.new()
@@ -39,7 +45,6 @@ module ColorTail
                        logger.add_color_matcher( @match_group )
                    end
     
-
                    # Create a thread for each file
                    threads = []
                    files.each do |file|
@@ -53,6 +58,7 @@ module ColorTail
                            # Tail the file and show new lines
                            tailer.tail { |line|  logger.log( file, line ) }
                        }
+                       threads[files.index(file)].run
                    end
 
                    # Let the threads do their real work
@@ -60,10 +66,21 @@ module ColorTail
                        thread.join
                    end
 
+               # If we get a CTRL-C, catch it (rescue) and send it for cleanup
+               rescue Interrupt
+                   cleanup(threads)
                end
 
                return 0
             end
+
+            def cleanup(threads)
+                threads.each do |thread|
+                    thread.kill
+                end
+                $stderr.puts "Terminating..."
+                exit
+            end
         end
     end
 

data/lib/colortail/configuration.rb

@@ -33,6 +33,13 @@ module ColorTail
             end
             return colorset
         end
+
+        def display_match_groups()
+            puts "The following match groups are available through your config files:"
+            Groupings.each_key do |group|
+                puts "  * #{group}"
+            end
+        end
     end
 
     class ComplexRecord < StandardError
@@ -52,17 +59,22 @@ module ColorTail
             
             require 'optparse'
             @opts = OptionParser.new do |o|
-                o.banner = "Usage: #{File.basename($0)} <file>"
+                o.banner = "Usage: #{File.basename($0)} <file1> <file2> ..."
             
                 options[:group] = 'default'
                 o.on( '-g', '--group <group>', 'Specify the color grouping to use for these files' ) do |group|
                     options[:group] = group
                 end
 
+                options[:list] = false
+                o.on( '-l', '--list', 'List all the available color groupings' ) do |group|
+                    options[:list] = true
+                end
+
                 o.separator ""
             
                 options[:conf] = "#{user_home}/.colortailrc"
-                o.on( '-c', '--conf <FILE>', 'Specify an alternate config file' ) do |file|
+                o.on( '-c', '--conf <file>', 'Specify an alternate config file' ) do |file|
                     if File.exists?(file)
                         options[:conf] = file
                     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: colortail
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Eric Lubow
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -04:00
+date: 2010-04-21 00:00:00 -04:00
 default_executable: colortail
 dependencies: 
 - !ruby/object:Gem::Dependency