rubytext 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb5ca1d05e1fc85ff4de0f5d028e83611176142fbf022b26b91bd608b6fe9e8
-  data.tar.gz: ae55d53aedf1a0da15cfcf2c9dff8d76bf7274804dc942ea67372adc287ca827
+  metadata.gz: b3bc88c14a4cf43b7d4669cc1e00e408983f633cf72d1a04a3310c17c538b8e7
+  data.tar.gz: 2f9476d26e485a802425efa8f3b0c8faf9cff875e60105f487f44d14ee22e1f4
 SHA512:
-  metadata.gz: 48d354dcf57a37dffbe6605da23bed650a34a8f05d8d024929c5fb681cc8beb13eea09cdedc5ba5583a03a2a0e99b35c57d4a9e3c380b297dbc119e073300dc0
-  data.tar.gz: 42ba4bbd57b6b7f5936dad8547a9f9f3b0db1bc968b549c578d480fe6d7f2b6131282b91ff428317ea90207c3931525b58ce45998b50d3af4083b4a326ec5e58
+  metadata.gz: 9f368ca6d83dbe958071972a5995a8e20ef829572342eb8438deb64b28c1cbdd21b42e1f81c31a1e63f24e1efe24975e72eb3d3e1ae5f0cc24788c0992f0d021
+  data.tar.gz: 11282127ca9e72e7ee1dde18f405ceed426d4435ab3a48680d3d598a89fd6cabd1f3e27afa2ddc6096215cbc24f88caa58b3b6c33ac260e35585cb9a90268fac

data/lib/menu.rb

@@ -22,7 +22,7 @@ module RubyText
 
   def self.menu(r: 0, c: 0, items:)
     high = items.size + 2
-    wide = items.map(&:length).max + 2
+    wide = items.map(&:length).max + 4
     saveback(high, wide, r, c)
     @mywin = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
     RubyText.set(:raw)
@@ -77,10 +77,12 @@ module RubyText
         when X::KEY_UP
           if sel > 0
             sel -= 1
+            handler.call(sel, items[sel])
           end
         when X::KEY_DOWN
           if sel < max
             sel += 1
+            handler.call(sel, items[sel])
           end
         when quit  # parameter
           win2.clear

data/lib/navigation.rb

@@ -0,0 +1,73 @@
+class RubyText::Window
+  def go(r, c)
+    save = self.rc
+    @win.setpos(r, c)
+    if block_given?
+      yield
+      go(*save)   # No block here!
+    end
+  end
+
+  def up(n=1)
+    r, c = rc
+    go r-n, c
+  end
+
+  def down(n=1)
+    r, c = rc
+    go r+n, c
+  end
+
+  def left(n=1)
+    r, c = rc
+    go r, c-n
+  end
+
+  def right(n=1)
+    r, c = rc
+    go r, c+n
+  end
+
+  def top
+    r, c = rc
+    go 0, c
+  end
+
+  def bottom 
+    r, c = rc
+    rmax = self.rows - 1
+    go rmax, c
+  end
+
+  def up!
+    top
+  end
+
+  def down!
+    bottom
+  end
+
+  def left!
+    r, c = rc
+    go r, 0
+  end
+
+  def right!
+    r, c = rc
+    cmax = self.cols - 1
+    go r, cmax
+  end
+
+  def home
+    go 0, 0
+  end
+
+  def crlf
+    r, c = rc
+    go r+1, 0
+  end
+
+  def rc
+    [@win.cury, @win.curx]
+  end
+end

data/lib/rubytext.rb

@@ -1,247 +1,30 @@
 $LOAD_PATH << "lib"
 
 require 'curses'
-require 'version'   # skeleton + version
 
 X = Curses  # shorthand
 
-require 'output'
-require 'keys'
-require 'menu'
+require 'version'
 
+require 'output'       # RubyText, RubyText::Window, Kernel
+require 'keys'         # RubyText::Keys
+require 'menu'         # RubyText
+require 'window'       # RubyText::Window
+require 'navigation'   # RubyText::Window
+require 'settings'     # RubyText
 
-class RubyText::Window
-  attr_reader :fg, :bg
-
-  def self.colors(win, fg, bg)
-    cfg, cbg, cp = fb2cp(fg, bg)
-    X.init_pair(cp, cfg, cbg)
-    win.color_set(cp|X::A_NORMAL)
-  end
-
-  def self.colors!(win, fg, bg)
-    colors(win, fg, bg)
-    num = win.maxx * win.maxy
-    win.setpos(0, 0)
-    win.addstr(' '*num)
-    win.setpos(0, 0)
-    win.refresh
-  end
-
-  def self.main(fg: nil, bg: nil)
-    @main_win = X.init_screen
-    X.start_color
-    colors!(@main_win, fg, bg)
-    rows, cols = @main_win.maxy, @main_win.maxx
-    @screen = self.make(@main_win, rows, cols, 0, 0, false,
-                        fg: fg, bg: bg)
-# FIXME Why is this hard to inline?
-#     @win = @main_win
-#     obj = self.allocate
-#     obj.instance_eval do 
-#       @outer = @win = @main_win
-#       @wide, @high, @r0, @c0 = cols, rows, 0, 0
-#       @fg, @bg = fg, bg
-#       @border = false
-#       @rows, @cols = @high, @wide
-#       @width, @height = @cols + 2, @rows + 2 if @border
-#     end
-#     @win = @main_win  # FIXME?
-#     obj
-    @screen
-  end
-
-  def self.make(cwin, high, wide, r0, c0, border, fg: :white, bg: :black)
-    obj = self.allocate
-    obj.instance_eval do 
-      debug "  Inside instance_eval..."
-      @outer = @win = cwin
-      @wide, @high, @r0, @c0 = wide, high, r0, c0
-      @fg, @bg = fg, bg
-      @border = border
-      @rows, @cols = high, wide
-      @width, @height = @cols + 2, @rows + 2 if @border
-    end
-    obj
-  end
-
-  def fg=(sym)
-    self.colors(@win, fg, @bg)
-  end
-end
+# Skeleton... Can't put at top because of #initalize
 
 module RubyText
-  def self.set(*args)
-    # Allow a block?
-    standard = [:cbreak, :raw, :echo, :keypad]
-    @flags = []   # FIXME can set/reset individually. hmmm
-    args.each do |arg|
-      if standard.include? arg
-        flag = arg.to_s
-        @flags << arg
-        flag.sub!(/_/, "no")
-        X.send(flag)
-      else
-        @flags << arg
-        case arg
-          when :cursor
-            X.show_cursor
-          when :_cursor, :nocursor
-            X.hide_cursor
-        end
-      end
-    end
-  end
-
-  def save_flags
-    @fstack ||= []
-    @fstack.push @flags
-  end
-
-  def rest_flags
-    @flags = @fstack.pop
+  module Keys
   end
 
-  def self.start(*args, log: nil, fg: nil, bg: nil)
-    $debug = File.new(log, "w") if log
-    Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
-    $stdscr = STDSCR
-    fg, bg, cp = fb2cp(fg, bg)
-    self.set(:_echo, :cbreak, :raw)  # defaults
-#   X.stdscr.keypad(true)
-    self.set(*args)  # override defaults
-  end
-
-  # For passing through arbitrary method calls
-  # to the lower level...
-
-  def self.method_missing(name, *args)
-    debug "method_missing: #{name}  #{args.inspect}"
-    if name[0] == '_'
-      X.send(name[1..-1], *args)
-    else
-      raise "#{name} #{args.inspect}" # NoMethodError
-    end
-  end
-
-  def RubyText.window(high, wide, r0, c0, border=false, fg: nil, bg: nil)
-    RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
-  end
-
-  def self.hide_cursor
-    X.curs_set(0)
-  end
-
-  def self.show_cursor
-    X.curs_set(1)
-  end
-
-  def self.show_cursor!
-    X.curs_set(2)  # Doesn't work?
+  class Window
   end
 end
 
-class RubyText::Window
-  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
-
-  attr_reader :win, :rows, :cols, :width, :height
-  attr_writer :fg, :bg
-
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil)
-    debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
-    @wide, @high, @r0, @c0 = wide, high, r0, c0
-    @border, @fg, @bg      = border, fg, bg
-    @win = X::Window.new(high, wide, r0, c0)
-    debug "outer = #{@win.inspect}"
-    debug "@border = #@border"
-    debug "Calling 'colors': #{[@win, fg, bg]}"
-    RubyText::Window.colors!(@win, fg, bg)
-#   self.clear(@main_win)
-    if @border
-      @win.box(Vert, Horiz)
-      @outer = @win
-      @outer.refresh
-      debug "About to call again: params = #{[high-2, wide-2, r0+1, c0+1]}"
-      @win = X::Window.new(high-2, wide-2, r0+1, c0+1) # , false, fg, bg)  # relative now??
-      RubyText::Window.colors!(@win, fg, bg)
-    else
-      @outer = @win
-    end
-    @rows, @cols = @win.maxy, @win.maxx  # unnecessary really...
-    @width, @height = @cols + 2, @rows + 2 if @border
-    @win.refresh
+def import(meth, recv)
+  Kernel.module_eval do
+    define_method(meth) {|*args| recv.send(meth, *args) }
   end
-
-  def go(r, c)
-    save = self.rc
-    @win.setpos(r, c)
-    if block_given?
-      yield
-      go(*save)   # No block here!
-    end
-  end
-
-  def up(n=1)
-    r, c = rc
-    go r-n, c
-  end
-
-  def down(n=1)
-    r, c = rc
-    go r+n, c
-  end
-
-  def left(n=1)
-    r, c = rc
-    go r, c-n
-  end
-
-  def right(n=1)
-    r, c = rc
-    go r, c+n
-  end
-
-  def top
-    r, c = rc
-    go 0, c
-  end
-
-  def bottom 
-    r, c = rc
-    rmax = self.rows - 1
-    go rmax, c
-  end
-
-  def up!
-    top
-  end
-
-  def down!
-    bottom
-  end
-
-  def left!
-    r, c = rc
-    go r, 0
-  end
-
-  def right!
-    r, c = rc
-    cmax = self.cols - 1
-    go r, cmax
-  end
-
-  def home
-    go 0, 0
-  end
-
-  def crlf
-    r, c = rc
-    go r+1, 0
-  end
-
-  def rc
-    [@win.cury, @win.curx]
-  end
-
 end

data/lib/settings.rb

@@ -0,0 +1,71 @@
+module RubyText
+  def self.set(*args)
+    # Allow a block?
+    standard = [:cbreak, :raw, :echo, :keypad]
+    @flags = []   # FIXME can set/reset individually. hmmm
+    args.each do |arg|
+      if standard.include? arg
+        flag = arg.to_s
+        @flags << arg
+        flag.sub!(/_/, "no")
+        X.send(flag)
+      else
+        @flags << arg
+        case arg
+          when :cursor
+            X.show_cursor
+          when :_cursor, :nocursor
+            X.hide_cursor
+        end
+      end
+    end
+  end
+
+  def save_flags
+    @fstack ||= []
+    @fstack.push @flags
+  end
+
+  def rest_flags
+    @flags = @fstack.pop
+  end
+
+  def self.start(*args, log: nil, fg: nil, bg: nil)
+    $debug = File.new(log, "w") if log
+    Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
+    $stdscr = STDSCR
+    fg, bg, cp = fb2cp(fg, bg)
+    self.set(:_echo, :cbreak, :raw)  # defaults
+#   X.stdscr.keypad(true)
+    self.set(*args)  # override defaults
+  end
+
+  # For passing through arbitrary method calls
+  # to the lower level...
+
+  def self.method_missing(name, *args)
+    debug "method_missing: #{name}  #{args.inspect}"
+    if name[0] == '_'
+      X.send(name[1..-1], *args)
+    else
+      raise "#{name} #{args.inspect}" # NoMethodError
+    end
+  end
+
+  def RubyText.window(high, wide, r0, c0, border=false, fg: nil, bg: nil)
+    RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
+  end
+
+  def self.hide_cursor
+    X.curs_set(0)
+  end
+
+  def self.show_cursor
+    X.curs_set(1)
+  end
+
+  def self.show_cursor!
+    X.curs_set(2)  # Doesn't work?
+  end
+end
+

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/lib/window.rb

@@ -0,0 +1,91 @@
+class RubyText::Window
+  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
+
+  attr_reader :win, :rows, :cols, :width, :height
+  attr_writer :fg, :bg
+
+  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil)
+    debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
+    @wide, @high, @r0, @c0 = wide, high, r0, c0
+    @border, @fg, @bg      = border, fg, bg
+    @win = X::Window.new(high, wide, r0, c0)
+    debug "outer = #{@win.inspect}"
+    debug "@border = #@border"
+    debug "Calling 'colors': #{[@win, fg, bg]}"
+    RubyText::Window.colors!(@win, fg, bg)
+    if @border
+      @win.box(Vert, Horiz)
+      @outer = @win
+      @outer.refresh
+      debug "About to call again: params = #{[high-2, wide-2, r0+1, c0+1]}"
+      @win = X::Window.new(high-2, wide-2, r0+1, c0+1) # , false, fg, bg)  # relative now??
+      RubyText::Window.colors!(@win, fg, bg)
+    else
+      @outer = @win
+    end
+    @rows, @cols = @win.maxy, @win.maxx  # unnecessary really...
+    @width, @height = @cols + 2, @rows + 2 if @border
+    @win.refresh
+  end
+  def self.colors(win, fg, bg)
+    cfg, cbg, cp = fb2cp(fg, bg)
+    X.init_pair(cp, cfg, cbg)
+    win.color_set(cp|X::A_NORMAL)
+  end
+
+  def self.colors!(win, fg, bg)
+    colors(win, fg, bg)
+    num = win.maxx * win.maxy
+    win.setpos(0, 0)
+    win.addstr(' '*num)
+    win.setpos(0, 0)
+    win.refresh
+  end
+
+  def self.main(fg: nil, bg: nil)
+    @main_win = X.init_screen
+    X.start_color
+    colors!(@main_win, fg, bg)
+    rows, cols = @main_win.maxy, @main_win.maxx
+    @screen = self.make(@main_win, rows, cols, 0, 0, false,
+                        fg: fg, bg: bg)
+# FIXME Why is this hard to inline?
+#     @win = @main_win
+#     obj = self.allocate
+#     obj.instance_eval do 
+#       @outer = @win = @main_win
+#       @wide, @high, @r0, @c0 = cols, rows, 0, 0
+#       @fg, @bg = fg, bg
+#       @border = false
+#       @rows, @cols = @high, @wide
+#       @width, @height = @cols + 2, @rows + 2 if @border
+#     end
+#     @win = @main_win  # FIXME?
+#     obj
+    @screen
+  end
+
+  def self.make(cwin, high, wide, r0, c0, border, fg: :white, bg: :black)
+    obj = self.allocate
+    obj.instance_eval do 
+      debug "  Inside instance_eval..."
+      @outer = @win = cwin
+      @wide, @high, @r0, @c0 = wide, high, r0, c0
+      @fg, @bg = fg, bg
+      @border = border
+      @rows, @cols = high, wide
+      @width, @height = @cols + 2, @rows + 2 if @border
+    end
+    obj
+  end
+
+  def fg=(sym)
+    self.colors(@win, fg, @bg)
+  end
+
+  def self.wocka
+    STDSCR.puts "HELLO!!!!!!"
+    sleep 5
+  end
+end
+

data/rubytext.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "rubytext"
-  s.add_runtime_dependency 'curses'
+  s.add_runtime_dependency 'curses', ">= 1.2.5"
 
   # Files...
   main = Find.find("lib").to_a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.5
 description: Uses the curses gem and extends functionality and ease of use in Ruby.
 email: rubyhacker@gmail.com
 executables:
@@ -63,9 +63,12 @@ files:
 - examples/slides
 - lib/keys.rb
 - lib/menu.rb
+- lib/navigation.rb
 - lib/output.rb
 - lib/rubytext.rb
+- lib/settings.rb
 - lib/version.rb
+- lib/window.rb
 homepage: https://github.com/Hal9000/rubytext
 licenses:
 - Ruby License