livetext 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769c4da93282df68e38011277d71ee8334fd14d4f87061c803d3d9643564afc7
-  data.tar.gz: 9b8611007ecbc2d4e899575cf504e6f87c9b1887df2b59ef8ff56a072f5e9e92
+  metadata.gz: c6069fc394894011ca9f5ed2db3022b62a3a8c541c51566126551297e60eec74
+  data.tar.gz: b95803194c64a840262b4912e9116905c27a1879e4f6ec4309ae48404b31fa7e
 SHA512:
-  metadata.gz: 2904613247a614b01a8b80ecefb9197ba070e69ebad4d292e3ce77b3f4ddf5b60850ad554333c1e2f8a54cf56b765c799ae52fd7491fd24648b570313ba401c6
-  data.tar.gz: e698ca1431dc18d64d1b44fc9edebe033c382dcc49252602cbf74c398c8f6fc38fea2dbe3d3a056fe550eca6291157bfba53e240d416a97bd1f3cca8ea4ec141
+  metadata.gz: '046369b5d8a1c659fc210eea5134e79d9c8c0cfff0a2a833fff84b89001b115f4bd326fcf10cddcabc284e3abf964ad59e43330f7b4783dc4fba7d4255e66db9'
+  data.tar.gz: 20fb083bbd8d727c5e5774c784afa49f9a0edd58e339bdd4b7966916ffa94cbe335c6f702c841b67b75c053c88592b7b864eb9abef60aa96a9a949f5171769e0

data/lib/livetext/helpers.rb

@@ -58,10 +58,8 @@ module Livetext::Helpers
     base  = "#{name}#{ext}"
     paths.each do |path|
       file = path + base
-# ::Livetext::TTY.puts  "   Checking: #{file}"
       return file if File.exist?(file)
     end
-# ::Livetext::TTY.puts  "   ...oops"
     return nil
   end
 
@@ -118,11 +116,10 @@ module Livetext::Helpers
     success
   end
 
-  def invoke_dotcmd(name, data="")
-    # FIXME Add cmdargs stuff... depends on name, etc.
-    api.data = data   # should permit _ in function names at least
-    args = data.split
-    api.args = args
+  def invoke_dotcmd(name, data0="")
+    api.data = data0.dup   # should permit _ in function names at least
+    args0 = data0.split
+    api.args = args0.dup
     retval = @main.send(name)  # , *args)
     retval
   rescue => err
@@ -161,7 +158,6 @@ module Livetext::Helpers
     end
     name = "dot_" + name if %w[include def].include?(name)
     @main.check_disallowed(name)
-#   @main.data = data       # FIXME kill this
     @main.api.data = data0  # FIXME kill this?
     [name.to_sym, data0]
   end

data/lib/livetext/more.rb

@@ -59,17 +59,6 @@ class Livetext
     str3
   end
 
-  def self.customize(mix: [], call: [], vars: {})
-    obj = self.new
-    mix  = Array(mix)
-    call = Array(call)
-    mix.each {|lib| obj.mixin(lib) }
-    call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
-    api.setvars(vars)
-    obj
-  end
-
   def peek_nextline
     @main.peek_nextline  # delegate
   end
@@ -102,6 +91,17 @@ class Livetext
     raise err
   end
 
+  def self.customize(mix: [], call: [], vars: {})
+    obj = self.new
+    mix  = Array(mix)
+    call = Array(call)
+    mix.each {|lib| obj.mixin(lib) }
+    call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
+    # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
+    obj.api.setvars(vars)
+    obj
+  end
+
   def customize(mix: [], call: [], vars: {})
     mix  = Array(mix)
     call = Array(call)

data/lib/livetext/standard.rb

@@ -27,16 +27,6 @@ module Livetext::Standard
 
   attr_reader :data
 
-#   def data=(val)    # FIXME this is weird, let's remove it soonish  and why are there two???
-# # api.tty ">>>> in #{__FILE__}: api id = #{api.object_id}"
-#     val ||= ""
-#     val = val.chomp
-#     api.data = val
-#     api.args = format(val).split rescue []
-#     @mixins = []
-#     @imports = []
-#   end
-
   # dumb name - bold, italic, teletype, striketrough
 
   def bits   # FIXME umm what is this?
@@ -153,12 +143,8 @@ module Livetext::Standard
   end
 
   def dot_def
-# api.tty "in #{__FILE__}: api id = #{api.inspect}"
     name = api.args[0]
-# api.tty :dd1
-# api.tty name.inspect
     check_disallowed(name)
-# api.tty :dd2
     # Difficult to avoid eval here
     str = "def #{name}\n"
     str << api.body(true).join("\n")
@@ -364,7 +350,6 @@ STDERR.puts "pairs = #{pairs.inspect}"
   end
 
   def xtable   # Borrowed from bookish - FIXME
-# TTY.puts "=== #{__method__} #{__FILE__} #{__LINE__}"
     title = api.data
     delim = " :: "
     api.out "<br><center><table width=90% cellpadding=5>"

data/lib/livetext/userapi.rb

@@ -32,7 +32,6 @@ class Livetext::UserAPI
   end
 
   def setvar(var, val)   # FIXME
-    # Livetext::Vars[var] = val  # Now indifferent and "safe"
     @live.vars.set(var, val)
   end
 
@@ -49,7 +48,8 @@ class Livetext::UserAPI
 
   def data=(value)
     @data = value.dup
-    @args = format(@data).chomp.split
+#   @args = format(@data).chomp.split
+    @data
   end
 
   def data
@@ -104,29 +104,17 @@ class Livetext::UserAPI
     lines = []
     end_found = false
     loop do
-# TTY.puts "BODY 0: @line = #{@line.inspect}"
       @line = @live.nextline
-# TTY.puts "BODY 1: @line = #{@line.inspect}"
       break if @line.nil?
-# TTY.puts "BODY 2: @line = #{@line.inspect}"
       @line.chomp!
-# TTY.puts "BODY 3: @line = #{@line.inspect}"
       break if end?(@line)
-# TTY.puts "BODY 4: @line = #{@line.inspect}"
       next if comment?(@line)
-# TTY.puts "BODY 5: @line = #{@line.inspect}"
       @line = format(@line) unless raw
-# TTY.puts "BODY 6: @line = #{@line.inspect}"
       lines << @line
-# TTY.puts "BODY 7: @line = #{@line.inspect}"
     end
-# TTY.puts "BODY 8: lines = #{lines.inspect}"
     raise "Expected .end, found end of file" unless end?(@line)  # use custom exception
-# TTY.puts "BODY 9: lines = #{lines.inspect}"
     optional_blank_line   # FIXME Delete this??
-# TTY.puts "BODY A: lines = #{lines.inspect}"
     return lines unless block_given?
-# TTY.puts "BODY B: lines = #{lines.inspect}"
     lines.each {|line| yield line }   # FIXME what about $. ?
   end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.31"
+  VERSION = "0.9.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.32
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -71,7 +71,6 @@ files:
 - test/extra/single.rb
 - test/extra/single.txt
 - test/extra/testgen.rb
-- test/extra/variables..rb
 - test/extra/variables.rb
 - test/extra/variables.txt
 - test/snapshots.rb