rubytext 0.0.68 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f3ff5611efd4871e31da6cbf2fc7131f5fdd546e651362449e4be0f91e4a5a
-  data.tar.gz: ae5fae35dca133795f63db64798ea6afb379feb18d3672c90f088ea55900b89b
+  metadata.gz: 05ecb544b4d51313454758aa89eeb5997ced7b0cc8c8dc5e5609c842957d9aea
+  data.tar.gz: 943e529d5da7f1eba8826e4702e6dd9c12fe644664012af610796805f419b21b
 SHA512:
-  metadata.gz: 108d7bb54f633c16b0c3d66e6d13d8ce8bee681a81fdba7567d5c26a2e98e25cd9b8b49aa54aba0def9c9b29f4e7312af7c00076fd0d71dcf2b8bc789eb85f21
-  data.tar.gz: 102b62ce8a5ba35cdced7c93ff52ff9b15d41e9b6f854055255747c7300e79b75198327cd6d069c8df1a296e60ab267550b88528db9ae34a50826ca5541cbfc4
+  metadata.gz: 06273a824f50b4248fdddda9e72d2c967a42e56a04edbece55af9a0c9a4e80cc45e8c96ad5dc588a277f8d7619e4b2a3b2386f5f6ff9a8844138f1bbd1198c0c
+  data.tar.gz: 3360acf134a66130a6e9aaa373b6ac951af363ff01dcffdea667aa931c2e7d2cf5767b42b626b51370de30d9ab9de1b5d6285803b0193960c293fe7b443ff552

data/examples/prog01.rb

@@ -1,5 +1,4 @@
-win = RubyText.window(6, 25, 2, 34, 
-                      # 6 rows, 25 cols; upper left at 2,4
-                      fg: Blue, bg: White) # foreground, background
+win = RubyText.window(6, 25, 10, 34,        # 6 rows, 25 cols; corner @ 10,34
+                      fg: Blue, bg: White)  # foreground, background colors
 
 win.puts "This is a window..."

data/examples/prog02.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(9, 36, 2, 6, fg: White, bg: Red) 
+win = RubyText.window(9, 36, 5, 11, fg: White, bg: Red) 
 
 win.output do
   puts "Because this code uses #output,"

data/examples/prog03.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(9, 35, 3, 7, border: false, fg: Black, bg: Green)
+win = RubyText.window(9, 35, 6, 12, border: false, fg: Black, bg: Green)
 
 win.puts "A window doesn't have to"
 win.puts "have a border."

data/examples/prog04.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(8, 39, 4, 9, fg: Black, bg: Blue)
+win = RubyText.window(8, 39, 7, 14, fg: Black, bg: Blue)
 
 win.puts "If your text is longer than " +
          "the width of the window, by default it will " +

data/examples/prog05.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 70, 2, 14, fg: Yellow, bg: Black)
+win = RubyText.window(10, 70, 4, 14, fg: Yellow, bg: Black)
 
 win.output do
   puts "Without scrolling, this is what happens when your window fills up..."

data/examples/prog06.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 60, 2, 14, fg: Blue, bg: Black)
+win = RubyText.window(10, 60, 3, 14, fg: Blue, bg: Black)
 
 win.output do
   puts "The #print and #p methods also act as you expect."

data/examples/prog07.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 50, 0, 5, fg: Yellow, bg: Blue)
+win = RubyText.window(10, 50, 2, 15, fg: Yellow, bg: Blue)
 
 win.output do
   puts "Of course, #puts and #print are unaffected \nfor other receivers."

data/examples/prog08.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 50, 0, 5, fg: Yellow, bg: Blue)
+win = RubyText.window(11, 50, 2, 15, fg: Yellow, bg: Blue)
 
 win.puts "We can use the []= method (0-based)"
 win.puts "to address individual window locations"

data/examples/prog09.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(12, 60, 2, 5, fg: Yellow, bg: Blue)
+win = RubyText.window(12, 60, 3, 10, fg: Yellow, bg: Blue)
 
 win.puts "ABCDE    Method [] can retrieve characters "
 win.puts "FGHIJ    from a window."

data/examples/prog10.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(6, 30, 2, 5, fg: Yellow, bg: Blue)
+win = RubyText.window(6, 30, 4, 13, fg: Yellow, bg: Blue)
 
 win.puts "You can write to a window..."
 

data/examples/prog12.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(12, 65, 1, 5, fg: Yellow, bg: Blue)
+win = RubyText.window(12, 65, 2, 11, fg: Yellow, bg: Blue)
 
 win.output do
   puts "You can detect the size and cursor position of any window."

data/examples/prog13.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 0, 15, fg: Blue, bg: Black)
+win = RubyText.window(11, 65, 2, 15, fg: Blue, bg: Black)
 
 win.puts "The #go method will move the cursor to a specific location."
 win.go 2, 5

data/examples/prog14.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(13, 65, 0, 6, fg: Blue, bg: White)
+win = RubyText.window(13, 65, 2, 14, fg: Blue, bg: White)
 
 win.puts "The #rcprint method will print at the specified"
 win.puts "row/column, like go(r,c) followed by a print,"

data/examples/prog15.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 0, 6, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 2, 14, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "   Method #home will home the cursor..."

data/examples/prog16.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 4, 14, fg: Blue, bg: White)
 
 win.puts "Methods up/down/left/right can also take an integer..."
 

data/examples/prog17.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 3, 14, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "We also have: up!, down!, left!, and right! which can" 

data/examples/prog18.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 4, 14, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "#top and #bottom are the same as #up! and #down!"

data/examples/prog19.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(15, 65, 1, 6, fg: Green, bg: Blue)
+win = RubyText.window(15, 65, 2, 14, fg: Green, bg: Blue)
 
 win.puts "#center will print text centered on the current row"
 win.puts "and do an implicit CRLF at the end.\n "

data/examples/prog20.rb

@@ -1,13 +1,15 @@
-win = RubyText.window(12, 65, 0, 6, fg: Green, bg: Blue)
+def fx(*args) # find better way
+  RubyText::Effects.new(*args)
+end
 
-win.puts "This is EXPERIMENTAL."
-win.puts "Use a color symbol to change text color temporarily:\n "
-
-win.puts "This is", :yellow, " another color", :white, " and yet another."
-win.puts "And this is normal again.\n "
+win = RubyText.window(9, 65, 2, 26, fg: Green, bg: Blue)
+fg, bg = Green, Blue
 
-win.puts "This does mean that you can't print a symbol that is"
-win.puts "also a color name... you'd need a workaround.\n "
+win.puts "This is EXPERIMENTAL."
+win.puts "Use an \"effect\" to change the color or \"look\""
+win.puts "of the text (temporarily):\n "
 
-sym = :red
-win.puts "The symbol is ", sym.inspect, " which works", sym, " just fine."
+win.puts "This is", fx(win, Yellow), " another color ", 
+          fx(win, White), "and yet another."
+win.puts "This is ", fx(win, :bold, Red), "bold red ", 
+         fx(win, :normal, fg), "and this is normal again.\n "

data/lib/color.rb

@@ -1,13 +1,4 @@
 
-def fb2cp(fg, bg)
-  fg ||= Blue
-  bg ||= White
-  f2 = X.const_get("COLOR_#{fg.upcase}")
-  b2 = X.const_get("COLOR_#{bg.upcase}")
-  cp = $ColorPairs[[fg, bg]]
-  [f2, b2, cp]
-end
-
 # Colors are 'global' for now
 Black, Blue, Cyan, Green, Magenta, Red, White, Yellow = 
   :black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
@@ -26,7 +17,15 @@ class RubyText::Color
   end
 
   def self.pair(fg, bg)
-    num = 8*index(fg) + index(bg)
+    nf = index(fg)
+    nb = index(bg)
+    File.open("/tmp/pair.out", "w") do |f| 
+      f.puts "fg, bg = #{[fg, bg].inspect}" 
+      f.puts "Colors = #{Colors.inspect}"
+      f.puts "index fg = #{nf.inspect}"
+      f.puts "index bg = #{nb.inspect}"
+    end
+    num = 8*nf + nb
     X.init_pair(num, sym2const(fg), sym2const(bg))
     num
   end
@@ -34,6 +33,9 @@ end
 
 class RubyText::Window
   def self.colorize!(win, 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)
     win.color_set(cp)
     num = win.maxx * win.maxy
@@ -41,6 +43,11 @@ class RubyText::Window
     win.addstr(' '*num)
     win.setpos 0,0
     win.refresh
+  rescue => err
+    File.open("/tmp/#{__method__}.out", "w") do |f|
+      f.puts err
+      f.puts err.backtrace
+    end
   end
 
   def set_colors(fg, bg)
@@ -57,11 +64,11 @@ class RubyText::Window
   end
 
   def fg=(sym)
-    set_colors(fg, @bg)
+    set_colors(sym, @bg)
   end
 
   def bg=(sym)
-    set_colors(@fg, bg)
+    set_colors(@fg, sym)
   end
 end
 

data/lib/effects.rb

@@ -1,17 +1,21 @@
 class RubyText::Effects   # dumb name?
-  Modes = %w[A_BOLD A_NORMAL A_PROTECT A_REVERSE A_STANDOUT A_UNDERLINE]
+  Modes  = {bold:    X::A_BOLD,
+            normal:  X:: A_NORMAL,
+            reverse: X:: A_REVERSE, 
+            under:   X:: A_UNDERLINE}
 
-  attr_reader :value
+  Others = %[:show, :hide]  # show/hide cursor; more later??
+
+  attr_reader :value, :fg
   
-  def initialize(bg, *args)
+  def initialize(win, *args)
     bits = 0
     args.each do |arg|
-      if Modes.include?(arg)
-        val = eval("X::A_#{arg.to_s.upcase}")
-        bits ||= val
-      elsif RubyText::Colors.include?(arg)
-        val = eval("X::COLOR_#{arg.to_s.upcase}")
+      if Modes.keys.include?(arg)
+        val = Modes[arg]
         bits ||= val
+      elsif ::Colors.include?(arg)
+        @fg = arg   # symbol
       end
     end
     @value = bits

data/lib/menu.rb

@@ -30,11 +30,13 @@ module RubyText
     RubyText.hide_cursor
     sel = curr
     max = items.size - 1
+    norm = RubyText::Effects.new(win, :normal, White)
+    bold = RubyText::Effects.new(win, :bold, Yellow)
     loop do
       items.each.with_index do |item, row|
         win.go row, 0
-        color = sel == row ? Yellow : White
-        win.puts color, " #{item} "
+        style = (sel == row) ? bold : norm
+        win.print style, " #{item} "
       end
       ch = getch
       case ch
@@ -69,8 +71,10 @@ module RubyText
     loop do
       items.each.with_index do |item, row|
         menu_win.go row, 0
-        color = sel == row ? Yellow : White
-        menu_win.puts color, " #{item} "
+        norm = RubyText::Effects.new(:normal, White)
+        rev  = RubyText::Effects.new(:reverse, White)
+        style = sel == row ? Yellow : White
+        menu_win.puts style, " #{item} "
       end
       ch = getch
       case ch

data/lib/output.rb

@@ -15,9 +15,8 @@ class RubyText::Window
 
 # FIXME Please refactor the Hal out of this.
 
-  def special?(arg)
-     RubyText::Color::Colors.include?(arg) || 
-       arg.is_a?(RubyText::Effects)
+  def effect?(arg)
+    arg.is_a?(RubyText::Effects)
   end
 
   def delegate_output(sym, *args)
@@ -27,14 +26,13 @@ class RubyText::Window
     if sym == :p
       args.map!(&:inspect) 
     else
-      args.map! {|x| special?(x) ? x : x.to_s }
+      args.map! {|x| effect?(x) ? x : x.to_s }
     end
     args.each do |arg|  
     case
-      when arg.is_a?(Symbol) # must be a color
-        set_colors(arg, @bg)  # FIXME?
       when arg.is_a?(RubyText::Effects)
         X.attrset(arg.value)
+        self.set_colors(arg.fg, @bg) if arg.fg
       else
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
       end
@@ -129,6 +127,7 @@ end
 
 # into top level...
 
+module WindowIO
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
     $stdscr.puts(*args)
   end
@@ -148,4 +147,5 @@ end
   def getch
     X.getch
   end
+end
 

data/lib/rubytext.rb

@@ -7,8 +7,6 @@ X = Curses  # shorthand
 module RubyText
 end
 
-$debug = File.new("wtf.out", "w")
-
 require 'version'
 require 'output'       # RubyText, RubyText::Window, Kernel
 require 'keys'         # RubyText::Keys
@@ -46,7 +44,8 @@ def make_exception(sym, str)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
     msg = str
-    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
+    list = (args + [nil]*2)[0..2]
+    list.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
     Object.class_eval(sym.to_s).new(msg)
   end
 end
@@ -54,7 +53,7 @@ end
 make_exception(:RTError, "General error: $1 $2 $3")
 
 def debug(*args)
-  return unless $debug
   $debug.puts *args
+  $debug.flush
 end
 

data/lib/settings.rb

@@ -40,7 +40,7 @@ module RubyText
           when :_cursor, :nocursor
             X.curs_set(0)
           else 
-            self.stop
+            # self.stop
             rest_flags  # prevent propagating error in test
             raise RTError("flag = #{flag.inspect}")
         end
@@ -70,18 +70,18 @@ module RubyText
     @flags = @defaults
   end
 
-  def self.start(*args, log: nil, fg: nil, bg: nil, scroll: false)
+  def self.start(*args, log: nil, fg: White, bg: Blue, scroll: false)
     $debug ||= File.new(log, "w") if log
     main = RubyText::Window.main(fg: fg, bg: bg, scroll: scroll)
-    Object.const_set(:STDSCR, main)
+    Object.const_set(:STDSCR, main) unless defined? STDSCR
     $stdscr = STDSCR
-    fg, bg, cp = fb2cp(fg, bg)
+    Object.include(WindowIO)
     self.set(:_echo, :cbreak)  # defaults
     self.set(*args)  # override defaults
   rescue => err
     debug(err.inspect)
     debug(err.backtrace)
-    # raise RTError("#{err}")
+    raise RTError("#{err}")
   end
 
   def self.stop
@@ -100,7 +100,7 @@ module RubyText
     end
   end
 
-  def self.window(high, wide, r0, c0, border: true, fg: nil, bg: nil, scroll: false)
+  def self.window(high, wide, r0, c0, border: true, fg: White, bg: Blue, scroll: false)
     RubyText::Window.new(high, wide, r0, c0, border, fg, bg, scroll)
   end
 

data/lib/version.rb

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

data/lib/window.rb

@@ -6,7 +6,7 @@ class RubyText::Window
 
   # Better to use Window.window IRL
 
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil, scroll=false)
+  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=White, bg=Blue, scroll=false)
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
     @cwin = X::Window.new(high, wide, r0, c0)
@@ -27,7 +27,7 @@ class RubyText::Window
     @cwin.refresh
   end
 
-  def self.main(fg: nil, bg: nil, scroll: false)
+  def self.main(fg: White, bg: Blue, scroll: false)
     main_win = X.init_screen
     X.start_color
     self.colorize!(main_win, fg, bg)
@@ -91,4 +91,12 @@ class RubyText::Window
     File.open(file, "w") {|f| f.puts lines }  if file
     lines
   end
+
+  def fg=(sym)
+    set_colors(fg, @bg)
+  end
+
+  def bg=(sym)
+    set_colors(@fg, bg)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -69,7 +69,6 @@ files:
 - examples/prog22.rb
 - examples/showme.rb
 - examples/slides
-- lib/_window.rb
 - lib/color.rb
 - lib/effects.rb
 - lib/keys.rb

data/lib/_window.rb

@@ -1,92 +0,0 @@
-class RubyText::Window
-  Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
-
-  attr_reader :cwin, :rows, :cols, :width, :height, :scrolling
-  attr_writer :fg, :bg
-
-  # Better to use Window.window IRL
-
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil, scroll=false)
-    @wide, @high, @r0, @c0 = wide, high, r0, c0
-    @border, @fg, @bg      = border, fg, bg
-    @cwin = X::Window.new(high, wide, r0, c0)
-    RubyText::Window.colorize!(@cwin, fg, bg)
-    if @border
-      @cwin.box(Vert, Horiz)
-      @outer = @cwin
-      @outer.refresh
-      @cwin = X::Window.new(high-2, wide-2, r0+1, c0+1)
-      RubyText::Window.colorize!(@cwin, fg, bg)
-    else
-      @outer = @cwin
-    end
-    @rows, @cols = @cwin.maxy, @cwin.maxx  # unnecessary really...
-    @width, @height = @cols + 2, @rows + 2 if @border
-    @scrolling = scroll
-    @cwin.scrollok(scroll) 
-    @cwin.refresh
-  end
-
-  def self.main(fg: nil, bg: nil, scroll: false)
-    main_win = X.init_screen
-    X.start_color
-    colorize!(main_win, fg, bg)
-    rows, cols = main_win.maxy, main_win.maxx
-    self.make(main_win, rows, cols, 0, 0, border: false,
-              fg: fg, bg: bg, scroll: scroll)
-  end
-
-  def self.make(cwin, high, wide, r0, c0, border: true, fg: White, bg: Black, scroll: false)
-    obj = self.allocate
-    obj.instance_eval do 
-      @outer = @cwin = 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.scrolling(scroll)
-    obj
-  end
-
-  # FIXME refactor bad code
-
-  def scrolling(flag=true)
-    @scrolling = flag
-    @cwin.scrollok(flag)
-  end
-
-  def noscroll
-    @scrolling = false
-    @cwin.scrollok(false)
-  end
-
-  def scroll(n=1)
-    if n < 0
-      @cwin.scrl(n)
-      (-n).times {|i| rcprint i, 0, (' '*@cols) }
-    else
-      n.times do |i|
-        @cwin.scroll
-        scrolling(false)
-        rcprint @rows-1, 0, (' '*@cols)
-        scrolling
-      end
-    end
-    @cwin.refresh
-  end
-
-  def screen_text(file = nil)
-    lines = []
-    0.upto(self.rows-1) do |r|
-      line = ""
-      0.upto(self.cols-1) do |c|
-        line << self[r, c]
-      end
-      lines << line
-    end
-    File.open(file, "w") {|f| f.puts lines }  if file
-    lines
-  end
-end