glark 1.10.0 → 1.10.1

data/lib/glark/app/help.rb

@@ -90,7 +90,7 @@ module Glark
       end
 
       if dir
-        manfile = dir + "man/glark.1"
+        # manfile = dir + "man/glark.1"
         cmd = "gem man glark"
         ::IO.popen(cmd) do |io|
           puts io.readlines

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

@@ -7,7 +7,7 @@ require 'glark/util/options'
 
 module Glark
   PACKAGE = 'glark'
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
   
   class InfoOptions < Options
     attr_reader :colors
@@ -21,7 +21,7 @@ module Glark
     end
 
     def config_fields
-      fields = {
+      {
         "known-nontext-files" => FileType.nontext_extensions.sort.join(' '),
         "known-text-files" => FileType.text_extensions.sort.join(' '),
         "quiet" => Log.quiet,
@@ -30,7 +30,7 @@ module Glark
     end
 
     def dump_fields
-      fields = { 
+      {
         "explain" => @explain,
         "known_nontext_files" => FileType.nontext_extensions.join(", "),
         "known_text_files" => FileType.text_extensions.join(", "),

data/lib/glark/app/options.rb

@@ -109,7 +109,7 @@ module Glark
     end
 
     def config_fields
-      fields = {
+      {
         "local-config-files" => @local_config_files,
       }
     end

data/lib/glark/app/runner.rb

@@ -87,7 +87,7 @@ module Glark
       when ZIP_RE.match(fstr)
         search_read_archive_file fname, Glark::ZipFile
       else
-        write "file '#{fname}' does not have a handled extension"
+        write "file '#{fstr}' does not have a handled extension for reading content"
         return
       end
     end
@@ -103,7 +103,7 @@ module Glark
             when TAR_GZ_RE.match(fstr)
               Glark::TarGzFile
             else
-              write "file '#{fname}' does not have a handled extension"
+              write "file '#{fstr}' does not have a handled extension for reading a list"
               return
             end
 
@@ -120,7 +120,7 @@ module Glark
       
       if name == "-" 
         write "reading standard input..."
-        search_text name, $stdin
+        search_text nil, $stdin
       else
         case type
         when :binary

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

@@ -16,8 +16,7 @@ module Glark
     end
 
     def config_fields
-      fields = {
-      }
+      Hash.new
     end
 
     def dump_fields

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

@@ -25,7 +25,7 @@ module Glark
 
     def config_fields
       maxsize = (filter = find_by_class(:size, :negative, SizeLimitFilter)) && filter.max_size
-      fields = {
+      {
         "size-limit" => maxsize
       }
     end

data/lib/glark/input/options.rb

@@ -33,7 +33,7 @@ module Glark
       $/ = if sep && sep.to_i > 0
              begin
                sep.oct.chr
-             rescue RangeError => e
+             rescue RangeError
                # out of range (e.g., 777) means nil:
                nil
              end
@@ -82,26 +82,26 @@ module Glark
     end
     
     def add_as_options optdata    
-      optdata << record_separator_option = {
+      optdata << {
         :res => [ Regexp.new('^ -0 (\d{1,3})? $ ', Regexp::EXTENDED) ],
         :set => Proc.new { |md| rs = md ? md[1] : 0; set_record_separator rs }
       }
 
       @range.add_as_option optdata
 
-      optdata << recurse_option = {
+      optdata << {
         :tags => %w{ -r --recurse },
         :set  => Proc.new { set_directory("recurse") }
       }
 
-      optdata << directories_option = {
+      optdata << {
         :tags => %w{ --directories -d },
         :arg  => [ :string ],
         :set  => Proc.new { |val| set_directory val },
       }
 
       re = Regexp.new '^[\'\"]?(' + VALID_BINARY_FILE_TYPES.join('|') + ')[\'\"]?$'
-      optdata << binary_files_option = {
+      optdata << {
         :tags => %w{ --binary-files },
         :arg  => [ :required, :regexp, re ],
         :set  => Proc.new { |md| @binary_files = md[1] },

data/lib/glark/input/range.rb

@@ -74,22 +74,22 @@ module Glark
     end
 
     def add_as_option optdata
-      optdata << range_after_option = {
-        :tags    => %w{ --after },
-        :arg     => [ :required, :regexp, %r{ (\d+%?) $ }x ],
-        :set     => Proc.new { |md| @from = md[1] }
+      optdata << {
+        :tags => %w{ --after },
+        :arg => [ :required, :regexp, %r{ (\d+%?) $ }x ],
+        :set => Proc.new { |md| @from = md[1] }
       }
 
-      optdata << range_before_option = { 
-        :tags    => %w{ --before },
-        :arg     => [ :required, :regexp, %r{ (\d+%?) $ }x ],
-        :set     => Proc.new { |md| @to = md[1] }
+      optdata << { 
+        :tags => %w{ --before },
+        :arg => [ :required, :regexp, %r{ (\d+%?) $ }x ],
+        :set => Proc.new { |md| @to = md[1] }
       }
 
-      optdata << range_option = {
-        :tags     => %w{ -R --range },
-        :arg      => [ :required, :regexp, Regexp.new('(\d+%?),(\d+%?)') ],
-        :set      => Proc.new do |md, opt, args|
+      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]

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

@@ -19,7 +19,7 @@ module Glark
       rescue LoadError => e
         msg = "error loading zip gem: #{e}\n"
         msg << "to install this dependency, run 'gem install rubyzip'"
-        info "msg: #{msg}".on_red
+        info "msg: #{msg}".color(:red)
         raise msg
       end
     end

data/lib/glark/match/options.rb

@@ -19,14 +19,14 @@ module Glark
     end
 
     def config_fields
-      fields = {
+      {
         "ignore-case" => @ignorecase,
         "text-color" => text_colors.join(' '),
       }
     end
 
     def dump_fields
-      fields = {
+      {
         "expr" => @expr,
         "extract_matches" => @extract_matches,
         "ignorecase" => @ignorecase,
@@ -51,7 +51,7 @@ module Glark
       add_opt_true optdata, :whole_lines, %w{ -x --line-regexp }
       add_opt_true optdata, :extended, %w{ --extended }
 
-      optdata << expr_file_option = {
+      optdata << {
         :tags => %w{ -f --file },
         :arg  => [ :string ],
         :set  => Proc.new { |fname| @expr = create_expression_factory.read_file fname }
@@ -62,7 +62,7 @@ module Glark
         @expr = create_expression_factory.make_expression args
       end
 
-      optdata << text_color_option = {
+      optdata << {
         :tags => %w{ --text-color },
         :arg  => [ :string ],
         :set  => Proc.new { |val| @colors.text_colors = [ @colors.create_color("text-color", val) ] }

data/lib/glark/output/context.rb

@@ -30,7 +30,7 @@ module Glark
     end
 
     def add_as_option optdata
-      optdata << context_option = {
+      optdata << {
         :tags => %w{ -C --context },
         :res  => %r{ ^ - ([1-9]\d*) $ }x,
         :arg  => [ :optional, :integer ],
@@ -38,14 +38,14 @@ module Glark
         :rc   => %w{ context },
       }
 
-      optdata << context_after_option = {
+      optdata << {
         :tags => %w{ --after-context -A },
         :arg  => [ :integer ],
         :set  => Proc.new { |val| @after = val },
         :rc   => %w{ after-context },
       }
 
-      optdata << context_before_option = {
+      optdata << {
         :tags => %w{ --before-context -B },
         :arg  => [ :integer ],
         :set  => Proc.new { |val| @before = val },

data/lib/glark/output/glark_format.rb

@@ -20,7 +20,7 @@ module Glark
     end
 
     def show_file_header
-      if @show_file_name && @file_header.nil?
+      if @show_file_name && @file_header.nil? && displayed_name
         @file_header = FileHeader.new displayed_name, @fname_highlighter
         @file_header.print @out
       end

data/lib/glark/output/grep_lines.rb

@@ -27,7 +27,7 @@ module Grep
     end
 
     def print_file_name
-      if @show_file_name
+      if @show_file_name && displayed_name
         @out.print displayed_name, ":"
       end
     end

data/lib/glark/output/options.rb

@@ -16,7 +16,7 @@ module Glark
     end
 
     def config_fields
-      fields = {
+      {
         "after-context" => @context.after,
         "before-context" => @context.before,
         "filter" => @filter,
@@ -25,7 +25,7 @@ module Glark
     end
 
     def dump_fields
-      fields = {
+      {
         "after" => @context.after,
         "before" => @context.before,
         "count" => @count,
@@ -76,7 +76,7 @@ module Glark
       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 = {
+      optdata << {
         :tags => %w{ --line-number-color },
         :arg  => [ :string ],
         :set  => Proc.new { |val| @colors.line_number_color = @colors.create_color "line-number-color", val },
@@ -87,13 +87,13 @@ module Glark
       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 = { 
+      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 }
       }
 
-      optdata << file_color_option = {
+      optdata << {
         :tags => %w{ --file-color },
         :arg  => [ :string ],
         :set  => Proc.new { |val| @colors.file_name_color = @colors.create_color "file-color", val }

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

@@ -61,7 +61,6 @@ module Glark
 
     def multi_colors 
       make_colors
-      # [ make_rgb_color(4, 3, 2, :bg) + make_rgb_color(0, 2, 1, :fg) ]
     end
 
     def single_color
@@ -100,7 +99,7 @@ module Glark
     end
 
     def config_fields
-      fields = {
+      {
         "file-color" => @file_name_color,
         "highlight" => @text_color_style,
         "line-number-color" => @line_number_color,
@@ -108,7 +107,7 @@ module Glark
     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"),
@@ -117,7 +116,7 @@ module Glark
 
     def colorize field, str
       if field
-        field + str + Text::Color::RESET
+        field + str + Sickill::Rainbow::TERM_EFFECTS[:reset]
       else
         str
       end

data/lib/glark/util/highlight.rb

@@ -1,27 +1,15 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-$rielold = false
-
 require 'rubygems'
 require 'rainbow'
 require 'singleton'
 
-if $rielold
-  require 'riel/ansicolor'
-else
-  require 'riel/text/ansi/ansi_highlight'
-end
-
 module Highlight
   RESET = "\x1b[0m"
   
   def adorn hl, str
-    if $rielold
-      hl.highlight str
-    else
-      hl + str + RESET
-    end
+    hl + str + RESET
   end
 end
 
@@ -90,16 +78,11 @@ end
 
 class HlWrapper
   def initialize
-    # @hl = $rielold ? Text::ANSIHighlighter : Text::ANSIHighlighter.instance
     @hl = RainbowHighlighter.instance
   end
   
   def make_color color
-    if $rielold
-      result = @hl.make color
-    else
-      @hl.to_codes color
-    end
+    @hl.to_codes color
   end
   
   def make_rgb_color red, green, blue, fgbg

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

@@ -80,8 +80,6 @@ module Glark
 
       (0 ... @files.size).each do |idx|
         pn = @files[idx]
-        type = FileType.type pn.to_s
-        
         if stdin?
           blk.call [ :text, '-' ]
           next

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

@@ -85,8 +85,7 @@ module Glark
         # This is much easier. Just resplit the whole thing at end of line
         # sequences.
         
-        eoline    = "\n"             # should be OS-dependent
-        srclines  = @lines
+        eoline = "\n"           # should be OS-dependent
         reallines = @lines.join("").split ANY_END_OF_LINE
 
         # "\n" after all but the last line

data/lib/glark/util/optutil.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'riel/text/ansi/color'
+require 'rubygems'
+require 'rainbow'
 
 module Glark
   module OptionUtil
@@ -60,7 +61,7 @@ module Glark
 
     def colorize field, str
       if field
-        field + str + Text::Color::RESET
+        field + str + Sickill::Rainbow::TERM_EFFECTS[:reset]
       else
         str
       end

data/test/glark/app/options_test.rb

@@ -28,31 +28,24 @@ module Glark
     end
 
     def assert_color opts, name, expval, args
-      val = opts.method(name).call
-      ### puts "val: #{val}"
-      ### puts "expval: #{expval}"
-      ###$$$ assert_equal expval, val, "args: #{args}"
+      opts.method(name).call
     end
 
     def assert_colors opts, exp, args
       return unless exp
       exp.each do |name, expval|
-        ### puts "name: #{name}"
         val = opts.method(name).call
-        ### puts "val: #{val}"
-        ### puts "expval: #{expval}"
-        ###$$$ assert_equal expval, val, "args: #{args}"
+        assert_equal  expval, val, "args: #{args}"
       end
     end
 
     def run_test args, expected = Hash.new, &blk
       gopt = Glark::AppOptions.new
       gopt.run args + Array.new
-      outputopts = gopt.output_options
       
       assert_method_values gopt, expected[:app], args
       assert_method_values gopt.match_spec, expected[:match], args
-      # assert_method_values gopt.colors, expected[:colors], args
+      assert_method_values gopt.colors, expected[:colors], args
       assert_colors gopt.colors, expected[:colors], args
       assert_method_values gopt.output_options, expected[:output], args
       assert_method_values gopt.info_options, expected[:info], args
@@ -194,7 +187,7 @@ module Glark
         end
       end
 
-      singlecolor = str_to_color_codes(Text::Highlighter::DEFAULT_COLORS[0])
+      singlecolor = str_to_color_codes(ColorOptions::DEFAULT_COLORS[0])
       
       %w{ single }.each do |val|
         [