kv 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c689e9c776cfb742a4258bcbb83ed972be567eff1478e734f30abca73aaed0d
-  data.tar.gz: 9aa2015affec2a824ce1f528f29ad180d48be400ecf5505932ad6c8d229c9334
+  metadata.gz: 3c803b1b67678cd6668eff3068451093dba82fa6bd85e09a7c32be56c7febeaf
+  data.tar.gz: 1d49373d49d9bc626d2a5635538dc58fe8839927461db18befcaec4d187fd14b
 SHA512:
-  metadata.gz: 4d261340c36970a0b5a828b4ff69868f0bc51858857a42e5307f2194bbc4116bdf6157064067fbbdfd4f175c1e8888e499163aca789fdcc02d93c1302208c959
-  data.tar.gz: 39e63f31e30988bc152a08d6afd77c605662291722912d2e3f9981f6731f421d8bb88da0c298b22f9bdaa116afabc8538ee152c8ec0e33afb5538454af604797
+  metadata.gz: 9b625de709b8af9d9f55672504c78b73979ff9f2a054c9e78503796fa659861a9ea14ef8c4a9990ab1006a7f315a63b88f7fcd54e06b96997e3031bcd7e3d5ca
+  data.tar.gz: 382d0287eaf1ac11904f8a7e71ed4be9019d15443b202991a5bb750d51b3a78283a439cbbfe5547ce8d26b9c2b8603abd29a63e45092f83ec48e5fabf307749f

data/lib/kv.rb

@@ -28,7 +28,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,
+                 time_stamp: nil, ext_input: nil
     @rs = RenderStatus.new
     @last_rs = nil
     @rs.y = first_line
@@ -42,7 +45,9 @@ class Screen
 
     @name = name
     @filename = @name if @name && File.exist?(@name)
+
     @time_stamp = time_stamp
+    @ext_input = ext_input
 
     @lines = lines
     @mode = :screen
@@ -189,18 +194,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
@@ -295,6 +288,18 @@ class Screen
     screen_status "#{name} lines:#{self.y+1}/#{@lines.size}#{x}#{loading}#{search}#{mouse}"
   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
+
   def check_update
     if @loading == false
       if @filename && File.exist?(@filename) && File.mtime(@filename) > @file_mtime
@@ -392,26 +397,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
@@ -538,7 +549,7 @@ class Screen
 
     when 'v'
       if @filename
-        system("vi #{@filename} +#{self.y + 1}")
+        syste m("vi #{@filename} +#{self.y + 1}")
         @last_rs = nil
       end
 
@@ -583,6 +594,26 @@ class Screen
     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
@@ -645,7 +676,14 @@ class KV
     @pipe_in = nil
 
     if files.empty?
-      if STDIN.isatty
+      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
@@ -694,6 +732,9 @@ class KV
     opts.on('-T', '--time-stamp', 'Enable time stamp'){
       @opts[:time_stamp] = true
     }
+    opts.on('-e CMD'){|cmd|
+      @opts[:e] = cmd
+    }
     opts.parse!(argv)
   end
 

data/lib/kv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -61,8 +61,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'