livetext 0.9.02 → 0.9.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e45d3b0ea8fb06374c84d7e830ca7537fc553decbdbe034171dd7f9395671a
-  data.tar.gz: 1943173d9090705f70b447e4a283d73cb9bbd86c7458a6e744431c79e3ccea21
+  metadata.gz: 868972bd6d69160614982ec1673ffe4b1e6b52cc0c37b3f3665b4cd63a9465c4
+  data.tar.gz: bb03f156bed4713bfa30804c6bb4fb5057a22db84523774a90649e62e22ac8f6
 SHA512:
-  metadata.gz: 78452f768fe1a334af4f7b2f5ac437bcda06d27a7e4ae3bf360ad92db61632a0bdb67c1a8e5fcf7ba8f18e4c3941181c084fb2a88b0ece4eae7b3eb31e4bddb6
-  data.tar.gz: 4fca6756c94dcceb8a7f5224d71aca40e3a47cea1bfc1d660e62409ed532b1bed1123528615e32ca01715f0a6a8d2e7efb07b9a22ed2c7f2c0362829c7b2639f
+  metadata.gz: f44235d6cd9649515ae9b6fed910b233f90c37f92c54bec3183f718b83e918ef95192aa8e8c08ec8b2eca16edbcbcc519a002214efeff4d042d7056f8a3a3a78
+  data.tar.gz: 148fa1af92fa0320bbbe3db92fb89cd24d4ebc0620d65343c1c0120c1a61c5612df7fe27bf2d6b0cf805189e00a566487cda712a4e1e09be3ce1f4e9ea035999

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.02"
+  VERSION = "0.9.03"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -271,7 +271,7 @@ line = line.sub(/# .*$/, "")
     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/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
@@ -50,22 +50,22 @@ EOS
   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 +94,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 +179,7 @@ EOS
   end
 
   def set_NEW
-    line = _data.dup  # dup needed?
+    line = _data.chomp
     e = line.each_char  # enum
     loop do 
       c = e.next
@@ -216,12 +216,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)
@@ -347,7 +347,7 @@ EOS
   end
 
   def r
-    _out @_data  # No processing at all
+    _out @_data.chomp  # No processing at all
   end
 
   def raw
@@ -393,7 +393,7 @@ EOS
 
   def heading
     _print "<center><font size=+1><b>"
-    _print @_data
+    _print @_data.chomp
     _print "</b></font></center>"
   end
 
@@ -444,7 +444,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)

data/lib/userapi.rb

@@ -19,6 +19,7 @@ module Livetext::UserAPI
   end
 
   def _args
+    @_args = @_data.chomp.split
     if block_given?
       @_args.each {|arg| yield arg }
     else
@@ -80,6 +81,8 @@ module Livetext::UserAPI
       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 $. ?
@@ -87,14 +90,13 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-    str = "Fake error? 'Expecting .end, found end of file'\n" 
     str << err.inspect + "\n"
     str << err.backtrace.map {|x| "  " + x }.join("\n")
     _error!(str)
   end
 
   def _body_text(raw=false)
-    _body.join("\n")
+    _raw_body.join("\n")
   end
 
   def _raw_body!

data/plugin/bookish.rb

@@ -88,7 +88,8 @@ 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>
@@ -103,7 +104,8 @@ 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>
@@ -118,7 +120,8 @@ def sec
   @section = "#@chapter.#@sec"
 # _errout("section #@section")
   @toc << "#{_nbsp(3)}<b>#@section</b> #@_data<br>"
-  _next_output(_slug(@_data))
+  @_data = _slug(@_data)
+  next_output
   _out "<h3>#@section #{@_data}</h3>\n"
 rescue => err
   STDERR.puts "#{err}\n#{err.backtrace}"
@@ -130,7 +133,8 @@ def subsec
   @subsec = "#@chapter.#@sec.#@sec2"
   @toc << "#{_nbsp(6)}<b>#@subsec</b> #@_data<br>"
 # _errout("section #@subsec")
-  _next_output(_slug(@_data))
+  @_data = _slug(@_data)
+  next_output
   _out "<h3>#@subsec #{@_data}</h3>\n"
 end
 
@@ -246,12 +250,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/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.02
+  version: 0.9.03
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-28 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