kv 0.3.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c689e9c776cfb742a4258bcbb83ed972be567eff1478e734f30abca73aaed0d
-  data.tar.gz: 9aa2015affec2a824ce1f528f29ad180d48be400ecf5505932ad6c8d229c9334
+  metadata.gz: 88a03848ba99241da0e03e0947b101f10f3377b2b86324a5d2221ebe5173da45
+  data.tar.gz: 381798ca027176bca1c4dcc6f62eba469b59a64bfd9fe8d1c3431791f7671d28
 SHA512:
-  metadata.gz: 4d261340c36970a0b5a828b4ff69868f0bc51858857a42e5307f2194bbc4116bdf6157064067fbbdfd4f175c1e8888e499163aca789fdcc02d93c1302208c959
-  data.tar.gz: 39e63f31e30988bc152a08d6afd77c605662291722912d2e3f9981f6731f421d8bb88da0c298b22f9bdaa116afabc8538ee152c8ec0e33afb5538454af604797
+  metadata.gz: abe415462dbed0bb96d4cc816c6a2c6b909662c7daf08bc575b748af6a15a803be27ac19dc8bb071d555cc273c7552517d18fc18a70f64623fcb3fc7e5274d1b
+  data.tar.gz: cc247a3f2488489a6023987e94aa346fdbb2f84dd581c552d4ab4e8554396bb1c510fa4a7a2528afdc221e618be9868bca9b6331dc647644d81d5e20664cead3

data/.github/FUNDING.yml

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

data/README.md

@@ -10,8 +10,6 @@ Install it yourself as:
 
 kv requires recent Ruby and curses gem.
 
-# Usage
-
 ## Use kv
 
 ```
@@ -27,13 +25,18 @@ $ [CMD] | kv [OPTIONS]
 # View command help
 $ kv
 
-Options:
+Usage: kv [options]
     -f                               following mode like "tail -f"
     -n, --line-number LINE           goto LINE
     -N                               Show lines
     -T, --time-stamp                 Enable time stamp
+    -e CMD                           Run CMD as a child process
+    -p, --pipe                       Open named pipe
+    -s                               Separation mode (tsv)
 ```
 
+Note that `--pipe` option creates a named pipe (`~/.kv_pipe` or a specified file) if there is not a fifo file.
+
 ## Command on a pager
 
 ```
@@ -79,6 +82,12 @@ kv: A pager by Ruby Command list
   s: Save screen buffer to file
   P: gist -p
 
+  # Child process
+  You can run child process using -e command line option like -e CMD
+  and you can send a meesage to the child process with x command.
+
+  x: send a message to the child process
+
   # Modes
   N: toggle line mode
   T: toggle time stamp mode

data/lib/kv.rb

@@ -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
@@ -28,7 +29,10 @@ class Screen
     end
   end
 
-  def initialize input, lines: [], search: nil, name: nil, following_mode: false, first_line: 0, line_mode: false, time_stamp: nil
+  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
     @rs = RenderStatus.new
     @last_rs = nil
     @rs.y = first_line
@@ -39,16 +43,20 @@ 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)
+
     @time_stamp = time_stamp
+    @ext_input = ext_input
+    @fifo_file = fifo_file
 
     @lines = lines
     @mode = :screen
 
-    @following_mode = following_mode
-    @searching = false
+    @following = following_mode
+    @apos = 0
 
     @mouse = false
     @search_ignore_case = false
@@ -78,7 +86,7 @@ class Screen
   def read_async input
     @loading = true
     begin
-      data = input.read_nonblock(4096)
+      data = input.read_nonblock(800_000)
     rescue IO::EAGAINWaitReadable, EOFError
       data = ''
     end
@@ -101,6 +109,7 @@ class Screen
         end
 
         @lines << setup_line(line)
+
         while !@load_unlimited && @lines.size > self.y + @buffer_lines
           @yq.pop; @yq.clear
         end
@@ -110,6 +119,10 @@ class Screen
       if @filename
         @file_mtime = File.mtime(@filename)
         @file_lastpos = input.tell
+      elsif @fifo_file
+        input = open(@fifo_file)
+        log(input)
+        redo
       end
       input.close
       @loading = false
@@ -117,7 +130,8 @@ class Screen
   end
 
   def y_max
-    @lines.size - Curses.lines + 2
+    max = @lines.size - Curses.lines + 2
+    max < 0 ? 0 : max
   end
 
   def y
@@ -161,6 +175,11 @@ class Screen
     else
       Curses.mousemask(0)
     end
+
+    if @loading && self.y_max < @rs.y
+      log [:going, self.y_max, @rs.y]
+      @following = :going
+    end
     self.y = @rs.y
   end
 
@@ -189,18 +208,6 @@ class Screen
     end
   end
 
-  def screen_status status, post = nil
-    Curses.setpos Curses.lines-1, 0
-    Curses.addstr ' '.ljust(Curses.cols)
-
-    standout{
-      Curses.setpos Curses.lines-1, 0
-      Curses.addstr status
-    }
-    Curses.addstr post if post
-    Curses.standend
-  end
-
   LINE_ATTR = Curses::A_DIM
 
   def render_data
@@ -216,6 +223,15 @@ class Screen
 
     Curses.clear
 
+    if @rs.separation_mode && (lines = @lines[self.y ... (self.y + c_lines - 1)])
+      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
+        }
+      }
+    end
+
     (c_lines-1).times{|i|
       lno = i + self.y
       line = @lines[lno]
@@ -258,6 +274,17 @@ class Screen
 
       line = line[self.x, cols] || ''
 
+      if @rs.separation_mode
+        line = line.split(/\t/).tap{|e|
+          if (max = max_cols.size) > 0
+            # fill empty columns
+            e[max - 1] ||= nil
+          end
+        }.map.with_index{|w, i|
+          "%-#{max_cols[i]}s" % w
+        }.join(' | ')
+      end
+
       if !@rs.search || !(Regexp === @rs.search)
         Curses.addstr line
       else
@@ -290,11 +317,49 @@ class Screen
     name = @name ? "<#{@name}>" : ''
     mouse  = @mouse ? ' [MOUSE]' : ''
     search = @rs.search ? " search[#{search_str}]" : ''
-    loading = @loading ? " (loading...#{@load_unlimited ? '!' : nil}#{@following_mode ? ' following' : ''}) " : ''
+    loading = @loading ? " (loading...#{@load_unlimited ? '!' : nil}#{@following ? ' following' : ''}) " : ''
     x = self.x > 0 ? " x:#{self.x}" : ''
     screen_status "#{name} lines:#{self.y+1}/#{@lines.size}#{x}#{loading}#{search}#{mouse}"
   end
 
+  ANIMATION = ['[O     ]',
+               '[o.    ]',
+               '[...   ]',
+               '[ ...  ]',
+               '[  ... ]',
+               '[   ...]',
+               '[    .o]',
+               '[     O]',
+               '[    .o]',
+               '[   ...]',
+               '[  ... ]',
+               '[  ... ]',
+               '[ ...  ]',
+               '[...   ]',
+               '[o.    ]',
+               ]
+
+  def screen_status status, post = nil
+    cols = Curses.cols
+    line = Curses.lines-1
+    Curses.setpos line, 0
+    Curses.addstr ' '.ljust(cols)
+    len  = status.size
+    len += post.size if post
+
+    standout{
+      Curses.setpos Curses.lines-1, 0
+      Curses.addstr status
+    }
+    Curses.addstr post if post
+
+    if !post && len < cols - ANIMATION.first.size
+      Curses.setpos line, cols - ANIMATION.first.size - 1
+      @apos = (@apos + 1) % ANIMATION.size
+      Curses.addstr ANIMATION[@apos]
+    end
+  end
+
   def check_update
     if @loading == false
       if @filename && File.exist?(@filename) && File.mtime(@filename) > @file_mtime
@@ -315,7 +380,7 @@ class Screen
   def render_screen
     ev = nil
 
-    ms = @following_mode ? 100 : 500
+    ms = @following ? 100 : 500
 
     ctimeout ms do
       while ev == nil
@@ -325,20 +390,27 @@ class Screen
         check_update
         y_max = self.y_max
 
-        if @rs.search && @searching
-          if search_next_move
-            break
+        if @following
+          case @following
+          when :searching
+            break if search_next_move
+          when :going
+            if @rs.goto <= y_max
+              self.y = @rs.goto
+              break
+            end
+          when true
+            # ok
+          else
+            raise "unknown following mode: #{@following}"
           end
-        end
 
-        if @following_mode
           self.y = y_max
         end
       end
 
-      @following_mode = false
+      @following = false
       set_load_unlimited false
-      @searching = false
 
       return ev
     end
@@ -346,7 +418,7 @@ class Screen
 
   def search_next_move
     last_line = @lines.size
-    log (@searching..last_line)
+    # log (@searching..last_line)
 
     (@searching...last_line).each{|i|
       if @rs.search === @lines[i]
@@ -366,6 +438,7 @@ class Screen
     else
       if @loading
         set_load_unlimited true
+        @following = :searching
       else
         screen_status "not found: [#{self.search_str}]"
         pause
@@ -392,26 +465,32 @@ class Screen
     ev
   end
 
-  def input_str pattern, str = ''.dup, other_actions: nil
-    loop{
-      ev = Curses.getch
+  def input_str pattern, str = ''.dup, other_actions: {}
+    update_action = other_actions[:update]
 
-      case ev
-      when 10
-        return str
-      when Curses::KEY_BACKSPACE
-        str.chop!
-      when pattern
-        str << ev
-      else
-        if other_actions && (action = other_actions[ev])
-          action.call(ev)
+    ctimeout update_action ? 200 : -1 do
+      loop do
+        ev = Curses.getch
+
+        case ev
+        when 10
+          return str
+        when Curses::KEY_BACKSPACE
+          str.chop!
+        when pattern
+          str << ev
+        when nil # timeout
+          update_action[str]
         else
-          log "failure: #{key_name ev}"
-          return nil
+          if action = other_actions[ev]
+            action.call(ev)
+          else
+            log "failure: #{key_name ev}"
+            return nil
+          end
         end
       end
-    }
+    end
   end
 
   def pause
@@ -454,7 +533,7 @@ class Screen
       end
 
     when 'F'
-      @following_mode = true
+      @following = true
       set_load_unlimited true
 
     when 'L'
@@ -538,7 +617,7 @@ class Screen
 
     when 'v'
       if @filename
-        system("vi #{@filename} +#{self.y + 1}")
+        syste m("vi #{@filename} +#{self.y + 1}")
         @last_rs = nil
       end
 
@@ -580,9 +659,31 @@ 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
     when 't'
       Curses.close_screen
       @mode = :terminal
+    when 'x'
+      while @ext_input && !@ext_input.closed?
+        update_ext_status = -> str do
+          screen_status "input for ext:", str
+        end
+        update_ext_status['']
+        actions = {
+          update: -> str do
+            self.y = self.y_max
+            render_data
+            update_ext_status[str]
+          end
+        }
+        str = input_str(/./, other_actions: actions)
+        if str && !str.empty?
+          @ext_input.puts str unless @ext_input.closed?
+        else
+          break
+        end
+      end
 
     when 'H'
       if @meta
@@ -641,11 +742,39 @@ class KV
     }
 
     files = parse_option(argv)
+    name = files.shift
 
     @pipe_in = nil
 
-    if files.empty?
-      if STDIN.isatty
+    if @opts[:pipe] || (name && File.pipe?(name))
+      @opts.delete(:pipe)
+      @opts[:fifo_file] = name || '/tmp/kv_pipe'
+
+      if name && File.pipe?(name)
+        # ok
+      else
+        begin
+          name ||= File.expand_path('~/.kv_pipe')
+          unlink_name = name
+          File.mkfifo(name)
+          at_exit{ puts "$ rm #{unlink_name}"; File.unlink(unlink_name) }
+        rescue Errno::EEXIST
+          raise "#{name} already exists."
+        end
+      end
+
+      puts "waiting for #{name}"
+      input = @pipe_in = open(name)
+      name = nil
+    elsif !name
+      case
+      when @opts[:e]
+        cmd = @opts.delete(:e)
+        input = IO.popen(cmd, 'a+')
+        name = nil
+        @pipe_in = input
+        @opts[:ext_input] = input
+      when STDIN.isatty
         input = help_io
         name = 'HELP'
       else
@@ -655,14 +784,13 @@ class KV
         @pipe_in = input
       end
     else
-      name = files.shift
       begin
         input = open(name)
       rescue Errno::ENOENT
         case name
         when /(.+):(\d+)/
           name = $1
-          @first_line = $2.to_i - 1
+          @opts[:first_line] = $2.to_i - 1
           retry
         when URI.regexp
           input = URI.open(name)
@@ -694,6 +822,15 @@ class KV
     opts.on('-T', '--time-stamp', 'Enable time stamp'){
       @opts[:time_stamp] = true
     }
+    opts.on('-e CMD', 'Run CMD as a child process'){|cmd|
+      @opts[:e] = cmd
+    }
+    opts.on('-p', '--pipe', 'Open named pipe'){
+      @opts[:pipe] = true
+    }
+    opts.on('-s', 'Separation mode (tsv)'){
+      @opts[:separation_mode] = true
+    }
     opts.parse!(argv)
   end
 
@@ -704,6 +841,7 @@ class KV
         @screens.last.control
       rescue PopScreen
         @screens.pop
+        @screens.last.redraw! unless @screens.empty?
       rescue PushScreen => e
         @screens.push e.screen
         @screens.last.redraw!

data/lib/kv/version.rb

@@ -1,3 +1,3 @@
 module KV
-  VERSION = "0.3.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-08-04 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.2
 signing_key: 
 specification_version: 4
 summary: 'kv: A page viewer written by Ruby'