rubytext 0.0.86 → 0.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 509abba3e565dfda3ccafe187272e258ea616dcd186204af9c21d16c73de073e
-  data.tar.gz: f83e12a5b937c539f3d7309dc458d9cb26a458636fb4ccc8185efd3efdc6d0e2
+  metadata.gz: 2a39b4c532ccbd898dc02313b42d209f287066dedd723ac626bdbce565d33ed1
+  data.tar.gz: b0e729eb203af8688c493464bd4f5e0b029a2951e8a70964bb878f99c02c792b
 SHA512:
-  metadata.gz: 6a88aea30b62d78cbb0700a5b3de6e97eab64be9f348ccf7d73c27ce2dd0b556176179c9f4b34cae405e22671edb16c1878ec294fae55dd22c9e4c7c079b36e4
-  data.tar.gz: db33b6f9333edd165c16ec37f42224886f40b9dafc5f70d0788c9738ef9b6c66a2501793a66765168596289e000bac579866e9548292f86e9eaf33ee6cbb9b8b
+  metadata.gz: f79b5eba776e61bc8ab656c951e01409e25047298eff671ea197d9f1bde14aec83067042c685780154e66db0fa34ffcee36917bd89c6863b675656d111cd2d03
+  data.tar.gz: 1b8638507d0ba10d4807bd2c7a9724e2a222ca1c22e40de3312c4be3935fd0dd2c013c9d2a64c1dcdede16585a1f35de65adca057d49c10589ec83a76e295685

data/examples/prog21.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, items: days)
+num, day = RubyText.menu(win: win, r: 1, c: 5, title: "Which day?", items: days)
 
 puts
 if day.nil?

data/examples/showme.rb

@@ -1,15 +1,15 @@
 require 'rubytext'
-require 'timeout'
 
 def next_slide
   RubyText.hide_cursor
-  sleep 2
-  Timeout.timeout(999) do
-    STDSCR.go @rmax-1-@upward, 0
-    STDSCR.center "Press any key..."
-    getch
+  case @proceed
+    when /\d+/
+      sleep @proceed.to_i
+    when "pause"
+      STDSCR.go @rmax-1-@upward, 0
+      STDSCR.center "Press any key..."
+      getch
   end
-rescue Timeout::Error
 end
 
 def show_code(prog, upward=0)
@@ -48,7 +48,7 @@ RubyText.hide_cursor
 
 check_window
 
-prog, @upward = ARGV
+prog, @proceed, @upward = ARGV
 @upward ||= 0
 
 show_code(prog, @upward)

data/examples/slides

@@ -13,27 +13,27 @@ exit unless rc
 #   - convert showme into a method?
 
 system("ruby showme.rb prog01.rb")
-system("ruby showme.rb prog02.rb")
-system("ruby showme.rb prog03.rb")
-system("ruby showme.rb prog04.rb")
-system("ruby showme.rb prog05.rb")
-system("ruby showme.rb prog06.rb")
-system("ruby showme.rb prog07.rb")
-system("ruby showme.rb prog08.rb")
-system("ruby showme.rb prog09.rb")
-system("ruby showme.rb prog10.rb")
-system("ruby showme.rb prog12.rb")
-system("ruby showme.rb prog13.rb")
-system("ruby showme.rb prog14.rb")
-system("ruby showme.rb prog15.rb")
-system("ruby showme.rb prog16.rb")
-system("ruby showme.rb prog17.rb")
-system("ruby showme.rb prog18.rb")
-system("ruby showme.rb prog19.rb")
-system("ruby showme.rb prog20.rb")
-system("ruby showme.rb prog21.rb")
-system("ruby showme.rb prog22.rb 11")
-system("ruby showme.rb prog23.rb")
-system("ruby showme.rb prog24.rb")
-system("ruby showme.rb prog25.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")
 

data/lib/color.rb

@@ -19,12 +19,6 @@ class RubyText::Color
   def self.pair(fg, 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
@@ -32,17 +26,18 @@ class RubyText::Color
 end
 
 class RubyText::Window
-  def self.colorize!(win, fg, bg)
+  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)
-    win.color_set(cp)
-    num = win.maxx * win.maxy
-    win.setpos 0,0
-    win.addstr(' '*num)
-    win.setpos 0,0
-    win.refresh
+    cwin.color_set(cp)
+    num = cwin.maxx * cwin.maxy
+    cwin.setpos 0,0
+    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,7 +1,7 @@
 
 
-def fx(str, *args)
-  eff = RubyText::Effects.new(*args)
+def fx(str, *args, bg: nil)
+  eff = RubyText::Effects.new(*args, bg: bg)
   str.define_singleton_method(:effect) { eff } 
   str  # must return str
 end
@@ -14,9 +14,11 @@ class RubyText::Effects   # dumb name?
 
   Others = %[:show, :hide]  # show/hide cursor; more later??
 
-  attr_reader :value, :fg
+  attr_reader :value, :fg, :bg
+
+  # TODO rewrite logic to accommodate color pairs
   
-  def initialize(*args)
+  def initialize(*args, bg: nil)
     bits = 0
     @list = args
     args.each do |arg|
@@ -27,21 +29,23 @@ class RubyText::Effects   # dumb name?
         @fg = arg   # symbol
       end
     end
+    @bg = bg || @bg
     @value = bits
   end
 
   def set(win)
-    # Save off current state?
-    @old_fg = win.fg
-    attr, fg = self.value, self.fg
+    @old_fg, @old_bg  = win.fg, win.bg  # Save off current state?
+    attr, fg, bg = self.value, self.fg, self.bg
     win.cwin.attron(attr)
-    win.set_colors(fg, win.bg) if fg
+    fg ||= win.fg
+    bg ||= win.bg
+    win.set_colors(fg, bg)
   end
 
   def reset(win)
     attr = self.value
     win.cwin.attroff(attr)
-    win.set_colors(@old_fg, win.bg) if fg
+    win.set_colors(@old_fg, @old_bg)
   end
 end
 

data/lib/menu.rb

@@ -1,23 +1,30 @@
 module RubyText
 
   def self.menu(win: STDSCR, r: 0, c: 0, items:, curr: 0,
-                fg: White, bg: Blue)
+                title: nil, fg: White, bg: Blue)
     RubyText.hide_cursor
     high = items.size + 2
     wide = items.map(&:length).max + 4
+    tlen = title.length + 6  
+    wide = [wide, tlen].max
     win.saveback(high, wide, r, c)
-    mwin = RubyText.window(high, wide, r: r+win.r0+1, c: c+win.c0+1, 
+    mr, mc = r+win.r0+1, c+win.c0+1 
+    mwin = RubyText.window(high, wide, r: mr, c: mc, 
                            fg: fg, bg: bg)
+    win.go(mr-2, mc-win.c0) { win.print fx("[ #{title} ]", :bold, fg, bg: bg) } unless title.nil?
+
     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) ? rev : norm
-        mwin.print style, " #{item} "
+        style = (sel == row) ? :reverse : :normal
+        label = (" "*3 + item + " "*8)[0..wide-1]
+        mwin.print fx(label, style)
       end
       ch = getch
       case ch

data/lib/version.rb

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

data/lib/window.rb

@@ -7,7 +7,8 @@ class RubyText::Window
 
   # Better to use Window.window IRL
 
-  def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=White, bg=Blue, 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)
@@ -29,12 +30,15 @@ class RubyText::Window
   end
 
   def self.main(fg: White, bg: Blue, scroll: false)
+    debug "Starting #main..."
     main_win = X.init_screen
     X.start_color
     self.colorize!(main_win, fg, bg)
     rows, cols = main_win.maxy, main_win.maxx
-    self.make(main_win, rows, cols, 0, 0, border: false,
+    win = self.make(main_win, rows, cols, 0, 0, border: false,
               fg: fg, bg: bg, scroll: scroll)
+    debug "...started #main"
+    win
   rescue => err
     File.open("/tmp/main.out", "w") {|f| f.puts err.inspect; f.puts err.backtrace } 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.86
+  version: 0.0.87
 platform: ruby
 authors:
 - Hal Fulton