glark 1.9.0 → 1.10.0

data/test/glark/resources.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+module Glark
+  class Resource
+    include Loggable
+    
+    RES_DIR = '/proj/org/incava/glark/test/resources/'
+    
+    def to_path basename
+      RES_DIR + basename
+    end
+
+    def readlines basename
+      ::IO.readlines to_path
+    end
+  end
+end

data/test/glark/tc.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+require 'test/unit'
+require 'tempfile'
+
+STDOUT.sync = true
+STDERR.sync = true
+
+require 'glark/app/runner'
+
+Log.verbose = true
+Log.set_widths(-15, 35, -35)
+Log.level = Log::DEBUG
+
+module Glark
+  class TestCase < Test::Unit::TestCase
+    include Loggable
+
+    # Returns a list of instance methods, in sorted order, so that they are run
+    # predictably by the unit test framework.
+
+    class << self
+      alias :unsorted_instance_methods :instance_methods
+      
+      def instance_methods b
+        unsorted_instance_methods(true).sort
+      end
+    end
+
+    def test_truth
+      assert true
+    end
+  end
+end

data/test/resources/add.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+class Adder
+  def initialize x, y
+    puts x.to_s + " + " + y.to_s + " = " + (x.to_i + y.to_i).to_s
+  end
+end
+
+Adder.new ARGV.shift || 2, ARGV.shift || 2

data/test/resources/echo.rb

@@ -0,0 +1,2 @@
+#!/usr/bin/ruby -w
+puts ARGV.join(' ')

data/test/resources/greet.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+class Greet
+  def initialize name
+    puts "hello, " + name
+  end
+end
+
+Greet.new ARGV.shift || "world"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glark
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 1
-  - 9
+  - 10
   - 0
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2012-12-30 00:00:00 -05:00
 default_executable: glark
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,36 +26,160 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 51
         segments: 
-        - 0
-        - 0
         - 1
-        version: 0.0.1
+        - 1
+        - 16
+        version: 1.1.16
   type: :runtime
   version_requirements: *id001
-description: 
-email: jpace@incava.org
+- !ruby/object:Gem::Dependency 
+  name: rainbow
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
+        version: 1.1.4
+  type: :runtime
+  version_requirements: *id002
+description: |
+  Glark searches files for regular expressions, extending grep by matching complex
+  expressions ("and", "or", and "xor"), extracting and searching within compressed
+  files, and excluding .svn and .git subdirectories by default. Different projects
+  can have their own Glark configuration.
+
+email: jeugenepace@gmail.com
 executables: 
 - glark
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- bin/jlark
-- bin/glark
-- lib/glark/input.rb
-- lib/glark/expression.rb
-- lib/glark/options.rb
-- lib/glark/exprfactory.rb
-- lib/glark/glark.rb
-- lib/glark/output.rb
-- lib/glark/help.rb
+- lib/glark/app/help.rb
+- lib/glark/app/options.rb
+- lib/glark/app/runner.rb
+- lib/glark/app/info/options.rb
+- lib/glark/app/app.rb
+- lib/glark/app/rcfile.rb
+- lib/glark/app/spec.rb
+- lib/glark/util/options.rb
+- lib/glark/util/option.rb
+- lib/glark/util/timestamper.rb
+- lib/glark/util/io/fileset.rb
+- lib/glark/util/io/filter/filter.rb
+- lib/glark/util/io/filter/criteria.rb
+- lib/glark/util/io/depth.rb
+- lib/glark/util/io/lines.rb
+- lib/glark/util/optutil.rb
+- lib/glark/util/highlight.rb
+- lib/glark/util/colors/options.rb
+- lib/glark/util/colors/spec.rb
+- lib/glark/input/options.rb
+- lib/glark/input/range.rb
+- lib/glark/input/filter/options.rb
+- lib/glark/input/filter/criteria_opts.rb
+- lib/glark/input/filter/filter.rb
+- lib/glark/input/filter/file_criteria_opts.rb
+- lib/glark/input/filter/dir_criteria_opts.rb
+- lib/glark/input/spec.rb
+- lib/glark/io/file/binary_file.rb
+- lib/glark/io/file/tar_gz_file.rb
+- lib/glark/io/file/zip_file.rb
+- lib/glark/io/file/tar_file.rb
+- lib/glark/io/file/file.rb
+- lib/glark/io/file/gz_file.rb
+- lib/glark/io/file/archive_file.rb
+- lib/glark/match/options.rb
+- lib/glark/match/and_distance.rb
+- lib/glark/match/re.rb
+- lib/glark/match/expression.rb
+- lib/glark/match/and.rb
+- lib/glark/match/factory.rb
+- lib/glark/match/compound.rb
+- lib/glark/match/xor.rb
+- lib/glark/match/or.rb
+- lib/glark/match/ior.rb
+- lib/glark/match/re_factory.rb
+- lib/glark/match/spec.rb
+- lib/glark/output/line_status.rb
+- lib/glark/output/unfiltered_lines.rb
+- lib/glark/output/options.rb
+- lib/glark/output/grep_lines.rb
+- lib/glark/output/grep_count.rb
+- lib/glark/output/glark_lines.rb
+- lib/glark/output/count.rb
+- lib/glark/output/glark_count.rb
+- lib/glark/output/glark_format.rb
+- lib/glark/output/binary_file_summary.rb
+- lib/glark/output/context.rb
+- lib/glark/output/lines.rb
+- lib/glark/output/results.rb
+- lib/glark/output/common.rb
+- lib/glark/output/match_list.rb
+- lib/glark/output/file_name_only.rb
+- lib/glark/output/formatted.rb
+- lib/glark/output/file_header.rb
+- lib/glark/output/spec.rb
 - lib/glark.rb
-- test/lib/glark/options_test.rb
-- test/lib/glark/glark_test.rb
-- README
+- man/glark.1
+- bin/glark
+- test/glark/app/and_test.rb
+- test/glark/app/invert_test.rb
+- test/glark/app/context_test.rb
+- test/glark/app/files_with_match_test.rb
+- test/glark/app/xor_test.rb
+- test/glark/app/ignore_case_test.rb
+- test/glark/app/line_number_color_test.rb
+- test/glark/app/ior_test.rb
+- test/glark/app/whole_words_test.rb
+- test/glark/app/expression_file_test.rb
+- test/glark/app/regexp_test.rb
+- test/glark/app/line_numbers_test.rb
+- test/glark/app/range_test.rb
+- test/glark/app/options_test.rb
+- test/glark/app/match_limit_test.rb
+- test/glark/app/text_color_test.rb
+- test/glark/app/extract_matches_test.rb
+- test/glark/app/highlight_test.rb
+- test/glark/app/whole_lines_test.rb
+- test/glark/app/record_separator_test.rb
+- test/glark/app/filter_test.rb
+- test/glark/app/label_test.rb
+- test/glark/app/extended_regexp_test.rb
+- test/glark/app/dump_test.rb
+- test/glark/app/tc.rb
+- test/glark/app/rcfile_test.rb
+- test/glark/app/compound_test.rb
+- test/glark/app/count_test.rb
+- test/glark/app/files_without_match_test.rb
+- test/glark/match_test.rb
+- test/glark/input/exclude_matching_test.rb
+- test/glark/input/split_as_path_test.rb
+- test/glark/input/filter/filter_spec_test.rb
+- test/glark/input/filter/filter_test.rb
+- test/glark/input/filter/criteria_test.rb
+- test/glark/input/range_test.rb
+- test/glark/input/size_limit_test.rb
+- test/glark/input/path_test.rb
+- test/glark/input/ext_test.rb
+- test/glark/input/directory_test.rb
+- test/glark/input/binary_file_test.rb
+- test/glark/input/name_test.rb
+- test/glark/input/dirname_test.rb
+- test/glark/resources.rb
+- test/glark/tc.rb
+- test/resources/greet.rb
+- test/resources/add.rb
+- test/resources/echo.rb
 has_rdoc: true
 homepage: http://www.incava.org/projects/glark
 licenses: []
@@ -86,10 +210,56 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Extended searching of text files.
 test_files: 
-- test/lib/glark/options_test.rb
-- test/lib/glark/glark_test.rb
+- test/glark/app/and_test.rb
+- test/glark/app/invert_test.rb
+- test/glark/app/context_test.rb
+- test/glark/app/files_with_match_test.rb
+- test/glark/app/xor_test.rb
+- test/glark/app/ignore_case_test.rb
+- test/glark/app/line_number_color_test.rb
+- test/glark/app/ior_test.rb
+- test/glark/app/whole_words_test.rb
+- test/glark/app/expression_file_test.rb
+- test/glark/app/regexp_test.rb
+- test/glark/app/line_numbers_test.rb
+- test/glark/app/range_test.rb
+- test/glark/app/options_test.rb
+- test/glark/app/match_limit_test.rb
+- test/glark/app/text_color_test.rb
+- test/glark/app/extract_matches_test.rb
+- test/glark/app/highlight_test.rb
+- test/glark/app/whole_lines_test.rb
+- test/glark/app/record_separator_test.rb
+- test/glark/app/filter_test.rb
+- test/glark/app/label_test.rb
+- test/glark/app/extended_regexp_test.rb
+- test/glark/app/dump_test.rb
+- test/glark/app/tc.rb
+- test/glark/app/rcfile_test.rb
+- test/glark/app/compound_test.rb
+- test/glark/app/count_test.rb
+- test/glark/app/files_without_match_test.rb
+- test/glark/match_test.rb
+- test/glark/input/exclude_matching_test.rb
+- test/glark/input/split_as_path_test.rb
+- test/glark/input/filter/filter_spec_test.rb
+- test/glark/input/filter/filter_test.rb
+- test/glark/input/filter/criteria_test.rb
+- test/glark/input/range_test.rb
+- test/glark/input/size_limit_test.rb
+- test/glark/input/path_test.rb
+- test/glark/input/ext_test.rb
+- test/glark/input/directory_test.rb
+- test/glark/input/binary_file_test.rb
+- test/glark/input/name_test.rb
+- test/glark/input/dirname_test.rb
+- test/glark/resources.rb
+- test/glark/tc.rb
+- test/resources/greet.rb
+- test/resources/add.rb
+- test/resources/echo.rb

data/bin/jlark

@@ -1,63 +0,0 @@
-#!/bin/sh
-exec ruby -w -x $0 ${1+"$@"} # -*- ruby -*-
-#!ruby -w
-# vim: set filetype=ruby : set sw=2
-
-# Extends glark into Java archives (jar and zip files)
-
-# $Id$
-
-dir = File.dirname(File.dirname(File.expand_path(__FILE__)))
-
-libpath = dir + "/share"
-$:.unshift libpath
-
-require 'glark/glark'
-
-$PACKAGE = "jlark"
-
-class Jlark < Glark
-  
-  def search(name)
-    case name[-4 .. -1]
-    when '.jar'
-      search_jar_file(name)
-    when '.zip'
-      search_zip_file(name)
-    end
-  end
-
-  def search_archive_file(fname, command)
-    if skipped?(fname)
-      log { "skipping file: #{fname}" }
-    else
-      IO.popen(command) do |io|
-        ifile_args = {
-          :after  => @after,
-          :before => @before,
-          :output => @output
-        }
-
-        input = InputFile.new(fname, io, ifile_args)
-        search_file(input)
-      end
-    end
-  end
-
-  def search_jar_file(fname)
-    search_archive_file(fname, "jar tvf #{fname}")
-  end
-
-  def search_zip_file(fname)
-    search_archive_file(fname, "unzip -l #{fname}")
-  end
-end
-
-# and use a cached file for .jar and .zip files
-
-# the pattern is always -r ., with --classpath optional
-class JlarkOptions < GlarkOptions
-
-end
-
-Jlark.main

data/lib/glark/expression.rb

@@ -1,440 +0,0 @@
-#!/usr/bin/ruby -w
-#!ruby -w
-# vim: set filetype=ruby : set sw=2
-
-# Extended regular-expression-based expressions.
-
-require 'rubygems'
-require 'riel'
-
-require 'glark/options'
-
-# A function object, which can be applied (processed) against a InputFile.
-class FuncObj
-  include Loggable
-  
-  attr_accessor :match_line_number, :file, :matches, :invert_match
-
-  def initialize
-    @match_line_number = nil
-    @matches           = Array.new
-    
-    opts               = GlarkOptions.instance
-    @invert_match      = opts.invert_match
-    @display_matches   = !opts.file_names_only && opts.filter && !opts.count
-    @range_start       = opts.range_start
-    @range_end         = opts.range_end
-    @file_names_only   = opts.file_names_only
-    @match_limit       = opts.match_limit
-    @write_null        = opts.write_null
-    @filter            = opts.filter
-  end
-
-  def add_match(lnum)
-    @matches.push(lnum)
-  end
-
-  def start_position
-    match_line_number
-  end
-
-  def end_position
-    start_position
-  end
-
-  def reset_file(file)
-    @match_line_number = nil
-    @file              = file
-    @matches           = Array.new
-  end
-
-  def range(var, infile)
-    if var
-      if var.index(/([\.\d]+)%/)
-        count = infile.linecount
-        count * $1.to_f / 100
-      else
-        var.to_f
-      end
-    else
-      nil
-    end
-  end
-
-  def process(infile)
-    got_match = false
-    reset_file(infile.fname)
-    
-    rgstart  = range(@range_start, infile)
-    rgend    = range(@range_end,   infile)
-
-    lastmatch = 0
-    nmatches = 0
-    lnum = 0
-    infile.each_line do |line|
-      if ((!rgstart || lnum >= rgstart) && 
-          (!rgend   || lnum <= rgend)   &&
-          evaluate(line, lnum, infile))
-  
-        mark_as_match(infile)
-        got_match = true
-        nmatches += 1
-        
-        if @display_matches
-          infile.write_matches(!@invert_match, lastmatch, lnum)
-          lastmatch = lnum + 1
-        elsif @file_names_only
-          # we don't need to match more than once
-          break
-        end
-        
-        if @match_limit && nmatches >= @match_limit
-          # we've found the match limit
-          break
-        end
-      end
-      lnum += 1
-    end
-    
-    if @file_names_only
-      if got_match != @invert_match
-        if @write_null
-          print infile.fname + "\0"
-        else
-          puts infile.fname
-        end
-      end
-    elsif @filter
-      if @invert_match
-        infile.write_matches(false, 0, lnum)
-      elsif got_match
-        infile.write_matches(true, 0, lnum)
-      end
-    else
-      infile.write_all
-    end
-  end
-
-  def mark_as_match(infile)
-    infile.mark_as_match(start_position)
-  end
-
-  def to_s
-    str = inspect
-  end
-  
-end
-
-
-# -------------------------------------------------------
-# Regular expression function object
-# -------------------------------------------------------
-
-# Applies a regular expression against a InputFile.
-class RegexpFuncObj < FuncObj
-
-  attr_reader :re
-
-  def initialize(re, hlidx, args = Hash.new)
-    @re              = re
-    @file            = nil
-    if @highlight = args[:highlight]
-      @text_highlights = args[:text_highlights]
-      @hlidx           = if @text_highlights.length > 0 && args[:highlight] == "multi"
-                           hlidx % @text_highlights.length
-                         else
-                           0
-                         end 
-    end
-    
-    @extract_matches = args[:extract_matches]
-    
-    super()
-  end
-
-  def <=>(other)
-    @re <=> other.re
-  end
-
-  def ==(other)
-    @re == other.re
-  end
-
-  def inspect
-    @re.inspect
-  end
-
-  def match?(line)
-    @re.match(line)
-  end
-
-  def evaluate(line, lnum, file)
-    if Log.verbose
-      log { "evaluating <<<#{line[0 .. -2]}>>>" }
-    end
-    
-    if md = match?(line)      
-      log { "matched" }
-      if @extract_matches
-        if md.kind_of?(MatchData)
-          line.replace(md[-1] + "\n")
-        else
-          warn "--not does not work with -v"
-        end
-      else
-        # log { "NOT replacing line" }
-      end
-      
-      @match_line_number = lnum
-
-      if @highlight
-        highlight_match(lnum, file)
-      end
-      
-      add_match(lnum)
-      true
-    else
-      false
-    end
-  end
-  
-  def explain(level = 0)
-    " " * level + to_s + "\n"
-  end
-
-  def highlight_match(lnum, file)
-    log { "lnum: #{lnum}; file: #{file}" }
-    
-    lnums = file.get_range(lnum)
-    log { "lnums(#{lnum}): #{lnums}" }
-    if lnums
-      lnums.each do |ln|
-        str = file.output.formatted[ln] || file.get_line(ln)
-        if Log.verbose
-          log { "file.output.formatted[#{ln}]: #{file.output.formatted[ln]}" }
-          log { "file.get_line(#{ln}): #{file.get_line(ln)}" }
-          log { "highlighting: #{str}" }
-        end
-        
-        file.output.formatted[ln] = str.gsub(@re) do |m|
-          lastcapts = Regexp.last_match.captures
-          # find the index of the first non-nil capture:
-          miidx = (0 ... lastcapts.length).find { |mi| lastcapts[mi] } || @hlidx
-          
-          @text_highlights[miidx].highlight(m)
-        end
-      end
-    end
-  end
-  
-end
-
-
-# -------------------------------------------------------
-# Compound expression function object
-# -------------------------------------------------------
-
-# Associates a pair of expressions.
-class CompoundExpression < FuncObj
-
-  attr_reader :ops
-
-  def initialize(*ops)
-    @ops  = ops
-    @file = nil
-    super()
-  end
-
-  def reset_file(file)
-    @ops.each do |op|
-      op.reset_file(file)
-    end
-    super
-  end
-
-  def start_position
-    @last_start
-  end
-  
-  def ==(other)
-    self.class == other.class && @ops == other.ops
-  end
-  
-end
-
-
-# -------------------------------------------------------
-# Multi-Or expression function object
-# -------------------------------------------------------
-
-# Evaluates both expressions.
-class MultiOrExpression < CompoundExpression
-
-  def evaluate(line, lnum, file)
-    matched_ops = @ops.select do |op|
-      op.evaluate(line, lnum, file)
-    end
-
-    if is_match?(matched_ops)
-      lastmatch          = matched_ops[-1]
-      @last_start        = lastmatch.start_position
-      @last_end          = lastmatch.end_position
-      @match_line_number = lnum
-      
-      add_match(lnum)
-      true
-    else
-      false
-    end
-  end
-
-  def inspect
-    "(" + @ops.collect { |op| op.to_s }.join(" " + operator + " ") + ")"
-  end
-
-  def end_position
-    @last_end
-  end
-
-  def explain(level = 0)
-    str  = " " * level + criteria + ":\n"
-    str += @ops.collect { |op| op.explain(level + 4) }.join(" " * level + operator + "\n")
-    str
-  end
-  
-end
-
-
-# -------------------------------------------------------
-# Inclusive or expression function object
-# -------------------------------------------------------
-
-# Evaluates the expressions, and is satisfied when one return true.
-class InclusiveOrExpression < MultiOrExpression
-
-  def is_match?(matched_ops)
-    return matched_ops.size > 0
-  end
-
-  def operator
-    "or"
-  end
-
-  def criteria
-    ops.size == 2 ? "either" : "any of"
-  end
-
-end
-
-
-# -------------------------------------------------------
-# Exclusive or expression function object
-# -------------------------------------------------------
-
-# Evaluates the expressions, and is satisfied when only one returns true.
-class ExclusiveOrExpression < MultiOrExpression
-
-  def is_match?(matched_ops)
-    return matched_ops.size == 1
-  end
-
-  def operator
-    "xor"
-  end
-
-  def criteria
-    "only one of"
-  end
-
-end
-
-
-# -------------------------------------------------------
-# And expression function object
-# -------------------------------------------------------
-
-# Evaluates both expressions, and is satisfied when both return true.
-class AndExpression < CompoundExpression
-  
-  def initialize(dist, op1, op2)
-    @dist = dist
-    super(op1, op2)
-  end
-
-  def mark_as_match(infile)
-    infile.mark_as_match(start_position, end_position)
-  end
-
-  def match_within_distance(op, lnum)
-    stack "op: #{op}; lnum: #{lnum}"
-    op.matches.size > 0 and (op.matches[-1] - lnum <= @dist)
-  end
-
-  def inspect
-    str = "("+ @ops[0].to_s
-    if @dist == 0
-      str += " same line as "
-    elsif @dist.kind_of?(Float) && @dist.infinite?
-      str += " same file as "
-    else 
-      str += " within " + @dist.to_s + " lines of "
-    end
-    str += @ops[1].to_s + ")"
-    str
-  end
-
-  def match?(line, lnum, file)
-    matches = (0 ... @ops.length).select do |oi|
-      @ops[oi].evaluate(line, lnum, file)
-    end
-
-    matches.each do |mi|
-      oidx  = (1 + mi) % @ops.length
-      other = @ops[oidx]
-      if match_within_distance(other, lnum)
-        # search for the maximum match within the distance limit
-        other.matches.each do |m|
-          if lnum - m <= @dist
-            log { "match: #{m} within range #{@dist} of #{lnum}" }
-            @last_start = m
-            return true
-          end
-        end
-        log { "other matches out of range" }
-        return false
-      end
-    end
-
-    return false
-  end
-  
-  def end_position
-    @ops.collect { |op| op.end_position }.max
-  end
-
-  def evaluate(line, lnum, file)
-    if match?(line, lnum, file)
-      @match_line_number = lnum
-      true
-    else
-      false
-    end
-  end
-
-  def explain(level = 0)
-    str = ""
-    if @dist == 0
-      str += " " * level + "on the same line:\n"
-    elsif @dist.kind_of?(Float) && @dist.infinite?
-      str += " " * level + "in the same file:\n"
-    else 
-      lnstr = @dist == 1 ? "line" : "lines"
-      str += " " * level + "within #{@dist} #{lnstr} of each other:\n"
-    end
-    str += @ops[0].explain(level + 4)
-    str += " " * level + "and\n"
-    str += @ops[1].explain(level + 4)
-    str
-  end
-  
-end