rubytext 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a05838e1cc579cdf013056ac5264886691d94639b728ee66c8882900505e4b
-  data.tar.gz: 9d6e520c32aecff63b3817ddf030ec972e5334058e69bbb81d50598555ab0924
+  metadata.gz: 15520eecd3c1ca3278f62731bad2a032a0ac638b02463fea3b5e7af7f9a14ed8
+  data.tar.gz: 97afb48c6b17f679bebe60c458e9a8530d5ad23a2fd24413fa1fc4da682fbd89
 SHA512:
-  metadata.gz: ceb638773d9f8b5030e6a3ec7025982b630a6c0571935e61035ebe2f242d2866ca53b7031c2717908b5eb02e4f4c723cd7269d07a1ad83d151dcb66e75107ffb
-  data.tar.gz: a0b1e4e6b2ee4aca0011e936ad9f5fa3a7d43b1b6205e63779d9bc3fc888d7d2a11353e417ceb5f11444d4061acbfa2f04601caba1aca6c5ebfa2067ad51d38e
+  metadata.gz: '09cc80674f2b607189d64739230e13c3f4ee4131447b2d402a69a971b022c294b4d6901187f4c1c089269b27cbe3a64c91dc16f767336fa6dfe1119e9f95049f'
+  data.tar.gz: fc868a9b1c97338be2f87d74b3a884175e9b4c58b6a1d1845c1bedb14b487e8b4e77e4bff4e500e1c318a621e7f8ad8d176ecea5347ee088a3e3b28302e60c2b

data/examples/slides

@@ -12,11 +12,26 @@ exit unless rc
 #   - use names instead of numbers?
 #   - convert showme into a method?
 
-1.upto(22) do |n|
-  next if n == 11  # junk this one
-  num = '%02d' % n
-  prog = "prog#{num}.rb"
-  upward = 10 if n == 22  # dumbest hack ever!
-  system("ruby showme.rb #{prog} #{upward}")
-end
+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")
 

data/lib/menu.rb

@@ -2,7 +2,6 @@ module RubyText
 
   def self.menu(win: STDSCR, r: 0, c: 0, items:, curr: 0,
                 fg: White, bg: Blue)
-#   save_flags
     RubyText.hide_cursor
     high = items.size + 2
     wide = items.map(&:length).max + 4
@@ -29,16 +28,13 @@ module RubyText
         when 27
           win.restback(high, wide, r, c)
           RubyText.show_cursor
-#         rest_flags
           return [nil, nil]
         when 10
           win.restback(high, wide, r, c)
           RubyText.show_cursor
-#         rest_flags
           return [sel, items[sel]]
       end
       RubyText.show_cursor
-#     rest_flags
     end
   end
 
@@ -47,7 +43,6 @@ module RubyText
                     win2:, callback:, enter: nil, quit: "q")
     high = rows
     wide = cols
-    win.saveback(high, wide, r, c)
     mwin = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
     handler = callback
     X.stdscr.keypad(true)
@@ -56,29 +51,29 @@ module RubyText
     rev  = RubyText::Effects.new(:reverse)
     sel = 0
     max = items.size - 1
-    send(handler, sel, items[sel], win2)
+    handler.call(sel, items[sel], win2)
     loop do
       mwin.home
       items.each.with_index do |item, row|
-        mwin.left
-        style = (sel == row) ? rev : norm
-        mwin.puts style, " #{item} "
+        mwin.crlf
+        style = (sel == row) ? :reverse : :normal
+        mwin.print fx(" #{item}", style)
       end
       ch = getch
       case ch
         when X::KEY_UP
           if sel > 0
             sel -= 1
-            send(handler, sel, items[sel], win2)
+            handler.call(sel, items[sel], win2)
           end
         when X::KEY_DOWN
           if sel < max
             sel += 1
-            send(handler, sel, items[sel], win2)
+            handler.call(sel, items[sel], win2)
           end
         when 10  # Enter
           if enter
-            del = send(enter, sel, items[sel], win2)
+            del = enter.call(sel, items[sel], win2)
             if del
               items -= [items[sel]]
               raise 

data/lib/navigation.rb

@@ -24,14 +24,17 @@ class RubyText::Window
     [r, c]
   end
 
+  def goto(r, c)  # only accepts numbers!
+    @cwin.setpos(r, c)
+  end
+
   def go(r0, c0)
     r, c = coords(r0, c0)
-    debug("go: #{[r0, c0].inspect} => #{[r, c].inspect}")
     save = self.rc
-    @cwin.setpos(r, c)
+    goto(r, c)
     if block_given?
-      yield
-      go(*save)   # No block here!
+      yield 
+      goto(*save)
     end
   end
 
@@ -89,11 +92,6 @@ class RubyText::Window
     go 0, 0
   end
 
-# def crlf
-#   r, c = rc
-#   go r+1, 0
-# end
-
   def rc
     [@cwin.cury, @cwin.curx]
   end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses