gren 0.1.3 → 0.1.4

data/Manifest.txt

@@ -1,18 +1,22 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-bin/gren
-lib/gren.rb
-lib/gren/cli.rb
-lib/gren/findgrep.rb
-lib/gren/result.rb
-lib/platform.rb
-rake_rdoc_custom.rb
-script/console
-script/destroy
-script/generate
-test/test_gren.rb
-test/test_gren_cli.rb
-test/test_helper.rb
+History.txt
+Manifest.txt
+PostInstall.txt
+README.rdoc
+Rakefile
+bin/gren
+lib/gren.rb
+lib/gren/cli.rb
+lib/gren/findgrep.rb
+lib/gren/result.rb
+lib/gren/util.rb
+lib/platform.rb
+lib/string_snip.rb
+rake_rdoc_custom.rb
+script/console
+script/destroy
+script/generate
+test/test_gren.rb
+test/test_gren_cli.rb
+test/test_gren_util.rb
+test/test_helper.rb
+test/test_string_snip.rb

data/bin/gren

@@ -7,5 +7,5 @@ require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/gren")
 require "gren/cli"
 
-Version = "0.1.3"
+Version = "0.1.4"
 Gren::CLI.execute(STDOUT, ARGV)

data/lib/gren.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gren
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/gren/cli.rb

@@ -23,6 +23,7 @@ module Gren
       opt.on('--if REGEXP', '--ignore-file REGEXP', 'Ignore file pattern. (Enable multiple call)') {|v| option.ignoreFiles << v}
       opt.on('--id REGEXP', '--ignore-dir REGEXP', 'Ignore dir pattern. (Enable multiple call)') {|v| option.ignoreDirs << v}
       opt.on('-e ENCODE', '--encode ENCODE', 'Specify encode(none, auto, jis, sjis, euc, ascii, utf8, utf16). Default is "auto"') {|v| setupEncodeOption(option, v) }
+      opt.on('--no-snip', 'There being a long line, it does not snip.') {|v| option.noSnip = true }
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成

data/lib/gren/findgrep.rb

@@ -5,12 +5,13 @@ require 'rubygems'
 require 'termcolor'
 require 'kconv'
 require File.join(File.dirname(__FILE__), '../platform')
+require File.join(File.dirname(__FILE__), 'util')
 
 module Gren
   class FindGrep
     IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)/
     IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
-    
+
     Option = Struct.new(:keywordsSub,
                         :keywordsOr,
                         :directory,
@@ -22,7 +23,8 @@ module Gren
                         :filePatterns,
                         :ignoreFiles,
                         :ignoreDirs,
-                        :kcode)
+                        :kcode,
+                        :noSnip)
 
     DEFAULT_OPTION = Option.new([],
                                 [],
@@ -35,7 +37,8 @@ module Gren
                                 [],
                                 [],
                                 [],
-                                Platform.get_shell_kcode)
+                                Platform.get_shell_kcode,
+                                false)
     
     def initialize(patterns, option)
       @option = option
@@ -83,7 +86,7 @@ module Gren
         unless (@option.colorHighlight)
           stdout.puts
         else
-          stdout.puts TermColor.parse("<7>------------------------------------------------------------</7>")
+          stdout.puts HighLine::REVERSE + "------------------------------------------------------------" + HighLine::CLEAR
         end
 
         @result.print(stdout)
@@ -190,16 +193,13 @@ module Gren
           result, match_datas = match?(line)
 
           if ( result )
+            header = "#{fpath_disp}:#{index + 1}:"
+            line = Util::snip(line, match_datas) unless (@option.noSnip)
+
             unless (@option.colorHighlight)
-              stdout.puts "#{fpath_disp}:#{index + 1}:#{line}"
+              stdout.puts header + line
             else
-              header = "#{fpath_disp}:#{index + 1}"
-                
-              begin
-                stdout.puts TermColor.parse("<34>#{header}</34>:") + coloring(line, match_datas)
-              rescue REXML::ParseException
-                stdout.puts header + line
-              end
+              stdout.puts HighLine::BLUE + header + HighLine::CLEAR + Util::coloring(line, match_datas)
             end
 
             unless match_file
@@ -248,14 +248,5 @@ module Gren
       return result, result_match
     end
     private :match?
-
-    def coloring(line, match_datas)
-      match_datas.each do |m|
-        line = line.split(m[0]).join(TermColor.parse("<42>#{m[0]}</42>"))
-      end
-      line
-    end
-    private :coloring
-
   end
 end

data/lib/gren/util.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+require File.join(File.dirname(__FILE__), '../string_snip')
+
+module Gren
+  class Util
+    MAX_LINE_SIZE = 256
+    HEADER_SIZE = 32
+    MARGIN_SIZE = 32
+    DELIMITER = '<<snip>>'
+
+    def self.snip(str, match_datas)
+      return str if (str.size <= MAX_LINE_SIZE)
+
+      ranges = []
+      ranges << (0..HEADER_SIZE-1)
+      ranges << (-HEADER_SIZE..-1)
+
+      match_datas.each do |m|
+        ranges << (m.begin(0)-MARGIN_SIZE..m.end(0)+MARGIN_SIZE)
+      end
+
+      snipper = StringSnip.new(MAX_LINE_SIZE, DELIMITER)
+      return snipper.snip(str, ranges)
+    end
+
+    def self.coloring(line, match_datas)
+      match_datas.each do |m|
+        line = line.split(m[0]).join(HighLine::ON_GREEN + m[0] + HighLine::CLEAR)
+      end
+      
+      line = line.split(DELIMITER).join(HighLine::ON_CYAN + DELIMITER + HighLine::CLEAR)
+
+      line
+    end
+  end
+end
+
+

data/lib/string_snip.rb

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+class StringSnip
+  def initialize(size = 256, delimiter = '<<snip>>', pri = nil)
+    @size = size
+    @delimiter = delimiter
+    @pri = pri
+  end
+
+  def snip(str, ranges)
+    @str = str
+    @ranges = ranges
+
+    # no snip
+    return @str if (@str.size <= @size)
+
+    # snip
+    @ranges = StringSnip::ranges_conv(@ranges, @str)
+    @ranges = StringSnip::ranges_sort(@ranges)
+    @ranges = StringSnip::ranges_compound(@ranges)
+
+    # result
+    results = []
+    @ranges.each {|r| results << @str[r] }
+    return results.join(@delimiter)
+  end
+
+  def self.ranges_conv(ranges, str)
+    ranges.map {|i| index_conv(str, i.begin)..index_conv(str, i.end)}
+  end
+
+  def self.index_conv(str, value)
+    if (value < 0)
+      str.size + value
+    else
+      value
+    end
+  end
+
+  def self.ranges_sort(ranges)
+    ranges.sort_by{|i| i.begin}
+  end
+
+  def self.ranges_compound(ranges)
+    result = []
+    
+    index = 0
+    while (ranges.size > 0)
+      if (ranges.size > 1 && ranges[0].end + 1 >= ranges[1].begin)
+        v1, v2 = ranges.shift(2)
+        ranges.unshift v1.begin..((v1.end > v2.end) ? v1.end : v2.end)
+      else
+        result << ranges.shift
+      end
+    end
+
+    result
+  end
+end
+
+

data/test/test_gren_util.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestGrenUtil < Test::Unit::TestCase
+  def setup
+  end
+  
+  def test_snip
+    str = "abcdefghijkmlnopqrstuvwxyz"
+    assert_equal(str, Gren::Util::snip(str, nil))
+
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|12345678901234567890123456789012345678901234567890123456"
+    assert_equal(str, Gren::Util::snip(str, nil))
+
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234561"
+    match_datas = []
+    match_datas << str.match(/123456789\|/)
+    assert_equal("12345678901234567890123456789012<<snip>>90123456789012345678901234567890123456789|123456789012345678901234567890123<<snip>>67890123456789012345678901234561", Gren::Util::snip(str, match_datas))
+
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234561"
+    match_datas = []
+    match_datas << str.match(/123456789\|/)
+    match_datas << str.match(/34567/)
+    assert_equal("12345678901234567890123456789012<<snip>>90123456789012345678901234567890123456789|123456789012345678901234567890123<<snip>>67890123456789012345678901234561", Gren::Util::snip(str, match_datas))
+
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234561"
+    match_datas = []
+    match_datas << str.match(/123456789\|/)
+    match_datas << str.match(/01234561/)
+    assert_equal("12345678901234567890123456789012<<snip>>90123456789012345678901234567890123456789|123456789012345678901234567890123<<snip>>8901234567890123456789012345678901234561", Gren::Util::snip(str, match_datas))
+
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,2 @@
 require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/gren'

data/test/test_string_snip.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestStringSnip < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_ranges_compound
+    ranges = [0..7, 8..232, 121..150, 248..255]
+    assert_equal(StringSnip.ranges_compound(ranges), [0..232, 248..255])
+
+    ranges = [10..20, 22..30, 33..40]
+    assert_equal(StringSnip.ranges_compound(ranges), [10..20, 22..30, 33..40])
+
+    ranges = [10..30, 20..30, 30..40]
+    assert_equal(StringSnip.ranges_compound(ranges), [10..40])
+  end
+  
+  def test_string_snip
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|12345678901234567890123456789012345678901234567890123456"
+
+    snipper = StringSnip.new
+    snip_str = snipper.snip(str, [0..7, -8..-1])
+    assert_equal(snip_str, str)
+
+    snipper = StringSnip.new(64)
+    snip_str = snipper.snip(str, [-8..-1, 10..20, 0..7])
+    assert_equal(snip_str, "12345678<<snip>>12345678901<<snip>>90123456")
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +09:00
+date: 2010-08-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 1
+        version: 2.6.1
   type: :development
   version_requirements: *id003
 description: gren is a next grep tool.
@@ -82,14 +82,18 @@ files:
 - lib/gren/cli.rb
 - lib/gren/findgrep.rb
 - lib/gren/result.rb
+- lib/gren/util.rb
 - lib/platform.rb
+- lib/string_snip.rb
 - rake_rdoc_custom.rb
 - script/console
 - script/destroy
 - script/generate
 - test/test_gren.rb
 - test/test_gren_cli.rb
+- test/test_gren_util.rb
 - test/test_helper.rb
+- test/test_string_snip.rb
 has_rdoc: true
 homepage: http://ongaeshi.github.com/gren
 licenses: []
@@ -124,4 +128,6 @@ summary: gren is a next grep tool.
 test_files: 
 - test/test_gren.rb
 - test/test_gren_cli.rb
+- test/test_gren_util.rb
 - test/test_helper.rb
+- test/test_string_snip.rb