yay 0.0.2 → 0.0.3

data/data/{defaults → yay}/log4x.yay

@@ -8,7 +8,7 @@ error is @serious
 fatal is @serious
 
 # some words that aren't logger levels but are still important
-exception is @serious
+exception is @interesting
 "unhandled exception" is @serious
 important is @serious
 

data/data/{defaults → yay}/syslog.yay

@@ -1,8 +1,6 @@
 #!/usr/bin/yay
 # Highlights syslog messages
 
-insensitive
-
 debug is normal
 informational is gray
 notice and warning are yellow

data/lib/yay/application.rb

@@ -1,11 +1,18 @@
 require 'yay/parser'
 require 'yay/colourizer'
+require 'yay/version'
 
 class Yay
   class Application
 
-    # args that can be used if you don't want the application to do anything
-    DO_NOTHING_ARGS = ['--do-nothing']
+    # arg that can be used if you don't want the application to do anything
+    DO_NOTHING_ARG = '--do-nothing'
+    
+    # arg that can be used if you want to dump the rules instead of using them
+    DUMP_RULES_ARG = '--dump'
+    
+    # arg that can be used to dump the version and exit
+    SHOW_VERSION_ARG = '--version'
 
     def initialize(input, output, error, args)
       raise ArgumentError, "input" unless input.kind_of? IO
@@ -24,7 +31,17 @@ class Yay
       raise "already running" if @running
       @running = true
       
-      return if @args == DO_NOTHING_ARGS
+      preArg = @args[0]
+      @args.shift if preArg == DO_NOTHING_ARG || 
+                     preArg == DUMP_RULES_ARG ||
+                     preArg == SHOW_VERSION_ARG
+      
+      if preArg == SHOW_VERSION_ARG
+        puts Yay::version
+        exit
+      end
+      
+      return if preArg == DO_NOTHING_ARG
       
       begin      
       
@@ -33,12 +50,33 @@ class Yay
         @rules = @parser.get_rules
 
         @colourizer = Yay::Colourizer.new @rules, @input, @output
+        
+        if preArg == DUMP_RULES_ARG
+          dump_colours @colourizer.line_rules, @colourizer.part_rules
+          return
+        end
+
         @colourizer.colourize_pipe
       rescue Yay::Error => error
         @error.puts error.printable_message
       rescue Interrupt
       end
     end
+    
+    def dump_colours line_rules, word_rules
+     
+      puts "line rules:" if line_rules
+      
+      line_rules.each { |rule| 
+        puts "#{rule[0]} => #{rule[1].dump}"
+      }
+      
+      puts "word rules:" if word_rules
+      
+      word_rules.each { |rule|
+        puts "#{rule[0]} => #{rule[1].dump}"
+      }
+    end
 
   end
 end

data/lib/yay/colourizer.rb

@@ -7,6 +7,14 @@ class Yay
       @input   = input
       @output  = output
     end
+    
+    def line_rules
+      @line_rules
+    end
+    
+    def part_rules
+      @part_rules
+    end
 
     def colourize_rules rules
       @line_rules = []

data/lib/yay/lexer_regex.rb

@@ -3,8 +3,8 @@ require 'yay/colour_wheel'
 class Yay
   class Lexer
     
-    # The expressions to match to find tokens
-    # Ensure the labels match up to tokens in grammar.y
+    # the expressions to match to find tokens
+    # ensure the labels match up to tokens in grammar.y
     BASE_PATTERNS = [
       [:whitespace     , /\s+/],
       [:comment        , /#.*$/],
@@ -12,7 +12,7 @@ class Yay
       # strings
       [:double_quoted  , /"[^"\\]*(?:\\.[^"\\]*)*"/],
       [:single_quoted  , /'[^'\\]*(?:\\.[^'\\]*)*'/],
-      [:regex          , /\/[^\/\\\r\n]*(?:x.[^\/x\r\n]*)*\/[a-z]*/],  
+      [:regex          , /\/[^\/\\\r\n]*(?:\\.[^\/\\\r\n]*)*\/(?:[a-z]*\b)?/],
       [:variable       , /@\w+/],
 
       # keywords

data/lib/yay/parser.rb

@@ -25,13 +25,40 @@ class Yay
     
     def handle_string string
       string = Regexp::escape(string)
-      Regexp.new(string, Regexp::IGNORECASE)
+      return Regexp.new(string, Regexp::IGNORECASE)
     end
 
     def handle_regex string
-      string
+      return string_to_regex string
     end
 
+    # for lack of a better function, this will take the ending sequence from
+    # a regular expression and convert it in to a bytewise options variable
+    def extract_regexp_options args
+      return 0 if args.nil?
+      raise ArgumentError unless args.kind_of? String
+      options_map = {
+        'i' => Regexp::IGNORECASE,
+        'm' => Regexp::MULTILINE,
+        'x' => Regexp::EXTENDED,
+      }
+      options = 0
+      args.each { |char|
+        options |= options_map[char] || 0
+      }
+      return options
+    end
+    
+    # for lack of a better function, this will take a string like "/abc/" and
+    # transform it in to a regex object
+    def string_to_regex string
+      matches = /\/([^\/\\\r\n]*(?:\\.[^\/\\\r\n]*)*)\/([a-z]\b)*/.match string
+      return nil if matches[1].nil?
+      content = Regexp::escape(matches[1])
+      options = extract_regexp_options matches[2]
+      return Regexp.new(content, options)
+    end
+    
     # given an array of colour strings, create an array with the VT100 colour
     # sequences inside
     def handle_colours colours

data/lib/yay/version.rb

@@ -2,7 +2,7 @@ require 'open3'
 
 class Yay
 
-	VERSION = "0.0.1"
+	VERSION = "0.0.3"
 
 	def self.version
 		@rev ||= begin

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: yay
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
-- Jon Davey
+- jon davey
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 +00:00
+date: 2011-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -29,16 +29,9 @@ extra_rdoc_files: []
 
 files: 
 - LICENSE
-- data/lexer_tests.rb
-- data/parser_tests.rb
-- data/examples/errors.yay
-- data/examples/variables.yay
-- data/examples/regex.yay
-- data/grammar.y
-- data/defaults/log4x.yay
-- data/defaults/174.txt.utf8
-- data/defaults/syslog.yay
-- data/defaults/log.yay
+- data/yay/default.yay
+- data/yay/log4x.yay
+- data/yay/syslog.yay
 - lib/yay/colourizer.rb
 - lib/yay/application.rb
 - lib/yay/version.rb
@@ -85,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Makes your logs colourful!
+summary: makes your logs colourful!
 test_files: []