livetext 0.9.05 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20018f4ffc0706839f4d17412fd107ed9525b6c0958d29fa3e52dd4be8e6eb36
-  data.tar.gz: f3805cf9788faf459c3abd3b5145d16d806802e641d432a4d0045180115a8ea1
+  metadata.gz: 67d6ad974fae59754a4bf3d6c306e01a9028b8d5f0d86968fa2a3de5fbf97018
+  data.tar.gz: d250929b203dbfe8bdec044b31abebfe6f7244e2dd19376b876c0daf2634b730
 SHA512:
-  metadata.gz: 559f0f7ef52b6b09d47c20577b2febd3ccfdd125d647deb91b71947b5ce9531fa12156889c2f58ea7cad88666aa332eb91cafd58a071fcd2380e88e2e7482274
-  data.tar.gz: 5f658b46c63d9fdc5b4786ff9f5b9be9cf2bb85e2c2215348b65f0e717af65fc20e8351dea7168765e9149c3f6c0c5ec5c632e20cd90fac4da9bc6d5974eb319
+  metadata.gz: 20dfdad9784ef0bab8439b63d2dccac59f21a27ae57c178c8961bc5414a9dc87af4e78b0d7b5d2b61ca9809715e6fa6e1ee0cf6f8e9091053f724be3d1b7d505
+  data.tar.gz: 7a8cc51ccf632a8ec43ee06669f54c39276e5d88fbeb990e4c2d23c33993eb308e83ae3aa5213a054d5e868cb5617eab2632cb480764ece197192d03f0a75618

data/bin/livetext

@@ -72,7 +72,6 @@ loop do
       @backtrace = true
     when "-m", "--mixin"
       mod = ARGV.shift
-STDERR.puts "Got mod: #{mod}"
       x.mixin(ARGV.shift)
       next
     when "-s", "--stdin"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.05"
+  VERSION = "0.9.10"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -126,6 +126,7 @@ class Livetext
       when Comment
         handle_scomment(line)
       when Dotcmd
+#       STDERR.puts "line = #{line.inspect}"
         handle_dotcmd(line)
       when Ddotcmd
         indent = line.index("$") + 1
@@ -169,7 +170,7 @@ class Livetext
     self.body
   end
 
-  def xform_file(file)  # , vars: {})
+  def xform_file(file, vars: nil)
     Livetext::Vars.replace(vars) unless vars.nil?
     @_vars.replace(vars) unless vars.nil?
     self.process_file(file)
@@ -184,6 +185,7 @@ class Livetext
     enum = text.each
     @backtrace = btrace
     @main.source(enum, fname, 0)
+    line = nil
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -192,6 +194,7 @@ class Livetext
     val = @main.finalize if @main.respond_to? :finalize
     @body
   rescue => err
+    STDERR.puts "[process_file] fname = #{fname.inspect}\n    line = #{line.inspect}"
     STDERR.puts "ERROR #{err} in process_file"
     err.backtrace.each {|x| STDERR.puts "   " + x }
     @body = ""
@@ -227,8 +230,10 @@ class Livetext
     end
     result
   rescue => err
+    STDERR.puts "Error was: #{err.inspect} (calling @main._error!)"
+    STDERR.puts err.backtrace
     @main._error!(err)
-    puts @body
+    # puts @body
     @body = ""
     return @body
   end

data/lib/processor.rb

@@ -34,8 +34,11 @@ class Livetext
 
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
-      puts @parent.body
-      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
+      # puts @parent.body
+      puts "[lib/processor] Error: #{err}"
+      puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
+      STDERR.puts "[lib/processor] Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
+      raise "lib/processor error!"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       exit if abort
     end

data/lib/standard.rb

@@ -43,12 +43,42 @@ module Livetext::Standard
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
       def #{funcname}(param)
-        #{_body_text(true)}
+        #{_body.to_a.join("\n")}
       end
 EOS
+    _optional_blank_line
+    
     Livetext::Functions.class_eval func_def
   end
 
+  def h1; _out "<h1>#{@_data}</h1>"; end
+  def h2; _out "<h2>#{@_data}</h2>"; end
+  def h3; _out "<h3>#{@_data}</h3>"; end
+  def h4; _out "<h4>#{@_data}</h4>"; end
+  def h5; _out "<h5>#{@_data}</h5>"; end
+  def h6; _out "<h6>#{@_data}</h6>"; end
+
+  def list
+    _out "<ul>"
+    _body {|line| _out "<li>#{line}</li>" }
+    _out "</ul>"
+  end
+
+  def list!
+    _out "<ul>"
+    lines = _body.each   # {|line| _out "<li>#{line}</li>" }
+    loop do 
+      line = lines.next
+      line = _format(line)
+      if line[0] == " "
+        _out line
+      else
+        _out "<li>#{line}</li>"
+      end
+    end
+    _out "</ul>"
+  end
+
   def shell!
     cmd = @_data.chomp
     system(cmd)
@@ -195,6 +225,26 @@ EOS
     end
   end
 
+  def variables!  # cwd, not FileDir - weird, fix later
+    prefix = _args[0]
+    file = _args[1]
+    prefix = nil if prefix == "-"  # FIXME dumb hack
+    if file
+      here = ""  # different for ! version
+      lines = File.readlines(here + file)
+    else
+      lines = _body
+    end
+    lines.map! {|x| x.sub(/# .*/, "").strip }  # strip comments
+    lines.each do |line|
+      next if line.strip.empty?
+      var, val = line.split(" ", 2)
+      val = FormatLine.var_func_parse(val)
+      var = prefix + "." + var if prefix
+      @parent._setvar(var, val)
+    end
+  end
+
   def variables
     prefix = _args[0]
     file = _args[1]
@@ -219,13 +269,21 @@ EOS
     eval _data.chomp
   end
 
+  def heredoc!   # adds <br>...
+    _heredoc(true)
+  end
+
   def heredoc
+    _heredoc
+  end
+
+  def _heredoc(bang=false)
     var = @_args[0]
     str = _body.join("\n")
     s2 = ""
     str.each_line do |s|
       str = FormatLine.var_func_parse(s.chomp)
-      s2 << str # + "<br>"
+      s2 << str + "<br>"
     end
     indent = @parent.indentation.last
     indented = " " * indent
@@ -250,8 +308,10 @@ EOS
         break if value
       end
 		end
+    STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
 	  return value
   rescue
+    STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
 	  return nil
   end
 	
@@ -259,21 +319,25 @@ EOS
     # like include, but search upward as needed
     file = @_args.first
 		file = _seek(file)
-    _error!(file, "No such include file '#{file}'") unless file
+    _error!("No such include file #{file.inspect}") unless file
     @parent.process_file(file)
     _optional_blank_line
+  rescue => err
+    STDERR.puts ".seek error - #{err}"
+    STDERR.puts err.inspect
+	  return nil
   end
 
   def in_out  # FIXME dumb name!
     file, dest = *@_args
-    _check_existence(file, "No such include file '#{file}'")
+    _check_existence(file, "No such include file #{file.inspect}")
     @parent.process_file(file, dest)
     _optional_blank_line
   end
 
   def _include
-    file = @_args.first
-    _check_existence(file, "No such include file '#{file}'")
+    file = _format(@_args.first)  # allows for variables
+    _check_existence(file, "No such include file #{file.inspect}")
     @parent.process_file(file)
     _optional_blank_line
   end
@@ -320,9 +384,10 @@ EOS
         Dir.chdir("..") { mixin }
         return
       else
-        STDERR.puts "No such mixin '#{name}"
-        puts @body
-        exit!
+        raise "No such mixin '#{name}'"
+        # STDERR.puts "No such mixin '#{name}'"
+        # puts @body
+        # exit!
       end
     end
 

data/lib/userapi.rb

@@ -94,7 +94,7 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-    str << err.inspect + "\n"
+    str = err.inspect + "\n"
     str << err.backtrace.map {|x| "  " + x }.join("\n")
     _error!(str)
   end

data/plugin/bookish.rb

@@ -15,27 +15,6 @@ def h1; _out "<h1>#{@_data}</h1>"; end
 def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
-def list
-  _out "<ul>"
-  _body {|line| _out "<li>#{line}</li>" }
-  _out "</ul>"
-end
-
-def list!
-  _out "<ul>"
-  lines = _body.each   # {|line| _out "<li>#{line}</li>" }
-  loop do 
-    line = lines.next
-    line = _format(line)
-    if line[0] == " "
-      _out line
-    else
-      _out "<li>#{line}</li>"
-    end
-  end
-  _out "</ul>"
-end
-
 def alpha_columns
   n = @_args.first.to_i   # FIXME: what if missing?
   words = []
@@ -43,7 +22,7 @@ def alpha_columns
     words << line.chomp
   end
   words.sort!
-  _out "<table cellpadding=10>"
+  _out "<table cellpadding=2>"
   words.each_slice(n) do |w|
     items = w.map {|x| "<tt>#{x}</tt>" }
     _out "<tr><td width=5% valign=top></td><td>" + items.join("</td><td>") + "</td></tr>"
@@ -93,7 +72,7 @@ def chapter
   next_output
   _out "<title>#{@chapter}. #{title}</title>"
   _out <<-HTML
-    <h2>Chapter #{@chapter}</h1>
+    <h2>Chapter #{@chapter}</h2>
     <h1>#{title}</h1>
 
   HTML
@@ -109,7 +88,7 @@ def chapterN
   next_output
   _out "<title>#{@chapter}. #{title}</title>"
   _out <<-HTML
-    <h2>Chapter #{@chapter}</h1>
+    <h2>Chapter #{@chapter}</h2>
     <h1>#{title}</h1>
 
   HTML
@@ -166,7 +145,7 @@ def table2
   wide = "90"
   extra = _args[2]
   delim = " :: "
-  _out "<br><center><table border=1 width=#{wide}% cellpadding=5>"
+  _out "<br><center><table width=#{wide}% cellpadding=5>"
   lines = _body(true)
   lines.map! {|line| _format(line) }
 
@@ -219,7 +198,7 @@ def table
   @table_num += 1
   title = @_data
   delim = " :: "
-  _out "<br><center><table border=1 width=90% cellpadding=5>"
+  _out "<br><center><table width=90% cellpadding=5>"
   lines = _body(true)
   maxw = nil
   lines.each do |line|

data/plugin/calibre.rb

@@ -22,5 +22,5 @@ def epub!
   str = `wc -w /tmp/links.out`
   nw = str.split[0]
   puts "Approx words: #{nw}"
-  ::FileUtils.rm("TEMP.html")
+  # ::FileUtils.rm("TEMP.html")
 end

data/test/data/block_comment/source.lt3

@@ -4,9 +4,9 @@ a comment
 .end
 abc 123
 xyz
-.comment     # and this is an extra-useless comment
+.comment
 And so is this.
-.end         # comment of dubious nature
+.end
 
 one
 more

data/test/data/error_inc_line_num/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: Name 'foobar' is unknown

data/test/data/error_invalid_name/expected-err-line1match.txt

@@ -1 +1 @@
-Error: Illegal name 'to_s' (at source.lt3 line 5)
+Error: Illegal name 'to_s'

data/test/data/error_mismatched_end/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: Mismatched 'end'

data/test/data/error_missing_end/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: #<RuntimeError: Expected .end, found end of file>

data/test/data/error_name_not_permitted/expected-error.txt

@@ -1 +1 @@
-Error: Name 'class' is not permitted (at source.lt3 line 4)
+Error: Name 'class' is not permitted

data/test/data/error_no_such_copy/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: No such file 'nosuchfile.txt' to copy

data/test/data/error_no_such_inc/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: No such include file 'nosuchinc.lt3'

data/test/data/error_no_such_mixin/expected-err-line1match.txt

@@ -0,0 +1 @@
+No such mixin 'nosuchthing'

data/test/data/error_no_such_mixin/expected-output.txt

@@ -1,6 +0,0 @@
-Test that 
-we give an error
-when a mixin does not
-exist:
-<p>
-

data/test/data/functions/source.lt3

@@ -3,7 +3,7 @@ some functions
 here...
 
 .func myfunc
-"Eureka!"
+  "Eureka!"
 .end
 
 I am calling $$myfunc here...

data/test/test.rb

@@ -18,7 +18,7 @@ class TestingLivetext < MiniTest::Test
 
   TestLines = []
 
-  Dir.chdir `livetext --path`.chomp if ARGV.first == "cmdline"
+  Dir.chdir `livetext --path`.chomp.chomp if ARGV.first == "cmdline"
 
   Dir.chdir(Data)
 
@@ -31,7 +31,7 @@ class TestingLivetext < MiniTest::Test
     break if f.eof?
   end
 
-  if File.size("subset.txt") #  == 0
+  if File.size("subset.txt")  == 0
     puts "Defining via TestLines"
     TestLines.each.with_index do |item, i|
       msg, src, exp, blank = *item
@@ -51,8 +51,6 @@ class TestingLivetext < MiniTest::Test
   selected = File.readlines("subset.txt").map(&:chomp)
   Subset   = selected.empty? ? TestDirs : selected
 
-# puts "Subset = #{Subset.inspect}"
-
   Subset.each do |tdir|
     define_method("test_#{tdir}") do
       external_files(tdir)
@@ -60,11 +58,11 @@ class TestingLivetext < MiniTest::Test
   end
 
   def green(str)
-    "" + str + ""
+    "" + str.to_s + ""
   end
 
   def red(str)
-    "" + str + ""
+    "" + str.to_s + ""
   end
 
   def external_files(base)
@@ -85,14 +83,14 @@ class TestingLivetext < MiniTest::Test
 
       if File.exist?(expout_regex)
         rx_out = /#{Regexp.escape(File.read(expout_regex).chomp)}/
-        expected = "(match test)"
+        expected = rx_out # "(match test)"
       else
         expected = File.read(exp)
       end
 
       if File.exist?(experr_regex)
         rx_err = /#{Regexp.escape(File.read(experr_regex).chomp)}/
-        errexp = "(match test)"
+        errexp = rx_err  # "(match test)"
       else
         errexp = File.read(erx)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.05
+  version: 0.9.10
 platform: ruby
 authors:
 - Hal Fulton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -53,34 +53,32 @@ files:
 - test/data/def_method/expected-error.txt
 - test/data/def_method/expected-output.txt
 - test/data/def_method/source.lt3
-- test/data/error_inc_line_num/expected-error.txt
+- test/data/error_inc_line_num/expected-err-line1match.txt
 - test/data/error_inc_line_num/expected-output.txt
 - test/data/error_inc_line_num/file2.lt3
 - test/data/error_inc_line_num/source.lt3
 - test/data/error_invalid_name/expected-err-line1match.txt
-- test/data/error_invalid_name/expected-error.txt
 - test/data/error_invalid_name/expected-output.txt
 - test/data/error_invalid_name/source.lt3
 - test/data/error_line_num/expected-err-line1match.txt
-- test/data/error_line_num/expected-error.txt
 - test/data/error_line_num/expected-output.txt
 - test/data/error_line_num/source.lt3
-- test/data/error_mismatched_end/expected-error.txt
+- test/data/error_mismatched_end/expected-err-line1match.txt
 - test/data/error_mismatched_end/expected-output.txt
 - test/data/error_mismatched_end/source.lt3
-- test/data/error_missing_end/expected-error.txt
+- test/data/error_missing_end/expected-err-line1match.txt
 - test/data/error_missing_end/expected-output.txt
 - test/data/error_missing_end/source.lt3
 - test/data/error_name_not_permitted/expected-error.txt
 - test/data/error_name_not_permitted/expected-output.txt
 - test/data/error_name_not_permitted/source.lt3
-- test/data/error_no_such_copy/expected-error.txt
+- test/data/error_no_such_copy/expected-err-line1match.txt
 - test/data/error_no_such_copy/expected-output.txt
 - test/data/error_no_such_copy/source.lt3
-- test/data/error_no_such_inc/expected-error.txt
+- test/data/error_no_such_inc/expected-err-line1match.txt
 - test/data/error_no_such_inc/expected-output.txt
 - test/data/error_no_such_inc/source.lt3
-- test/data/error_no_such_mixin/expected-error.txt
+- test/data/error_no_such_mixin/expected-err-line1match.txt
 - test/data/error_no_such_mixin/expected-output.txt
 - test/data/error_no_such_mixin/source.lt3
 - test/data/example_alpha/expected-error.txt
@@ -139,7 +137,7 @@ homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A smart processor for text
 test_files: []

data/test/data/error_inc_line_num/expected-error.txt

@@ -1 +0,0 @@
-Error: Name 'foobar' is unknown (at file2.lt3 line 5)

data/test/data/error_invalid_name/expected-error.txt

@@ -1 +0,0 @@
-Error: Illegal name 'to_s' (at source.lt3 line 5)

data/test/data/error_line_num/expected-error.txt

@@ -1 +0,0 @@
-Error: Name 'foobar' is unknown (at source.lt3 line 4)

data/test/data/error_mismatched_end/expected-error.txt

@@ -1 +0,0 @@
-Error: Mismatched 'end' (at source.lt3 line 6)

data/test/data/error_missing_end/expected-error.txt

@@ -1 +0,0 @@
-Error: Expecting .end, found end of file (at source.lt3 line 6)

data/test/data/error_no_such_copy/expected-error.txt

@@ -1 +0,0 @@
-Error: No such file 'nosuchfile.txt' to copy (at source.lt3 line 5)

data/test/data/error_no_such_inc/expected-error.txt

@@ -1 +0,0 @@
-Error: No such include file 'nosuchinc.lt3' (at source.lt3 line 5)

data/test/data/error_no_such_mixin/expected-error.txt

@@ -1 +0,0 @@
-Error: No such mixin 'nosuchthing' (at source.lt3 line 6)