listpager 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c5f337edc88d63d288790ab7b3d3340a07c8ff
-  data.tar.gz: e0258e3a5820063c7458fb5fab6f1bbc742cd0a5
+  metadata.gz: 0d4f836e524e3a80691d2a2a0212b3e447d683c7
+  data.tar.gz: 4d68a1eee960c026cfbcbaa24b3b9f7378218e26
 SHA512:
-  metadata.gz: a3dc50e4c96303c00c64a860ddbf7756b399f963d23935d65bf8b27aaa74360d15b9d552c979d060c1a29ac150467480709a3761a88831a57be973464118f696
-  data.tar.gz: a632c1124f1e3257dac52afd9f25ce76d32ca7bf2e7f4226a51c83906a8a8e1a24b43e5d1fd45958caaa2070351ed4092b16b2c4a3d9959bf7b51758797cae6a
+  metadata.gz: c2942ab1c84e13c509b4958b6002604f81c3ee7ee8708eeb3a6e6dce0e0286ff2df89b5a3d60463535d4c7941b0052c4755519452b394d3bf87095c3ef101d29
+  data.tar.gz: 8789bc607ee28fdf54d6018144c18df4583e61fd4c250739f46e7209e25cf638371e5ec7cb1f5ffca89f8b79df0aff660d926da9112fb0a8bea78a6b1b088f3f

data/README.md

@@ -73,8 +73,13 @@ ask for statuses, manipulate the list, add badges, change captions, etc.
 
 ## Dependencies and Installation
 Install listpager with `gem install listpager`.  It has few dependencies:
-currently only `ncurses-ruby`.
+currently only `ncursesw`.  BUT IT DOESNT STOP THERE, of course:  For the
+gem to build on a fresh Ubuntu, you'll need the following for widechar-
+supporting libncurses development headers:
 
+```bash
+sudo apt install libncursesw5-dev
+```
 
 ## Implementation Notes
 curses is terrible but portable.  'curses' doesn't expose enough to be useful,

data/lib/listpager/client_terminal.rb

@@ -1,4 +1,4 @@
-require 'listpager/ncurses'
+require 'ncursesw'
 require 'shellwords'
 require 'optparse'
 require 'io/console'
@@ -54,36 +54,41 @@ module Listpager
       @mode == :append
     end
 
-    def process_command(line)
-      if append_mode?
-        case line
-        when '\%%'
-          list.values.push('%%')
+    def process_command(argv)
+      cmd, *args = argv
+      case cmd
+        when 'append-mode', '%'
+          @mode = :append
+        when 'title'
+          @list.title = args[0]
+        when 'clear'
+          @list.values = []
+          @list.selected = 0
           list.dirty!
-        when '%%'
+        when 'get-selected'
+          list.selection_changed
+        when 'select'
+          list.selected = args.fetch(0).to_i
+        when 'get-item'
+          puts ["item", args.fetch(0), list.values[args.fetch(0).to_i]].join ' '
+        when 'quit'
+          raise Interrupt
+      end
+    end
+
+    def process_line(line)
+      if append_mode?
+        if line == '%%'
           @mode = :command
+        elsif line[0] == '%'
+          cmd = Shellwords.split(line[1..-1])
+          process_command(cmd)
         else
           list.values.push(line)
           list.dirty!
         end
       else
-        cmd, *args = Shellwords.split(line)
-        begin
-          case cmd
-            when '%%', 'append-mode'
-              @mode = :append
-            when 'get-selected'
-              list.selection_changed
-            when 'select'
-              list.selected = args.fetch(0).to_i
-            when 'get-item'
-              puts ["item", args.fetch(0), list.values[args.fetch(0).to_i]].join ' '
-            when 'quit'
-              raise Interrupt
-          end
-        rescue IndexError => e
-          puts "error bad-command #{line}"
-        end
+        process_command(Shellwords.split(line))
       end
     end
 
@@ -103,7 +108,7 @@ module Listpager
         used = 0
         StringIO.new(@buffer).each_line do |line|
           if line[-1] == "\n"
-            process_command(line.chomp)
+            process_line(line.chomp)
             used += line.size
           else
             break

data/lib/listpager/color.rb

@@ -1,4 +1,4 @@
-require 'listpager/ncurses'
+require 'ncursesw'
 
 module Listpager
   class Color
@@ -8,6 +8,7 @@ module Listpager
       scroll_track: 2,
       scroll_thumb: 3,
       scroll_arrow: 4,
+      title: 5,
     }.freeze
 
     def self.curses_lookup(c)
@@ -24,6 +25,7 @@ module Listpager
       init_color(:scroll_track, :COLOR_BLACK, :COLOR_BLACK)
       init_color(:scroll_thumb, :COLOR_WHITE, :COLOR_WHITE)
       init_color(:scroll_arrow, :COLOR_WHITE, :COLOR_BLACK)
+      init_color(:title, :COLOR_BLACK, :COLOR_BLUE)
     end
 
     def self.[](name)

data/lib/listpager/list.rb

@@ -1,5 +1,4 @@
-require 'listpager/ncurses'
-
+require 'ncursesw'
 require 'listpager/color'
 require 'listpager/scrollbar'
 
@@ -27,9 +26,11 @@ module Listpager
     attr_reader :selected
     attr_reader :offset
     attr_reader :scrollbar
+    attr_reader :title
 
     def initialize(window)
       @window = window
+      @title = nil
       @values = []
       @selected = 0
       @offset = 0
@@ -45,17 +46,29 @@ module Listpager
       @dirty
     end
 
+    def title=(v)
+      if v != @title
+        @title = v
+        dirty!
+      end
+      @title
+    end
+
     def offset=(v)
       dirty! if v != @offset
+      v = 0 if v < 0
       @offset = v
     end
 
     attr_reader :selected
     def selected=(v)
+      minx, miny = getminxy
       maxx, maxy = getmaxxy
 
       v = [0, v, values.size - 1].sort[1]
-      self.offset = [v - maxy + 1, offset, v].sort[1]
+      screenh = maxy - miny
+
+      self.offset = [v + miny - 1, offset, (v + miny + 1) - screenh].sort[1]
 
       if v != @selected
         dirty!
@@ -103,21 +116,45 @@ module Listpager
       s.gsub(/[^[:print:]]/, '')
     end
 
+    def getminxy
+      x, y = 0, 0
+      y += 1 if title
+      [x, y]
+    end
+
     def getmaxxy
       maxx, maxy = [], []
       window.getmaxyx(maxy, maxx)
       [maxx[0], maxy[0]]
     end
 
+    def space_pad(s, w)
+      nspaces = (w - s.size)
+      nspaces = 0 if nspaces < 0
+      s + (BLANK_SPACE * (w - s.size))
+    end
+
+    def render_title
+      maxx, maxy = getmaxxy
+      if title
+        window.color_set(Color[:title], nil)
+        window.move(0, 0)
+        window.addstr(space_pad(' ' + title, maxx))
+      end
+    end
+
     def render
       return false if ! dirty?
 
+      render_title
+
       maxx, maxy = getmaxxy
+      minx, miny = getminxy
 
-      (0...maxy).each do |i|
+      (miny...maxy).each do |i|
         window.color_set(Color[:list_default], nil)
 
-        list_index = offset + i
+        list_index = (offset + i) - miny
         window.move(i, 0)
         indicator = nil
 

data/lib/listpager/scrollbar.rb

@@ -1,5 +1,4 @@
-require 'listpager/ncurses'
-
+require 'ncursesw'
 require 'listpager/color'
 
 module Listpager

data/lib/listpager/version.rb

@@ -1,3 +1,3 @@
 module Listpager
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/listpager.gemspec

@@ -27,16 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Check out the hack in ext/mkrf_conf.rb, which is effectively:
-  #
-  # if RUBY_PLATFORM =~ /\bdarwin/
-  #   spec.add_runtime_dependency 'ncurses-ruby'
-  # else
-  #   # Doesn't build on newer macOS...
-  #   spec.add_runtime_dependency 'ncursesw'
-  # end
-  #
-  # A PR has been submitted to ncursesw, so hopefully this can go away soon.
+  spec.add_runtime_dependency "ncursesw", "~> 1.4.10"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: listpager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ncursesw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,12 +69,10 @@ files:
 - bin/setup
 - doc/screenshot.png
 - exe/listpager
-- ext/mkrf_conf.rb
 - lib/listpager.rb
 - lib/listpager/client_terminal.rb
 - lib/listpager/color.rb
 - lib/listpager/list.rb
-- lib/listpager/ncurses.rb
 - lib/listpager/scrollbar.rb
 - lib/listpager/version.rb
 - listpager.gemspec

data/ext/mkrf_conf.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-  # We're good
-end
-
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_PLATFORM =~ /\bdarwin/i
-    inst.install "ruby-ncurses", "~> 1.2.4"
-  else
-    inst.install "ncursesw", "~> 1.4.9"
-  end
-rescue
-  exit 1
-end
-
-# create dummy rakefile to indicate success
-File.write(__dir__("Rakefile"), "task: default\n")

data/lib/listpager/ncurses.rb

@@ -1,8 +0,0 @@
-# Note: This is a hack to work around ncursesw not building on macOS.
-# Hopefully it can go away soon.
-
-if RUBY_PLATFORM =~ /\bdarwin/i
-  require 'ncurses'
-else
-  require 'ncursesw'
-end