livetext 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d6ad974fae59754a4bf3d6c306e01a9028b8d5f0d86968fa2a3de5fbf97018
-  data.tar.gz: d250929b203dbfe8bdec044b31abebfe6f7244e2dd19376b876c0daf2634b730
+  metadata.gz: 2f49173986fc8a17fc77f35032e823f4818d404007d5aacd2d3d5a4a74f19e02
+  data.tar.gz: 61c0eab54d60c23abe0c27a6b8adc16f621e35c347253b557f07ffc80b31f80e
 SHA512:
-  metadata.gz: 20dfdad9784ef0bab8439b63d2dccac59f21a27ae57c178c8961bc5414a9dc87af4e78b0d7b5d2b61ca9809715e6fa6e1ee0cf6f8e9091053f724be3d1b7d505
-  data.tar.gz: 7a8cc51ccf632a8ec43ee06669f54c39276e5d88fbeb990e4c2d23c33993eb308e83ae3aa5213a054d5e868cb5617eab2632cb480764ece197192d03f0a75618
+  metadata.gz: '07389bbd1154d200f6f56b0373c0459bf140baeefa370d789224f2dedd53fe5120f0f7116e2c9d1381ff07a48f945786bb8e5f3478ac9002aea0f9443f61f579'
+  data.tar.gz: 12829e57528407a55f842f8ad8de77b47396cb6fffb22d76feaf8d98d644ebf00fc50d447a24f453026980a7cb7631443e11f9f7d67121ce9529d583ef85e513

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -74,6 +74,10 @@ class Livetext
     @main = Processor.new(self, output)
     @indentation = [0]
     @_vars = Livetext::Vars
+   
+    # Other predefined variables (see also _setfile)
+    _setvar(:User, `whoami`.chomp)
+    _setvar(:Version, Livetext::VERSION)
   end
 
   def _parse_colon_args(args, hash)  # really belongs in livetext
@@ -230,10 +234,10 @@ class Livetext
     end
     result
   rescue => err
-    STDERR.puts "Error was: #{err.inspect} (calling @main._error!)"
+    STDERR.puts "Error: #{err.inspect}"
     STDERR.puts err.backtrace
-    @main._error!(err)
-    # puts @body
+    # @main._error!(err)
+    puts @body
     @body = ""
     return @body
   end

data/lib/processor.rb

@@ -35,11 +35,11 @@ class Livetext
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
       # puts @parent.body
-      puts "[lib/processor] Error: #{err}"
-      puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
+      # 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
+      # raise "lib/processor error!" # FIXME
       exit if abort
     end
 

data/lib/userapi.rb

@@ -93,10 +93,10 @@ module Livetext::UserAPI
     else
       lines
     end
-  rescue => err
-    str = err.inspect + "\n"
-    str << err.backtrace.map {|x| "  " + x }.join("\n")
-    _error!(str)
+# rescue => err
+#   str = err.inspect + "\n"
+#   str << err.backtrace.map {|x| "  " + x }.join("\n")
+#   _error!(str)
   end
 
   def _body_text(raw=false)

data/test/data/error_inc_line_num/FOO

@@ -0,0 +1,21 @@
+[lib/processor] Error: Name 'foobar' is unknown
+Error was: #<RuntimeError: lib/processor error!> (calling @main._error!)
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/processor.rb:41:in `_error!'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:228:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:341:in `_include'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'

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

@@ -5,3 +5,9 @@ which includes file2 here:
   which has an error
   about an unknown command
   in line 5
+<p>
+
+  And this is file2 line 7.
+And here we are
+back in the
+original file.

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

@@ -4,3 +4,5 @@ without something
 beginning a block:
 <p>
 
+foo bar
+baz

data/test/data/error_missing_end/ERR

@@ -0,0 +1,32 @@
+[lib/processor] Error: #<RuntimeError: Expected .end, found end of file>
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:88:in `_body'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:32:in `comment'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'
+Error was: #<RuntimeError: lib/processor error!> (calling @main._error!)
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/processor.rb:41:in `_error!'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:99:in `rescue in _body'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:75:in `_body'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:32:in `comment'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'

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

@@ -2,3 +2,4 @@ Blah
 blah
 <p>
 
+

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

@@ -3,3 +3,7 @@ nonexistent file with .copy
 gives an error.
 <p>
 
+<p>
+
+Nothing to
+see here.

data/test/data/error_no_such_copy/source.lt3

@@ -1,3 +1,4 @@
+.debug
 Make sure a
 nonexistent file with .copy
 gives an error.

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

@@ -3,3 +3,7 @@ a nonexistent include
 will give an error.
 <p>
 
+<p>
+
+Nothing to
+see here.

data/test/data/lines.txt

@@ -118,3 +118,7 @@ Doubled underscore, midline
 This is __doubled, it seems
 This is <i>doubled</i>, it seems
 
+Underscore inside parens
+This is (_italicized and parenthesized)
+This is (<i>italicized</i> and parenthesized)
+

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

@@ -0,0 +1,6 @@
+Here we go...
+File = source.lt3
+FileDir = /Users/Hal/Dropbox/topx/git/livetext/test/data/predef_vars
+User = Hal
+Version = 0.9.11
+NoSuchVar = [NoSuchVar is undefined]

data/test/data/predef_vars/source.lt3

@@ -0,0 +1,6 @@
+Here we go...
+File = $File
+FileDir = $FileDir
+User = $User
+Version = $Version
+NoSuchVar = $NoSuchVar

data/test/testlines.rb

@@ -8,20 +8,30 @@ require 'formatline'
 input = ARGV.first || "test/data/lines.txt"
 data = File.readlines(input)
 
-data.each_slice(4) do |lines|
+pass = fail = 0
+data.each_slice(4).with_index do |lines, i|
   title, input, expected, blank = *lines
+  lnum = i*4 + 1
   input.chomp!
   expected.chomp!
   expected = eval(expected) if expected[0] == "/"
   
-  puts "-----------------------------"
-  print "Test:      #{title}"
 
   actual = FormatLine.parse!(input)
-  next if expected === actual
+  if expected === actual
+    pass += 1
+#   puts "PASS:      #{title}"
+    next
+  end
 
-  puts "Input:     #{input}"
+  fail += 1
+  puts "----------------------------- (line #{lnum})"
+  puts "Test:  #{title}"
+  puts "Input: #{input}"
   puts "  #{red('FAIL Expected: ')} #{expected.inspect}"
   puts "  #{red('     Actual  : ')} #{actual.inspect}"
   puts 
 end
+
+puts
+puts "#{pass} passes   #{fail} fails"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -53,6 +53,7 @@ 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/FOO
 - 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
@@ -66,6 +67,7 @@ files:
 - 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/ERR
 - test/data/error_missing_end/expected-err-line1match.txt
 - test/data/error_missing_end/expected-output.txt
 - test/data/error_missing_end/source.lt3
@@ -98,6 +100,9 @@ files:
 - test/data/more_complex_vars/expected-error.txt
 - test/data/more_complex_vars/expected-output.txt
 - test/data/more_complex_vars/source.lt3
+- test/data/predef_vars/expected-error.txt
+- test/data/predef_vars/expected-output.txt
+- test/data/predef_vars/source.lt3
 - test/data/raw_lines/expected-error.txt
 - test/data/raw_lines/expected-output.txt
 - test/data/raw_lines/source.lt3
@@ -127,7 +132,6 @@ files:
 - test/data/table_with_heredocs/expected-error.txt
 - test/data/table_with_heredocs/expected-output.txt
 - test/data/table_with_heredocs/source.lt3
-- test/extratests.txt
 - test/formatting.rb
 - test/newtest
 - test/sdtest
@@ -152,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A smart processor for text

data/test/extratests.txt

@@ -1,20 +0,0 @@
-Line starts with underscore
-_This for example
-<i>This</i> for example
-
-Line starts with double underscore
-__This, for example
-<i>This,</i> for example
-
-Line has embedded underscores
-This has some_embedded_underscores
-This has some_embedded_underscores
-
-Doubled underscore, midline
-This is __doubled, it seems
-This is <i>doubled,</i> it seems
-
-Line has escaped underscores
-This has some\_escaped\_underscores
-This has some_escaped_underscores
-