rubytext 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94623e9ab70d1b8cc1d743a018fadfbfc036c57532d8fd15bb53a1b1ad24a200
-  data.tar.gz: 40c219776d5735a49e03e4362b4212609b7241963b464b69a22fa1747f404cab
+  metadata.gz: 3919685b14367cf51dd12193b7e3397fde0843ee965dc7ea202aa8792ff5d973
+  data.tar.gz: d8cf125187b359c15e5ad5eda14652ca4e0e64f14d6394eb3dcee93b70fe61de
 SHA512:
-  metadata.gz: 34544c7346c4be72e6d1ffb690785eed028f028e901a595f7941e95d9022db5fb4a2f13387e7b01795201d4ba715f974512a3a080772eea12cdfe188f8901309
-  data.tar.gz: af0380bd45ff5f3503aaccffd9f1d5081d5141fd2e360e921f8e7250b6f1175ee97c450e3bfea44b40aad9c0312f0264ebf4c37ac1f207f656675f73bf8f8a70
+  metadata.gz: c5c4118c0b3b8a8827ef56188f77a648e9660fea3f3edef249fa24c4594300637c51b988d7c5329a1cd5fae799a0332f7c4d9659e9e085dfaa99df243166479a
+  data.tar.gz: ea7dd88f236d86fbf4308b4bbd8e9ac0f3395ffd796ef4f651ab3993180bee65e29a331863e4dd0bd5b0cc81e77c314773ff83cae495ba429a19d7710409899a

data/bin/rubytext

@@ -1,5 +1,16 @@
 #!/usr/bin/env ruby
 
-require 'rubytext'
+require 'rubytext'   # Remember: Specify STDOUT as needed!
 
-STDOUT.puts RubyText::Path
+path = RubyText::Path
+
+cmd = ARGV.first
+
+case cmd
+  when nil
+    STDOUT.puts "Usage: rubytext [demo|slides]"
+  when "demo"
+    system("ruby #{path}/../examples/demo.rb")
+  when "slides"
+    system("#{path}/../examples/slides")
+end

data/examples/demo.rb

@@ -2,8 +2,8 @@ $LOAD_PATH.unshift "lib"
 
 require 'rubytext'
 
-def delay(sec)
-  sleep sec/2.0
+def delay(sec, speed=1.0)
+  sleep sec/speed
 end
 
 RubyText.start(log: "mylog.txt", fg: :green, bg: :black)

data/examples/prog08.rb

@@ -1,14 +1,14 @@
-win = RubyText.window(10, 50, 2, 5, true, fg: :yellow, bg: :blue)
+win = RubyText.window(10, 50, 0, 5, true, fg: :yellow, bg: :blue)
 
 win.puts "We can use the []= method (0-based)"
 win.puts "to address individual window locations"
-win.puts "and place characters there.\n "
+win.puts "and place characters there.     [BUG!]\n "
 
 sleep 2
 win[4,2] = "X"
 
 sleep 2
-win[6,20] = "y"
+win[8,10] = "y"
 
 sleep 2
-win[8,8] = "Z"
+win[6,18] = "Z"

data/examples/prog10.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(6, 30, 2, 5, true, fg: :black, bg: :blue)
+win = RubyText.window(6, 30, 2, 5, true, fg: :yellow, bg: :blue)
 
 win.puts "You can write to a window..."
 

data/examples/prog11.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(6, 30, 2, 5, true, fg: :black, bg: :blue)
+win = RubyText.window(6, 30, 2, 5, true, fg: :yellow, bg: :blue)
 
 win.puts "We default to cbreak mode, so that characters are "
 win.puts "accepted instantly, but control-C still works."

data/examples/prog12.rb

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

data/examples/prog14.rb

@@ -0,0 +1,11 @@
+win = RubyText.window(13, 65, 2, 6, true, 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,"
+win.puts "except that it does NOT move the cursor."
+
+win.rcprint 4,8,  "Simplify,"
+win.rcprint 6,12, "simplify,"
+win.rcprint 8,16, "simplify!"
+
+win.rcprint 10,0, "Later there will be other ways to do this kind of thing."

data/examples/prog15.rb

@@ -0,0 +1,14 @@
+win = RubyText.window(11, 65, 1, 6, true, fg: :blue, bg: :white)
+
+win.go 2,0
+win.puts "   Method #home will home the cursor..."
+win.puts "   and #putch will put a character at the current location."
+sleep 2
+win.home; win.putch "H"; sleep 2
+win.rcprint 4,3, "We can also move up/down/left/right..."; sleep 2
+
+win.go 7, 29;            win.putch("+"); sleep 1
+win.go 7, 29; win.up;    win.putch("U"); sleep 1
+win.go 7, 29; win.down;  win.putch("D"); sleep 1
+win.go 7, 29; win.left;  win.putch("L"); sleep 1
+win.go 7, 29; win.right; win.putch("R"); sleep 1

data/examples/prog16.rb

@@ -0,0 +1,9 @@
+win = RubyText.window(11, 65, 1, 6, true, fg: :blue, bg: :white)
+
+win.puts "Methods up/down/left/right can also take an integer..."
+
+win.go 4, 29;               win.putch("+"); sleep 1
+win.go 4, 29; win.up(2);    win.putch("2"); sleep 1
+win.go 4, 29; win.down(3);  win.putch("3"); sleep 1
+win.go 4, 29; win.left(4);  win.putch("4"); sleep 1
+win.go 4, 29; win.right(5); win.putch("5"); sleep 1

data/examples/prog17.rb

@@ -0,0 +1,11 @@
+win = RubyText.window(11, 65, 1, 6, true, fg: :blue, bg: :white)
+
+win.go 2,0
+win.puts "We also have: up!, down!, left!, and right! which can" 
+win.puts "Take us to the edges of the window."
+
+win.go 5, 21;             win.putch("+"); sleep 1
+win.go 5, 21; win.up!;    win.putch("U"); sleep 1
+win.go 5, 21; win.down!;  win.putch("D"); sleep 1
+win.go 5, 21; win.left!;  win.putch("L"); sleep 1
+win.go 5, 21; win.right!; win.putch("R"); sleep 1

data/examples/prog18.rb

@@ -0,0 +1,8 @@
+win = RubyText.window(11, 65, 1, 6, true, fg: :blue, bg: :white)
+
+win.go 2,0
+win.puts "#top and #bottom are the same as #up! and #down!"
+
+win.go 5, 21;             win.putch("+"); sleep 1
+win.go 5, 21; win.top;    win.putch("T"); sleep 1
+win.go 5, 21; win.bottom; win.putch("B"); sleep 1

data/examples/prog19.rb

@@ -0,0 +1,10 @@
+win = RubyText.window(15, 65, 1, 6, true, 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 "
+
+stuff = ["I","can","never","imagine","good sets","of real words",
+         "which can somehow", "produce tree shapes", "|", "|"]
+
+stuff.each {|str| win.center(str) }
+

data/examples/showme.rb

@@ -0,0 +1,56 @@
+require 'rubytext'
+require 'timeout'
+
+def next_slide
+  RubyText.hide_cursor
+  sleep 2
+  Timeout.timeout(999) do
+    STDSCR.go @rmax-1, 0
+    STDSCR.center "Press any key..."
+    getch
+  end
+rescue Timeout::Error
+end
+
+def show_code(prog)
+  text = File.read(prog)
+  nlines = text.split("\n").size
+
+  prog_top = @rmax-nlines-3
+  code = RubyText.window(nlines+2, @cmax-2, prog_top, 1, 
+                         true, fg: :green, bg: :black)
+  code.puts text
+
+  STDSCR.go prog_top, 61
+  STDSCR.print "[ #{prog} ]"
+  STDSCR.go 0,0
+end
+
+def check_window
+  if @rmax < 25 || @cmax < 80
+    puts "\n  Your window should be 25x80 or larger,"
+    puts   "  but this one is only  #{rmax}x#{cmax}."
+    puts "  Please resize and run again!"
+    getch
+    exit 1
+  end
+end
+
+#### Main
+
+RubyText.start(:cbreak, log: "showme.log", fg: :white, bg: :black)
+
+@cmax = STDSCR.cols
+@rmax = STDSCR.rows
+
+RubyText.hide_cursor
+
+check_window
+
+prog = ARGV.first
+
+show_code(prog)
+
+require_relative prog
+
+next_slide

data/examples/slides

@@ -3,15 +3,13 @@
 rc = system("ruby examples/check.rb")
 exit unless rc
 
-system("ruby showme.rb examples/prog01.rb")
-system("ruby showme.rb examples/prog02.rb")
-system("ruby showme.rb examples/prog03.rb")
-system("ruby showme.rb examples/prog04.rb")
-system("ruby showme.rb examples/prog05.rb")
-system("ruby showme.rb examples/prog06.rb")
-system("ruby showme.rb examples/prog07.rb")
-system("ruby showme.rb examples/prog08.rb")
-system("ruby showme.rb examples/prog09.rb")
-system("ruby showme.rb examples/prog10.rb")
-#system("ruby showme.rb examples/prog11.rb")
-system("ruby showme.rb examples/prog12.rb")
+# FIXME 
+#   - use names instead of numbers?
+#   - convert rt-show into a method?
+
+1.upto(19) do |n|
+  num = '%02d' % n
+  prog = "examples/prog#{num}.rb"
+  system("ruby examples/showme.rb #{prog}")
+end
+

data/lib/rubytext.rb

@@ -73,7 +73,6 @@ module RubyText
 
     def self.main(fg: nil, bg: nil)
       @main_win = X.init_screen
-debug(@main_win.inspect)
       X.start_color
       colors!(@main_win, fg, bg)
       rows, cols = @main_win.maxy, @main_win.maxx
@@ -192,9 +191,16 @@ class RubyText::Window
     @win.refresh
   end
 
-  def center(row, str)
+  def center(str)
+    r, c = self.rc
     n = @win.maxx - str.length
-    rcprint row, n/2, str
+    go r, n/2
+    puts str
+  end
+
+  def putch(ch)
+    r, c = self.rc
+    self[r, c] = ch[0]
   end
 
   def delegate_output(sym, *args)
@@ -247,9 +253,58 @@ debug "delegate: colors are #@fg, #@bg"
     end
   end
 
-  def down
+  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+1, c
+    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
@@ -295,7 +350,7 @@ debug "delegate: colors are #@fg, #@bg"
 
   def []=(r, c, char)
     @win.setpos(r, c)
-    @win.addstr(char[0])
+    @win.addch(char[0])
     @win.refresh
   end
 
@@ -315,7 +370,6 @@ end
 ### Stick stuff into Kernel for top level
 
 module Kernel
-  # private 
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
     $stdscr.puts(*args)
   end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Hal Fulton
@@ -51,6 +51,13 @@ files:
 - 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/showme.rb
 - examples/slides
 - lib/rubytext.rb
 - lib/version.rb