rubytext 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82e028f0fcc61304b43307716aa8300010e31358f7945569a57053040f3bf85
-  data.tar.gz: 632ecf99dbef00a9e3518e383ee21db379becc47a0a02f6da9d818d878e13055
+  metadata.gz: f76ca1f9288f586dee2ea9270f4213e22561b90009a7bbd6e773de9e024af442
+  data.tar.gz: 00345a5a7fe85aa24966717d612ab6d602d0d1b95b361fd547b1570ab0101e6e
 SHA512:
-  metadata.gz: 94e0ac4ee9dcd8876ddba84063ab10d56f48878330e4993ce906011d7d3bfa326f8e54893c67ae5a1023545b2bb31d640e4d2cfbdc29811943933c654c4fa577
-  data.tar.gz: 55a3dc93323093e5aeb93750a9bbee0a39e86c60436da8dce533a539129c047551e00fb49e5d61fd4296e86bd52da085bf2d018c4a38ca152ec33e674d034913
+  metadata.gz: 7f675a7b1c5d3f174abec10d03137e309d2401e44a138bd88d4bc389cf577583cbd9b19a225588e1e1640d691367ec4b400fc7245f268427a5f55f2d133d2060
+  data.tar.gz: 4e1101676ff0a27dd3d9cf22b4150d356dcf38a7b4f842f8840c1d5e450ca0d8ca2a23c93772563d6f008fd2104260f4194e119b47cd1d1ac0a3cb3f1258b1c7

data/README.md

@@ -5,7 +5,14 @@ RubyText is a curses wrapper that is in the early experimental
 stages. The code has bugs. Running it may cause general bad luck
 as well as demon infestation.
 
-For now, just run the `examples/demo.rb` program.
+Install the `rubytext` gem and then run the demo or the slides
+or both.
+
+```
+  $ gem install rubytext
+  $ rubytext demo      # 2-minute demo
+  $ rubytext slides    # longer "slideshow"
+```
 
 There is also `examples/ide.rb` ("world's simplest Ruby IDE").
 It is _very_ dumb.  :)

data/examples/ide.rb

@@ -7,31 +7,34 @@ end
 
 require 'rubytext'
 
-print " "  # FIXME - bug requires this?
+RubyText.start
+
+# print " "  # FIXME - bug requires this?
 
 @lib, @code = ARGV
 
 def menu
 $debug.puts "Entering menu"
-  m = @mywin
-  m.boxme   # FIXME - dumb hack
-  m.clear
-  m.puts
-  m.puts " World's Simplest Ruby IDE\n "
-  m.puts " Lib  = #{@lib}"
-  m.puts " Code = #{@code}"
-  m.puts 
-  m.puts " 1  Edit lib"
-  m.puts " 2  Edit code"
-  m.puts " 3  Run code"
-  m.puts " 4  pry"
-  m.puts " 5  Shell"
-  m.puts " 6  irb"
-  m.puts " 7  RubyDocs"
-  m.puts
-  m.puts " 0  Quit"
-  m.print "\n  Choice = "
-  m.refresh   # FIXME - dumb hack
+  @mywin.output do
+#   boxme   # FIXME - dumb hack
+    @mywin.clear
+    puts
+    puts " World's Simplest Ruby IDE\n "
+    puts " Lib  = #{@lib}"
+    puts " Code = #{@code}"
+    puts 
+    puts " 1  Edit lib"
+    puts " 2  Edit code"
+    puts " 3  Run code"
+    puts " 4  pry"
+    puts " 5  Shell"
+    puts " 6  irb"
+    puts " 7  RubyDocs"
+    puts
+    puts " 0  Quit"
+    print "\n  Choice = "
+    @mywin.refresh   # FIXME - dumb hack
+  end
 $debug.puts "Exiting menu"
 end
 
@@ -50,9 +53,7 @@ end
 
 loop do 
   menu
-  # $debug.puts "about to call getch"
   cmd = getch.chr
-  # $debug.puts "called getch - '#{cmd}'"
   case cmd
     when "1"; system("vi #{@lib}")
     when "2"; system("vi #{@code}") 

data/examples/prog08.rb

@@ -1,14 +1,14 @@
-win = RubyText.window(10, 50, 0, 5, true, fg: :yellow, bg: :blue)
+win = RubyText.window(12, 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.     [BUG!]\n "
+win.puts "and place characters there.\n "
 
 sleep 2
-win[4,2] = "X"
+win[4,22] = "X"
 
 sleep 2
-win[8,10] = "y"
+win[8,20] = "y"
 
 sleep 2
-win[6,18] = "Z"
+win[6,38] = "Z"

data/examples/prog20.rb

@@ -0,0 +1,13 @@
+win = RubyText.window(12, 65, 2, 6, true, fg: :green, bg: :blue)
+
+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.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 "
+
+sym = :red
+win.puts "The symbol is ", sym.inspect, " which works", sym, " just fine."

data/examples/prog21.rb

@@ -0,0 +1,14 @@
+puts "This very crude menu is also EXPERIMENTAL."
+puts "At the moment, it only works inside STDSCR!\n"
+puts "It knows up, down, Enter, and Escape.\n "
+puts "Press any key to display the menu..."
+getch
+
+days = %w[Monday Tuesday Wednesday Thursday Friday]
+picked = RubyText.menu(c: 30, items: days)
+
+if picked.nil?
+  puts "You picked nothing!"
+else
+  puts "You picked item #{picked} which is #{days[picked].inspect}"
+end

data/examples/showme.rb

@@ -21,7 +21,8 @@ def show_code(prog)
                          true, fg: :green, bg: :black)
   code.puts text
 
-  STDSCR.go prog_top, 61
+  right = STDSCR.cols - prog.length - 8
+  STDSCR.go prog_top, right 
   STDSCR.print "[ #{prog} ]"
   STDSCR.go 0,0
 end

data/examples/slides

@@ -10,7 +10,7 @@ exit unless rc
 
 # FIXME 
 #   - use names instead of numbers?
-#   - convert rt-show into a method?
+#   - convert showme into a method?
 
 1.upto(19) do |n|
   next if n == 11  # junk this one

data/lib/rubytext.rb

@@ -13,26 +13,28 @@ end
 def fb2cp(fg, bg)
   fg ||= :blue
   bg ||= :white
-  fg = X.const_get("COLOR_#{fg.upcase}")
-  bg = X.const_get("COLOR_#{bg.upcase}")
+  f2 = X.const_get("COLOR_#{fg.upcase}")
+  b2 = X.const_get("COLOR_#{bg.upcase}")
   cp = $ColorPairs[[fg, bg]]
-  [fg, bg, cp]
+  [f2, b2, cp]
 end
 
 module RubyText
 
-  Colors = %w[black blue cyan green magenta red white yellow]
+  Colors = [:black, :blue, :cyan, :green, :magenta, :red, :white, :yellow]
   $ColorPairs = {}
   num = 0
-  Colors.each do |fc|
-    Colors.each do |bc|
-      fg = X.const_get("COLOR_#{fc.upcase}")
-      bg = X.const_get("COLOR_#{bc.upcase}")
+  Colors.each do |fsym|
+    Colors.each do |bsym|
+      fg = X.const_get("COLOR_#{fsym.upcase}")
+      bg = X.const_get("COLOR_#{bsym.upcase}")
       X.init_pair(num+=1, fg, bg)  # FIXME backwards?
-      $ColorPairs[[fg, bg]] = num
+      $ColorPairs[[fsym, bsym]] = num
     end
   end
 
+# $ColorPairs.each_pair {|k, v| STDOUT.puts "#{k.inspect} => #{v}" }
+
   module Keys
     Down  = 258
     Up    = 259
@@ -107,6 +109,10 @@ module RubyText
       end
       obj
     end
+
+    def fg=(sym)
+      self.colors(@win, fg, @bg)
+    end
   end
 end
 
@@ -114,13 +120,36 @@ end
 module RubyText
 
   def self.set(*args)
+    # Allow a block?
+    standard = [:cbreak, :raw, :echo, :keypad]
+    @flags = []   # FIXME can set/reset individually. hmmm
     args.each do |arg|
-      flag = arg.to_s
-      flag.sub!(/_/, "no")
-      X.send(flag)
+      if standard.include? arg
+        flag = arg.to_s
+        @flags << arg
+        flag.sub!(/_/, "no")
+        X.send(flag)
+      else
+        @flags << arg
+        case arg
+          when :cursor
+            X.show_cursor
+          when :_cursor, :nocursor
+            X.hide_cursor
+        end
+      end
     end
   end
 
+  def save_flags
+    @fstack ||= []
+    @fstack.push @flags
+  end
+
+  def rest_flags
+    @flags = @fstack.pop
+  end
+
   def self.start(*args, log: nil, fg: nil, bg: nil)
     $debug = File.new(log, "w") if log
     Object.const_set(:STDSCR, RubyText::Window.main(fg: fg, bg: bg))
@@ -159,12 +188,65 @@ module RubyText
     X.curs_set(2)  # Doesn't work?
   end
 
+  def self.saveback(high, wide, r, c)
+    @pos = STDSCR.rc
+    @save = []
+    0.upto(high) do |h|
+      0.upto(wide) do |w|
+        @save << STDSCR[h+r, w+c]
+      end
+    end
+  end
+
+  def self.restback(high, wide, r, c)
+    0.upto(high) do |h|
+      0.upto(wide) do |w|
+        STDSCR[h+r, w+c] = @save.shift
+      end
+    end
+    STDSCR.go *@pos
+    STDSCR.refresh
+  end
+
+  def self.menu(r: 0, c: 0, items:)
+    high = items.size + 2
+    wide = items.map(&:length).max + 2
+    saveback(high, wide, r, c)
+    @mywin = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
+    RubyText.set(:raw)
+    X.stdscr.keypad(true)
+    RubyText.hide_cursor
+    sel = 0
+    max = items.size - 1
+    loop do
+      items.each.with_index do |item, row|
+        @mywin.go row, 0
+        color = sel == row ? :yellow : :white
+        @mywin.puts color, " #{item} "
+      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
+          restback(high, wide, r, c)
+          return nil
+        when 10
+          restback(high, wide, r, c)
+          return sel
+      end
+    end
+  end
+
 end
 
 class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
-  attr_reader :win, :rows, :cols, :width, :height, :fg, :bg
+  attr_reader :win, :rows, :cols, :width, :height
+  attr_writer :fg, :bg
 
   def initialize(high=nil, wide=nil, r0=1, c0=1, border=false, fg=nil, bg=nil)
     debug "RT::Win.init: #{[high, wide, r0, c0, border]}"
@@ -203,23 +285,37 @@ class RubyText::Window
     self[r, c] = ch[0]
   end
 
+  def need_crlf?(sym, args)
+    sym != :print &&      # print doesn't default to crlf
+    args[-1][-1] != "\n"  # last char is a literal linefeed
+  end
+
   def delegate_output(sym, *args)
     args = [""] if args.empty?
-debug "delegate: colors are #@fg, #@bg"
     RubyText::Window.colors(@win, @fg, @bg)  # FIXME?
-#   debug "#{sym}: args = #{args.inspect}"
     if sym == :p
       args.map!(&:inspect) 
     else
-      args.map!(&:to_s) 
+      args.map! do |x|
+        if RubyText::Colors.include? x
+          x
+        else
+          x.to_s
+        end
+      end
     end
-    str = sprintf(*args)
-    flag = true if sym != :print && str[-1] != "\n"
-    # FIXME: color-handling code here
-    str.each_char do |ch|
-      ch == "\n" ? crlf : @win.addch(ch)
+# STDOUT.puts "again: #{args.inspect}"
+    flag = need_crlf?(sym, args)
+    # Limitation: Can't print color symbols!
+    args.each do |arg|  
+      if arg.is_a? Symbol # must be a color
+        RubyText::Window.colors(@win, arg, @bg)  # FIXME?
+      else
+        arg.each_char {|ch| ch == "\n" ? crlf : @win.addch(ch) }
+      end
     end
     crlf if flag
+    RubyText::Window.colors(@win, @fg, @bg)  # FIXME?
     @win.refresh
   end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 
   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.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -57,6 +57,8 @@ files:
 - examples/prog17.rb
 - examples/prog18.rb
 - examples/prog19.rb
+- examples/prog20.rb
+- examples/prog21.rb
 - examples/showme.rb
 - examples/slides
 - lib/rubytext.rb