kv 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b1f3af205a0cc4e0654de74a8d9e31e023719c8cf04cd6fbb9e43d96b14be4
-  data.tar.gz: 5265f5930278a1f39f5d00f6a6f3265e436bcdce233b7350f8f791d7f0752fee
+  metadata.gz: 510d5e2565cf1d662da48e3c4af89799375377b594469132319f5475ff53b8ce
+  data.tar.gz: '09136cab7d1f49371444949e563d5ec58225881b6ab7f781711314ea176f4401'
 SHA512:
-  metadata.gz: 935613e6eb8be95f504d75b777b83a864bab18a34ccbdc4694df5e82c8b2312d270e9f4f4f5da7ef07ed360cc083281705b61ff62a329aa7004da289e989909f
-  data.tar.gz: 7fb6b11b84f0c014c956cf0f0e223a74ce88426860f65919ef2e351028b957876c72a255fba10c2ed2e65dac0dbf701691cf10817745f7ec231a42de76ff7ed4
+  metadata.gz: e3e76a17edc990f59d1a999cb16d75619852503beafd05c9009c3efb697ccd2712203eeec6e6627614e71cce676f516972e17384588ecc9a24bd0f4acb8c2ae5
+  data.tar.gz: ad6c7de4f61931c05a867554ae47998d0f19f72548fbf76cfb3336fdebca7b06f111e828b17ac21011dd95defa5adb588d70c157b9043b3b897ad612fda7f4b3

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [ko1]

data/exe/kv

@@ -2,7 +2,7 @@
 
 begin
   require 'kv'
-rescue LoadError
+rescue
   $:.unshift File.join(__dir__, '../lib')
   require 'kv'
 end

data/lib/kv/version.rb

@@ -1,3 +1,3 @@
 module KV
-  VERSION = "0.6.0"
+  VERSION = "0.9.0"
 end

data/lib/kv.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "kv/version"
+require_relative "kv/version"
 require "curses"
 require 'stringio'
 require 'optparse'
@@ -20,7 +20,8 @@ end
 class Screen
   RenderStatus = Struct.new(
     :c_cols, :c_lines, :x, :y, :last_lineno,
-    :search, :goto, :line_mode, :ts_mode, :wrapping,
+    :search, :goto, :wrapping,
+    :line_mode, :ts_mode, :separation_mode,
   )
   class RenderStatus
     def to_s
@@ -29,9 +30,18 @@ class Screen
   end
 
   def initialize input, lines: [],
-                 name: nil, search: nil, first_line: 0,
-                 following_mode: false, line_mode: false, separation_mode: false,
-                 time_stamp: nil, ext_input: nil, fifo_file: nil
+                 name: nil,
+                 search: nil,
+                 first_line: 0,
+                 following_mode: false,
+                 line_mode: false,
+                 separation_mode: false,
+                 time_stamp: nil,
+                 ext_input: nil,
+                 fifo_file: nil,
+                 watch: false,
+                 filter_command: nil
+
     @rs = RenderStatus.new
     @last_rs = nil
     @rs.y = first_line
@@ -42,18 +52,21 @@ class Screen
     @rs.search = search
     @rs.wrapping = false
     @rs.ts_mode = false
+    @rs.separation_mode = separation_mode
 
     @name = name
     @filename = @name if @name && File.exist?(@name)
+    @filter_command = @filename && filter_command
 
     @time_stamp = time_stamp
     @ext_input = ext_input
     @fifo_file = fifo_file
-    @separation_mode = separation_mode
 
     @lines = lines
     @mode = :screen
 
+    @watch_mode = watch
+
     @following = following_mode
     @apos = 0
 
@@ -70,11 +83,23 @@ class Screen
     end
 
     @prev_render = {}
+    input = open_file if @filename
     @meta = input.respond_to?(:meta) ? input.meta : nil
-
     read_async input if input
   end
 
+  def open_file
+    input = open(@filename)
+    @rs.last_lineno = 0
+
+    if @filter_command
+      io = IO.popen("#{@filter_command} #{@filename}", err: '/dev/null')
+      # io.close_write
+      input = io
+    end
+    input
+  end
+
   def setup_line line
     line = line.chomp
     line.instance_variable_set(:@time_stamp, Time.now.strftime('%H:%M:%S')) if @time_stamp
@@ -117,7 +142,7 @@ class Screen
     ensure
       if @filename
         @file_mtime = File.mtime(@filename)
-        @file_lastpos = input.tell
+        @file_lastpos = input.tell unless @filter_command
       elsif @fifo_file
         input = open(@fifo_file)
         log(input)
@@ -184,9 +209,9 @@ class Screen
 
   
   def standout
-    Curses.standout
-    yield
-    Curses.standend
+    cattr Curses::A_STANDOUT do
+      yield
+    end
   end
 
   def cattr attr
@@ -222,11 +247,11 @@ class Screen
 
     Curses.clear
 
-    if @separation_mode && (lines = @lines[self.y ... (self.y + c_lines - 1)])
-      max_cols = []
+    if @rs.separation_mode && (lines = @lines[self.y ... (self.y + c_lines - 1)])
+      @max_cols = [] unless defined? @max_cols
       lines.each.with_index{|line, ln|
         line.split("\t").each_with_index{|w, i|
-          max_cols[i] = max_cols[i] ? [max_cols[i], w.size].max : w.size
+          @max_cols[i] = @max_cols[i] ? [@max_cols[i], w.size].max : w.size
         }
       }
     end
@@ -273,29 +298,32 @@ class Screen
 
       line = line[self.x, cols] || ''
 
-      if @separation_mode
+      if @rs.separation_mode
         line = line.split(/\t/).tap{|e|
-          if (max = max_cols.size) > 0
+          if (max = @max_cols.size) > 0
             # fill empty columns
             e[max - 1] ||= nil
           end
         }.map.with_index{|w, i|
-          "%-#{max_cols[i]}s" % w
+          "%-#{@max_cols[i]}s" % w
         }.join(' | ')
       end
 
-      if !@rs.search || !(Regexp === @rs.search)
+      if !@rs.search || !(Regexp === @rs.search) ||
+         (parts = search_partition(line, @rs.search)).is_a?(String)
         Curses.addstr line
       else
-        partition(line, @rs.search).each{|(matched, str)|
-          if matched == :match
-            standout{
+        cattr Curses::A_UNDERLINE do
+          parts.each{|(matched, str)|
+            if matched == :match
+              standout{
+                Curses.addstr str
+              }
+            else
               Curses.addstr str
-            }
-          else
-            Curses.addstr str
-          end
-        }
+            end
+          }
+        end
       end
     }
   end
@@ -361,17 +389,25 @@ class Screen
 
   def check_update
     if @loading == false
-      if @filename && File.exist?(@filename) && File.mtime(@filename) > @file_mtime
-        input = open(@filename)
+      if @filename && File.mtime(@filename) > @file_mtime
+        screen_status "#{@filename} is updated."
 
-        if input.size < @file_lastpos
-          screen_status "#{@filename} is truncated. Rewinded."
-          pause
-          @lineno = 0
+        if @watch_mode
+          @lines = []
+          input = open_file
+          read_async input
         else
-          input.seek @file_lastpos
+          input = open(@filename)
+
+          if input.size < @file_lastpos
+            screen_status "#{@filename} is truncated. Rewinded."
+            pause
+            @lineno = 0
+          else
+            input.seek @file_lastpos
+          end
+          read_async input
         end
-        read_async input
       end
     end
   end
@@ -658,6 +694,9 @@ class Screen
       @rs.line_mode = !@rs.line_mode
     when 'T'
       @rs.ts_mode = !@rs.ts_mode if @time_stamp
+    when 'S'
+      @rs.separation_mode = !@rs.separation_mode
+      @max_cols = []
     when 't'
       Curses.close_screen
       @mode = :terminal
@@ -828,6 +867,12 @@ class KV
     opts.on('-s', 'Separation mode (tsv)'){
       @opts[:separation_mode] = true
     }
+    opts.on('-w', 'Watch mode: Reload on file changed'){
+      @opts[:watch] = true
+    }
+    opts.on('--filter-command=FILTER_COMMAND', 'Apply filter command'){|cmd|
+      @opts[:filter_command] = cmd
+    }
     opts.parse!(argv)
   end
 
@@ -838,7 +883,7 @@ class KV
         @screens.last.control
       rescue PopScreen
         @screens.pop
-        @screens.last.redraw!
+        @screens.last.redraw! unless @screens.empty?
       rescue PushScreen => e
         @screens.push e.screen
         @screens.last.redraw!
@@ -861,18 +906,23 @@ def log obj, prefix = ''
   end
 end
 
-def partition str, search
+def search_partition str, search
   results = []
   loop{
     r = str.match(search){|m|
       break if m.post_match == str
-      results << [:unmatch, m.pre_match]
+      results << [:unmatch, m.pre_match] unless m.pre_match.empty?
       results << [:match, m.to_s]
       str = m.post_match
     }
     break unless r
   }
-  results << [:unmatch, str]
+  if results.empty?
+    str
+  else
+    results << [:unmatch, str] unless str.empty?
+    results
+  end
 end
 
 def help_io
@@ -888,5 +938,5 @@ def help_io
     end
   }
 
-  help_io = StringIO.new(help.join)
+  StringIO.new(help.join)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kv
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -32,6 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - LICENSE
 - README.md
@@ -61,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 'kv: A page viewer written by Ruby'