livetext 0.9.20 → 0.9.21

data/test/snapshots.rb

@@ -65,15 +65,17 @@ class TestingLivetext < MiniTest::Test
     TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
 
 
-    def self.filter  # TODO move subset/omit logic here??
-puts "Data = #{Data}"
-      all = Dir.entries(Data).reject {|fname| ! File.directory?(fname) } - %w[. ..]
-      included, excluded = [], []
+    def self.filter
+      all = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
+      @included, @excluded = all, []
+      @reasons = []
       @iflag, @eflag = true, false   # defaults to INCLUDE
-      control = File.new("clusion.txt")
-      control.each_line do |line|
+      control = File.new("subset.txt")
+      control.each_line do |raw_line|
+        line = raw_line.dup
         line.sub!(/#.*/, "")
         line.strip!
+        line.chomp!
         lower = line.downcase
         dejavu = false
         case
@@ -85,28 +87,32 @@ puts "Data = #{Data}"
             dejavu = true
           when lower == "default exclude all"
             raise "Only one 'default' allowed" if dejavu
+            @included = []
             @iflag, @eflag = false, true
             dejavu = true
           when lower == "quit"
             break
-          when lower[0] == "i"
+          when lower[0] == "i" && lower[1] == " "
             TTY.puts "Warning: Can't include with 'i' when that is default" if @iflag
-            included << line.split(" ", 2)[1] # add to included
-          when lower[0] == "x"
+            val = raw_line.split(" ", 2)[1]
+            @included << val unless val.nil?  # add to @included
+          when lower[0] == "x" && lower[1] == " "
             TTY.puts "Warning: Can't exclude with 'x' when that is default" if @eflag
-            excluded << line.split(" ", 2)[1] # add to excluded
-            # add to excluded
+            val, why = raw_line.split(" ", 3).values_at(1, 2)
+            @excluded << val unless val.nil?  # add to @excluded
+            @reasons << why.chomp
         end
-        [included, excluded]
       end
+      unless @excluded.empty?
+        puts "\nExcluded:\n "
+        @excluded.each.with_index do |name, num| 
+          printf "  %-20s %s\n", name, @reasons[num]
+        end
+        puts
+      end
+      @included - @excluded
     end
 
-    i, e = self.filter
-    p i
-    p e
-
-    exit
-
     def initialize(base, assertion = nil)
       @assertion = assertion
       @base = base
@@ -185,26 +191,7 @@ puts "Data = #{Data}"
     end
   end
 
-  if args.empty?
-    selected = File.readlines("subset.txt").map(&:chomp)
-    omitfile = "OMIT.txt"
-    omitted  = File.readlines(omitfile).map(&:chomp)
-    omitted.reject! {|line| line.start_with?("#") }
-    omit_names = omitted.map {|line| line.split.first }
-    STDERR.puts
-    STDERR.puts "  >>> Warning: Omitting #{omitted.size} snapshot tests:\n " 
-    indented = " "*7
-    omitted.each do |line| 
-      STDERR.print indented 
-      name, info = line.split(" ", 2)
-      STDERR.printf "%-20s  %s\n", name, info
-    end
-    STDERR.puts
-    wanted   = selected.empty? ? TestDirs : selected
-    Subset = wanted - omit_names
-  else
-    Subset = args
-  end
+  Subset = Snapshot.filter
 
   Subset.each do |tdir|
     define_method("test_#{tdir}") do

data/test/unit/parser/set.rb

@@ -13,7 +13,7 @@ class TestParseSet < MiniTest::Test
   def teardown
   end
 
-  def ztest_one_unquoted
+  def test_one_unquoted
     set = ParseSet.new('my_var_123 = 789').parse
     pair = set.first
     assert_equal pair, %w[my_var_123 789]
@@ -23,38 +23,37 @@ class TestParseSet < MiniTest::Test
     assert_equal pair, %w[var_234 naked_string]
   end
 
-  def ztest_one_single_quoted
+  def test_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 ztest_one_double_quoted
+  def test_one_double_quoted
     set = ParseSet.new('fancy.var2 = "another string"').parse
     pair = set.first
     assert_equal pair, ["fancy.var2", "another string"]
   end
 
-  def ztest_multiple_unquoted
-puts __method__
+  def test_multiple_unquoted
     pair1, pair2 = ParseSet.new("this=345, that=678").parse
     assert_equal pair1, %w[this 345]
     assert_equal pair2, %w[that 678]
   end
 
-  def ztest_multiple_unquoted_quoted
+  def test_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 ztest_quote_embedded_comma
+  def test_quote_embedded_comma
     set = ParseSet.new('gamma = "oh, well"').parse
     pair = set.first
     assert_equal pair, ["gamma", "oh, well"]
   end
 
-  def ztest_get_var
+  def test_get_var
     @parse = ParseSet.new("foo=345")
     assert_equal @parse.get_var, "foo"
     @parse = ParseSet.new("foo = 345")
@@ -79,7 +78,7 @@ puts __method__
     assert_raises(BadVariableName) { @parse.get_var }
   end
 
-  def ztest_skip_equal
+  def test_skip_equal
     @parse = ParseSet.new("=")
     assert_nil @parse.skip_equal
     @parse = ParseSet.new("   = ")
@@ -97,7 +96,7 @@ puts __method__
     assert_raises(NoEqualSign) { @parse.skip_equal }
   end
 
-  def ztest_quoted_value
+  def test_quoted_value
     @parse = ParseSet.new(%['this'])
     assert_equal @parse.quoted_value, "this"
     @parse = ParseSet.new(%["that"])
@@ -119,7 +118,7 @@ puts __method__
     #  - allow (escaped?) comma in quoted string
   end
 
-  def ztest_unquoted_value
+  def test_unquoted_value
     # Note: an unquoted value is still a string!
     @parse = ParseSet.new(%[342 ])
     assert_equal @parse.unquoted_value, "342"
@@ -140,19 +139,22 @@ puts __method__
 
   # BUG: FormatLine doesn't know variables in this context!
 
-  def xtest_4  # FIXME
+  def test_var_eq_var
     set = ParseSet.new("file = $File").parse
+    set = set.first  # [["var", "value"]]
     assert_equal set.first, "file"
-    assert set.last !~ /undefined/
+    refute set.last =~ /undefined/, "Found 'undefined' for variable value"
   end
 
   # BUG: ...or functions.
   # (Additional bug: Failing silently seems wrong.)
 
-  def xtest_5  # FIXME
+  def test_var_eq_func
     set = ParseSet.new("date = $$date").parse
+    set = set.first  # [["var", "value"]]
     assert_equal set.first, "date"
-    assert set.last =~ /^\d\d.\d\d.\d\d/
+    refute set.last =~ /undefined/, "Found 'undefined' for variable value"
+    assert set.last =~ /^\d\d.\d\d.\d\d/, "Did not find 6-digit date with two separators"
   end
 
   def test_two_strings

data/test/unit/parser/string.rb

@@ -58,7 +58,7 @@ class TestStringParser < MiniTest::Test
     assert @zero.eos?
     
     @one.grab
-    assert @one.eos?
+    assert @one.eos?   # FIXME??
     @one.grab
     assert @one.eos?
 
@@ -81,19 +81,15 @@ class TestStringParser < MiniTest::Test
     assert_nil char1
     assert_nil char2
     assert @zero.i == 0
-    assert @zero.last?
     assert @zero.eos?
 
-    refute @one.last?    # FIXME??
     char1 = @one.peek
-    refute @one.last?    # FIXME??
     char2 = @one.grab
     char3 = @one.peek
     assert char1
     assert char2 == char1
     assert char3 == @str1[1]
     assert @one.i == 1
-    assert @one.last?
     assert @one.eos?     # FIXME??
 
     char1 = @many.peek
@@ -103,7 +99,6 @@ class TestStringParser < MiniTest::Test
     assert char2 == char1
     assert char3 == @strN[1]
     assert @many.i == 1
-    refute @many.last?
     refute @many.eos?
   end
 
@@ -126,5 +121,49 @@ class TestStringParser < MiniTest::Test
     refute some.peek == " "
     assert_equal some.peek, "x"
     assert_equal some.i, 3
+
+    some = StringParser.new("abc   123")
+    3.times { some.grab }
+    assert_equal some.peek, " "
+    some.skip_spaces
+    refute some.peek == " "
+    assert_equal some.peek, "1"
+    assert_equal some.i, 6
+  end
+
+  def test_ungrab
+    parse = StringParser.new("abcdef")
+    assert_equal parse.i, 0
+    assert_equal parse.peek, "a"
+    3.times { parse.grab }
+    assert_equal parse.i, 3
+    assert_equal parse.peek, "d"
+    parse.ungrab
+    assert_equal parse.i, 2
+    assert_equal parse.peek, "c"
+  end
+
+  def test_next_bang
+    parse = StringParser.new("abcdef")
+    assert_equal parse.peek, "a"
+    assert_equal parse.next!, "b"
+    assert_equal parse.i, 0
+    3.times { parse.grab }
+    before = parse.i
+    assert_equal parse.next!, "e"
+    after = parse.i
+    assert_equal before, after
+  end
+  
+  def test_prev
+    parse = StringParser.new("abcdef")
+    assert_nil parse.prev
+    assert_equal parse.i, 0
+    3.times { parse.grab }
+    before = parse.i
+    assert_equal parse.prev, "c"
+    after = parse.i
+    assert_equal before, after
   end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -54,21 +54,14 @@ files:
 - plugin/markdown.rb
 - plugin/pyggish.rb
 - plugin/tutorial.rb
-- test/affirm/kbks.jpg
-- test/affirm/lm-kbks.lt
 - test/all.rb
-- test/cleanup
-- 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
@@ -76,7 +69,6 @@ files:
 - 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
@@ -114,7 +106,6 @@ files:
 - 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

data/test/affirm/lm-kbks.lt

@@ -1,19 +0,0 @@
-.mixin livemagick
-
-.nopass
-
-  .image 300 100 lightgray
-  .canvas green 1 0
-  .pen red red
-  .font 80 Arial
-  
-   .rectangle 100,50 300x300 green 9
-  
-  .text! 100,50 100x100 
-  K B K Z
-  .end
-  .draw
-  .save! myfile.jpg
-
-.def foobar
-

data/test/cleanup

@@ -1 +0,0 @@
-find testfiles -name actual-*.txt | xargs rm

data/test/newtest

@@ -1,14 +0,0 @@
-mkdir test/data/$1
-
-# actual-error.txt        actual-output.txt       expected-error.txt      expected-output.txt     source.lt3
-
-cd test/data/$1
-
-touch expected-output.txt expected-error.txt
-
-vi source.lt3 
-
-livetext source.lt3 >expected-output.txt 2>expected-error.txt
-
-vi -O source.lt3 expected-output.txt expected-error.txt
-

data/test/sdtest

@@ -1,6 +0,0 @@
-
-sdiff test/data/$1/expected-output.txt /tmp/$1--actual-output.txt
-
-echo ==========
-
-sdiff test/data/$1/expected-error.txt /tmp/$1--actual-error.txt

data/test/snapshots/OMIT.txt

@@ -1,11 +0,0 @@
-# Comments are ignored.
-# Other lines:  name_of_snapshot and any comments here are ignored (no # needed)
-# fake_test_name       Use # to un-omit   ;)
-  error_no_such_inc      Output BEFORE error doesn't get passed through
-  error_no_such_copy     ^ Same behavior as  error_no_such_inc
-  error_no_such_mixin    ^ Same behavior as error_missing_end
-  error_invalid_name     ^ Same behavior as error_no_such_inc
-  error_missing_end      Output is duplicated somehow. Look for: puts @body or puts @main.body
-  error_inc_line_num     Forgot what's wrong here
-  simple_import          Not coded yet
-  icanhaz                Dummy command similar to import/mixin

data/test/snapshots/clusion.txt

@@ -1,84 +0,0 @@
-# This file specifies which snapshots will/won't be run.
-
-# Blank lines and comments are ignored.
-# Other lines:  name_of_snapshot and any comments here are ignored (no # needed)
-
-# You can start by uncommenting one of these:
-# Default INCLUDE all
-# Default EXCLUDE all
-# If you use neither, INCLUDE is the default (but explicit is better)
-
-# If you include all, you can specify exclusions with an x:
-# x  my_test_name           # this is a comment
-
-# Likewise if you EXCLUDE all, you can specify inclusions with an i:
-# i  some_other_test        # this is a comment
-
-# The i and x (to include/exclude) must be the first token on
-#   the line (preceding the test name)
-
-# Note that QUIT (on a line by itself) will stop processing the file
-
-x  error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
-x  error_no_such_copy       # ^ Same behavior as  error_no_such_inc
-x  error_no_such_mixin      # ^ Same behavior as error_missing_end
-x  error_invalid_name       # ^ Same behavior as error_no_such_inc
-x  error_missing_end        # Output is duplicated somehow. Look for: puts @body or puts @main.body
-x  error_inc_line_num       # Forgot what's wrong here
-
-# Dummy command .icanhaz works like .mixin or .import
-
-x  icanhaz                  # "Leading" output doesn't get generated (same as error_no_such_inc)
-   icanhaz2
-
-# Others (usually passing):
-
-# import/include/mixin, others...
-
-   simple_copy              #                      
-   simple_import            #                                            
-   simple_include           #                                                                      
-   simple_mixin             #                                                                      
-                       
-# raw input                       
-                       
-   single_raw_line          #                                            
-   raw_lines                #                                            
-   raw_text_block           #                                            
-   copy_is_raw              #                                            
-                       
-# comments                       
-                       
-   block_comment            #                                                                        
-   comments_ignored_1       #                                            
-                       
-# variables and heredocs                       
-                       
-   predef_vars              #                                            
-   simple_vars              #                                            
-   more_complex_vars        #                                            
-   table_with_heredocs      #                                            
-
-# testing def
-
-   def_method               #                                            
-                       
-# intraline formatting
-
-   basic_formatting         #                                            
-
-# Errors
-
-   error_line_num           #                                            
-   error_mismatched_end     #                                            
-   error_name_not_permitted #                                            
-
-# functions
-
-   functions                #                                            
-
-# More/misc...                       
-                       
-   example_alpha            #                                            
-   example_alpha2           #                                            
-   hello_world              #                                            

data/test/snapshots/crap

@@ -1,16 +0,0 @@
-./fixit block_comment
-./fixit comments_ignored_1
-./fixit comments_ignored_2
-./fixit copy_is_raw
-./fixit def_method
-./fixit example_alpha
-./fixit example_alpha2
-./fixit hello_world
-./fixit more_complex_vars
-./fixit raw_text_block
-./fixit sigil_can_change
-./fixit simple_copy
-./fixit simple_include
-./fixit simple_mixin
-./fixit simple_vars
-./fixit single_raw_line

data/test/snapshots/fixit

@@ -1,6 +0,0 @@
-cd $1
-mv $1.err actual-error.txt
-mv $1.erx expected-error.txt
-mv $1.exp expected-output.txt
-mv $1.lt3 source.lt3
-mv $1.out actual-output.txt