rubytext 0.0.72 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3736e2791cf23d42807517df4cfe769d2ec39a37e1d83f5c821b659f4303927
-  data.tar.gz: eb10a35201cfb772ed3e305e4810d411a9172804932fdca6bdf0fac6ac4d46c7
+  metadata.gz: 8aab3de408243095abccb5ccd7096708f0aff51e5aa27d04fd2e27e8fa1b870c
+  data.tar.gz: f3a0c894e21d5e498287942c078b730cc18431d7455e1f8cf1267691419927fc
 SHA512:
-  metadata.gz: 9ec76711b390cc2f70b323ec1d22163beb03b56947f5f3b9ab18545968f55cb7aaf7053933430f3bd4512ba20d3f90e23aef8b8a58ba524c154dcd3ce78fd015
-  data.tar.gz: 9a0603eaee4606b092963aa85b0dd71babbff7ba9304e80a08c315da2a3cf2acb74fb44faa62c9eb264b52f77c84445a24a0a8017d603423dfe9b8cdcba56902
+  metadata.gz: 59fdd86f11a6532e19a976b587a163fab2f75b4830e2f37469ec2c48ee621e8f03829198201084d565096bd786581761bc5b59cf36c85d7e12bc07047449093e
+  data.tar.gz: 389232176c392a98f8b2a961d3cb9a21496b154f1be949e615720cb8551a8ae132e09e54bb2f4b34872fcf7ad499064e9a1ee1cc716b354fc1dbdd3a2b0096a7

data/examples/ide.rb

@@ -7,8 +7,6 @@ require 'rubytext'
 
 RubyText.start
 
-# print " "  # FIXME - bug requires this?
-
 @lib, @code = ARGV
 
 def shell(str)

data/examples/prog20.rb

@@ -1,4 +1,4 @@
-def fx(*args) # find better way
+def effect(*args) # find better way
   RubyText::Effects.new(*args)
 end
 
@@ -8,11 +8,11 @@ win = RubyText.window(9, 65, 2, 26, fg: fg, bg: bg)
 win.puts "This is EXPERIMENTAL (and BUGGY)."
 win.puts "Use an \"effect\" to change the text color or \"look\":"
 
-win.puts "This is", fx(win, Yellow), " another color ", 
-          fx(win, White), "and yet another."
-win.puts "We can ", fx(win, :bold), "boldface ",
-         "and ", fx(win, :reverse), "reverse ",
-         "and ", fx(win, :under), "underline ",
-         fx(win, :normal), "text at will.\n "
-win.puts "This is ", fx(win, :bold, Red), "bold red ", 
-         fx(win, :normal, fg), "and this is normal again.\n "
+win.puts "This is", effect(win, Yellow), " another color ", 
+          effect(win, White), "and yet another."
+win.puts "We can ", effect(win, :bold), "boldface ",
+         "and ", effect(win, :reverse), "reverse ",
+         "and ", effect(win, :under), "underline ",
+         effect(win, :normal), "text at will.\n "
+win.puts "This is ", effect(win, :bold, Red), "bold red ", 
+         effect(win, :normal, fg), "and this is normal again.\n "

data/examples/slides

@@ -8,7 +8,7 @@ Dir.chdir(examples)
 rc = system("ruby check.rb")
 exit unless rc
 
-# FIXME 
+# FIXME later:
 #   - use names instead of numbers?
 #   - convert showme into a method?
 

data/lib/output.rb

@@ -23,33 +23,29 @@ class RubyText::Window
     self.cwin.attrset(0)
     args = [""] if args.empty?
     args += ["\n"] if sym == :puts
-#   debug "\ndelegate_output:"
-#   debug "  1. args = #{args.inspect}"
     set_colors(@fg, @bg)
     debug "  set colors: #{[@fg, @bg].inspect}"
     if sym == :p
       args.map! {|x| effect?(x) ? x : x.inspect }
-#     debug "  2. args = #{args.inspect}"
     else
       args.map! {|x| effect?(x) ? x : x.to_s }
-#     debug "  3. args = #{args.inspect}"
     end
     args.each do |arg|  
-#     debug "  loop: arg = #{arg.inspect}"
       if arg.is_a?(RubyText::Effects)
-#       debug "    arg.value = #{arg.value.inspect}, fg = #{arg.fg.inspect}"
-        self.cwin.attron(arg.value)
-#       debug "    set colors = #{[arg.fg, @bg]}"
-        self.set_colors(arg.fg, @bg) if arg.fg
+        attr, fg = arg.value, arg.fg
+        self.cwin.attron(attr)
+        self.set_colors(fg, @bg) if fg
+      elsif arg.respond_to? :effect
+        attr, fg = arg.effect.value, arg.effect.fg
+        self.cwin.attron(attr)
+        self.set_colors(fg, @bg) if fg
       else
-#       debug "    printing arg = #{arg.inspect}"
         arg.each_char {|ch| ch == "\n" ? crlf : @cwin.addch(ch) }
         @cwin.refresh
       end
     end
     crlf if sym == :p
     set_colors(@fg, @bg)
-#   debug "  set colors: #{[@fg, @bg].inspect}"
     @cwin.refresh
   end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.72"
+  VERSION = "0.0.73"
 
   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.72
+  version: 0.0.73
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses