rubytext 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af54fc7aa3e8470885d6f41f4cf9f33ce0dabe1b53a88ee1d1e0750b20ced927
-  data.tar.gz: 108611204efed6b3faef383c320625ea5236ba3a591ff798f3e1233cd12870ca
+  metadata.gz: 33b423bc804b45b9a7cf9b322a822551ec748664ae0c01888d193575aeec3792
+  data.tar.gz: 9bbd79f2a7dff3507a5ced5f83df3375a85a8b95ad92bd759e93e7a496867a87
 SHA512:
-  metadata.gz: 1d33192d6f51cac31efc8f0494a4337b276b698a46841e2ae13fe915530dad20ce60fe93d66953e34072bb5ead2d4a5f358215af026cdbaf3f818c81e8bf92f0
-  data.tar.gz: e940105ed012605c24cf504a3ffe10d481bcc0f78091c389f77375e14c73b665a3ffb60b354dc65b336b6920eb2cd4ed0c3a1b99146dcb76cb2f539c6886da89
+  metadata.gz: 409ddaf82104c1f4d6c11c72fcf92654bf169ddabdc7ee717b05e1ae2f8e0a0d54e4958b54f33bf526411befb6221b3a05a3a69679267a72728ed4a6a48de534
+  data.tar.gz: e6bec1c738ed8ed503215c402fd40b6f501c56a5d7147518994c52621a90e0fa787d1b7e7b7430e59b9b5ddcea596ec3ac95c5252fc36dc473c4ae9c5fde1a65

data/lib/settings.rb

@@ -1,7 +1,18 @@
 module RubyText
   # Hmm, all these are module-level.
+
   def self.flags
-    @fstack.last
+    @flags.uniq!
+    @flags
+  end
+
+  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?
@@ -10,7 +21,11 @@ module RubyText
     @flags = @defaults.dup
     save_flags
     args.each do |arg|
-      @flags << arg
+puts "\n@flags = #{@flags.inspect}... add #{arg}, remove #{inverse_flag(arg)}"
+      @flags += [arg]
+      @flags -= [inverse_flag(arg)]
+      @flags.uniq!
+puts "@flags = #{@flags.inspect}"
       flag = arg.to_s
       if standard.include? flag.to_sym
         X.send(flag)
@@ -20,15 +35,16 @@ module RubyText
       else
         case arg
           when :cursor
-            X.show_cursor
+            X.curs_set(1)
           when :_cursor, :nocursor
-            X.hide_cursor
+            X.curs_set(0)
           else 
             self.stop
             raise RTError
         end
       end
     end
+
     if block_given?
       yield
       rest_flags
@@ -36,16 +52,18 @@ module RubyText
   end
 
   def self.reset
-    restflags
+    rest_flags
   end
 
   def self.save_flags
     @fstack ||= []
+    @flags.uniq!
     @fstack.push @flags
   end
 
   def self.rest_flags
     @flags = @fstack.pop
+    @flags.uniq!
   rescue 
     @flags = @defaults
   end
@@ -58,7 +76,9 @@ module RubyText
     self.set(:_echo, :cbreak, :raw)  # defaults
 #   X.stdscr.keypad(true)
     self.set(*args)  # override defaults
-  rescue 
+  rescue => err
+    debug(err.inspect)
+    debug(err.backtrace)
     raise RTError
   end
 

data/lib/version.rb

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

data/test/auto.rb

@@ -4,6 +4,8 @@ require "minitest/autorun"
 
 require 'rubytext'
 
+at_exit { RubyText.stop }
+
 class MyTest < Minitest::Test
 
   def show_lines(text)
@@ -15,7 +17,6 @@ class MyTest < Minitest::Test
 
   def test_001_start_no_params
     RubyText.start
-#   puts RubyText.flags.inspect
     curr = RubyText.flags
     RubyText.stop
     assert curr == [:cbreak, :echo, :keypad, :cursor, :_raw]
@@ -29,5 +30,35 @@ class MyTest < Minitest::Test
     assert_raises(RTError) { RubyText.start(fg: :chartreuse); RubyText.stop }
   end
 
+  def test_004_set_reset
+    RubyText.start
+    orig = [:cbreak, :echo, :keypad, :cursor, :_raw]
+    assert RubyText.flags == orig
+
+    used = [:raw, :_cursor, :_echo]
+    RubyText.set(*used)
+    curr = RubyText.flags
+    assert used.all? {|x| curr.include? x }
+
+    RubyText.reset
+    assert RubyText.flags == orig
+
+    RubyText.stop
+  end
+
+  def test_005_set_block
+    RubyText.start
+    orig = RubyText.flags
+    used = [:raw, :_cursor, :_echo]
+    RubyText.set(*used) do 
+      curr = RubyText.flags
+      assert used.all? {|x| curr.include? x }
+    end
+    # outside block again...
+    assert RubyText.flags == orig
+
+    RubyText.stop
+  end
+
 end
 

metadata

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