livetext 0.9.08 → 0.9.13

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.08
+  version: 0.9.13
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -20,9 +20,19 @@ files:
 - "./README.lt3"
 - "./README.md"
 - bin/livetext
+- lib/errors.rb
 - lib/formatline.rb
 - lib/functions.rb
+- lib/helpers.rb
+- lib/html.rb
 - lib/livetext.rb
+- lib/livetext/importable.rb
+- lib/parser.rb
+- lib/parser/general.rb
+- lib/parser/import.rb
+- lib/parser/mixin.rb
+- lib/parser/set.rb
+- lib/parser/string.rb
 - lib/processor.rb
 - lib/standard.rb
 - lib/userapi.rb
@@ -35,104 +45,151 @@ files:
 - plugin/tutorial.rb
 - test/affirm/kbks.jpg
 - test/affirm/lm-kbks.lt
+- test/all.rb
 - test/cleanup
-- test/data/basic_formatting/expected-error.txt
-- test/data/basic_formatting/expected-output.txt
-- test/data/basic_formatting/source.lt3
-- test/data/block_comment/expected-error.txt
-- test/data/block_comment/expected-output.txt
-- test/data/block_comment/source.lt3
-- test/data/comments_ignored_1/expected-error.txt
-- test/data/comments_ignored_1/expected-output.txt
-- test/data/comments_ignored_1/source.lt3
-- test/data/copy_is_raw/expected-error.txt
-- test/data/copy_is_raw/expected-output.txt
-- test/data/copy_is_raw/rawtext.inc
-- test/data/copy_is_raw/source.lt3
-- test/data/crap
-- 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-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-output.txt
-- test/data/error_invalid_name/source.lt3
-- test/data/error_line_num/expected-err-line1match.txt
-- test/data/error_line_num/expected-output.txt
-- test/data/error_line_num/source.lt3
-- 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-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-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-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-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
-- test/data/example_alpha/expected-output.txt
-- test/data/example_alpha/source.lt3
-- test/data/example_alpha2/expected-error.txt
-- test/data/example_alpha2/expected-output.txt
-- test/data/example_alpha2/source.lt3
-- test/data/fixit
-- test/data/functions/expected-error.txt
-- test/data/functions/expected-output.txt
-- test/data/functions/source.lt3
-- test/data/hello_world/expected-error.txt
-- test/data/hello_world/expected-output.txt
-- test/data/hello_world/source.lt3
-- test/data/lines.txt
-- 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/raw_lines/expected-error.txt
-- test/data/raw_lines/expected-output.txt
-- test/data/raw_lines/source.lt3
-- test/data/raw_text_block/expected-error.txt
-- test/data/raw_text_block/expected-output.txt
-- test/data/raw_text_block/rawtext.inc
-- test/data/raw_text_block/source.lt3
-- test/data/simple_copy/expected-error.txt
-- test/data/simple_copy/expected-output.txt
-- test/data/simple_copy/simplefile.inc
-- test/data/simple_copy/source.lt3
-- test/data/simple_include/expected-error.txt
-- test/data/simple_include/expected-output.txt
-- test/data/simple_include/simplefile.inc
-- test/data/simple_include/source.lt3
-- test/data/simple_mixin/expected-error.txt
-- test/data/simple_mixin/expected-output.txt
-- test/data/simple_mixin/simple_mixin.rb
-- test/data/simple_mixin/source.lt3
-- test/data/simple_vars/expected-error.txt
-- test/data/simple_vars/expected-output.txt
-- test/data/simple_vars/source.lt3
-- test/data/single_raw_line/expected-error.txt
-- test/data/single_raw_line/expected-output.txt
-- test/data/single_raw_line/source.lt3
-- test/data/subset.txt
-- 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
-- test/test.rb
+- test/snapshots.rb
+- test/snapshots/basic_formatting/expected-error.txt
+- test/snapshots/basic_formatting/expected-output.txt
+- test/snapshots/basic_formatting/source.lt3
+- test/snapshots/block_comment/expected-error.txt
+- test/snapshots/block_comment/expected-output.txt
+- test/snapshots/block_comment/source.lt3
+- test/snapshots/comments_ignored_1/expected-error.txt
+- test/snapshots/comments_ignored_1/expected-output.txt
+- test/snapshots/comments_ignored_1/source.lt3
+- test/snapshots/copy_is_raw/expected-error.txt
+- test/snapshots/copy_is_raw/expected-output.txt
+- test/snapshots/copy_is_raw/rawtext.inc
+- test/snapshots/copy_is_raw/source.lt3
+- test/snapshots/crap
+- test/snapshots/def_method/expected-error.txt
+- test/snapshots/def_method/expected-output.txt
+- test/snapshots/def_method/source.lt3
+- test/snapshots/error_inc_line_num/actual-error.txt
+- test/snapshots/error_inc_line_num/actual-output.txt
+- test/snapshots/error_inc_line_num/expected-err-line1match.txt
+- test/snapshots/error_inc_line_num/expected-output.txt
+- test/snapshots/error_inc_line_num/file2.lt3
+- test/snapshots/error_inc_line_num/out-sdiff.txt
+- test/snapshots/error_inc_line_num/source.lt3
+- test/snapshots/error_invalid_name/actual-error.txt
+- test/snapshots/error_invalid_name/actual-output.txt
+- test/snapshots/error_invalid_name/expected-err-line1match.txt
+- test/snapshots/error_invalid_name/expected-output.txt
+- test/snapshots/error_invalid_name/out-sdiff.txt
+- test/snapshots/error_invalid_name/source.lt3
+- test/snapshots/error_line_num/actual-error.txt
+- test/snapshots/error_line_num/actual-output.txt
+- test/snapshots/error_line_num/expected-err-line1match.txt
+- test/snapshots/error_line_num/expected-output.txt
+- test/snapshots/error_line_num/out-sdiff.txt
+- test/snapshots/error_line_num/source.lt3
+- test/snapshots/error_mismatched_end/actual-error.txt
+- test/snapshots/error_mismatched_end/actual-output.txt
+- test/snapshots/error_mismatched_end/expected-err-line1match.txt
+- test/snapshots/error_mismatched_end/expected-output.txt
+- test/snapshots/error_mismatched_end/out-sdiff.txt
+- test/snapshots/error_mismatched_end/source.lt3
+- test/snapshots/error_missing_end/actual-error.txt
+- test/snapshots/error_missing_end/actual-output.txt
+- test/snapshots/error_missing_end/expected-err-line1match.txt
+- test/snapshots/error_missing_end/expected-output.txt
+- test/snapshots/error_missing_end/out-sdiff.txt
+- test/snapshots/error_missing_end/source.lt3
+- test/snapshots/error_name_not_permitted/OLD-exp-out
+- test/snapshots/error_name_not_permitted/expected-output.txt
+- test/snapshots/error_name_not_permitted/match-error.txt
+- test/snapshots/error_name_not_permitted/source.lt3
+- test/snapshots/error_no_such_copy/actual-error.txt
+- test/snapshots/error_no_such_copy/actual-output.txt
+- test/snapshots/error_no_such_copy/expected-err-line1match.txt
+- test/snapshots/error_no_such_copy/expected-output.txt
+- test/snapshots/error_no_such_copy/out-sdiff.txt
+- test/snapshots/error_no_such_copy/source.lt3
+- test/snapshots/error_no_such_inc/actual-error.txt
+- test/snapshots/error_no_such_inc/actual-output.txt
+- test/snapshots/error_no_such_inc/expected-err-line1match.txt
+- test/snapshots/error_no_such_inc/expected-output.txt
+- test/snapshots/error_no_such_inc/out-sdiff.txt
+- test/snapshots/error_no_such_inc/source.lt3
+- test/snapshots/error_no_such_mixin/actual-error.txt
+- test/snapshots/error_no_such_mixin/actual-output.txt
+- test/snapshots/error_no_such_mixin/expected-err-line1match.txt
+- test/snapshots/error_no_such_mixin/expected-output.txt
+- test/snapshots/error_no_such_mixin/out-sdiff.txt
+- test/snapshots/error_no_such_mixin/source.lt3
+- test/snapshots/example_alpha/expected-error.txt
+- test/snapshots/example_alpha/expected-output.txt
+- test/snapshots/example_alpha/source.lt3
+- test/snapshots/example_alpha2/expected-error.txt
+- test/snapshots/example_alpha2/expected-output.txt
+- test/snapshots/example_alpha2/source.lt3
+- test/snapshots/fixit
+- test/snapshots/functions/expected-error.txt
+- test/snapshots/functions/expected-output.txt
+- test/snapshots/functions/source.lt3
+- test/snapshots/hello_world/expected-error.txt
+- test/snapshots/hello_world/expected-output.txt
+- test/snapshots/hello_world/source.lt3
+- test/snapshots/lines.txt
+- test/snapshots/more_complex_vars/expected-error.txt
+- test/snapshots/more_complex_vars/expected-output.txt
+- test/snapshots/more_complex_vars/source.lt3
+- test/snapshots/predef_vars/actual-error.txt
+- test/snapshots/predef_vars/actual-output.txt
+- test/snapshots/predef_vars/expected-error.txt
+- test/snapshots/predef_vars/expected-output.txt
+- test/snapshots/predef_vars/out-sdiff.txt
+- test/snapshots/predef_vars/source.lt3
+- test/snapshots/raw_lines/expected-error.txt
+- test/snapshots/raw_lines/expected-output.txt
+- test/snapshots/raw_lines/source.lt3
+- test/snapshots/raw_text_block/expected-error.txt
+- test/snapshots/raw_text_block/expected-output.txt
+- test/snapshots/raw_text_block/rawtext.inc
+- test/snapshots/raw_text_block/source.lt3
+- test/snapshots/simple_copy/expected-error.txt
+- test/snapshots/simple_copy/expected-output.txt
+- test/snapshots/simple_copy/simplefile.inc
+- test/snapshots/simple_copy/source.lt3
+- test/snapshots/simple_include/expected-error.txt
+- test/snapshots/simple_include/expected-output.txt
+- test/snapshots/simple_include/simplefile.inc
+- test/snapshots/simple_include/source.lt3
+- test/snapshots/simple_mixin/actual-error.txt
+- test/snapshots/simple_mixin/actual-output.txt
+- test/snapshots/simple_mixin/expected-error.txt
+- test/snapshots/simple_mixin/expected-output.txt
+- test/snapshots/simple_mixin/out-sdiff.txt
+- test/snapshots/simple_mixin/simple_mixin.rb
+- test/snapshots/simple_mixin/source.lt3
+- test/snapshots/simple_vars/expected-error.txt
+- test/snapshots/simple_vars/expected-output.txt
+- test/snapshots/simple_vars/source.lt3
+- test/snapshots/single_raw_line/expected-error.txt
+- test/snapshots/single_raw_line/expected-output.txt
+- test/snapshots/single_raw_line/source.lt3
+- test/snapshots/subset.txt
+- test/snapshots/table_with_heredocs/expected-error.txt
+- test/snapshots/table_with_heredocs/expected-output.txt
+- test/snapshots/table_with_heredocs/source.lt3
 - test/testlines.rb
+- test/unit/all.rb
+- test/unit/html.rb
+- test/unit/parse_misc.rb
+- test/unit/parse_set.rb
+- test/unit/parser.rb
+- test/unit/parser/all.rb
+- test/unit/parser/general.rb
+- test/unit/parser/importable.rb
+- test/unit/parser/mixin.rb
+- test/unit/parser/set.rb
+- test/unit/parser/string.rb
+- test/unit/standard.rb
+- test/unit/stringparser.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby

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

@@ -1 +0,0 @@
-Error: Name 'class' is not permitted

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

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

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

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

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
-

data/test/test.rb

@@ -1,140 +0,0 @@
-def minitest?
-  require 'minitest/autorun'
-end
-
-abort "minitest gem is not installed" unless minitest?
-
-
-$LOAD_PATH << "./lib"
-
-require 'livetext'
-
-class TestingLivetext < MiniTest::Test
-
-  TTY = File.open("/dev/tty","w")
-
-  dir  = ARGV.first == "cmdline" ? "../" : ""
-  Data = "#{dir}test/data"
-
-  TestLines = []
-
-  Dir.chdir `livetext --path`.chomp.chomp if ARGV.first == "cmdline"
-
-  Dir.chdir(Data)
-
-  f = File.open("lines.txt")
-  loop do 
-    item = []
-    4.times { item << f.gets.chomp }
-    raise "Oops? #{item.inspect}" unless item.last == ""
-    TestLines << item
-    break if f.eof?
-  end
-
-  if File.size("subset.txt")  == 0
-    puts "Defining via TestLines"
-    TestLines.each.with_index do |item, i|
-      msg, src, exp, blank = *item
-      define_method("test_formatting_#{i}") do
-        actual = FormatLine.parse!(src)
-        if exp[0] == "/" # regex!
-          exp = Regexp.compile(exp[1..-2])   # skip slashes
-          assert_match(exp, actual, msg)
-        else
-          assert_equal(exp, actual, msg)
-        end
-      end
-    end
-  end
-
-  TestDirs = Dir.entries(".").reject {|f| ! File.directory?(f) } - %w[. ..]
-  selected = File.readlines("subset.txt").map(&:chomp)
-  Subset   = selected.empty? ? TestDirs : selected
-
-  Subset.each do |tdir|
-    define_method("test_#{tdir}") do
-      external_files(tdir)
-    end
-  end
-
-  def green(str)
-    "" + str.to_s + ""
-  end
-
-  def red(str)
-    "" + str.to_s + ""
-  end
-
-  def external_files(base)
-    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   = 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 = 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 = rx_err  # "(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"
-      bad_err = "--- Error Expected: \n#{green(errexp)}\n--- Error Output:  \n#{red(errors)}\n"
-
-      assert(out_ok, bad_out)
-      assert(err_ok, bad_err)
-      # only on success
-      system("rm -f #{out} #{err}") if out_ok && err_ok
-    end
-  end
-
-end
-
-
-=begin
-
-You can add any ordinary test method above. But so far, all these tests simply 
-call external_files.
-
-The external_files method works this way: 
-  - If the test (caller) method is test_my_silly_feature, then we will
-    look for a directory called data/my_silly_feature
-  - In here, there must be a source.lt3, expected-output.txt, and expected-error.txt
-  - Technically, any of these can be empty
-  - We run livetext on the source and compare actual vs expected (stdout, stderr)
-  - The "real" output gets checked first
-  - Of course, both must compare correctly for the test to pass
-
-=end
-