kv 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94c201f245d4df4b646fa9b88cd197d915d37096962da6e0cca0bd8dbb39d24
-  data.tar.gz: 0f8e816be09a9509e5d1fe5b6b157d8d3dcafefc8acd0e97f16a83893bd0aac1
+  metadata.gz: 70b1f3af205a0cc4e0654de74a8d9e31e023719c8cf04cd6fbb9e43d96b14be4
+  data.tar.gz: 5265f5930278a1f39f5d00f6a6f3265e436bcdce233b7350f8f791d7f0752fee
 SHA512:
-  metadata.gz: 96524f391e1af962c1f276d6036ef73e07a2f182736b6d8d92ee1060d5dd82c778dba0567f3ca8eb719d5797fe1f67955768578ac1c34abb6171f9170a2a394a
-  data.tar.gz: '092e3cb69c9b55c16435a88b3bcffc32e4e4d0ee2301d5f91f497fb538b75dcbfefafbd38f8b6e3dd957fa2be438df8e47391006ce7b1b21044088c052db3365'
+  metadata.gz: 935613e6eb8be95f504d75b777b83a864bab18a34ccbdc4694df5e82c8b2312d270e9f4f4f5da7ef07ed360cc083281705b61ff62a329aa7004da289e989909f
+  data.tar.gz: 7fb6b11b84f0c014c956cf0f0e223a74ce88426860f65919ef2e351028b957876c72a255fba10c2ed2e65dac0dbf701691cf10817745f7ec231a42de76ff7ed4

data/README.md

@@ -10,8 +10,6 @@ Install it yourself as:
 
 kv requires recent Ruby and curses gem.
 
-# Usage
-
 ## Use kv
 
 ```
@@ -27,14 +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
 
 ```

data/lib/kv.rb

@@ -30,8 +30,8 @@ class Screen
 
   def initialize input, lines: [],
                  name: nil, search: nil, first_line: 0,
-                 following_mode: false, line_mode: false,
-                 time_stamp: nil, ext_input: nil
+                 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
@@ -48,6 +48,8 @@ class Screen
 
     @time_stamp = time_stamp
     @ext_input = ext_input
+    @fifo_file = fifo_file
+    @separation_mode = separation_mode
 
     @lines = lines
     @mode = :screen
@@ -106,6 +108,7 @@ class Screen
         end
 
         @lines << setup_line(line)
+
         while !@load_unlimited && @lines.size > self.y + @buffer_lines
           @yq.pop; @yq.clear
         end
@@ -115,6 +118,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
@@ -215,6 +222,15 @@ class Screen
 
     Curses.clear
 
+    if @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]
@@ -257,6 +273,17 @@ class Screen
 
       line = line[self.x, cols] || ''
 
+      if @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
@@ -712,10 +739,31 @@ class KV
     }
 
     files = parse_option(argv)
+    name = files.shift
 
     @pipe_in = nil
 
-    if files.empty?
+    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)
@@ -733,7 +781,6 @@ class KV
         @pipe_in = input
       end
     else
-      name = files.shift
       begin
         input = open(name)
       rescue Errno::ENOENT
@@ -775,6 +822,12 @@ class KV
     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
 
@@ -785,6 +838,7 @@ class KV
         @screens.last.control
       rescue PopScreen
         @screens.pop
+        @screens.last.redraw!
       rescue PushScreen => e
         @screens.push e.screen
         @screens.last.redraw!

data/lib/kv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kv
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses