rubytext 0.0.66 → 0.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1026a49ec8ff0ecd96f14d6e34cb5bf689e277e2c619ea39f9746c899f5238a9
-  data.tar.gz: 8baa928f1c76383407165447ea3df23876f1fb698cfd05444088e78d5067fd5b
+  metadata.gz: a60cfbca3fe7273cfcf397c296efa9ec9f15465e37f6e14c2f4d48d04ba1d2dd
+  data.tar.gz: 9f6064816a1c0e6fbdcd8e43a2a8e6ad46b47e05d7b40128c54619e90aa9db2c
 SHA512:
-  metadata.gz: e4e118a18444c9831ecc6136f6ac36caa16fa6f60adb6fd4de5640d3b66901f623348d46306ac812387183163e30c674e47f0f2533e8c81f650f74d6094e10b4
-  data.tar.gz: 73a1fe904439c2f680dace4927528a7cff96afe84a4f3bb43ecd04ef7e9b9f4af4f191833dd61beef968cb91887b98f8cf88882521af86e511ba864524512bee
+  metadata.gz: 20bcfd4c010aef7769f1535f5e8ae82d4aa61a564646b92c1d7665dc8a6e475f3c8f4a234f95387fd67aae751387b9c226430a1893c5bb22f336c625dcc97a9d
+  data.tar.gz: 5114876fdb6681991646b0b9b940efa5b7baac99717d909011998457cf147682468729c2cf5be40c4a3ce965786fd02ca56a99d5a41af8bc19455c61229f5116

data/lib/color.rb

@@ -8,37 +8,58 @@ def fb2cp(fg, bg)
   [f2, b2, cp]
 end
 
-module RubyText
+# Colors are 'global' for now
+Black, Blue, Cyan, Green, Magenta, Red, White, Yellow = 
+  :black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
+
+class RubyText::Color
   Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
-  $ColorPairs = {}
-  num = 0
-  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[[fsym, bsym]] = num
-    end
+
+  def self.sym2const(color)   # to curses constant
+    X.const_get("COLOR_#{color.to_s.upcase}")
+  end
+
+  def self.index(color)
+    Colors.find_index(color)  # "our" number
+  end
+
+  def self.pair(fg, bg)
+    num = 8*index(fg) + index(bg)
+    X.init_pair(num, sym2const(fg), sym2const(bg))
+    num
   end
 end
 
 class RubyText::Window
-  def self.colors(win, fg, bg)
-    cfg, cbg, cp = fb2cp(fg, bg)
-    X.init_pair(cp, cfg, cbg)
+  def self.colorize!(win, fg, bg)
+    cp = RubyText::Color.pair(fg, bg)
     win.color_set(cp)
-  end
-
-  def self.colors!(win, fg, bg)
-    colors(win, fg, bg)
     num = win.maxx * win.maxy
-    win.setpos(0, 0)
+    win.setpos 0,0
     win.addstr(' '*num)
-    win.setpos(0, 0)
+    win.setpos 0,0
     win.refresh
   end
 
+  def set_colors(fg, bg)
+    cp = RubyText::Color.pair(fg, bg)
+    @cwin.color_set(cp)
+  end
+
+  def colorize!(fg, bg)
+    set_colors(fg, bg)
+    num = @cwin.maxx * @cwin.maxy
+    self.home
+    self.go(0, 0) { @cwin.addstr(' '*num) }
+    @cwin.refresh
+  end
+
   def fg=(sym)
-    self.colors(@cwin, fg, @bg)
+    set_colors(fg, @bg)
+  end
+
+  def bg=(sym)
+    set_colors(@fg, bg)
   end
 end
+

data/lib/output.rb

@@ -16,14 +16,14 @@ class RubyText::Window
 # FIXME Please refactor the Hal out of this.
 
   def special?(arg)
-     RubyText::Colors.include?(arg) || 
+     RubyText::Color::Colors.include?(arg) || 
        arg.is_a?(RubyText::Effects)
   end
 
   def delegate_output(sym, *args)
     args = [""] if args.empty?
     args += ["\n"] unless sym == :print
-    RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
+    set_colors(@fg, @bg)  # FIXME?
     if sym == :p
       args.map!(&:inspect) 
     else
@@ -32,14 +32,14 @@ class RubyText::Window
     args.each do |arg|  
     case
       when arg.is_a?(Symbol) # must be a color
-        RubyText::Window.colors(@cwin, arg, @bg)  # FIXME?
+        set_colors(arg, @bg)  # FIXME?
       when arg.is_a?(RubyText::Effects)
         X.attrset(arg.value)
       else
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
       end
     end
-    RubyText::Window.colors(@cwin, @fg, @bg)  # FIXME?
+    set_colors(@fg, @bg)
     @cwin.refresh
   end
 
@@ -127,9 +127,8 @@ class RubyText::Window
   end
 end
 
-### Stick stuff into Kernel for top level
+# into top level...
 
-module Kernel
   def puts(*args)       # Doesn't affect STDOUT.puts, etc.
     $stdscr.puts(*args)
   end
@@ -149,5 +148,4 @@ module Kernel
   def getch
     X.getch
   end
-end
 

data/lib/rubytext.rb

@@ -4,10 +4,6 @@ require 'curses'
 
 X = Curses  # shorthand
 
-# Colors are 'global' for now
-Black, Blue, Cyan, Green, Magenta, Red, White, Yellow = 
-  :black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
-
 module RubyText
 end
 

data/lib/settings.rb

@@ -81,7 +81,6 @@ module RubyText
   rescue => err
     debug(err.inspect)
     debug(err.backtrace)
-exit
     # raise RTError("#{err}")
   end
 

data/lib/version.rb

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

data/lib/window.rb

@@ -10,13 +10,13 @@ class RubyText::Window
     @wide, @high, @r0, @c0 = wide, high, r0, c0
     @border, @fg, @bg      = border, fg, bg
     @cwin = X::Window.new(high, wide, r0, c0)
-    RubyText::Window.colors!(@cwin, fg, bg)
+    colorize!(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.colors!(@cwin, fg, bg)
+      colorize!(fg, bg)
     else
       @outer = @cwin
     end
@@ -30,10 +30,12 @@ class RubyText::Window
   def self.main(fg: nil, bg: nil, scroll: false)
     main_win = X.init_screen
     X.start_color
-    colors!(main_win, fg, bg)
+    self.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)
+  rescue => err
+    File.open("/tmp/main.out", "w") {|f| f.puts err.inspect; f.puts err.backtrace } 
   end
 
   def self.make(cwin, high, wide, r0, c0, border: true, fg: White, bg: Black, scroll: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.66
+  version: 0.0.67
 platform: ruby
 authors:
 - Hal Fulton
@@ -41,12 +41,8 @@ files:
 - "./rubytext.gemspec"
 - bin/rubytext
 - examples/README
-- examples/_demo.rb
-- examples/_showme.rb
-- examples/_slides
 - examples/check.rb
 - examples/demo.rb
-- examples/foo
 - examples/ide.rb
 - examples/prog01.rb
 - examples/prog02.rb
@@ -72,7 +68,7 @@ files:
 - examples/prog22.rb
 - examples/showme.rb
 - examples/slides
-- lib/_color.rb
+- examples/wtf.out
 - lib/_window.rb
 - lib/color.rb
 - lib/effects.rb

data/examples/_demo.rb

@@ -1,118 +0,0 @@
-$LOAD_PATH.unshift "lib"
-
-require 'rubytext'
-
-def delay(sec, speed=1.0)
-  sleep sec/speed
-end
-
-speed = ARGV.first || 1.0
-speed = speed.to_f
-delay(speed)
-
-RubyText.start(log: "mylog.txt", fg: Green, bg: Black)
-
-print "Here goes... "
-delay 2
-
-ymax, xmax = STDSCR.rows, STDSCR.cols
-
-puts "STDSCR is #{ymax.inspect} by #{xmax.inspect}"
-delay 2
-
-print "\nI can write here "
-delay 2
-puts "and then continue."
-
-delay 2
-print "I can jump away "
-
-delay 2
-STDSCR.go(20, 15) { puts "and print somewhere else" }
-# ^ Same as: rcprint(20, 15, "and print somewhere else" }
-
-delay 2
-puts "and then return."
-
-delay 3
-print "I can hide the cursor... "
-delay 1
-RubyText.hide_cursor
-delay 1
-print "then show it again... "
-delay 1
-RubyText.show_cursor
-delay 1
-print "and hide it again. "
-delay 1
-RubyText.hide_cursor
-delay 3
-
-puts "\n\nNow watch as I create a window:"
-
-mywin = RubyText.window(16, 40, 8, 14, fg: :blue, bg: :yellow)
-
-delay 3
-mywin.puts "\nNow I'm writing in a window."
-mywin.puts "\nIts size is  #{mywin.rows} rows by #{mywin.cols} cols"
-mywin.puts "(or #{mywin.height}x#{mywin.width} with the frame).\n "
-
-delay 4
-mywin.puts "I always try to honor the borders of my window."
-
-delay 2
-mywin.puts "\nWatch as I place 50 random stars here..."
-
-delay 2
-
-50.times do
-  r = rand(mywin.rows)
-  c = rand(mywin.cols)
-  delay 0.1
-  mywin.rcprint(r, c, "*")
-end
-
-delay 4
-mywin.output do
-  mywin.clear
-  puts "The window method called 'output'"
-  puts "will temporarily override STDSCR so that (in the code)"
-  puts "we don't have to use the window name over and over for stream I/O."
-  delay 4
-# STDSCR.rcprint 25, 3, "Of course I can still print here if I want."
-  STDSCR.go 25, 3
-  STDSCR.print "Of course I can still print here if I want."
-  delay 3
-  puts "\nOne moment..."
-  delay 4
-end
-
-mywin.output do
-  mywin.clear
-  puts "The []= method allows us to place characters in"
-  puts "the window (without auto-refresh)."
-  puts "\nLet's see the '50 stars' trick again:"
-  delay 5
-  50.times do
-    r = rand(mywin.rows)
-    c = rand(mywin.cols)
-    mywin[r, c] =  "*"
-  end
-  mywin.cwin.refresh 
-end
-
-delay 5
-mywin.output do
-  mywin.clear
-  mywin.puts "The [] method (zero-based) is still buggy, but let's try it."
-  mywin.puts "XYZ"
-  ch = mywin[2,2]
-  mywin.puts "The char at [2,2] is: #{ch.chr.inspect}"
-end
-
-delay 4
-mywin.puts "\nThat's all for now."
-delay 1
-mywin.puts "\nPress any key to exit."
-
-getch

data/examples/_showme.rb

@@ -1,58 +0,0 @@
-require 'rubytext'
-require 'timeout'
-
-def next_slide
-  RubyText.hide_cursor
-  sleep 0.2
-  Timeout.timeout(999) do
-    STDSCR.go @rmax-1-@upward, 0
-    STDSCR.center "Press any key..."
-    getch
-  end
-rescue Timeout::Error
-end
-
-def show_code(prog, upward=0)
-  text = File.read(prog)
-  nlines = text.split("\n").size
-
-  prog_top = @rmax-nlines-3 - upward.to_i
-  code = RubyText.window(nlines+2, @cmax-2, prog_top, 1, 
-                         fg: Green, bg: Black)
-  code.puts text
-
-  right = STDSCR.cols - prog.length - 8
-  STDSCR.go prog_top, right 
-  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: "/tmp/showme.log", fg: White, bg: Black)
-
-@cmax = STDSCR.cols
-@rmax = STDSCR.rows
-
-RubyText.hide_cursor
-
-check_window
-
-prog, @upward = ARGV
-@upward ||= 0
-
-show_code(prog, @upward)
-
-require_relative prog
-
-next_slide # if @upward == 0

data/examples/_slides

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-
-mylib = `gem which rubytext`.chomp
-examples = mylib.sub(%r[/lib/rubytext.rb], "/examples")
-
-Dir.chdir(examples)
-
-rc = system("ruby check.rb")
-exit unless rc
-
-# FIXME 
-#   - 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 = 11 if n == 22  # dumbest hack ever!
-  system("ruby showme.rb #{prog} #{upward}")
-end
-

data/examples/foo

@@ -1,7 +0,0 @@
-#<ArgumentError: wrong number of arguments (given 2, expected 1)>
-/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:30:in `[]'
-/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:30:in `colors'
-/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/color.rb:35:in `colors!'
-/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/window.rb:33:in `main'
-/Users/Hal/.rvm/gems/ruby-2.4.2/gems/rubytext-0.0.65/lib/settings.rb:75:in `start'
-check.rb:3:in `<main>'

data/lib/_color.rb

@@ -1,69 +0,0 @@
-
-def fb2cp(fg, bg)
-  fg ||= Blue
-  bg ||= White
-  f2 = X.const_get("COLOR_#{fg.upcase}")
-  b2 = X.const_get("COLOR_#{bg.upcase}")
-  cp = RubyText::ColorPairs[[fg, bg]]
-  [f2, b2, cp]
-end
-
-class RubyText::Color
-  attr_reader :curses
-
-  def self.pair(fg, bg)
-    RubyText::ColorPairs[[fg, bg]]
-  end
-
-  def initialize(sym)
-    @color  = sym
-    @curses = X.const_get("COLOR_#{sym.upcase}")
-  end
-end
-
-module RubyText
-  Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
-
-  # Initialize all color pairs
-  ColorPairs = {}
-  num = 0
-  color_file = File.new("pairs.out", "w")
-  Colors.each do |fsym|
-    Colors.each do |bsym|
-      cfg, cbg = Color.new(fsym).curses, Color.new(bsym).curses
-      X.init_pair(num+=1, cfg, cbg)
-      ColorPairs[[fsym, bsym]] = num
-#     debug "pair #{num} = #{[fsym, bsym]}"
-      color_file.puts "pair #{num} = #{[fsym, bsym]}"
-    end
-  end
-  color_file.close
-end
-
-class RubyText::Window
-  def self.set_colors(cwin, fg, bg)
-    @cfile = File.new("colors-#{rand(1000)}.out", "w")
-    cp = RubyText::Color.pair(fg, bg)
-    @cfile.puts "Setting: #{cp} = pair #{[fg, bg].inspect}"
-    @cfile.close
-exit
-    cwin.color_set(cp)
-  end
-
-  def self.colorize!(win, fg, bg)
-    set_colors(win, fg, bg)
-    num = win.maxx * win.maxy
-    win.setpos(0, 0)
-    win.addstr(' '*num)
-    win.setpos(0, 0)
-    win.refresh
-  end
-
-  def fg=(sym)
-    self.class.set_colors(@cwin, sym, @bg)   # BREAK??
-  end
-
-  def bg=(sym)
-    self.class.set_colors(@cwin, @fg, sym)
-  end
-end