rubytext 0.0.89 → 0.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d6049a03577c6aa5919abd27092093e46a57484285f3a79f49c01465d86fce
-  data.tar.gz: 51acb3997e4112519f88247d13e42c3857d3213ea16101696a3437aa5dc5f016
+  metadata.gz: 421ecdc77007b4ff06944a75582f99576d0600a535286241d3bfa6e7e22f9880
+  data.tar.gz: ee7e7d097b20c55accceb97cc86b9a7ec9c461e9a96c32478d2faecf9c841e9d
 SHA512:
-  metadata.gz: 2b3c8b90adfafc39d23bf4f14fe6c3251c725b38a8c63dadcd7f42f245977efae6b02801d3cec43becea64be1c554fe6187d6e1602c4498442e846846be33435
-  data.tar.gz: ca0598628940b1681e04ad820ea6b42d0142098dece9e1852f9c1bba9eea97b27cc3c14ac53deb4d8c2b7981b8aa8c3de9eb5d3e7ddd97eff9e09111dc1977c3
+  metadata.gz: fd36f540b28317f4c7d745033d043f9a906371b95a9add8609a1affbf285b8f6f99c78f39db2c4db4967a494e64741c0a3b1a0abb390e3a037484e549e403447
+  data.tar.gz: 07fd65a3d3fa0ce4ba9ef77ab5904c19f07fe7a710ee0b05db2c038803e6ed9e581ce9fd11cd0f66cc87be3f258ab3de9c074d16842fb444af847f31af9c6318

data/README.md

@@ -355,7 +355,7 @@ puts "Press any key to display the menu..."
 getch
 
 days = %w[Monday Tuesday Wednesday Thursday Friday]
-num, day = RubyText.menu(c: 30, items: days)
+num, day = STDSCR.menu(c: 30, items: days)
 
 puts
 if day.nil?

data/examples/{prog08.rb → brack_equal.rb}

@@ -4,11 +4,6 @@ win.puts "We can use the []= method (0-based)"
 win.puts "to address individual window locations"
 win.puts "and place characters there.\n "
 
-sleep 2
-win[4,22] = "X"; win.refresh
-
-sleep 2
-win[8,20] = "y"; win.refresh
-
-sleep 2
-win[6,38] = "Z"; win.refresh
+sleep 1; win[4,22] = "X"; win.refresh
+sleep 1; win[8,20] = "y"; win.refresh
+sleep 1; win[6,38] = "Z"; win.refresh

data/examples/duh

@@ -0,0 +1,26 @@
+brack_equal.rb
+simple_menu.rb
+win_centering.rb
+putch.rb
+sym_navigate.rb
+effects2.rb
+effects.rb
+center_meth.rb
+topbottom.rb
+udlr_bang.rb
+updown_etc.rb
+home_etc.rb
+rcprint.rb
+go_meth.rb
+detect_rc.rb
+hmmm.rb
+stdscr.rb
+brackets.rb
+stdout_etc.rb
+puts_print.rb
+window_full.rb
+no_scroll.rb
+no_border.rb
+output_meth.rb
+simple_win.rb
+ticker_threads.rb

data/examples/fixme.rb

@@ -0,0 +1,16 @@
+
+files = Dir["**"].select {|x| x =~ /prog.*rb/ }
+
+files.each do |file|
+  system "tput clear"
+  system "head -n 20 #{file}"
+  puts "\n\n "
+  print "New name = "
+  name = gets.chomp
+  break if name.empty?
+  str = "mv #{file} #{name}.rb"
+  puts str
+  system str
+  puts "\nEnter to continue..."
+  gets
+end

data/examples/ide.rb

@@ -40,7 +40,7 @@ end
 
 loop do
   show
-  n, str = RubyText.menu(r: 10, c: 5, items: items)
+  n, str = STDSCR.menu(r: 10, c: 5, items: items)
 puts n.inspect
   case n
     when 0; system("vi #{@lib}")

data/examples/{prog04.rb → no_scroll.rb}

@@ -4,4 +4,4 @@ win.puts "If your text is longer than " +
          "the width of the window, by default it will " +
          "wrap around."
 
-win.puts "Scrolling is not yet supported."
+win.puts "Scrolling is OFF by default."

data/examples/{prog21.rb → simple_menu.rb}

@@ -7,7 +7,7 @@ win.puts
 getch
 
 days = %w[Monday Tuesday Wednesday Thursday Friday]
-num, day = RubyText.menu(win: win, r: 1, c: 5, title: "Which day?", items: days)
+num, day = win.menu(r: 1, c: 5, title: "Which day?", items: days)
 
 puts
 if day.nil?

data/examples/slides

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+def showme(name, up="", mode="pause")
+  system("ruby showme.rb #{name}.rb #{mode} #{up}")
+end
+
 mylib = `gem which rubytext`.chomp
 examples = mylib.sub(%r[/lib/rubytext.rb], "/examples")
 
@@ -8,32 +12,29 @@ Dir.chdir(examples)
 rc = system("ruby check.rb")
 exit unless rc
 
-# FIXME later:
-#   - use names instead of numbers?
-#   - convert showme into a method?
 
-system("ruby showme.rb prog01.rb")
-system("ruby showme.rb prog02.rb pause")
-system("ruby showme.rb prog03.rb pause")
-system("ruby showme.rb prog04.rb pause")
-system("ruby showme.rb prog05.rb pause")
-system("ruby showme.rb prog06.rb pause")
-system("ruby showme.rb prog07.rb pause")
-system("ruby showme.rb prog08.rb pause")
-system("ruby showme.rb prog09.rb pause")
-system("ruby showme.rb prog10.rb pause")
-system("ruby showme.rb prog12.rb pause")
-system("ruby showme.rb prog13.rb pause")
-system("ruby showme.rb prog14.rb pause")
-system("ruby showme.rb prog15.rb pause")
-system("ruby showme.rb prog16.rb pause")
-system("ruby showme.rb prog17.rb pause")
-system("ruby showme.rb prog18.rb pause")
-system("ruby showme.rb prog19.rb pause")
-system("ruby showme.rb prog20.rb pause")
-system("ruby showme.rb prog21.rb pause")
-system("ruby showme.rb prog22.rb pause 11")
-system("ruby showme.rb prog23.rb pause")
-system("ruby showme.rb prog24.rb pause")
-system("ruby showme.rb prog25.rb pause")
+  showme("simple_win")
+  showme("stdscr")
+  showme("stdout_etc")
+  showme("detect_rc")
+  showme("brackets")
+  showme("brack_equal")
+  showme("puts_print")
+  showme("output_meth")
+  showme("win_centering")
+  showme("putch")
+  showme("sym_navigate")
+  showme("effects")
+  showme("center_meth")
+  showme("topbottom")
+  showme("udlr_bang")
+  showme("updown_etc")
+  showme("home_udlr")
+  showme("rcprint")
+  showme("go_meth")
+  showme("no_border")
+  showme("no_scroll")
+  showme("window_full")
+  showme("ticker_threads", 11)
+  showme("simple_menu")
 

data/lib/color.rb

@@ -6,7 +6,7 @@ Black, Blue, Cyan, Green, Magenta, Red, White, Yellow =
 Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
 
 class RubyText::Color
-  Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
+  Colors = ::Colors
 
   def self.sym2const(color)   # to curses constant
     X.const_get("COLOR_#{color.to_s.upcase}")
@@ -17,8 +17,7 @@ class RubyText::Color
   end
 
   def self.pair(fg, bg)
-    nf = index(fg)
-    nb = index(bg)
+    nf, nb = index(fg), index(bg)
     num = 8*nf + nb
     X.init_pair(num, sym2const(fg), sym2const(bg))
     num
@@ -27,9 +26,6 @@ end
 
 class RubyText::Window
   def self.colorize!(cwin, fg, bg)
-    File.open("/tmp/cize.out", "w") do |f|
-      f.puts "colorize: fg, bg = #{[fg, bg].inspect}"
-    end
     cp = RubyText::Color.pair(fg, bg)
     cwin.color_set(cp)
     num = cwin.maxx * cwin.maxy
@@ -37,7 +33,6 @@ class RubyText::Window
     cwin.addstr(' '*num)
     cwin.setpos 0,0
     cwin.refresh
-    debug "returning from colorize! call"
   rescue => err
     File.open("/tmp/#{__method__}.out", "w") do |f|
       f.puts err

data/lib/effects.rb

@@ -1,5 +1,4 @@
 
-
 def fx(str, *args, bg: nil)
   eff = RubyText::Effects.new(*args, bg: bg)
   str.define_singleton_method(:effect) { eff } 
@@ -45,7 +44,6 @@ class RubyText::Effects   # dumb name?
   def reset(win)
     attr = self.value
     win.cwin.attroff(attr)
-    win.set_colors(@old_fg, @old_bg)
+    win.set_colors(@old_fg, @old_bg)  # Does restore logic work?
   end
 end
-

data/lib/menu.rb

@@ -1,58 +1,59 @@
 module RubyText
 
-  def self.menu(win: STDSCR, r: :center, c: :center, items:, curr: 0,
-                title: nil, fg: White, bg: Blue)
-    RubyText.hide_cursor
-    high = items.size + 2
-    wide = items.map(&:length).max + 4
-    tlen = title.length + 8  
-    wide = [wide, tlen].max
-    r, c = win.coords(r, c)
-    win.saveback(high, wide, r, c)
-    mr, mc = r+win.r0, c+win.c0
-    debug "menu: rc = #{[r,c].inspect} win r0c0 = #{[win.r0, win.c0].inspect}"
-#   debug "   and mr,mc = #{[mr,mc].inspect}"
-    mwin = RubyText.window(high, wide, r: mr, c: mc, 
-                           fg: fg, bg: bg)
-
-    where = win == STDSCR ? [r, c+1] : [r-1, c+1]  # wtf?
+  class Window
+    def menu(r: :center, c: :center, items:, curr: 0,
+             title: nil, fg: White, bg: Blue)
+      RubyText.hide_cursor
+      high = items.size + 2
+      wide = items.map(&:length).max + 5
+      tlen = title.length + 8 rescue 0
+      wide = [wide, tlen].max
+      row, col = self.coords(r, c)
+      row = row - high/2 if r == :center
+      col = col - wide/2 if c == :center
+      r, c = row, col
+      self.saveback(high, wide, r, c)
+      mr, mc = r+self.r0, c+self.c0
+      mwin = RubyText.window(high, wide, r: mr, c: mc, 
+                             fg: fg, bg: bg)
 
-    unless title.nil?
-      win.go(*where) do   # same row as corner but farther right
-        win.print fx("[ #{title} ]", :bold, fg, bg: bg)
+      where = self == STDSCR ? [r, c+1] : [r-1, c+1]  # wtf?
+      unless title.nil?
+        self.go(*where) do   # same row as corner but farther right
+          self.print fx("[ #{title} ]", :bold, fg, bg: bg)
+        end
       end
-    end
 
-    X.stdscr.keypad(true)
-    sel = curr
-    max = items.size - 1
-    norm = RubyText::Effects.new(:normal)
-    rev = RubyText::Effects.new(:reverse)
-    loop do
-      RubyText.hide_cursor  # FIXME should be unnecessary
-      items.each.with_index do |item, row|
-        mwin.go row, 0
-        style = (sel == row) ? :reverse : :normal
-        label = (" "*3 + item + " "*8)[0..wide-1]
-        mwin.print fx(label, style)
+      X.stdscr.keypad(true)
+      sel = curr
+      max = items.size - 1
+      loop do
+        RubyText.hide_cursor  # FIXME should be unnecessary
+        items.each.with_index do |item, row|
+          mwin.go row, 0
+          style = (sel == row) ? :reverse : :normal
+          label = (" "*2 + item + " "*8)[0..wide-1]
+          mwin.print fx(label, style)
+        end
+        ch = getch
+        case ch
+          when X::KEY_UP
+            sel -= 1 if sel > 0
+          when X::KEY_DOWN
+            sel += 1 if sel < max
+          when 27
+            self.restback(high, wide, r, c)
+            RubyText.show_cursor
+            return [nil, nil]
+          when 10
+            self.restback(high, wide, r, c)
+            RubyText.show_cursor
+            return [sel, items[sel]]
+        end
+        RubyText.show_cursor
       end
-      ch = getch
-      case ch
-        when X::KEY_UP
-          sel -= 1 if sel > 0
-        when X::KEY_DOWN
-          sel += 1 if sel < max
-        when 27
-          win.restback(high, wide, r, c)
-          RubyText.show_cursor
-          return [nil, nil]
-        when 10
-          win.restback(high, wide, r, c)
-          RubyText.show_cursor
-          return [sel, items[sel]]
-      end
-      RubyText.show_cursor
     end
+
   end
 
   def self.selector(win: STDSCR, r: 0, c: 0, rows: 10, cols: 20, 
@@ -64,8 +65,6 @@ module RubyText
     handler = callback
     X.stdscr.keypad(true)
     RubyText.hide_cursor
-    norm = RubyText::Effects.new(:normal)
-    rev  = RubyText::Effects.new(:reverse)
     sel = 0
     max = items.size - 1
     handler.call(sel, items[sel], win2)

data/lib/navigation.rb

@@ -31,10 +31,10 @@ class RubyText::Window
   def go(r0, c0)
     r, c = coords(r0, c0)
     save = self.rc
-    goto(r, c)
+    goto r, c 
     if block_given?
       yield 
-      goto(*save)
+      goto *save
     end
   end
 

data/lib/output.rb

@@ -19,25 +19,18 @@ class RubyText::Window
     args = [""] if args.empty?
     args += ["\n"] if sym == :puts
     set_colors(@fg, @bg)
-#   debug "  set colors: #{[@fg, @bg].inspect}"
-    if sym == :p
-      args.map! {|x| effect?(x) ? x : x.inspect }
-    else
-      args.map! {|x| effect?(x) ? x : x.to_s }
-    end
+    meth = sym == :p ? :inspect : :to_s
+    args.map! {|x| effect?(x) ? x : x.send(meth) }
     args.each do |arg|  
       if arg.is_a?(RubyText::Effects)
         arg.set(self)
-      elsif arg.respond_to? :effect
-        arg.effect.set(self)
-        arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
-        @cwin.refresh
       else
+        arg.effect.set(self) if arg.respond_to? :effect
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
         @cwin.refresh
       end
     end
-    crlf if sym == :p
+    crlf if sym == :p   # no implicit newline
     set_colors(@fg, @bg)
     @cwin.refresh
   end
@@ -79,7 +72,6 @@ class RubyText::Window
         fx.set(self) if fx
         val = fx.value rescue 0
         @cwin.addch(ch.ord|val)
-        # @cwin.addch(ch)
       end
       fx.reset(self) if fx
     end
@@ -104,7 +96,7 @@ class RubyText::Window
     end
   end
 
-  def self.clear(win)
+  def self.clear(win)   # delete this?
     num = win.maxx * win.maxy
     win.setpos(0, 0)
     win.addstr(' '*num)
@@ -113,11 +105,8 @@ class RubyText::Window
   end
 
   def clear
-    num = self.rows * self.cols
     self.home
-    self.rows.times { @cwin.addstr(' '*self.cols); @cwin.refresh }
-    self.home
-    @cwin.refresh
+    self.scroll self.rows
   end
 
   def output(&block)
@@ -136,6 +125,7 @@ class RubyText::Window
   def []=(r, c, char)
     @cwin.setpos(r, c)
     @cwin.addch(char[0].ord|X::A_NORMAL)
+    @cwin.setpos(r, c)
     @cwin.refresh
   end
 
@@ -155,7 +145,6 @@ class RubyText::Window
     r0, c0 = self.rc
     loop do
       ch = self.getch
-      debug "gets: found #{ch.inspect}; cursor at #{self.rc.inspect}"
       case ch
         when 10  # Enter
           self.crlf
@@ -175,7 +164,6 @@ class RubyText::Window
             i += 1
             self.right
         else
-          debug "  case 3 (#{ch.inspect})"
           str.insert(i, ch)
           self.right
           self.go(r0, c0) { self.print str }
@@ -187,8 +175,6 @@ class RubyText::Window
 
 end
 
-# into top level...
-
 module WindowIO
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
     recv = RubyText.started ? $stdscr : Kernel

data/lib/rubytext.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << "lib"
 
 require 'curses'
 
-X = Curses  # shorthand
+X = Curses  # shorthand. klunky I know
 
 module RubyText
 end
@@ -33,6 +33,8 @@ end
 
 at_exit { RubyText.stop }
 
+# FIXME lots of changes to make here...
+
 def import(meth, recv)
   Kernel.module_eval do
     define_method(meth) {|*args| recv.send(meth, *args) }

data/lib/settings.rb

@@ -1,7 +1,8 @@
 module RubyText
-  # Hmm, all these are module-level.
+  # Hmm, all these are module-level...?
 
-  ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak, :keypad, :_keypad]
+  ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak, 
+               :keypad, :_keypad, :cursor, :_cursor]
 
   def self.started
     @started

data/lib/version.rb

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

data/lib/window.rb

@@ -84,7 +84,7 @@ class RubyText::Window
     @cwin.refresh
   end
 
-  def screen_text(file = nil)
+  def screen_text(file = nil)   # rename?
     lines = []
     0.upto(self.rows-1) do |r|
       line = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.90
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -41,39 +41,40 @@ files:
 - "./rubytext.gemspec"
 - bin/rubytext
 - examples/README
+- examples/brack_equal.rb
+- examples/brackets.rb
+- examples/center_meth.rb
 - examples/check.rb
 - examples/crap.rb
 - examples/demo.rb
+- examples/detect_rc.rb
+- examples/duh
+- examples/effects.rb
+- examples/fixme.rb
+- examples/go_meth.rb
+- examples/hmmm.rb
+- examples/home_udlr.rb
 - examples/ide.rb
 - examples/multitest.rb
-- examples/prog01.rb
-- examples/prog02.rb
-- examples/prog03.rb
-- examples/prog04.rb
-- examples/prog05.rb
-- examples/prog06.rb
-- examples/prog07.rb
-- examples/prog08.rb
-- examples/prog09.rb
-- examples/prog10.rb
-- examples/prog11.rb
-- examples/prog12.rb
-- examples/prog13.rb
-- examples/prog14.rb
-- examples/prog15.rb
-- examples/prog16.rb
-- examples/prog17.rb
-- examples/prog18.rb
-- examples/prog19.rb
-- examples/prog20.rb
-- examples/prog20a.rb
-- examples/prog21.rb
-- examples/prog22.rb
-- examples/prog23.rb
-- examples/prog24.rb
-- examples/prog25.rb
+- examples/no_border.rb
+- examples/no_scroll.rb
+- examples/output_meth.rb
+- examples/putch.rb
+- examples/puts_print.rb
+- examples/rcprint.rb
 - examples/showme.rb
+- examples/simple_menu.rb
+- examples/simple_win.rb
 - examples/slides
+- examples/stdout_etc.rb
+- examples/stdscr.rb
+- examples/sym_navigate.rb
+- examples/ticker_threads.rb
+- examples/topbottom.rb
+- examples/udlr_bang.rb
+- examples/updown_etc.rb
+- examples/win_centering.rb
+- examples/window_full.rb
 - lib/color.rb
 - lib/effects.rb
 - lib/keys.rb

data/examples/prog20.rb

@@ -1,18 +0,0 @@
-def effect(*args) # find better way
-  RubyText::Effects.new(*args)
-end
-
-fg, bg = White, Blue
-win = RubyText.window(9, 65, r: 2, c: 26, fg: fg, bg: bg)
-
-win.puts "This is EXPERIMENTAL (and BUGGY)."
-win.puts "Use an \"effect\" to change the text color or \"look\":"
-
-win.puts "This is", effect(Yellow), " another color ", 
-          effect(White), "and yet another."
-win.puts "We can ", effect(:bold), "boldface ",
-         "and ", effect(:reverse), "reverse ",
-         "and ", effect(:under), "underline ",
-         effect(:normal), "text at will.\n "
-win.puts "This is ", effect(:bold, Red), "bold red ", 
-         effect(:normal, fg), "and this is normal again.\n "