glark 1.10.2 → 1.10.3

data/lib/glark/app/app.rb

@@ -13,7 +13,7 @@ module Glark
   class App
     def initialize
       begin
-        Log.set_widths(-15, -40, -40)
+        Logue::Log.set_widths(-15, -40, -40)
         
         opts = AppOptions.new
         opts.run ARGV
@@ -32,7 +32,7 @@ module Glark
       rescue => e
         # show the message, and the stack trace only if verbose:
         $stderr.puts "error: #{e}"
-        if Log.verbose
+        if Logue::Log.verbose
           $stderr.puts e.backtrace
           raise
         else

data/lib/glark/app/info/options.rb

@@ -7,7 +7,7 @@ require 'glark/util/options'
 
 module Glark
   PACKAGE = 'glark'
-  VERSION = '1.10.2'
+  VERSION = '1.10.3'
   
   class InfoOptions < Options
     attr_reader :colors
@@ -24,8 +24,8 @@ module Glark
       {
         "known-nontext-files" => FileType.nontext_extensions.sort.join(' '),
         "known-text-files" => FileType.text_extensions.sort.join(' '),
-        "quiet" => Log.quiet,
-        "verbose" => Log.verbose,
+        "quiet" => Logue::Log.quiet,
+        "verbose" => Logue::Log.verbose,
       }
     end
 
@@ -34,9 +34,9 @@ module Glark
         "explain" => @explain,
         "known_nontext_files" => FileType.nontext_extensions.join(", "),
         "known_text_files" => FileType.text_extensions.join(", "),
-        "quiet" => Log.quiet,
+        "quiet" => Logue::Log.quiet,
         "ruby version" => RUBY_VERSION,
-        "verbose" => Log.verbose,
+        "verbose" => Logue::Log.verbose,
         "version" => Glark::VERSION,
       }
     end
@@ -53,25 +53,25 @@ module Glark
             FileType.set_text ext
           end
         when "quiet"
-          Log.quiet = to_boolean(values.last)
+          Logue::Log.quiet = to_boolean(values.last)
         when "verbose"
-          Log.verbose = to_boolean(values.last) ? 1 : nil
+          Logue::Log.verbose = to_boolean(values.last) ? 1 : nil
         when "verbosity"
-          Log.verbose = values.last.to_i
+          Logue::Log.verbose = values.last.to_i
         end
       end
     end
     
     def add_as_options optdata
       add_opt_blk(optdata, %w{ -V --version }) { show_version }
-      add_opt_blk(optdata, %w{ --verbose }) { Log.verbose = true }
+      add_opt_blk(optdata, %w{ --verbose }) { Logue::Log.verbose = true }
       add_opt_blk(optdata, %w{ -? --help }) { Help.new.show_usage; exit 0 }
       add_opt_blk(optdata, %w{ --man }) { Help.new.show_man; exit 0 }
       
       add_opt_true optdata, :explain, %w{ --explain }
 
-      add_opt_blk(optdata, %w{ -q -s --quiet --messages }) { Log.quiet = true }
-      add_opt_blk(optdata, %w{ -Q -S --no-quiet --no-messages }) { Log.quiet = false }
+      add_opt_blk(optdata, %w{ -q -s --quiet --messages }) { Logue::Log.quiet = true }
+      add_opt_blk(optdata, %w{ -Q -S --no-quiet --no-messages }) { Logue::Log.quiet = false }
     end
 
     def show_version

data/lib/glark/app/options.rb

@@ -3,7 +3,8 @@
 
 require 'rubygems'
 require 'riel/dir'
-require 'riel/optproc'
+require 'ragol/optproc/optproc'
+require 'riel/env'
 require 'glark/app/info/options'
 require 'glark/app/rcfile'
 require 'glark/app/spec'
@@ -13,8 +14,21 @@ require 'glark/output/options'
 require 'glark/util/colors/options'
 require 'glark/util/options'
 require 'glark/util/optutil'
+require 'pathname'
 
 module Glark
+  class OptionSet < OptProc::OptionSet
+    include Logue::Loggable
+    
+    def set_option results
+      # intercept these, which we'll use to create the expression:
+      %w{ -o --or --and -a \( \) --xor }.each do |tag|
+        return nil if results.current_arg.index(tag) == 0
+      end
+      super
+    end
+  end
+
   class AppOptions < AppSpec
     include OptionUtil
     
@@ -39,7 +53,7 @@ module Glark
 
       super @input_options, @match_options, @output_options
       
-      @optset = OptProc::OptionSet.new optdata
+      @optset = OptionSet.new optdata
     end
     
     def run args
@@ -161,8 +175,8 @@ module Glark
       @info_options.show_version if @args.size == 1 && @args.first == "-v"
       
       @match_options.expr = nil
-      
-      nil while @args.size > 0 && @optset.process_option(@args)
+
+      @optset.process(@args)
 
       unless @match_options.expr
         read_expression

data/lib/glark/app/rcfile.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'pathname'
+
 module Glark
   class RCFile
     COMMENT_RE = Regexp.new '\s*#.*'

data/lib/glark/app/runner.rb

@@ -3,7 +3,7 @@
 # vim: set filetype=ruby : set sw=2
 
 require 'rubygems'
-require 'riel/log/loggable'
+require 'logue/loggable'
 require 'glark/app/options'
 require 'glark/io/file/binary_file'
 require 'glark/io/file/gz_file'
@@ -17,7 +17,7 @@ $stderr.sync = true             # unbuffer
 module Glark
   # The main processor.
   class Runner
-    include Loggable
+    include Logue::Loggable
 
     GZ_RE = Regexp.new '\.gz$'
     TAR_GZ_RE = Regexp.new '\.(?:tgz|tar\.gz)$'

data/lib/glark/input/filter/filter.rb

@@ -2,11 +2,13 @@
 #!ruby -w
 # vim: set filetype=ruby : set sw=2
 
+require 'rubygems'
+require 'logue/loggable'
 require 'glark/util/io/filter/filter'
 
 module Glark
   class PatternFilter < Filter
-    include Loggable
+    include Logue::Loggable
 
     attr_reader :pattern
 

data/lib/glark/input/options.rb

@@ -5,13 +5,14 @@
 # Options for input.
 
 require 'rubygems'
+require 'logue/loggable'
 require 'glark/input/spec'
 require 'glark/util/io/fileset'
 require 'glark/util/options'
 
 module Glark
   class InputOptions < InputSpec
-    include OptionUtil, Loggable
+    include OptionUtil, Logue::Loggable
     
     def initialize optdata
       super()
@@ -104,7 +105,7 @@ module Glark
       optdata << {
         :tags => %w{ --binary-files },
         :arg  => [ :required, :regexp, re ],
-        :set  => Proc.new { |md| @binary_files = md[1] },
+        :set  => Proc.new { |md| @binary_files = md },
         :rc   => %w{ binary-files },
       }
       

data/lib/glark/input/range.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'logue/loggable'
+
 module Glark
   class RangeError < RuntimeError
   end
 
   class Range
-    include Loggable, Comparable
+    include Logue::Loggable, Comparable
 
     PCT_RE = Regexp.new '([\.\d]+)%'
     
@@ -77,27 +79,19 @@ module Glark
       optdata << {
         :tags => %w{ --after },
         :arg => [ :required, :regexp, %r{ (\d+%?) $ }x ],
-        :set => Proc.new { |md| @from = md[1] }
+        :set => Proc.new { |md| @from = md }
       }
 
       optdata << { 
         :tags => %w{ --before },
         :arg => [ :required, :regexp, %r{ (\d+%?) $ }x ],
-        :set => Proc.new { |md| @to = md[1] }
+        :set => Proc.new { |md| @to = md }
       }
 
       optdata << {
         :tags => %w{ -R --range },
-        :arg => [ :required, :regexp, Regexp.new('(\d+%?),(\d+%?)') ],
-        :set => Proc.new do |md, opt, args|
-          if md && md[1] && md[2]
-            @from = md[1]
-            @to = md[2]
-          else
-            @from = args.shift
-            @to = args.shift
-          end
-        end
+        :arg => [ :required, :regexp, Regexp.new('(\d+%?,\d+%?)') ],
+        :set => Proc.new { |md, opt, args| @from, @to = md.split(',') }
       }
     end
   end

data/lib/glark/io/file/tar_gz_file.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'rubygems'
+require 'logue/loggable'
 require 'glark/io/file/gz_file'
 require 'glark/io/file/tar_file'
 
 module Glark
   class TarGzFile
-    include Loggable
+    include Logue::Loggable
     
     def initialize fname, range
       @fname = fname

data/lib/glark/io/file/zip_file.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'rubygems'
+require 'logue/loggable'
 require 'glark/io/file/archive_file'
 
 module Glark
   class ZipFile < ArchiveFile
-    include Loggable
+    include Logue::Loggable
     
     def initialize fname, range, &blk
       super fname, range

data/lib/glark/match/and_distance.rb

@@ -5,15 +5,12 @@
 # Distance for and expression
 
 require 'rubygems'
-require 'riel/string'
 require 'glark/match/re'
 require 'glark/match/ior'
 require 'glark/match/xor'
 require 'glark/match/and'
 
 class AndDistance
-  include Loggable
-
   # signifies no limit to the distance between matches, i.e., anywhere within
   # the entire file is valid.
   INFINITE_DISTANCE = -1
@@ -53,6 +50,12 @@ class AndDistance
   end
   
   def numeric? x
-    x && (x.kind_of?(Fixnum) || x.to_i == INFINITE_DISTANCE || x.num)
+    return nil unless x
+    return true if x.kind_of?(Fixnum) || x.to_i == INFINITE_DISTANCE
+    begin
+      Integer x
+    rescue ArgumentError
+      nil
+    end
   end  
 end

data/lib/glark/match/expression.rb

@@ -4,13 +4,8 @@
 
 # Extended regular-expression-based expressions.
 
-require 'rubygems'
-require 'riel'
-
 # An expression, which can be applied (processed) against a Glark::File.
 class Expression
-  include Loggable
-  
   attr_accessor :matches
 
   def initialize

data/lib/glark/match/factory.rb

@@ -6,7 +6,7 @@
 
 require 'rubygems'
 require 'riel/regexp'
-require 'riel/log/loggable'
+require 'logue/loggable'
 require 'glark/match/and'
 require 'glark/match/and_distance'
 require 'glark/match/ior'
@@ -14,7 +14,7 @@ require 'glark/match/re_factory'
 require 'glark/match/xor'
 
 class ExpressionFactory
-  include Loggable
+  include Logue::Loggable
 
   attr_reader :expr
 

data/lib/glark/match/options.rb

@@ -5,7 +5,6 @@
 # Options for matching.
 
 require 'rubygems'
-require 'riel/log'
 require 'glark/match/spec'
 require 'glark/util/options'
 

data/lib/glark/match/re_factory.rb

@@ -5,11 +5,12 @@
 # RegexpExpression factory.
 
 require 'rubygems'
+require 'logue/loggable'
 require 'riel/regexp'
 require 'glark/match/re'
 
 class RegexpExpressionFactory
-  include Loggable
+  include Logue::Loggable
 
   attr_reader :count
 

data/lib/glark/match/spec.rb

@@ -5,7 +5,6 @@
 # Options for matching.
 
 require 'rubygems'
-require 'riel/log'
 require 'glark/match/factory'
 require 'glark/util/colors/spec'
 

data/lib/glark/output/context.rb

@@ -3,12 +3,13 @@
 
 module Glark
   class Context
+    include Logue::Loggable
+    
     attr_accessor :after
     attr_accessor :before
 
-    def initialize 
-      @after = 0
-      @before = 0
+    def initialize
+      clear
     end
 
     def clear
@@ -31,11 +32,11 @@ module Glark
 
     def add_as_option optdata
       optdata << {
-        :tags => %w{ -C --context },
-        :res  => %r{ ^ - ([1-9]\d*) $ }x,
-        :arg  => [ :optional, :integer ],
-        :set  => Proc.new { |val, opt, args| @after = @before = val || 2 },
-        :rc   => %w{ context },
+        :tags    => %w{ -C --context },
+        :regexp  => %r{ ^ - ([1-9]\d*) $ }x,
+        :arg     => [ :optional, :integer ],
+        :process => Proc.new { |val, opt, args| @after = @before = val == true ? 2 : val },
+        :rcname  => %w{ context },
       }
 
       optdata << {
@@ -54,4 +55,3 @@ module Glark
     end
   end
 end
-

data/lib/glark/output/file_header.rb

@@ -5,7 +5,7 @@
 require 'glark/util/highlight'
 
 class FileHeader
-  include Loggable, Highlight
+  include Highlight
   
   def initialize name, highlighter
     @name = name

data/lib/glark/output/glark_format.rb

@@ -9,7 +9,7 @@ module Glark; end
 
 module Glark
   module Format
-    include Loggable, Highlight
+    include Highlight
     
     def initialize file, spec
       @file_header = nil        # not nil after file header written

data/lib/glark/output/options.rb

@@ -90,7 +90,7 @@ module Glark
       optdata << { 
         :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 }
+        :set  => Proc.new { |md| val = md ? md : "multi"; @colors.text_color_style = val }
       }
 
       optdata << {

data/lib/glark/output/results.rb

@@ -5,8 +5,6 @@
 # Results of searching files.
 
 class Results
-  include Loggable
-
   attr_reader :count
 
   def initialize

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

@@ -46,11 +46,7 @@ module Glark
     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
+      @highlighter.to_codes color
     end
 
     def make_colors limit = -1
@@ -70,7 +66,7 @@ module Glark
     def text_color_style= tcstyle
       @text_color_style = tcstyle
       if @text_color_style
-        @highlighter = @text_color_style && HlWrapper.new
+        @highlighter = @text_color_style && RainbowHighlighter.instance
         @text_colors = case @text_color_style
                            when highlight_multi?(@text_color_style), true
                              multi_colors

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

@@ -1,13 +1,8 @@
 #!/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

data/lib/glark/util/highlight.rb

@@ -75,17 +75,3 @@ class RainbowHighlighter
     end.join ''
   end
 end
-
-class HlWrapper
-  def initialize
-    @hl = RainbowHighlighter.instance
-  end
-  
-  def make_color color
-    @hl.to_codes color
-  end
-  
-  def make_rgb_color red, green, blue, fgbg
-    @hl.instance.to_rgb_code red, green, blue, fgbg
-  end
-end

data/lib/glark/util/io/fileset.rb

@@ -3,13 +3,14 @@
 # vim: set filetype=ruby : set sw=2
 
 require 'rubygems'
+require 'logue/loggable'
 require 'glark/util/io/depth'
 require 'riel/filetype'
 
 module Glark
   # Files and directories. And standard input, just for fun.
   class FileSet
-    include Loggable, Enumerable
+    include Logue::Loggable, Enumerable
 
     attr_reader :files
 
@@ -111,18 +112,18 @@ module Glark
       subdepth = depth - 1
 
       pn.children.sort.each do |entry|
-        next if @yielded_files.include?(entry)
         if entry.file?
           type = FileType.type entry.to_s
           next if type == FileType::BINARY && @binary_files == 'skip'
         end
-        @yielded_files << entry
         handle_pathname entry, subdepth, &blk
       end
     end
 
     def handle_file pn, &blk
       return if @file_criteria.skipped? pn
+      return if @yielded_files.include? pn
+      @yielded_files << pn
 
       type = FileType.type pn.to_s
       case type

data/lib/glark/util/io/filter/criteria.rb

@@ -2,11 +2,13 @@
 #!ruby -w
 # vim: set filetype=ruby : set sw=2
 
+require 'rubygems'
+require 'logue/loggable'
 require 'glark/util/io/filter/filter'
 
 module Glark
   class Criteria
-    include Loggable
+    include Logue::Loggable
 
     def initialize
       # by type (hash) => by positive/negative (hash) => filter list (array)

data/lib/glark/util/option.rb

@@ -4,8 +4,6 @@
 
 module Glark
   class Option
-    include Loggable
-    
     def initialize optee
       @optee = optee
     end

data/lib/glark/util/options.rb

@@ -3,10 +3,10 @@
 # vim: set filetype=ruby : set sw=2
 
 require 'glark/util/optutil'
-require 'riel/log/loggable'
+require 'logue/loggable'
 
 module Glark
   class Options
-    include Loggable, Glark::OptionUtil
+    include Logue::Loggable, Glark::OptionUtil
   end
 end