rubytext 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef493cd27a795e722bc61332718af2332c38f6530e74ee3b00289e2507f2ddc6
-  data.tar.gz: e88ba1983fea2d0b1aa5b88f57197a50d571fd55ab35bf8556f53da532b2b8fe
+  metadata.gz: b6036e0b122b120c698646243dd7679e7a6b0991687d958a01e66be56119ad1a
+  data.tar.gz: ede2e0e43159005799fe9de6679858037cc3e1b6d3883583611ff87e2dfbed36
 SHA512:
-  metadata.gz: 72f0c62756d9cbf4f19c75319be3707f7337010d73dbee57cdcd73bc099ee15c5ee918116d3cc3014c92ebdbc72ddad121f629712c3eadc790c16051f9271a22
-  data.tar.gz: 1279205bdddfbff8a017a1e6b07dc82631738ac6dae99a607b146784aecfc67834af5bddc2e6a4d3a3e1ef7119ad193b2d549aa97e8c31bbf69d0785d8ef3b83
+  metadata.gz: 28124389eeef71e3cad064680fc1347649fba40cbf61a06ed0bea1d67fc2aaedd6679cc6c2db3196e03677596f3c7f7fc1172c6e17cc84852b730165db6ef166
+  data.tar.gz: 1fda7e185b9d33a85629fd6eb9d3c84e4a651001d5f002b4e504bd81682f1aba8aa273d3f00bc2ac0ee46a6593c2c83d5ad3c05f31d96ad530e8a36976d96246

data/lib/rubytext_version.rb

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

data/lib/settings.rb

@@ -1,12 +1,9 @@
 module RubyText
   # Hmm, all these are module-level...?
 
-  ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak, 
-               :keypad, :_keypad, :cursor, :_cursor]
-
-
   class Settings
-    # raw echo cbreak keypad cursor
+    ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak, 
+                 :keypad, :_keypad, :cursor, :_cursor]
     def initialize
       @defaults = {raw: false, echo: false, cbreak: true, keypad: true, cursor: true}
       @current = @defaults.dup
@@ -26,8 +23,8 @@ module RubyText
           when [:raw, false];    Curses.noraw
           when [:echo, true];    Curses.echo
           when [:echo, false];   Curses.noecho
-          when [:keypad, true];  STDSCR.cwin.keypad(true)
-          when [:keypad, false]; STDSCR.cwin.keypad(false)
+          when [:keypad, true];  Curses.stdscr.keypad(true)
+          when [:keypad, false]; Curses.stdscr.keypad(false)
           when [:cursor, true];  Curses.curs_set(1)
           when [:cursor, false]; Curses.curs_set(0)
         end
@@ -50,8 +47,16 @@ module RubyText
       set_curses(@current)
     end
 
-    def set(syms)
+    def set(*syms)
+      raise ArgumentError unless syms - ValidArgs == []
       # FIXME - call set_boolean
+      list = {}
+      syms.each do |sym|
+        str = sym.to_s
+        val = str[0] != "_"
+        list[sym] = val
+      end
+      set_boolean(list)
       # allow a block here?
     end
 
@@ -82,18 +87,19 @@ module RubyText
 
   def self.start(*args, log: "/tmp/rubytext.log", 
                  fg: White, bg: Blue, scroll: false)
-    $debug ||= File.new(log, "w") if log   # FIXME remove global
+#   $debug ||= File.new(log, "w") if log   # FIXME remove global
 
-    args.each {|arg| raise "#{arg} is not valid" unless ValidArgs.include?(arg) }
+    args.each {|arg| raise "#{arg} is not valid" unless Settings::ValidArgs.include?(arg) }
     raise "#{fg} is not a color" unless ::Colors.include? fg
     raise "#{bg} is not a color" unless ::Colors.include? bg
 
+    @settings = Settings.new
+    @settings.set(*args)            # override defaults
+
     main = RubyText::Window.main(fg: fg, bg: bg, scroll: scroll)
     Object.const_set(:STDSCR, main) unless defined? STDSCR
     $stdscr = STDSCR  # FIXME global needed?
     Object.include(WindowIO)
-    self.set(:_echo, :cbreak, :keypad)  # defaults
-    self.set(*args)            # override defaults
     @started = true
   rescue => err
     debug(err.inspect)
@@ -101,87 +107,19 @@ module RubyText
     raise RTError("#{err}")
   end
 
-  def self.flags
-    @flags.uniq!
-    @flags
-  end
-
-# FIXME Refactor the Hal out of this...
-
-    def self.inverse_flag(flag)
-      sflag = flag.to_s
-      if sflag[0] == "_"
-        sflag[1..-1].to_sym
-      else
-        ("_" + sflag).to_sym
-      end
-    end
-
-    def self.set(*args)   # Allow a block?
-      standard = [:cbreak, :raw, :echo]
-      @defaults = [:cbreak, :_echo, :keypad]
-      @flags = @defaults.dup
-      save_flags
-      args.each do |arg|
-        @flags += [arg]
-        inv = inverse_flag(arg)
-        @flags -= [inv]
-        @flags.uniq!
-        flag = arg.to_s
-        if standard.include?(flag.to_sym) || standard.include?(flag.sub(/no/, "_").to_sym)
-          Curses.send(flag)
-        elsif flag[0] == "_" && standard.include?(flag[1..-1].to_sym)
-          flag.sub!(/^_/, "no")
-          Curses.send(flag)
-        else
-          case flag.to_sym
-            when :cursor
-              Curses.curs_set(1)
-            when :_cursor, :nocursor
-              Curses.curs_set(0)
-            when :keypad
-              STDSCR.cwin.keypad(true)
-            when :_keypad
-              STDSCR.cwin.keypad(false)
-            else 
-              # self.stop
-              rest_flags  # prevent propagating error in test
-              raise RTError("flag = #{flag.inspect}")
-          end
-        end
-      end
-
-      if block_given?
-        yield
-        rest_flags
-      end
-    end
-
-    def self.reset
-      rest_flags
-    end
-
-    def self.save_flags
-      @fstack ||= []
-      @flags.uniq!
-      @fstack.push @flags
-    end
-
-    def self.rest_flags
-      @flags = @fstack.pop
-      @flags.uniq!
-      self.set(*@flags)
-    rescue 
-      @flags = @defaults
-    end
-
-# ... end of ugly settings weirdness
-
   def self.stop
     @started = false
     Curses.close_screen
   end
 
+  def set(*args)
+    @settings.set(*args)
+  end
+
+  def reset
+    @settings.reset
+  end
+
   # For passing through arbitrary method calls
   # to the lower level...
 

data/test/auto.rb

@@ -8,6 +8,10 @@ at_exit { RubyText.stop }
 
 class MyTest < Minitest::Test
 
+  def setup
+    load "rubytext.rb"
+  end
+
   def show_lines(text)
     lines = text.split("\n")
     str = "#{lines.size} lines\n"
@@ -20,14 +24,20 @@ class MyTest < Minitest::Test
     curr = RubyText.flags
     RubyText.stop
     assert curr == [:cbreak, :_echo, :keypad], "Got #{curr.inspect}"
+  rescue
+    RubyText.stop
   end
 
   def test_002_start_bad_param
     assert_raises(RTError) { RubyText.start(:foobar); RubyText.stop }
+  rescue
+    RubyText.stop
   end
 
   def test_003_start_bad_color
     assert_raises(RTError) { RubyText.start(fg: :chartreuse); RubyText.stop }
+  rescue
+    RubyText.stop
   end
 
   def test_004_set_reset
@@ -43,6 +53,8 @@ class MyTest < Minitest::Test
     RubyText.reset
     assert RubyText.flags == orig
 
+    RubyText.stop
+  rescue
     RubyText.stop
   end
 
@@ -57,6 +69,8 @@ class MyTest < Minitest::Test
     # outside block again...
     assert RubyText.flags == orig
 
+    RubyText.stop
+  rescue
     RubyText.stop
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses