rubytext 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67f09e356a4a6791fd17ad598b3dbabbf2d2bcb4e22c3aa3d7a44394255e183
-  data.tar.gz: e121b61f5b8e29942bd9a807a3fea1a42c9324cce9a743a76576e3f59084f5dd
+  metadata.gz: bfe42d3f30f5d06e6668a824a6cda9f0ef349d4307785ce8e936b4968e1a813a
+  data.tar.gz: 7305d3b2d83ec1b466ee51abba9c4ce046d16a2715f3d0e4f510a4a3e9bb767b
 SHA512:
-  metadata.gz: 5fdee3ed7ccd0a5113c58f7d7f512ca7aee795b9484c8496c940e250ad8b57e5f645e9c7d59dcb5708c6b57c59a3817e7fce857d8002453697be57f204d637fa
-  data.tar.gz: bea38489db79ac0f1d5a6333c3965acd99f23b63c905050db894e9bd0043d02bef34517c863f86056b6515341e75046189b567685f6dc2ec8cc68e263ca00fe0
+  metadata.gz: 80bebaac7083f9b504874dbddd33040650cbc11eab952bbabcb3f08f31e60665ba01c506457b0c01c1aa0fe0dcae345ae7218153c5168a259387f382cfba56dd
+  data.tar.gz: 805fe981c7f4ba539e32537e8fb11e907b993a1e719cd39644c280a712953f121783f532ac24794db999c454de19d32f7bb462207e113e240f1c714c0b193105

data/lib/rubytext.rb

@@ -13,12 +13,9 @@ end
 def fb2cp(fg, bg)
   fg ||= :blue
   bg ||= :white
-  debug "Colors are: #{fg} on #{bg}"
   fg = X.const_get("COLOR_#{fg.upcase}")
   bg = X.const_get("COLOR_#{bg.upcase}")
-  debug "Curses colors are: #{fg} on #{bg}"
   cp = $ColorPairs[[fg, bg]]
-  debug "cp is: #{cp}"
   [fg, bg, cp]
 end
 
@@ -75,21 +72,31 @@ module RubyText
     end
 
     def self.main(fg: nil, bg: nil)
-      debug "Entering Window.main (#{fg}, #{bg}) => "
       @main_win = X.init_screen
+debug(@main_win.inspect)
       X.start_color
       colors!(@main_win, fg, bg)
-      debug "About to call .make"
       rows, cols = @main_win.maxy, @main_win.maxx
       @screen = self.make(@main_win, rows, cols, 0, 0, false,
                           fg: fg, bg: bg)
+# FIXME Why is this hard to inline?
+#     @win = @main_win
+#     obj = self.allocate
+#     obj.instance_eval do 
+#       @outer = @win = @main_win
+#       @wide, @high, @r0, @c0 = cols, rows, 0, 0
+#       @fg, @bg = fg, bg
+#       @border = false
+#       @rows, @cols = @high, @wide
+#       @width, @height = @cols + 2, @rows + 2 if @border
+#     end
+#     @win = @main_win  # FIXME?
+#     obj
       @screen
     end
 
     def self.make(cwin, high, wide, r0, c0, border, fg: :white, bg: :black)
-      debug "make: #{[cwin, high, wide, r0, c0, border, fg, bg]}"
       obj = self.allocate
-      debug "Allocate returned a #{obj.class}"
       obj.instance_eval do 
         debug "  Inside instance_eval..."
         @outer = @win = cwin
@@ -107,29 +114,22 @@ end
 
 module RubyText
 
+  def self.set(*args)
+    args.each do |arg|
+      flag = arg.to_s
+      flag.sub!(/_/, "no")
+      X.send(flag)
+    end
+  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))
     $stdscr = STDSCR
-
-debug "STDSCR has #{STDSCR.fg} on #{STDSCR.bg}" 
-    debug "fg = #{fg} is not a valid color" unless Colors.include?(fg.to_s)
-    debug "bg = #{bg} is not a valid color" unless Colors.include?(bg.to_s)
     fg, bg, cp = fb2cp(fg, bg)
-    X.noecho
-    X.stdscr.keypad(true)
-    X.cbreak   # by default
-
-    args.each do |arg|
-      case arg
-        when :raw
-          X.raw
-        when :echo
-          X.echo
-        when :noecho
-          X.noecho
-      end
-    end
+    self.set(:_echo, :cbreak, :raw)  # defaults
+#   X.stdscr.keypad(true)
+    self.set(*args)  # override defaults
   end
 
   # For passing through arbitrary method calls

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 
   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.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses