rubytext 0.0.52 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c70e2361d174352a8b4bd66080a08636c41afb2e4caffc72dd1583aa1339f70
-  data.tar.gz: b84934ee1a6fe52023bfe6c2d80ed2c5265441d021841c1ac0bcd4d2abba3cbf
+  metadata.gz: db3eb662edeaaf44456c062353906a426018b8901cd2993b6d1f95b4716f7461
+  data.tar.gz: 868861d08490f9f3923336761cf8a8447969b60fbe4c8dd01863f72014f6e49a
 SHA512:
-  metadata.gz: 6e0017838a8c4b56f9bba9858438c84b0d72b5343bed1791fb17c5c99db9c8db8578928c00f5496a3c6bbc6730a9c34df24d891aab8cdf1f7dbd76cc2f44bd9d
-  data.tar.gz: 3b4ec8017fd0b6fe286d786eaa34f291fb878f2e89ad8b68ce23cfb0d4a815c4872d44bc758534c47e8e19921fe07334989d50a69b8cd3fb0d3f9eb5104936e3
+  metadata.gz: 51bf39bda0424bd55f335ac03a234a5520b8e44f87526879b7b4c4e02915e696748925856cc650b79848e45e1d2fa72c77cf799fd8c287b2039e04adb880cacd
+  data.tar.gz: b60cf035089e2f11d8c3359816d76648cee9ffb2c7d56156923c1500d51bd7c7880012976e044566f4a6452a6d551ca93e4fbe62ea31a1fc6bb9da0003af55a8

data/examples/prog01.rb

@@ -1,6 +1,5 @@
 win = RubyText.window(6, 25, 2, 34, 
                       # 6 rows, 25 cols; upper left at 2,4
-                      true, # has a border
                       fg: Blue, bg: White) # foreground, background
 
 win.puts "This is a window..."

data/examples/prog02.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(9, 36, 2, 6, true, fg: White, bg: Red) 
+win = RubyText.window(9, 36, 2, 6, fg: White, bg: Red) 
 
 win.output do
   puts "Because this code uses #output,"

data/examples/prog03.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(9, 35, 3, 7, false, fg: Black, bg: Green)
+win = RubyText.window(9, 35, 3, 7, border: false, fg: Black, bg: Green)
 
 win.puts "A window doesn't have to"
 win.puts "have a border."

data/examples/prog04.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(8, 39, 4, 9, true, fg: Black, bg: Blue)
+win = RubyText.window(8, 39, 4, 9, fg: Black, bg: Blue)
 
 win.puts "If your text is longer than " +
          "the width of the window, by default it will " +

data/examples/prog05.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 70, 2, 14, true, fg: Yellow, bg: Black)
+win = RubyText.window(10, 70, 2, 14, fg: Yellow, bg: Black)
 
 win.output do
   puts "Without scrolling, this is what happens when your window fills up..."

data/examples/prog06.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 60, 2, 14, true, fg: Blue, bg: Black)
+win = RubyText.window(10, 60, 2, 14, fg: Blue, bg: Black)
 
 win.output do
   puts "The #print and #p methods also act as you expect."

data/examples/prog07.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(10, 50, 0, 5, true, fg: Yellow, bg: Blue)
+win = RubyText.window(10, 50, 0, 5, fg: Yellow, bg: Blue)
 
 win.output do
   puts "Of course, #puts and #print are unaffected \nfor other receivers."

data/examples/prog08.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 50, 0, 5, true, fg: Yellow, bg: Blue)
+win = RubyText.window(11, 50, 0, 5, fg: Yellow, bg: Blue)
 
 win.puts "We can use the []= method (0-based)"
 win.puts "to address individual window locations"

data/examples/prog09.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(12, 60, 2, 5, true, fg: Yellow, bg: Blue)
+win = RubyText.window(12, 60, 2, 5, fg: Yellow, bg: Blue)
 
 win.puts "ABCDE    Method [] can retrieve characters "
 win.puts "FGHIJ    from a window."

data/examples/prog10.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(6, 30, 2, 5, true, fg: Yellow, bg: Blue)
+win = RubyText.window(6, 30, 2, 5, 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: Yellow, bg: Blue)
+win = RubyText.window(6, 30, 2, 5, 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: Yellow, bg: Blue)
+win = RubyText.window(12, 65, 1, 5, fg: Yellow, bg: Blue)
 
 win.output do
   puts "You can detect the size and cursor position of any window."

data/examples/prog13.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 0, 15, true, fg: Blue, bg: Black)
+win = RubyText.window(11, 65, 0, 15, fg: Blue, bg: Black)
 
 win.puts "The #go method will move the cursor to a specific location."
 win.go 2, 5

data/examples/prog14.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(13, 65, 0, 6, true, fg: Blue, bg: White)
+win = RubyText.window(13, 65, 0, 6, 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,"

data/examples/prog15.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 0, 6, true, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 0, 6, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "   Method #home will home the cursor..."

data/examples/prog16.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, true, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
 
 win.puts "Methods up/down/left/right can also take an integer..."
 

data/examples/prog17.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, true, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "We also have: up!, down!, left!, and right! which can" 

data/examples/prog18.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(11, 65, 1, 6, true, fg: Blue, bg: White)
+win = RubyText.window(11, 65, 1, 6, fg: Blue, bg: White)
 
 win.go 2,0
 win.puts "#top and #bottom are the same as #up! and #down!"

data/examples/prog19.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(15, 65, 1, 6, true, fg: Green, bg: Blue)
+win = RubyText.window(15, 65, 1, 6, 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 "

data/examples/prog20.rb

@@ -1,4 +1,4 @@
-win = RubyText.window(12, 65, 0, 6, true, fg: Green, bg: Blue)
+win = RubyText.window(12, 65, 0, 6, fg: Green, bg: Blue)
 
 win.puts "This is EXPERIMENTAL."
 win.puts "Use a color symbol to change text color temporarily:\n "

data/examples/showme.rb

@@ -18,7 +18,7 @@ def show_code(prog, upward=0)
 
   prog_top = @rmax-nlines-3 - upward.to_i
   code = RubyText.window(nlines+2, @cmax-2, prog_top, 1, 
-                         true, fg: :green, bg: :black)
+                         fg: Green, bg: Black)
   code.puts text
 
   right = STDSCR.cols - prog.length - 8
@@ -39,7 +39,7 @@ end
 
 #### Main
 
-RubyText.start(:cbreak, log: "/tmp/showme.log", fg: :white, bg: :black)
+RubyText.start(:cbreak, log: "/tmp/showme.log", fg: White, bg: Black)
 
 @cmax = STDSCR.cols
 @rmax = STDSCR.rows

data/lib/color.rb

@@ -1,7 +1,7 @@
 
 def fb2cp(fg, bg)
-  fg ||= :blue
-  bg ||= :white
+  fg ||= Blue
+  bg ||= White
   f2 = X.const_get("COLOR_#{fg.upcase}")
   b2 = X.const_get("COLOR_#{bg.upcase}")
   cp = $ColorPairs[[fg, bg]]
@@ -9,8 +9,7 @@ def fb2cp(fg, bg)
 end
 
 module RubyText
-  Colors = [:black, :blue, :cyan, :green, :magenta, 
-            :red, :white, :yellow]
+  Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
   $ColorPairs = {}
   num = 0
   Colors.each do |fsym|
@@ -27,7 +26,7 @@ class RubyText::Window
   def self.colors(win, fg, bg)
     cfg, cbg, cp = fb2cp(fg, bg)
     X.init_pair(cp, cfg, cbg)
-    win.color_set(cp)  # |X::A_NORMAL)
+    win.color_set(cp)
   end
 
   def self.colors!(win, fg, bg)

data/lib/menu.rb

@@ -24,7 +24,7 @@ module RubyText
     high = items.size + 2
     wide = items.map(&:length).max + 4
     saveback(high, wide, r, c)
-    win = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
+    win = RubyText.window(high, wide, r, c, fg: White, bg: Blue)
     RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
@@ -33,7 +33,7 @@ module RubyText
     loop do
       items.each.with_index do |item, row|
         win.go row, 0
-        color = sel == row ? :yellow : :white
+        color = sel == row ? Yellow : White
         win.puts color, " #{item} "
       end
       ch = getch
@@ -57,7 +57,7 @@ module RubyText
     high = rows
     wide = cols
     saveback(high, wide, r, c)
-    menu_win = RubyText.window(high, wide, r, c, true, fg: :white, bg: :blue)
+    menu_win = RubyText.window(high, wide, r, c, fg: White, bg: Blue)
     win2 = win
     handler = callback
     RubyText.set(:raw)
@@ -69,7 +69,7 @@ module RubyText
     loop do
       items.each.with_index do |item, row|
         menu_win.go row, 0
-        color = sel == row ? :yellow : :white
+        color = sel == row ? Yellow : White
         menu_win.puts color, " #{item} "
       end
       ch = getch

data/lib/rubytext.rb

@@ -6,7 +6,7 @@ X = Curses  # shorthand
 
 # Colors are 'global' for now
 Black, Blue, Cyan, Green, Magenta, Red, White, Yellow = 
-:black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
+  :black, :blue, :cyan, :green, :magenta, :red, :white, :yellow
 
 require 'version'
 require 'output'       # RubyText, RubyText::Window, Kernel

data/lib/settings.rb

@@ -6,6 +6,8 @@ module RubyText
     @flags
   end
 
+# FIXME Refactor the Hal out of this.
+
   def self.inverse_flag(flag)
     sflag = flag.to_s
     if sflag[0] == "_"
@@ -97,7 +99,7 @@ module RubyText
     end
   end
 
-  def self.window(high, wide, r0, c0, border=false, fg: nil, bg: nil)
+  def self.window(high, wide, r0, c0, border: true, fg: nil, bg: nil)
     RubyText::Window.new(high, wide, r0, c0, border, fg, bg)
   end
 

data/lib/version.rb

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

data/lib/widgets.rb

@@ -1,8 +1,8 @@
 module RubyText
   def self.ticker(row: STDSCR.rows-1, col: 0, width: STDSCR.cols, 
-                  fg: :white, bg: :blue, text:, delay: 0.1)
+                  fg: White, bg: Blue, text:, delay: 0.1)
     text = text.gsub("\n", " ") + " "
-    win = RubyText.window(1, width, row, col, false, fg: fg, bg: bg)
+    win = RubyText.window(1, width, row, col, border: false, fg: fg, bg: bg)
     leader = " "*width + text
     leader = text.chars.cycle.each_cons(width)
     width.times { win.rcprint 0, 0, leader.next.join }

data/lib/window.rb

@@ -51,7 +51,7 @@ class RubyText::Window
     @screen
   end
 
-  def self.make(cwin, high, wide, r0, c0, border, fg: :white, bg: :black)
+  def self.make(cwin, high, wide, r0, c0, border, fg: White, bg: Black)
     obj = self.allocate
     obj.instance_eval do 
       #  debug "  Inside instance_eval..."

metadata

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