livetext 0.9.01 → 0.9.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5dbf29a35e17c163982a4c2d5355949a72be58c662e75cf1f1d59bef1894dd
-  data.tar.gz: 882f20c410919dc4aa5f5d4e4277cdff88dca8efce5b1d0d96d1228767dd80c3
+  metadata.gz: 4070b2fad292adbaaf7e01d3436d352e91c4af4d51a9cdf4217af97ab9650d2f
+  data.tar.gz: 483229184f006895624ab5bb9abecf3c64e131d813ad7ec5f7dca761d148890b
 SHA512:
-  metadata.gz: 58671323ec46267e898c2999e86fc3f5e1379eae4adca5df0adf7be90d0d8b35a9aefaa9f4bf778f67963624fa764ba8087349500e5c4c280c90297c9fc07789
-  data.tar.gz: 3ddfa97b6ef5a86c311baf9df53851bf39f01780fbec54a34de64bd9b4970aa8e055b77147891927e1ed378b87a050a414d11a51d942010ba0d774a99714e3bb
+  metadata.gz: 8fa6323f64814746b0181b7440b3f85638c1a42275816aa541d41dccbfccf20d2730f6a4d151981a7232f7c89fb3f165d6f35ec1d2df1b8bfcf81b9ccaeec854
+  data.tar.gz: 89f65b89dd48f01ea6afa008fbd5db90ff68349cdc5fc2a45e7653830d631d230962b0c04b5a0b3406ad3fccd95b8c0eff21afdf84016a3186721257cc081dc6

data/lib/formatline.rb

@@ -195,6 +195,7 @@ class FormatLine
   end
 
   def add_token(kind, token = @token)
+    return if token.nil?
     @tokenlist << [kind, token] unless token.empty?
     @token = Null.dup
   end
@@ -352,6 +353,8 @@ class FormatLine
     grab   # ZZZ
     loop do
       case
+        when curr.nil?
+          return str
         when curr == Escape
           str << escaped
           next

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.01"
+  VERSION = "0.9.06"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -31,6 +31,10 @@ class Livetext
     attr_accessor :output      # both bad solutions?
   end
 
+  def vars
+    Livetext::Vars.dup
+  end
+
   def self.customize(mix: [], call: [], vars: {})
     obj = self.new
     mix  = Array(mix)
@@ -50,10 +54,6 @@ class Livetext
     self
   end
 
-  def vars
-    Livetext::Vars.dup
-  end
-
   Space = " "
   Sigil = "." # Can't change yet
 
@@ -73,29 +73,30 @@ class Livetext
     @body = ""
     @main = Processor.new(self, output)
     @indentation = [0]
+    @_vars = Livetext::Vars
   end
 
-def _parse_colon_args(args, hash)  # really belongs in livetext
-  h2 = hash.dup
-  e = args.each
-  loop do
-    arg = e.next.chop.to_sym
-    raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
-    h2[arg] = e.next
+  def _parse_colon_args(args, hash)  # really belongs in livetext
+    h2 = hash.dup
+    e = args.each
+    loop do
+      arg = e.next.chop.to_sym
+      raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
+      h2[arg] = e.next
+    end
+    h2 = h2.reject {|k,v| v.nil? }
+    h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
+    h2
   end
-  h2 = h2.reject {|k,v| v.nil? }
-  h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
-  h2
-end
 
-def _get_arg(name, args)  # really belongs in livetext
-  raise "(#{name}) Expected an array" unless args.is_a? Array
-  raise "(#{name}) Expected an arg" if args.empty?
-  raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
-  val = args[0]
-  raise "Expected an argument '#{name}'" if val.nil?
-  val
-end
+  def _get_arg(name, args)  # really belongs in livetext
+    raise "(#{name}) Expected an array" unless args.is_a? Array
+    raise "(#{name}) Expected an arg" if args.empty?
+    raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
+    val = args[0]
+    raise "Expected an argument '#{name}'" if val.nil?
+    val
+  end
 
   def mixin(mod)
     @main._mixin(mod)
@@ -105,6 +106,8 @@ end
     str, sym = var.to_s, var.to_sym
     Livetext::Vars[str] = val
     Livetext::Vars[sym] = val
+    @_vars[str] = val
+    @_vars[sym] = val
   end
 
   def _setfile(file)
@@ -166,50 +169,13 @@ end
     self.body
   end
 
-  def xform_file(file, vars: {})
+  def xform_file(file)  # , vars: {})
     Livetext::Vars.replace(vars) unless vars.nil?
+    @_vars.replace(vars) unless vars.nil?
     self.process_file(file)
     self.body
   end
 
-#  def transform(text)
-#    _setfile!("(string)")
-#    @output = ::Livetext.output
-#    enum = text.each_line
-#    front = text.match(/.*?\n/).to_a.first.chomp  rescue "..."
-#    @main.source(enum, "STDIN: '#{front}...'", 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)  # transform_line ???
-#    end
-#    @body
-#  end
-
-## FIXME don't need process *and* process_text
-
-#  def process_text(text)
-#    _setfile!("(string)")
-#    text = text.split("\n") if text.is_a? String
-#    enum = text.each
-#    @backtrace = false
-#    front = text[0].chomp
-#    @main.source(enum, "(text): '#{front}...'", 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)
-#    end
-#    val = @main.finalize if @main.respond_to? :finalize
-#    val
-#  rescue => err
-#    puts "process_text: err = #{err}"
-##   puts err.backtrace.join("\n")
-#    puts @body
-#    @body = ""
-#    return @body
-#  end
-
 ## FIXME process_file[!] should call process[_text]
 
   def process_file(fname, btrace=false)
@@ -231,21 +197,6 @@ end
     @body = ""
   end
 
-#  def process_file!(fname, backtrace=false)
-#    _setfile(fname)
-#    raise "No such file '#{fname}' to process" unless File.exist?(fname)
-#    @main.output = StringIO.new
-#    enum = File.readlines(fname).each
-#    @backtrace = backtrace
-#    @main.source(enum, fname, 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)
-#    end
-#    @main.finalize if @main.respond_to? :finalize
-#  end
-
   def handle_scomment(line)
   end
 
@@ -265,13 +216,13 @@ end
 
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
-line = line.sub(/# .*$/, "")
+    line = line.sub(/# .*$/, "")
     name = _get_name(line).to_sym
     result = nil
     if @main.respond_to?(name)
       result = @main.send(name)
     else
-      @main._error! "Name '#{name}' is unknown; version = #{Livetext::VERSION}"
+      @main._error! "Name '#{name}' is unknown"
       return
     end
     result

data/lib/processor.rb

@@ -35,7 +35,7 @@ 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]})"
+      STDERR.puts "Error: #{err} " # (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       exit if abort
     end

data/lib/standard.rb

@@ -9,7 +9,7 @@ module Livetext::Standard
   attr_reader :_data
 
   def data=(val)
-    @_data = val
+    @_data = val.chomp
     @_args = val.split rescue []
     @_mixins = []
   end
@@ -33,7 +33,7 @@ module Livetext::Standard
   end
 
   def shell
-    cmd = @_data
+    cmd = @_data.chomp
 #   _errout("Running: #{cmd}")
     system(cmd)
   end
@@ -49,23 +49,30 @@ EOS
     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 shell!
-    cmd = @_data
+    cmd = @_data.chomp
     system(cmd)
   end
 
   def errout
-    TTY.puts @_data
+    TTY.puts @_data.chomp
   end
 
   def say
-    str = _format(@_data)
+    str = _format(@_data.chomp)
     TTY.puts str
     _optional_blank_line
   end
 
   def banner
-    str = _format(@_data)
+    str = _format(@_data.chomp)
     n = str.length - 1
     puts "-"*n
     puts str
@@ -94,7 +101,7 @@ EOS
     name = @_args[0]
     str = "def #{name}\n"
     raise "Illegal name '#{name}'" if _disallowed?(name)
-    str += _body_text(true)
+    str += _body(true).join("\n")
     str += "\nend\n"
     eval str
   rescue => err
@@ -179,7 +186,7 @@ EOS
   end
 
   def set_NEW
-    line = _data.dup  # dup needed?
+    line = _data.chomp
     e = line.each_char  # enum
     loop do 
       c = e.next
@@ -205,6 +212,7 @@ EOS
     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)
@@ -215,12 +223,12 @@ EOS
   end
 
   def reval
-    eval _data
+    eval _data.chomp
   end
 
   def heredoc
     var = @_args[0]
-    str = _body_text
+    str = _body.join("\n")
     s2 = ""
     str.each_line do |s|
       str = FormatLine.var_func_parse(s.chomp)
@@ -346,7 +354,7 @@ EOS
   end
 
   def r
-    _out @_data  # No processing at all
+    _out @_data.chomp  # No processing at all
   end
 
   def raw
@@ -392,7 +400,7 @@ EOS
 
   def heading
     _print "<center><font size=+1><b>"
-    _print @_data
+    _print @_data.chomp
     _print "</b></font></center>"
   end
 
@@ -443,7 +451,7 @@ EOS
   end
 
   def xtable   # Borrowed from bookish - FIXME
-    title = @_data
+    title = @_data.chomp
     delim = " :: "
     _out "<br><center><table width=90% cellpadding=5>"
     lines = _body(true)
@@ -471,6 +479,11 @@ EOS
     _out "</table></center>"
   end
 
+  def image
+    name = @_args[0]
+    _out "<img src='#{name}'></img>"
+  end
+
   def br
     n = _args.first || "1"
     out = ""

data/lib/userapi.rb

@@ -19,6 +19,7 @@ module Livetext::UserAPI
   end
 
   def _args
+    @_args = _format(@_data).chomp.split
     if block_given?
       @_args.each {|arg| yield arg }
     else
@@ -26,6 +27,10 @@ module Livetext::UserAPI
     end
   end
 
+  def _vars
+    @_vars.dup
+  end
+
   def _optional_blank_line
     peek = peek_nextline
     return if peek.nil?
@@ -68,19 +73,20 @@ module Livetext::UserAPI
   end
 
   def _body(raw=false)
-    lines = []      #   @save_location = @sources.last
+    lines = []
     end_found = false
     loop do
       @line = nextline
       break if @line.nil?
       @line.chomp!
-      end_found = _end?(@line)
-      break if end_found 
-      next if _comment?(@line)  # FIXME Will cause problem with $. ?
+      break if _end?(@line)
+      next if _comment?(@line)
       @line = _format(@line) unless raw
       lines << @line 
     end
 
+    raise "Expected .end, found end of file" unless _end?(@line)
+
     _optional_blank_line
     if block_given?
       lines.each {|line| yield line }   # FIXME what about $. ?
@@ -88,16 +94,13 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-    str = "Fake error? 'Expecting .end, found end of file'\n" 
-    str << err.inspect + "\n"
+    str = err.inspect + "\n"
     str << err.backtrace.map {|x| "  " + x }.join("\n")
-STDERR.puts str
-exit
-#   _error!(str)
+    _error!(str)
   end
 
   def _body_text(raw=false)
-    _body(Livetext::Sigil).join("\n")
+    _raw_body.join("\n")
   end
 
   def _raw_body!

data/plugin/bookish.rb

@@ -12,6 +12,7 @@ def credit
 end
 
 def h1; _out "<h1>#{@_data}</h1>"; end
+def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
 def list
@@ -42,7 +43,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>"
@@ -88,10 +89,11 @@ def chapter
   @sec = @sec2 = 0
   title = @_data.split(" ",2)[1]
   @toc << "<br><b>#@chapter</b> #{title}<br>"
-  _next_output(_slug(title))
+  @_data = _slug(title)
+  next_output
   _out "<title>#{@chapter}. #{title}</title>"
   _out <<-HTML
-    <h2>Chapter #{@chapter}</h1>
+    <h2>Chapter #{@chapter}</h2>
     <h1>#{title}</h1>
 
   HTML
@@ -103,10 +105,11 @@ def chapterN
   title = @_data    # .split(" ",2)[1]
   _errout("Chapter #@chapter: #{title}")
   @toc << "<br><b>#@chapter</b> #{title}<br>"
-  _next_output(_slug(title))
+  @_data = _slug(title)
+  next_output
   _out "<title>#{@chapter}. #{title}</title>"
   _out <<-HTML
-    <h2>Chapter #{@chapter}</h1>
+    <h2>Chapter #{@chapter}</h2>
     <h1>#{title}</h1>
 
   HTML
@@ -116,10 +119,11 @@ def sec
   @sec += 1
   @sec2 = 0
   @section = "#@chapter.#@sec"
-# _errout("section #@section")
-  @toc << "#{_nbsp(3)}<b>#@section</b> #@_data<br>"
-  _next_output(_slug(@_data))
-  _out "<h3>#@section #{@_data}</h3>\n"
+  title = @_data.dup
+  @toc << "#{_nbsp(3)}<b>#@section</b> #{title}<br>"
+  @_data = _slug(@_data)
+  next_output
+  _out "<h3>#@section #{title}</h3>\n"
 rescue => err
   STDERR.puts "#{err}\n#{err.backtrace}"
   exit
@@ -128,10 +132,33 @@ end
 def subsec
   @sec2 += 1
   @subsec = "#@chapter.#@sec.#@sec2"
-  @toc << "#{_nbsp(6)}<b>#@subsec</b> #@_data<br>"
-# _errout("section #@subsec")
-  _next_output(_slug(@_data))
-  _out "<h3>#@subsec #{@_data}</h3>\n"
+  title = @_data.dup
+  @toc << "#{_nbsp(6)}<b>#@subsec</b> #{title}<br>"
+  @_data = _slug(@_data)
+  next_output
+  _out "<h3>#@subsec #{title}</h3>\n"
+end
+
+def definition_table
+  title = @_data
+  wide = "95"
+  delim = " :: "
+  _out "<br><center><table width=#{wide}% cellpadding=5>"
+  lines = _body(true)
+  lines.map! {|line| _format(line) }
+
+  lines.each do |line|
+    cells = line.split(delim)
+    _out "<tr>"
+    cells.each.with_index do |cell, i| 
+      width = (i == 0) ? "width=15%" : ""
+      _out "  <td #{width} valign=top>#{cell}</td>"
+    end
+    _out "</tr>"
+  end
+  _out "</table></center><br><br>"
+
+  _optional_blank_line
 end
 
 def table2
@@ -139,7 +166,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) }
 
@@ -192,7 +219,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|
@@ -200,7 +227,7 @@ def table
     cells = line.split(delim)
     wide = cells.map {|x| x.length }
     maxw = [0] * cells.size
-    maxw = maxw.map.with_index {|x, i| [x, wide[i]].max }
+    maxw = maxw.map.with_index {|x, i| [x, wide[i]+2].max }
   end
 
   sum = maxw.inject(0, :+)
@@ -246,12 +273,12 @@ end
 def missing
   @toc << "#{_nbsp(8)}<font color=red>TBD: #@_data</font><br>"
   stuff = @_data.empty? ? "" : ": #@_data"
-  _print "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
+  _out "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
 end
 
 def TBC
   @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>"
-  _print "<br><font color=red><i>To be continued...</i></font><br>"
+  _out "<br><font color=red><i>To be continued...</i></font><br>"
 end
 
 def note

data/plugin/calibre.rb

@@ -6,6 +6,7 @@ def epub!
   @cover = @_args[2]
   if ::File.directory?(src)
     files = ::Dir["#{src}/*"].grep /\.html$/
+    files = files.sort  # why is this necessary now?
     cmd = "cat #{files.join(' ')} >TEMP.html"
     system(cmd)
   else
@@ -17,8 +18,9 @@ def epub!
   cmd << "--cover #@cover " if @cover
   system(cmd)
 
-  str = `links -dump TEMP.html | wc -w`
+  system("links -dump TEMP.html >/tmp/links.out")
+  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/basic_formatting/expected-output.txt

@@ -1,4 +1,4 @@
-Here are examples of <b>boldface</b>  
+Here are examples of <b>boldface</b> 
 and <i>italics</i>
 and <font size=+1><tt>code</tt></font>
 as well as <b>more complex</b> examples 

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

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

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

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

data/test/data/example_alpha2/source.lt3

@@ -3,7 +3,7 @@
    cols = "1" if cols == ""
    cols = cols.to_i
    raise "Columns must be 1-5" unless cols.between?(1,5)
-   text = _body_text
+   text = _body.join("\n")
    text.gsub!(/\n/, " ")
    words = text.split.sort
    words.each_slice(cols) do |row| 

data/test/data/lines.txt

@@ -104,7 +104,7 @@ _This for example
 
 Line starts with double underscore
 __This, for example
-<i>This,</i> for example
+<i>This</i>, for example
 
 Line has embedded underscores
 This has some_embedded_underscores
@@ -116,5 +116,5 @@ This has some_escaped_underscores
 
 Doubled underscore, midline
 This is __doubled, it seems
-This is <i>doubled,</i> it seems
+This is <i>doubled</i>, it seems
 

data/test/test.rb

@@ -71,12 +71,44 @@ class TestingLivetext < MiniTest::Test
     Dir.chdir(base) do
       src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
       err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
+     
+      # New features - match out/err by regex
+      expout_regex = "expected-out-line1match.txt"
+      experr_regex = "expected-err-line1match.txt"
+
       cmd = "livetext #{src} >#{out} 2>#{err}"
       system(cmd)
-      output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
 
-      out_ok = output == expected
-      err_ok = errors == errexp
+      output   = File.read(out)
+      errors   = File.read(err)
+      rx_out = rx_err = nil
+
+      if File.exist?(expout_regex)
+        rx_out = /#{Regexp.escape(File.read(expout_regex).chomp)}/
+        expected = "(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)"
+      else
+        errexp = File.read(erx)
+      end
+
+      if rx_out
+        out_ok = output =~ rx_out
+      else
+        out_ok = output == expected
+      end
+
+      if rx_err
+        err_ok = errors =~ rx_err
+      else
+        err_ok = errors == errexp
+      end
+
       nout = output.split("\n").size
       nexp = expected.split("\n").size
       bad_out = "--- Expected (#{nexp} lines): \n#{green(expected)}\n--- Output (#{nout} lines):  \n#{red(output)}\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.01
+  version: 0.9.06
 platform: ruby
 authors:
 - Hal Fulton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -57,9 +57,11 @@ files:
 - 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
@@ -137,7 +139,7 @@ homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +154,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.1.2
+signing_key:
 specification_version: 4
 summary: A smart processor for text
 test_files: []