kv 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c803b1b67678cd6668eff3068451093dba82fa6bd85e09a7c32be56c7febeaf
-  data.tar.gz: 1d49373d49d9bc626d2a5635538dc58fe8839927461db18befcaec4d187fd14b
+  metadata.gz: a94c201f245d4df4b646fa9b88cd197d915d37096962da6e0cca0bd8dbb39d24
+  data.tar.gz: 0f8e816be09a9509e5d1fe5b6b157d8d3dcafefc8acd0e97f16a83893bd0aac1
 SHA512:
-  metadata.gz: 9b625de709b8af9d9f55672504c78b73979ff9f2a054c9e78503796fa659861a9ea14ef8c4a9990ab1006a7f315a63b88f7fcd54e06b96997e3031bcd7e3d5ca
-  data.tar.gz: 382d0287eaf1ac11904f8a7e71ed4be9019d15443b202991a5bb750d51b3a78283a439cbbfe5547ce8d26b9c2b8603abd29a63e45092f83ec48e5fabf307749f
+  metadata.gz: 96524f391e1af962c1f276d6036ef73e07a2f182736b6d8d92ee1060d5dd82c778dba0567f3ca8eb719d5797fe1f67955768578ac1c34abb6171f9170a2a394a
+  data.tar.gz: '092e3cb69c9b55c16435a88b3bcffc32e4e4d0ee2301d5f91f497fb538b75dcbfefafbd38f8b6e3dd957fa2be438df8e47391006ce7b1b21044088c052db3365'

data/README.md

@@ -32,6 +32,7 @@ Options:
     -n, --line-number LINE           goto LINE
     -N                               Show lines
     -T, --time-stamp                 Enable time stamp
+    -e CMD                           Run CMD as a child process
 ```
 
 ## Command on a pager
@@ -79,6 +80,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

@@ -52,8 +52,8 @@ class Screen
     @lines = lines
     @mode = :screen
 
-    @following_mode = following_mode
-    @searching = false
+    @following = following_mode
+    @apos = 0
 
     @mouse = false
     @search_ignore_case = false
@@ -83,7 +83,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
@@ -122,7 +122,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
@@ -166,6 +167,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
 
@@ -283,21 +289,47 @@ 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
-    Curses.setpos Curses.lines-1, 0
-    Curses.addstr ' '.ljust(Curses.cols)
+    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
-    Curses.standend
+
+    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
@@ -320,7 +352,7 @@ class Screen
   def render_screen
     ev = nil
 
-    ms = @following_mode ? 100 : 500
+    ms = @following ? 100 : 500
 
     ctimeout ms do
       while ev == nil
@@ -330,20 +362,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
@@ -351,7 +390,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]
@@ -371,6 +410,7 @@ class Screen
     else
       if @loading
         set_load_unlimited true
+        @following = :searching
       else
         screen_status "not found: [#{self.search_str}]"
         pause
@@ -465,7 +505,7 @@ class Screen
       end
 
     when 'F'
-      @following_mode = true
+      @following = true
       set_load_unlimited true
 
     when 'L'
@@ -700,7 +740,7 @@ class KV
         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)
@@ -732,7 +772,7 @@ class KV
     opts.on('-T', '--time-stamp', 'Enable time stamp'){
       @opts[:time_stamp] = true
     }
-    opts.on('-e CMD'){|cmd|
+    opts.on('-e CMD', 'Run CMD as a child process'){|cmd|
       @opts[:e] = cmd
     }
     opts.parse!(argv)

data/lib/kv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kv
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -61,7 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'kv: A page viewer written by Ruby'