glark 1.9.0 → 1.10.0

data/lib/glark/output/match_list.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+module Glark
+  # not yet supported; will be matches stored instead of written to stdout.
+  class MatchList
+    attr_reader :matches
+
+    def initialize file, show_file_names 
+      super
+      @matches = Array.new
+    end
+  end
+end

data/lib/glark/output/options.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/spec'
+require 'glark/util/options'
+
+module Glark
+  class OutputOptions < OutputSpec
+    include OptionUtil
+    
+    def initialize colors, optdata
+      super colors
+
+      add_as_options optdata
+    end
+
+    def config_fields
+      fields = {
+        "after-context" => @context.after,
+        "before-context" => @context.before,
+        "filter" => @filter,
+        "output" => @style,
+      }
+    end
+
+    def dump_fields
+      fields = {
+        "after" => @context.after,
+        "before" => @context.before,
+        "count" => @count,
+        "file_names_only" => @file_names_only,
+        "filter" => @filter,
+        "invert_match" => @invert_match,
+        "label" => @label,
+        "match_limit" => @match_limit,
+        "output" => @style,
+        "show_file_names" => @show_file_names,
+        "show_line_numbers" => @show_line_numbers,
+        "write_null" => @write_null
+      }
+    end
+
+    def update_fields fields
+      fields.each do |name, values|
+        case name
+        when "grep"
+          self.style = "grep" if to_boolean values.last
+        when "output"
+          self.style = values.last
+        end
+      end
+      @context.update_fields fields
+    end
+
+    def add_as_options optdata
+      @context.add_as_option optdata
+
+      add_opt_true optdata, :invert_match, %w{ -v --invert-match }
+
+      add_opt_true optdata, :filter, %w{ --filter }
+      add_opt_false optdata, :filter, %w{ --no-filter --nofilter }
+      
+      add_opt_true optdata, :show_line_numbers, %w{ -n --line-number }
+      add_opt_false optdata, :show_line_numbers, %w{ -N --no-line-number }
+
+      add_opt_blk(optdata, %w{ -l --files-with-matches }) { set_file_names_only false }
+      add_opt_blk(optdata, %w{ -L --files-without-match }) { set_file_names_only true }
+      
+      add_opt_true optdata, :write_null, %w{ -Z --null }
+
+      add_opt_str optdata, :label, %w{ --label }
+      
+      add_opt_int optdata, :match_limit, %w{ -m --match-limit }
+
+      add_opt_blk(optdata, %w{ -U --no-highlight }) { @colors.text_color_style =  nil }
+      add_opt_blk(optdata, %w{ -g --grep }) { self.style = "grep" }
+      
+      optdata << lnum_color_option = {
+        :tags => %w{ --line-number-color },
+        :arg  => [ :string ],
+        :set  => Proc.new { |val| @colors.line_number_color = @colors.create_color "line-number-color", val },
+      }
+
+      add_opt_true optdata, :count, %w{ -c --count }
+
+      add_opt_true optdata, :show_file_names, %w{ -H --with-filename }
+      add_opt_false optdata, :show_file_names, %w{ -h --no-filename }
+
+      optdata << highlight_option = { 
+        :tags => %w{ -u --highlight },
+        :arg  => [ :optional, :regexp, %r{ ^ (?:(multi|single)|none) $ }x ],
+        :set  => Proc.new { |md| val = md ? md[1] : "multi"; @colors.text_color_style = val }
+      }
+
+      optdata << file_color_option = {
+        :tags => %w{ --file-color },
+        :arg  => [ :string ],
+        :set  => Proc.new { |val| @colors.file_name_color = @colors.create_color "file-color", val }
+      }
+    end
+  end
+end

data/lib/glark/output/results.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+# Results of searching files.
+
+class Results
+  include Loggable
+
+  attr_reader :count
+
+  def initialize
+    @count = 0
+  end
+
+  def matched?
+    @count > 0
+  end
+
+  def add_match
+    @count += 1
+  end
+end

data/lib/glark/output/spec.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/binary_file_summary'
+require 'glark/output/context'
+require 'glark/output/file_name_only'
+require 'glark/output/glark_count'
+require 'glark/output/glark_lines'
+require 'glark/output/grep_count'
+require 'glark/output/grep_lines'
+require 'glark/output/unfiltered_lines'
+
+module Glark
+  class OutputSpec
+    attr_accessor :context           # lines before and after
+    attr_accessor :count             # only count the matches
+    attr_accessor :file_names_only   # display only the file names
+    attr_accessor :filter            # display only matches
+    attr_accessor :invert_match      # display non-matching lines
+    attr_accessor :label
+    attr_accessor :match_limit       # the maximum number of matches to display per file
+    attr_accessor :out
+    attr_accessor :show_file_names   # display file names
+    attr_accessor :show_line_numbers # display numbers of matching lines
+    attr_accessor :write_null        # in @file_names_only mode, write '\0' instead of '\n'
+
+    attr_reader :colors
+    attr_reader :style               # grep, glark
+
+    def initialize colors
+      @colors = colors
+      @context = Glark::Context.new
+      @count = false
+      @file_names_only = false
+      @filter = true
+      @highlight = nil
+      @invert_match = false
+      @label = nil
+      @match_limit = nil
+      @out = $stdout
+      @show_file_names = nil      # nil == > 1; true == >= 1; false means never
+      @show_line_numbers = true
+      @style = nil
+      @write_null = false
+
+      @output_cls = nil
+
+      self.style = "glark"
+    end
+
+    def line_number_highlight
+      @colors.line_number_color
+    end
+
+    def file_highlight 
+      @colors.file_name_color
+    end
+
+    def highlight
+      @colors.text_color_style
+    end
+
+    def style= style
+      @style = style
+      if @style == "glark"
+        @colors.text_color_style = "multi"
+      elsif @style == "grep"
+        @colors.text_color_style = false
+        @show_line_numbers = false
+        @context.clear
+      else
+        raise "error: unrecognized style '" + style + "'"
+      end
+      @output_cls = nil
+    end
+
+    def create_output_type file
+      output_type_cls.new file, self
+    end
+
+    def output_type_cls
+      @output_cls ||= if @count
+                        if @style == "grep" 
+                          Grep::Count
+                        else
+                          Glark::Count
+                        end
+                      elsif @file_names_only
+                        FileNameOnly
+                      elsif !@filter
+                        UnfilteredLines
+                      elsif @style == "grep"
+                        Grep::Lines
+                      else
+                        Glark::Lines
+                      end
+    end
+    
+    def set_file_names_only invert_match
+      @file_names_only = true
+      @invert_match = invert_match
+    end
+  end
+end

data/lib/glark/output/unfiltered_lines.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby -w
+#!ruby -w
+# vim: set filetype=ruby : set sw=2
+
+require 'glark/output/lines'
+require 'glark/output/glark_format'
+
+module Glark
+  class UnfilteredLines < Lines
+    include Glark::Format
+    
+    def display_matches?
+      false
+    end
+
+    def process_end lnum
+      show_file_header
+      write_all
+    end
+
+    def write_all
+      show_file_header
+      (0 ... @file.get_lines.length).each do |ln|
+        print_line ln  
+      end
+    end
+  end
+end

data/lib/glark/util/colors/options.rb

@@ -0,0 +1,143 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'glark/util/colors/spec'
+
+module Glark
+  class ColorOptions < ColorSpec    
+    DEFAULT_COLORS = [
+                      # "FF88CC",
+                      "black on yellow",
+                      "black on green",
+                      "black on magenta",
+                      "yellow on black",
+                      "magenta on black",
+                      "green on black",
+                      "cyan on black",
+                      "blue on yellow",
+                      "blue on magenta",
+                      "blue on green",
+                      "blue on cyan",
+                      "yellow on blue",
+                      "magenta on blue",
+                      "green on blue",
+                      "cyan on blue",
+                     ]
+
+    attr_reader :text_color_style # single, multi, or nil (no text highlights)
+
+    def initialize
+      super
+      @highlighter = nil
+      @text_color_style = "multi"
+    end
+
+    # creates a color for the given option, based on its value
+    def create_color opt, value
+      if @highlighter
+        if value
+          make_color value
+        else
+          raise "error: '" + opt + "' requires a color"
+        end
+      else
+        log { "no highlighter defined" }
+      end
+    end
+
+    def make_color color
+      @highlighter.make_color color
+    end
+
+    def make_rgb_color red, green, blue, fgbg
+      @highlighter.make_rgb_color red, green, blue, fgbg
+    end
+
+    def make_colors limit = -1
+      DEFAULT_COLORS[0 .. limit].collect do |color| 
+        make_color color
+      end
+    end
+
+    def multi_colors 
+      make_colors
+      # [ make_rgb_color(4, 3, 2, :bg) + make_rgb_color(0, 2, 1, :fg) ]
+    end
+
+    def single_color
+      make_colors 0
+    end
+
+    def text_color_style= tcstyle
+      @text_color_style = tcstyle
+      if @text_color_style
+        @highlighter = @text_color_style && HlWrapper.new
+        @text_colors = case @text_color_style
+                           when highlight_multi?(@text_color_style), true
+                             multi_colors
+                           when "single"
+                             single_color
+                           else
+                             raise "highlight format '" + @text_color_style.to_s + "' not recognized"
+                           end
+
+        @file_name_color = make_color "bold"
+        @line_number_color = nil
+      else
+        @highlighter = nil
+        @text_colors = Array.new
+        @file_name_color = nil
+        @line_number_color = nil
+      end
+    end
+
+    def set_text_color index, color
+      @text_colors[index] = color
+    end
+
+    def highlight_multi? str
+      %w{ multi on true yes }.detect { |x| str == x }
+    end
+
+    def config_fields
+      fields = {
+        "file-color" => @file_name_color,
+        "highlight" => @text_color_style,
+        "line-number-color" => @line_number_color,
+      }
+    end
+
+    def dump_fields
+      fields = {
+        "file_name_color" => colorize(@file_name_color, "filename"),
+        "highlight" => @text_color_style,
+        "line_number_color" => colorize(@line_number_color, "12345"),
+      }
+    end
+
+    def colorize field, str
+      if field
+        field + str + Text::Color::RESET
+      else
+        str
+      end
+    end
+    
+    def update_fields fields
+      fields.each do |name, values|
+        case name
+        when "file-color"
+          @file_name_color = create_color name, values.last
+        when "highlight"
+          self.text_color_style = values.last
+        when "line-number-color"
+          @line_number_color = create_color name, values.last
+        when "text-color"
+          @text_colors = [ create_color(name, values.last) ]
+        when %r{^text\-color\-(\d+)$}
+          set_text_color $1.to_i, create_color(name, values.last)
+        end
+      end
+    end
+  end
+end

data/lib/glark/util/colors/spec.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel/log/loggable'
+
+module Glark
+  class ColorSpec
+    include Loggable
+    
+    attr_accessor :text_colors
+    attr_accessor :file_name_color
+    attr_accessor :line_number_color
+    
+    def initialize
+      @text_colors = Array.new
+      @file_name_color = nil
+      @line_number_color = nil
+    end
+  end
+end