kv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f9b8b9be509c1a29acef17374146c9381713514e19c91a8a2942f9c2ba09e9
-  data.tar.gz: fb877ac8dbf8b5fac3f9b2c4e6690aa01fc25bca3b11fcf7abf88c52ef41fa23
+  metadata.gz: 5c689e9c776cfb742a4258bcbb83ed972be567eff1478e734f30abca73aaed0d
+  data.tar.gz: 9aa2015affec2a824ce1f528f29ad180d48be400ecf5505932ad6c8d229c9334
 SHA512:
-  metadata.gz: c8c646ba69a9a977ea232dedaaff65db9f781d054e76d846913763821678c93c5362e7f4e153574d252505181da0a73a01b7865c38ac2c380c4bc9abaadcd6bc
-  data.tar.gz: eb9f37454be0ce707fbc02f6caae238541fe1865460e67de6c730a2eb81e2ba90d2fbaefa97f418426f19a8343e651b843f9943c61cd5e49cb2d22d15e5cde32
+  metadata.gz: 4d261340c36970a0b5a828b4ff69868f0bc51858857a42e5307f2194bbc4116bdf6157064067fbbdfd4f175c1e8888e499163aca789fdcc02d93c1302208c959
+  data.tar.gz: 39e63f31e30988bc152a08d6afd77c605662291722912d2e3f9981f6731f421d8bb88da0c298b22f9bdaa116afabc8538ee152c8ec0e33afb5538454af604797

data/README.md

@@ -1,6 +1,6 @@
-# kv: A page viewer written by Ruby
+# kv: A page viewer written in Ruby
 
-kv is a page viewer designed for streaming data written by Ruby.
+kv is a page viewer designed for streaming data written in Ruby.
 
 ## Installation
 
@@ -8,9 +8,9 @@ Install it yourself as:
 
     $ gem install kv
 
-# Usage
+kv requires recent Ruby and curses gem.
 
-kv requires Ruby and curses gem.
+# Usage
 
 ## Use kv
 
@@ -18,6 +18,9 @@ kv requires Ruby and curses gem.
 # View [FILE]
 $ kv [OPTIONS] [FILE]
 
+# View [URI] source code
+$ kv [URI]
+
 # View results of [CMD]
 $ [CMD] | kv [OPTIONS]
 
@@ -27,6 +30,8 @@ $ kv
 Options:
     -f                               following mode like "tail -f"
     -n, --line-number LINE           goto LINE
+    -N                               Show lines
+    -T, --time-stamp                 Enable time stamp
 ```
 
 ## Command on a pager
@@ -72,12 +77,15 @@ kv: A pager by Ruby Command list
 
   # Output
   s: Save screen buffer to file
+  P: gist -p
 
   # Modes
   N: toggle line mode
+  T: toggle time stamp mode
   m: toggle mouse mode
   t: terminal (REPL) mode
   v: vi ("vi filename +[LINE]")
+  H: show HTTP response header
 ```
 
 `G` is notable feature, `less` doesn't have. This feature jumps to "current" last line even if the pipe source command does not close output (== input for kv). You can refresh the last line by putting any command.

data/lib/kv/version.rb

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

data/lib/kv.rb

@@ -4,22 +4,23 @@ require "kv/version"
 require "curses"
 require 'stringio'
 require 'optparse'
+require 'open-uri'
 
 module KV
-class KV_PushScreen < Exception
+class PushScreen < Exception
   attr_reader :screen
   def initialize screen
     @screen = screen
   end
 end
 
-class KV_PopScreen < Exception
+class PopScreen < Exception
 end
 
-class KV_Screen
+class Screen
   RenderStatus = Struct.new(
-    :c_cols, :c_lines, :x, :y,
-    :search, :goto, :line_mode, :render_full, :last_lineno
+    :c_cols, :c_lines, :x, :y, :last_lineno,
+    :search, :goto, :line_mode, :ts_mode, :wrapping,
   )
   class RenderStatus
     def to_s
@@ -27,7 +28,7 @@ class KV_Screen
     end
   end
 
-  def initialize input, lines: [], search: nil, name: nil, following_mode: false, first_line: 0, line_mode: false
+  def initialize input, lines: [], search: nil, name: nil, following_mode: false, first_line: 0, line_mode: false, time_stamp: nil
     @rs = RenderStatus.new
     @last_rs = nil
     @rs.y = first_line
@@ -36,14 +37,18 @@ class KV_Screen
     @rs.last_lineno = 0
     @rs.line_mode = line_mode
     @rs.search = search
+    @rs.wrapping = false
+    @rs.ts_mode = false
 
     @name = name
     @filename = @name if @name && File.exist?(@name)
+    @time_stamp = time_stamp
 
     @lines = lines
     @mode = :screen
 
     @following_mode = following_mode
+    @searching = false
 
     @mouse = false
     @search_ignore_case = false
@@ -51,25 +56,35 @@ class KV_Screen
     @loading = false
     @buffer_lines = 10_000
     @yq = Queue.new
-    @load_unlimited = false
+    if @filename
+      @load_unlimited = true
+    else
+      @load_unlimited = false
+    end
+
     @prev_render = {}
+    @meta = input.respond_to?(:meta) ? input.meta : nil
 
     read_async input if input
   end
 
   def setup_line line
     line = line.chomp
+    line.instance_variable_set(:@time_stamp, Time.now.strftime('%H:%M:%S')) if @time_stamp
     line.instance_variable_set(:@lineno, @rs.last_lineno += 1)
     line
   end
 
   def read_async input
     @loading = true
-    data = input.read_nonblock(4096)
+    begin
+      data = input.read_nonblock(4096)
+    rescue IO::EAGAINWaitReadable, EOFError
+      data = ''
+    end
 
-    lines = data.each_line.to_a
     last_line = nil
-    lines.each{|line|
+    data.each_line{|line|
       if line[-1] != "\n"
         last_line = line
         break
@@ -131,6 +146,11 @@ class KV_Screen
     @rs.x
   end
 
+  def set_load_unlimited b
+    @load_unlimited = b
+    @yq << true
+  end
+
   def init_screen
     Curses.init_screen
     Curses.stdscr.keypad(true)
@@ -185,8 +205,8 @@ class KV_Screen
 
   def render_data
     # check update
-    c_lines = Curses.lines
-    c_cols  = Curses.cols
+    c_lines = @rs.c_lines = Curses.lines
+    c_cols = @rs.c_cols  = Curses.cols
 
     if @rs != @last_rs
       @last_rs = @rs.dup
@@ -229,6 +249,13 @@ class KV_Screen
         end
       end
 
+      if @rs.ts_mode && ts = line.instance_variable_get(:@time_stamp)
+        cattr LINE_ATTR do
+          ts = line.instance_variable_get(:@time_stamp)
+          Curses.addstr("#{ts} |")
+        end
+      end
+
       line = line[self.x, cols] || ''
 
       if !@rs.search || !(Regexp === @rs.search)
@@ -296,39 +323,54 @@ class KV_Screen
         render_status
         ev = Curses.getch
         check_update
-        if @following_mode
-          if @rs.search && search_next_move(self.y + 1)
+        y_max = self.y_max
+
+        if @rs.search && @searching
+          if search_next_move
             break
           end
-          self.y = self.y_max
         end
-      end
 
-      if @following_mode
-        @following_mode = false
-        @load_unlimited = false
+        if @following_mode
+          self.y = y_max
+        end
       end
 
+      @following_mode = false
+      set_load_unlimited false
+      @searching = false
+
       return ev
     end
   end
 
-  def search_next_move start
-    (start...@lines.size).each{|i|
+  def search_next_move
+    last_line = @lines.size
+    log (@searching..last_line)
+
+    (@searching...last_line).each{|i|
       if @rs.search === @lines[i]
         self.y = i
+        @searching = false
         return true
       end
     }
+    @searching = last_line
     return false
   end
 
   def search_next start
-    if search_next_move start
-      # OK
+    @searching = start
+    if search_next_move
+      # OK. self.y is updated.
     else
-      screen_status "not found: [#{self.search_str}]"
-      pause
+      if @loading
+        set_load_unlimited true
+      else
+        screen_status "not found: [#{self.search_str}]"
+        pause
+        @searching = false
+      end
     end
   end
 
@@ -382,7 +424,7 @@ class KV_Screen
 
     case ev
     when 'q'
-      raise KV_PopScreen
+      raise PopScreen
 
     when Curses::KEY_UP, 'k'
       self.y -= 1
@@ -413,12 +455,10 @@ class KV_Screen
 
     when 'F'
       @following_mode = true
-      @load_unlimited = true
-      @yq << true
+      set_load_unlimited true
 
     when 'L'
-      @load_unlimited = !@load_unlimited
-      @yq << true
+      set_load_unlimited !@load_unlimited
 
     when '/'
       search_str = ''.dup
@@ -470,8 +510,8 @@ class KV_Screen
         filter_mode_title = "*filter mode [#{self.search_str}]*"
         if @name != filter_mode_title
           lines = @lines.grep(@rs.search)
-          fscr = KV_Screen.new nil, lines: lines, search: @rs.search, name: filter_mode_title
-          raise KV_PushScreen.new(fscr)
+          fscr = Screen.new nil, lines: lines, search: @rs.search, name: filter_mode_title
+          raise PushScreen.new(fscr)
         end
       end
 
@@ -502,6 +542,30 @@ class KV_Screen
         @last_rs = nil
       end
 
+    when 'P'
+      begin
+        if v = `gist -v` and /^gist v\d/ =~ v
+          screen_status "gist-ing..."
+
+          url = IO.popen('gist -p', 'a+'){|rw|
+            @lines.each{|line| rw.puts line}
+            rw.close_write
+            rw.read
+          }
+          msg = "gist URL: #{url}"
+          at_exit{
+            puts msg
+          }
+          screen_status msg
+          pause
+        else
+          raise v.inspect
+        end
+      rescue Errno::ENOENT
+        screen_status 'gist command is not found'
+        pause
+      end
+
     when 'm'
       @mouse = !@mouse
       Curses.close_screen
@@ -514,16 +578,30 @@ class KV_Screen
 
     when 'N'
       @rs.line_mode = !@rs.line_mode
+    when 'T'
+      @rs.ts_mode = !@rs.ts_mode if @time_stamp
     when 't'
       Curses.close_screen
       @mode = :terminal
 
+    when 'H'
+      if @meta
+        lines = @meta.map{|k, v| "#{k}: #{v}"}
+        raise PushScreen.new(Screen.new nil, lines: lines, name: "Response header [#{@name}]")
+      end
+
+    when Curses::KEY_CTRL_G
+      # do nothing
+
     when '?'
-      raise KV_PushScreen.new(KV_Screen.new help_io)
+      raise PushScreen.new(Screen.new help_io)
 
     when nil
       # ignore
 
+    when Curses::KEY_RESIZE
+      # ignore
+
     else
       screen_status "unknown: #{key_name(ev)}"
       pause
@@ -548,6 +626,10 @@ class KV_Screen
       raise
     end
   end
+
+  def redraw!
+    @last_rs = nil
+  end
 end
 
 class KV
@@ -576,13 +658,18 @@ class KV
       name = files.shift
       begin
         input = open(name)
-      rescue
-        if /(.+):(\d+)/ =~ name
+      rescue Errno::ENOENT
+        case name
+        when /(.+):(\d+)/
           name = $1
           @first_line = $2.to_i - 1
           retry
+        when URI.regexp
+          input = URI.open(name)
+        else
+          STDERR.puts "#{name}: No such file or directory"
+          exit 1
         end
-        raise
       end
     end
 
@@ -590,7 +677,7 @@ class KV
       log "SIGINT"
     }
 
-    @screens = [KV_Screen.new(input, name: name, **@opts)]
+    @screens = [Screen.new(input, name: name, **@opts)]
   end
 
   def parse_option argv
@@ -604,6 +691,9 @@ class KV
     opts.on('-N', 'Show lines'){
       @opts[:line_mode] = true
     }
+    opts.on('-T', '--time-stamp', 'Enable time stamp'){
+      @opts[:time_stamp] = true
+    }
     opts.parse!(argv)
   end
 
@@ -612,10 +702,11 @@ class KV
     until @screens.empty?
       begin
         @screens.last.control
-      rescue KV_PopScreen
+      rescue PopScreen
         @screens.pop
-      rescue KV_PushScreen => e
+      rescue PushScreen => e
         @screens.push e.screen
+        @screens.last.redraw!
       end
     end
   ensure

metadata

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