livetext 0.9.19 → 0.9.23

data/test/snapshots/more_functions/expected-output.txt

@@ -0,0 +1,37 @@
+Testing some more functions here...
+<p>
+
+Here I am calling a function  with 
+a colon parameter...
+<p>
+
+<p>
+
+Next let's <b>do*</b> something with our parameter:
+<p>
+
+I'll call these variants...
+<p>
+
+"Motel" spelled backwards is letom :)
+<p>
+
+"lamina" reversed is animal
+<p>
+
+I can also use the erutaef tekcarb here.
+<p>
+
+If I don't use a parameter for [Error evaluating $$reverse()] - it gives
+me an error. (Bug or feature??)
+<p>
+
+What if a function doesn't use parameters at all, but
+we pass them? Hmm...
+<p>
+
+Now we succeed and succeed some more
+and finally we succeed in life.
+<p>
+
+But can we succeed, when our beds are burning?

data/test/snapshots/more_functions/source.lt3

@@ -0,0 +1,40 @@
+Testing some more functions here...
+
+.func just_do_it
+  item = param
+  # Do "something" with the parameter...
+  return ""  # parameter disappears!
+.end
+
+Here I am calling a function $$just_do_it:foobar with 
+a colon parameter...
+
+
+Next let's *do* something with our parameter:
+
+.func reverse
+  param.reverse   # just reverse it
+.end
+
+I'll call these variants...
+
+"Motel" spelled backwards is $$reverse:motel :)
+
+"lamina" reversed is $$reverse:lamina
+
+I can also use the $$reverse[bracket feature] here.
+
+If I don't use a parameter for $$reverse - it gives
+me an error. (Bug or feature??)
+
+What if a function doesn't use parameters at all, but
+we pass them? Hmm...
+
+.func meditate 
+   "succeed"   # just replaces params with this verb
+.end
+
+Now we $$meditate:slowly and $$meditate some more
+and finally we $$meditate[on various things] in life.
+
+But can we $$meditate, when our beds are burning?

data/test/snapshots/simple_import/expected-output.txt

@@ -4,4 +4,6 @@ testing a simple import
 
 Now call a method:
 Hello, world.
+<p>
+
 That's all.

data/test/snapshots/simple_import/source.lt3

@@ -1,7 +1,9 @@
 Here I am
 testing a simple import
-.mixin simple_import
+
+.import simple_import
 
 Now call a method:
 .hello_world
+
 That's all.

data/test/snapshots/subset.txt

@@ -0,0 +1,84 @@
+h 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
+
+
+# Others (usually passing):
+
+# import/include/mixin, others...
+
+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
+   simple_copy              #                    
+   simple_import            # 
+   simple_include           #                            
+   simple_mixin             #                            
+x  import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
+   import2                  # 
+   mixin_bookish            # 
+   import_bookish           # 
+                    
+# 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 #  
+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
+
+# functions
+
+   functions                #  
+   more_functions           # 
+
+# More/misc...                     
+                     
+   example_alpha            #  
+   example_alpha2           #  
+   hello_world              #  

data/test/snapshots.rb

@@ -45,8 +45,8 @@ class TestingLivetext < MiniTest::Test
 
     TTY = File.open("/dev/tty","w")
 
-    def self.get_dir   # FIXME - uh what?
-      cmdline = ARGV.first == "cmdline"   # FIXME remove??
+    def self.get_dir   # FIXME - uh what? remove this??
+      cmdline = ARGV.first == "cmdline"
       if cmdline
         dir = "../"
         Dir.chdir `livetext --path`.chomp.chomp
@@ -55,24 +55,34 @@ class TestingLivetext < MiniTest::Test
       end
     end
 
-    args = ARGV - ["cmdline"]
-
+    Args = ARGV - ["cmdline"]
     dir = self.get_dir
-
     Data = "#{dir}test/snapshots"
     Dir.chdir(Data)
-
     TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
 
+    Specified = []
+    Args.each do |name| 
+      which = TestDirs.select {|tdir| Regexp.new(name) =~ tdir }
+      which.each {|item| Specified << item }
+    end
+    Specified.uniq!
 
-    def self.filter  # TODO move subset/omit logic here??
-      all = Dir.entries(Data).reject {|fname| ! File.directory?(fname) } - %w[. ..]
-      included, excluded = [], []
+    def self.filter
+      unless Args.empty?
+        puts "Running: #{Args.map {|arg| "/#{arg}/" }}"
+        return Args
+      end
+      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
@@ -84,28 +94,32 @@ class TestingLivetext < MiniTest::Test
             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
@@ -184,26 +198,8 @@ class TestingLivetext < MiniTest::Test
     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 = Specified = Snapshot::Specified
+  Subset.replace(Snapshot.filter) if Specified.empty?
 
   Subset.each do |tdir|
     define_method("test_#{tdir}") do