rubytext 0.0.97 → 0.0.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fd4f07417878ad5d57fa7e320c0994c2eb66ca041496f3343e5653d3d917d2
-  data.tar.gz: f0ab6a636a4cbade143d65601cae90f1eae786f413e86afb415c06cd59b4197f
+  metadata.gz: db229c48ceef85f09ba0f26e8a2b9db9c38254f5285c511dbd208c37061a0db6
+  data.tar.gz: df30b42eced953fba5747e56c71e5a8fb682a37eb802d7318731c0b9619801a8
 SHA512:
-  metadata.gz: 403c07f49e761a3b5cbb92121f8ba3342e3b03d3fd6c45f2c977639fa0feb96080611c330c441ebcd80b9af159a42e7657e398bf217157c90d370b7d7620f654
-  data.tar.gz: 8fb97b2927abe08075348d1a49651b37c0eca436539a89f3d278099a0edea84d970018dbcc4b8213a730e48c8b98cda40d2930a62e37f631c621f8de0d2fd482
+  metadata.gz: 289af3313189482069f4077f5fd8206d065acc20f5e870c1312eaf5c9510ab7738d6f152e8bff7e17b2588220a1b4b0ed4393cc3f689fd3bea940b595206bf47
+  data.tar.gz: 3786a4654e1a4bd580079dc77cae3b58e647a61346e607ba40bb8c55294a515c0183845b9fd909b474ac2231324cdf5c793c3b51c5cba2d090387729a8808ef8

data/lib/color.rb

@@ -8,6 +8,9 @@ Colors = [Black, Blue, Cyan, Green, Magenta, Red, White, Yellow]
 class RubyText::Color
   Colors = ::Colors
 
+# FIXME some should be private
+# TODO  add color-pair constants
+
   def self.sym2const(color)   # to curses constant
     X.const_get("COLOR_#{color.to_s.upcase}")
   end

data/lib/output.rb

@@ -245,44 +245,6 @@ class RubyText::Window
     gs.value
   end
 
-  def old_gets  # still needs improvement
-    # echo assumed to be OFF, keypad ON
-    str = ""
-    i = 0
-    r0, c0 = self.rc
-    loop do
-      ch = self.getch
-      case ch
-        when 10;          self.crlf; break # Enter
-        when 8, 127, 63   # backspace, del, ^H (huh?)
-          if i >= 1
-            str = str[0..-2]
-            i -= 1
-            self.left
-            self[*self.rc] = ' '
-            r, c = self.rc
-            rcprint r, c, str[i+1..-1] + "   "
-          end
-          when 260   # left-arrow
-            if i > 0
-              i -= 1
-              self.left
-            end
-          when 261   # right-arrow
-            if i < str.length
-              i += 1
-              self.right
-            end
-        else
-          str.insert(i, ch)
-          self.right
-          self.go(r0, c0) { self.print str }
-          i += 1
-      end
-    end
-    str
-  end
-
 end
 
 module WindowIO

data/lib/rubytext.rb

@@ -41,7 +41,7 @@ def import(meth, recv)
   end
 end
 
-def make_exception(sym, str)
+def make_exception(sym, str)   # FIXME refactor
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -53,14 +53,15 @@ def make_exception(sym, str)
 end
 
 make_exception(:RTError, "General error: $1 $2 $3")
+   # TODO more...
 
 def debugging(onoff)
-  $debugging = onoff
+  $debugging = onoff    # FIXME eschew global?
 end
 
 def debug(*args)
   return unless $debugging
-  return unless $debug
+  return unless $debug   # FIXME eschew global?
   $debug.puts *args
   $debug.flush
 end

data/lib/settings.rb

@@ -10,6 +10,8 @@ module RubyText
 
   $debugging = true
 
+  # FIXME refactor save/restore, etc.  - rep as binary vector?
+
   def self.start(*args, log: "/tmp/rubytext.log", 
                  fg: White, bg: Blue, scroll: false)
     $debug ||= File.new(log, "w") if log   # FIXME remove global
@@ -122,15 +124,6 @@ module RubyText
     end
   end
 
-  # Why did I put this here?
-
-  def self.window(high, wide, r: nil, c: nil, border: true, 
-                  fg: White, bg: Blue, scroll: false)
-    r ||= (STDSCR.rows - high)/2
-    c ||= (STDSCR.cols - wide)/2
-    RubyText::Window.new(high, wide, r, c, border, fg, bg, scroll)
-  end
-
   def self.hide_cursor
     X.curs_set(0)
   end

data/lib/version.rb

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

data/lib/widgets.rb

@@ -13,7 +13,7 @@ module RubyText
     end
   end
 
-  def self.spinner(win: STDSCR, &block)
+  def self.spinner(win: STDSCR, &block) # TODO delay, etc.
     chars = "-\\|/"
     RubyText.hide_cursor
     thread = Thread.new { i=0; loop { i = (i+1) % 4; win.print chars[i]; win.left; sleep 0.1 } }
@@ -22,4 +22,6 @@ module RubyText
     Thread.kill(thread)
     RubyText.show_cursor
   end
+
+  # TODO add splash
 end

data/lib/window.rb

@@ -1,3 +1,14 @@
+
+module RubyText
+  # TODO add title:?
+  def self.window(high, wide, r: nil, c: nil, border: true, 
+                  fg: White, bg: Blue, scroll: false)
+    r ||= (STDSCR.rows - high)/2
+    c ||= (STDSCR.cols - wide)/2
+    RubyText::Window.new(high, wide, r, c, border, fg, bg, scroll)
+  end
+end
+
 class RubyText::Window
   Vert, Horiz = X::A_VERTICAL, X::A_HORIZONTAL
 
@@ -5,7 +16,7 @@ class RubyText::Window
   attr_reader :r0, :c0
   attr_accessor :fg, :bg
 
-  # Better to use Window.window IRL
+  # Better to use Window.window IRL 
 
   def initialize(high=nil, wide=nil, r0=0, c0=0, border=false, 
                  fg=White, bg=Blue, scroll=false)
@@ -43,6 +54,8 @@ class RubyText::Window
     File.open("/tmp/main.out", "w") {|f| f.puts err.inspect; f.puts err.backtrace } 
   end
 
+# FIXME try again to inline this
+
   def self.make(cwin, high, wide, r0, c0, border: true, fg: White, bg: Black, scroll: false)
     obj = self.allocate
     obj.instance_eval do 

metadata

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