rubytext 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25332b6e7f7962ccc17a01bd12b8b1b694044b0849e8d5753dece732b87a20f8
-  data.tar.gz: eacd7986b4f28031736f5f1161fd5d0a8a636121e456b11fc644a96e3c5fe1ef
+  metadata.gz: ef493cd27a795e722bc61332718af2332c38f6530e74ee3b00289e2507f2ddc6
+  data.tar.gz: e88ba1983fea2d0b1aa5b88f57197a50d571fd55ab35bf8556f53da532b2b8fe
 SHA512:
-  metadata.gz: 9a7c4ff165b93fc05b31b8c345cfd243449f6ec3efbacc1068f8fd4db56ffb0fb0dcee161c5141198d4ded867c12d789bdd2d4f654a1f05918646d35fd4b5efc
-  data.tar.gz: 33f68ebebd48faabf3bef69f96a12df62376c95bb8f204e9ba39e7875a81af4687565b973956e61eacde785e9920cf141630e727dbb857161f9be096aebd83b9
+  metadata.gz: 72f0c62756d9cbf4f19c75319be3707f7337010d73dbee57cdcd73bc099ee15c5ee918116d3cc3014c92ebdbc72ddad121f629712c3eadc790c16051f9271a22
+  data.tar.gz: 1279205bdddfbff8a017a1e6b07dc82631738ac6dae99a607b146784aecfc67834af5bddc2e6a4d3a3e1ef7119ad193b2d549aa97e8c31bbf69d0785d8ef3b83

data/lib/rubytext_version.rb

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

data/lib/settings.rb

@@ -4,7 +4,67 @@ module RubyText
   ValidArgs = [:raw, :_raw, :echo, :_echo, :cbreak, :_cbreak, 
                :keypad, :_keypad, :cursor, :_cursor]
 
-  def self.started
+
+  class Settings
+    # raw echo cbreak keypad cursor
+    def initialize
+      @defaults = {raw: false, echo: false, cbreak: true, keypad: true, cursor: true}
+      @current = @defaults.dup
+      @stack = []
+      @stack.push @current   # Note: Never let stack be empty
+      set_curses(@current)   # Set them for real
+      # FIXME To be continued...
+    end
+
+    def set_curses(**hash)
+      # Later: check for bad keys
+      hash.each_pair do |sym, val|
+        case [sym, val]
+          when [:cbreak, true];  Curses.cbreak
+          when [:cbreak, false]; Curses.nocbreak
+          when [:raw, true];     Curses.raw
+          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 [:cursor, true];  Curses.curs_set(1)
+          when [:cursor, false]; Curses.curs_set(0)
+        end
+      end
+    end
+    
+    def set_boolean(raw: nil, echo: nil, cbreak: nil, keypad: nil, cursor: nil)
+      raw    ||= @current[:raw]
+      echo   ||= @current[:echo]
+      cbreak ||= @current[:cbreak]
+      keypad ||= @current[:keypad]
+      cursor ||= @current[:cursor]
+      @stack.push @current
+      @current = {raw: raw, echo: echo, cbreak: cbreak, keypad: keypad, cursor: cursor}
+      set_curses(@current)
+    end
+
+    def reset_boolean
+      @current = @stack.pop rescue @stack[0]
+      set_curses(@current)
+    end
+
+    def set(syms)
+      # FIXME - call set_boolean
+      # allow a block here?
+    end
+
+    def reset
+      # FIXME - call reset_boolean
+    end
+  end
+
+  def self.started   # remove later
+    @started
+  end
+
+  def self.started?
     @started
   end
 
@@ -46,74 +106,76 @@ module RubyText
     @flags
   end
 
-# FIXME Refactor the Hal out of this.
+# 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
+    def self.inverse_flag(flag)
+      sflag = flag.to_s
+      if sflag[0] == "_"
+        sflag[1..-1].to_sym
+      else
+        ("_" + sflag).to_sym
+      end
     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}")
+    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
 
-    if block_given?
-      yield
+    def self.reset
       rest_flags
     end
-  end
 
-  def self.reset
-    rest_flags
-  end
+    def self.save_flags
+      @fstack ||= []
+      @flags.uniq!
+      @fstack.push @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
 
-  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
@@ -132,11 +194,11 @@ module RubyText
     end
   end
 
-  def self.hide_cursor
+  def self.hide_cursor    # remove later?
     Curses.curs_set(0)
   end
 
-  def self.show_cursor
+  def self.show_cursor    # remove later?
     Curses.curs_set(1)
   end
 

metadata

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