livetext 0.9.13 → 0.9.19

data/test/unit/parser/general.rb

@@ -3,9 +3,9 @@ require 'minitest/autorun'
 
 require_relative '../../../lib/parser/general'
 
-ParseMisc = ::Livetext::ParseMisc
+ParseGeneral = ::Livetext::ParseGeneral
 
-class TestParseMisc < MiniTest::Test
+class TestParseGeneral < MiniTest::Test
 
   def setup
   end
@@ -14,45 +14,45 @@ class TestParseMisc < MiniTest::Test
   end
 
   def test_strip_quotes
-    assert_raises(NilValue)         { ParseMisc.new(nil).strip_quotes }
-    assert_raises(NullString)       { ParseMisc.new("").strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%['test]).strip_quotes }
-#   assert_raises(MismatchedQuotes) { ParseMisc.new(%[test']).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%["test]).strip_quotes }
-#   assert_raises(MismatchedQuotes) { ParseMisc.new(%[test"]).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%["test']).strip_quotes }
-    assert_raises(MismatchedQuotes) { ParseMisc.new(%['test"]).strip_quotes }
-
-    assert ParseMisc.new(%[24601]).strip_quotes  == "24601", "Failure 1"
-    assert ParseMisc.new(%[3.14]).strip_quotes   == "3.14",  "Failure 2"
-    assert ParseMisc.new(%[test]).strip_quotes   == "test",  "Failure 3"
-    assert ParseMisc.new(%['test']).strip_quotes == "test",  "Failure 4"
-    assert ParseMisc.new(%["test"]).strip_quotes == "test",  "Failure 5"
+    assert_raises(NilValue)         { ParseGeneral.new(nil).strip_quotes }
+    assert_raises(NullString)       { ParseGeneral.new("").strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%['test]).strip_quotes }
+#   assert_raises(MismatchedQuotes) { ParseGeneral.new(%[test']).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%["test]).strip_quotes }
+#   assert_raises(MismatchedQuotes) { ParseGeneral.new(%[test"]).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%["test']).strip_quotes }
+    assert_raises(MismatchedQuotes) { ParseGeneral.new(%['test"]).strip_quotes }
+
+    assert ParseGeneral.new(%[24601]).strip_quotes  == "24601", "Failure 1"
+    assert ParseGeneral.new(%[3.14]).strip_quotes   == "3.14",  "Failure 2"
+    assert ParseGeneral.new(%[test]).strip_quotes   == "test",  "Failure 3"
+    assert ParseGeneral.new(%['test']).strip_quotes == "test",  "Failure 4"
+    assert ParseGeneral.new(%["test"]).strip_quotes == "test",  "Failure 5"
   end
 
   def test_variables
     vars = ["foo 234\n", "bar 456\n"]
     expect = [%w[foo 234], %w[bar 456]]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     vars = ["foo2 234", "bar2 456"]     # newline irrelevant
     expect = [%w[foo2 234], %w[bar2 456]]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     # quotes are not stripped... hmm
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["alpha", "'simple string'"], ["beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect
 
     # prefix (namespacing)
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["this.alpha", "'simple string'"], ["this.beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars, prefix: "this"), expect
+    assert_equal ParseGeneral.parse_vars(vars, prefix: "this"), expect
 
     # prefix (namespacing)
     vars = ["alpha 'simple string'", 'beta "another string"']
     expect = [["this.that.alpha", "'simple string'"], ["this.that.beta", '"another string"']]
-    assert_equal ParseMisc.parse_vars(vars, prefix: "this.that"), expect
+    assert_equal ParseGeneral.parse_vars(vars, prefix: "this.that"), expect
 
   end
 

data/test/unit/parser/importable.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 
 require_relative '../../../lib/parser/set'
 
-ParseSet = Livetext::ParseSet
+# ParseSet = Livetext::ParseSet
 
 class TestParseSet < MiniTest::Test
 

data/test/unit/parser/mixin.rb

@@ -1,9 +1,9 @@
 
 require 'minitest/autorun'
 
-require_relative 'set'
+require_relative '../../../lib/parser/set'
 
-ParseSet = Livetext::ParseSet
+# ParseSet = Livetext::ParseSet
 
 class TestParseSet < MiniTest::Test
 

data/test/unit/parser/set.rb

@@ -13,7 +13,7 @@ class TestParseSet < MiniTest::Test
   def teardown
   end
 
-  def test_one_unquoted
+  def ztest_one_unquoted
     set = ParseSet.new('my_var_123 = 789').parse
     pair = set.first
     assert_equal pair, %w[my_var_123 789]
@@ -23,37 +23,38 @@ class TestParseSet < MiniTest::Test
     assert_equal pair, %w[var_234 naked_string]
   end
 
-  def test_one_single_quoted
+  def ztest_one_single_quoted
     set = ParseSet.new("fancy.var.name = 'simple string'").parse
     pair = set.first
     assert_equal pair, ["fancy.var.name", "simple string"]
   end
 
-  def test_one_double_quoted
+  def ztest_one_double_quoted
     set = ParseSet.new('fancy.var2 = "another string"').parse
     pair = set.first
     assert_equal pair, ["fancy.var2", "another string"]
   end
 
-  def test_multiple_unquoted
+  def ztest_multiple_unquoted
+puts __method__
     pair1, pair2 = ParseSet.new("this=345, that=678").parse
     assert_equal pair1, %w[this 345]
     assert_equal pair2, %w[that 678]
   end
 
-  def test_multiple_unquoted_quoted
+  def ztest_multiple_unquoted_quoted
     pair1, pair2 = ParseSet.new('alpha = 567, beta = "oh well"').parse
     assert_equal pair1, %w[alpha 567]
     assert_equal pair2, ["beta", "oh well"]
   end
 
-  def test_quote_embedded_comma
+  def ztest_quote_embedded_comma
     set = ParseSet.new('gamma = "oh, well"').parse
     pair = set.first
     assert_equal pair, ["gamma", "oh, well"]
   end
 
-  def test_get_var
+  def ztest_get_var
     @parse = ParseSet.new("foo=345")
     assert_equal @parse.get_var, "foo"
     @parse = ParseSet.new("foo = 345")
@@ -78,7 +79,7 @@ class TestParseSet < MiniTest::Test
     assert_raises(BadVariableName) { @parse.get_var }
   end
 
-  def test_skip_equal
+  def ztest_skip_equal
     @parse = ParseSet.new("=")
     assert_nil @parse.skip_equal
     @parse = ParseSet.new("   = ")
@@ -96,7 +97,7 @@ class TestParseSet < MiniTest::Test
     assert_raises(NoEqualSign) { @parse.skip_equal }
   end
 
-  def test_quoted_value
+  def ztest_quoted_value
     @parse = ParseSet.new(%['this'])
     assert_equal @parse.quoted_value, "this"
     @parse = ParseSet.new(%["that"])
@@ -118,7 +119,7 @@ class TestParseSet < MiniTest::Test
     #  - allow (escaped?) comma in quoted string
   end
 
-  def test_unquoted_value
+  def ztest_unquoted_value
     # Note: an unquoted value is still a string!
     @parse = ParseSet.new(%[342 ])
     assert_equal @parse.unquoted_value, "342"
@@ -139,7 +140,7 @@ class TestParseSet < MiniTest::Test
 
   # BUG: FormatLine doesn't know variables in this context!
 
-  def xtest_4
+  def xtest_4  # FIXME
     set = ParseSet.new("file = $File").parse
     assert_equal set.first, "file"
     assert set.last !~ /undefined/
@@ -148,10 +149,16 @@ class TestParseSet < MiniTest::Test
   # BUG: ...or functions.
   # (Additional bug: Failing silently seems wrong.)
 
-  def xtest_5
+  def xtest_5  # FIXME
     set = ParseSet.new("date = $$date").parse
     assert_equal set.first, "date"
     assert set.last =~ /^\d\d.\d\d.\d\d/
   end
 
+  def test_two_strings
+    line = %[bday="May_31", date="5/31"]
+    set = ParseSet.new(line).parse
+    assert set == [["bday", "May_31"], ["date", "5/31"]]
+  end
+
 end

data/test/unit/parser/string.rb

@@ -35,14 +35,14 @@ class TestStringParser < MiniTest::Test
     assert_equal @many.i, 0
   end
 
-  def test_next
-    assert_nil @zero.next
+  def test_grab
+    assert_nil @zero.grab
     assert_equal @zero.i, 0      # nothing happens
     
-    assert_equal @one.next, "x"
+    assert_equal @one.grab, "x"
     assert_equal @one.i, 1
 
-    assert_equal @many.next, "T"
+    assert_equal @many.grab, "T"
     refute @many.eos, "EOS was true for #{@many.inspect}"
     assert_equal @many.i, 1
   end
@@ -53,19 +53,19 @@ class TestStringParser < MiniTest::Test
     refute @many.eos?
   end
 
-  def test_next_eos
-    @zero.next
+  def test_grab_eos
+    @zero.grab
     assert @zero.eos?
     
-    @one.next
+    @one.grab
     assert @one.eos?
-    @one.next
+    @one.grab
     assert @one.eos?
 
-    @many.next
+    @many.grab
     refute @many.eos?
     count = @many.len    # doesn't make sense??
-    count.times { @many.next }
+    count.times { @many.grab }
     assert @many.eos?
   end
 
@@ -75,8 +75,8 @@ class TestStringParser < MiniTest::Test
     assert_equal @many.peek, @strN[0]
   end
 
-  def test_next_peek
-    char1 = @zero.next
+  def test_grab_peek
+    char1 = @zero.grab
     char2 = @zero.peek
     assert_nil char1
     assert_nil char2
@@ -87,7 +87,7 @@ class TestStringParser < MiniTest::Test
     refute @one.last?    # FIXME??
     char1 = @one.peek
     refute @one.last?    # FIXME??
-    char2 = @one.next
+    char2 = @one.grab
     char3 = @one.peek
     assert char1
     assert char2 == char1
@@ -97,7 +97,7 @@ class TestStringParser < MiniTest::Test
     assert @one.eos?     # FIXME??
 
     char1 = @many.peek
-    char2 = @many.next
+    char2 = @many.grab
     char3 = @many.peek
     assert char1
     assert char2 == char1

data/test/unit/parser.rb

@@ -2,3 +2,5 @@
 require_relative 'parser/string'
 require_relative 'parser/set'
 require_relative 'parser/general'
+require_relative 'parser/mixin'       # currently empty
+require_relative 'parser/importable'  # currently empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.19
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -20,14 +20,25 @@ files:
 - "./README.lt3"
 - "./README.md"
 - bin/livetext
+- imports/bookish.rb
+- imports/calibre.rb
+- imports/livemagick.rb
+- imports/markdown.rb
+- imports/markdown_importable.rb
+- imports/pyggish.rb
+- imports/tutorial.rb
+- lib/cmdargs.rb
 - lib/errors.rb
 - lib/formatline.rb
 - lib/functions.rb
+- lib/handler.rb
+- lib/handler/icanhaz.rb
 - lib/helpers.rb
 - lib/html.rb
 - lib/livetext.rb
 - lib/livetext/importable.rb
 - lib/parser.rb
+- lib/parser/file.rb
 - lib/parser/general.rb
 - lib/parser/import.rb
 - lib/parser/mixin.rb
@@ -47,16 +58,17 @@ files:
 - test/affirm/lm-kbks.lt
 - test/all.rb
 - test/cleanup
-- test/formatting.rb
 - test/newtest
 - test/sdtest
 - test/snapshots.rb
+- test/snapshots/OMIT.txt
 - 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/clusion.txt
 - test/snapshots/comments_ignored_1/expected-error.txt
 - test/snapshots/comments_ignored_1/expected-output.txt
 - test/snapshots/comments_ignored_1/source.lt3
@@ -68,58 +80,33 @@ files:
 - 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/match-error.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/match-error.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/match-error.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/match-error.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/match-error.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/match-error.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/match-error.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/match-error.txt
 - test/snapshots/error_no_such_mixin/source.lt3
 - test/snapshots/example_alpha/expected-error.txt
 - test/snapshots/example_alpha/expected-output.txt
@@ -134,15 +121,19 @@ files:
 - 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/icanhaz/expected-output.txt
+- test/snapshots/icanhaz/match-error.txt
+- test/snapshots/icanhaz/simple_import.rb
+- test/snapshots/icanhaz/source.lt3
+- test/snapshots/icanhaz2/expected-error.txt
+- test/snapshots/icanhaz2/expected-output.txt
+- test/snapshots/icanhaz2/simple_canhaz.rb
+- test/snapshots/icanhaz2/source.lt3
 - 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/match-output.txt
 - test/snapshots/predef_vars/source.lt3
 - test/snapshots/raw_lines/expected-error.txt
 - test/snapshots/raw_lines/expected-output.txt
@@ -155,15 +146,16 @@ files:
 - test/snapshots/simple_copy/expected-output.txt
 - test/snapshots/simple_copy/simplefile.inc
 - test/snapshots/simple_copy/source.lt3
+- test/snapshots/simple_import/expected-error.txt
+- test/snapshots/simple_import/expected-output.txt
+- test/snapshots/simple_import/simple_import.rb
+- test/snapshots/simple_import/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
@@ -178,9 +170,8 @@ files:
 - test/snapshots/table_with_heredocs/source.lt3
 - test/testlines.rb
 - test/unit/all.rb
+- test/unit/formatline.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

data/test/formatting.rb

@@ -1,103 +0,0 @@
-require 'minitest/autorun'
-
-require_relative '../lib/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 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
-
-# puts "Subset = #{Subset.inspect}"
-
-  Subset.each do |tdir|
-    define_method("test_#{tdir}") do
-      external_files(tdir)
-    end
-  end
-
-  def green(str)
-    "" + str + ""
-  end
-
-  def red(str)
-    "" + str + ""
-  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"
-      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
-      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
-

data/test/snapshots/error_inc_line_num/actual-error.txt

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

data/test/snapshots/error_inc_line_num/actual-output.txt

@@ -1,13 +0,0 @@
-This is my 
-source file
-which includes file2 here:
-  This is file2
-  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/snapshots/error_inc_line_num/expected-err-line1match.txt

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

data/test/snapshots/error_inc_line_num/out-sdiff.txt

@@ -1,14 +0,0 @@
-EXPECTED                                                    | ACTUAL                                                      
-This is my                                                    This is my 
-source file                                                   source file
-which includes file2 here:                                    which includes file2 here:
-  This is file2                                                 This is file2
-  which has an error                                            which has an error
-  about an unknown command                                      about an unknown command
-  in line 5                                                     in line 5
-<p>                                                           <p>
-
-  And this is file2 line 7.                                     And this is file2 line 7.
-And here we are                                               And here we are
-back in the                                                   back in the
-original file.                                                original file.

data/test/snapshots/error_invalid_name/actual-error.txt

@@ -1,10 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:7:in `check_disallowed': to_s (DisallowedName)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:142:in `_def'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext.rb:232:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext.rb:141:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext.rb:203:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext.rb:200:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext.rb:200:in `process_file'
-	from ../../../bin/livetext:88:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

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

@@ -1 +0,0 @@
-Error: Illegal name 'to_s'

data/test/snapshots/error_invalid_name/out-sdiff.txt

@@ -1,6 +0,0 @@
-EXPECTED                                                    | ACTUAL                                                      
-                                                            > This file has
-                                                            > a defined method
-                                                            > that is invalid:
-                                                            > <p>
-                                                            >

data/test/snapshots/error_line_num/actual-error.txt

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

data/test/snapshots/error_line_num/actual-output.txt

@@ -1,5 +0,0 @@
-This file 
-will have an error
-on line 4
-if all goes
-well.

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

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

data/test/snapshots/error_line_num/out-sdiff.txt

@@ -1,6 +0,0 @@
-EXPECTED                                                    | ACTUAL                                                      
-This file                                                     This file 
-will have an error                                            will have an error
-on line 4                                                     on line 4
-if all goes                                                 <
-well.                                                       <

data/test/snapshots/error_mismatched_end/actual-error.txt

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