livetext 0.9.17 → 0.9.22

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

@@ -0,0 +1,14 @@
+ACTUAL                                                      | EXPECTED                                                    
+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>
+                                                            >
+                                                            >   And this is file2 line 7.
+                                                            > And here we are
+                                                            > back in the
+                                                            > original file.

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

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:140:in `check_disallowed': Error: name 'to_s' is invalid (DisallowedName)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:142:in `dot_def'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

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

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

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/userapi.rb:92:in `_body': Expected .end, found end of file (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:48:in `comment'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Blah
+                                                            > blah
+                                                            > <p>
+                                                            >
+                                                            >

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

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:144:in `check_file_exists': Error: file 'nosuchfile.txt' not found (FileNotFound)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:252:in `copy'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:144:in `check_file_exists': Error: file 'nosuchinc.lt3' not found (FileNotFound)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:209:in `dot_include'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,13 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:34:in `find_file': No such mixin 'nosuchthing' (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:12:in `initialize'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `new'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `get_module'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:231:in `mixin'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Test that
+                                                            > we give an error
+                                                            > when a mixin does not
+                                                            > exist:
+                                                            > <p>

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

@@ -0,0 +1,13 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:34:in `find_file': No such mixin 'nonexistent' (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:9:in `initialize'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `new'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `get_module'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:243:in `import'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Test fake command .icanhaz:
+                                                            > we give an error
+                                                            > when a .rb does not
+                                                            > exist:
+                                                            > <p>

data/test/snapshots/{icanhaz → import}/source.lt3

@@ -1,9 +1,9 @@
-Test fake command .icanhaz:
+Test .import:
 we give an error
 when a .rb does not
 exist:
 
-.icanhaz nonexistent
+.import nonexistent
 
 We shouldn't
 reach this point

data/test/snapshots/{icanhaz2 → import2}/expected-output.txt

@@ -1,6 +1,8 @@
-Testing fake command .icanhaz:
+Testing .import:
 <p>
 
 Now call a method:
 Hello, world.
+<p>
+
 That's all.

data/test/snapshots/import2/source.lt3

@@ -0,0 +1,8 @@
+Testing .import:
+
+.import simple_import
+
+Now call a method:
+.hello_world
+
+That's all.

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,83 @@
+# 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                  # 
+ 
+                     
+# 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/wtf_bookish/expected-output.txt

@@ -0,0 +1,10 @@
+<table cellpadding=2>
+<tr>
+  <td width=[0, 0]% valign=top>this</td>
+  <td width=[0, 0]% valign=top>that</td>
+</tr>
+<tr>
+  <td width=[0, 0]% valign=top>foo</td>
+  <td width=[0, 0]% valign=top>bar</td>
+</tr>
+</table>

data/test/snapshots/wtf_bookish/source.lt3

@@ -0,0 +1,7 @@
+.import bookish
+
+.simple_table
+this :: that
+foo :: bar
+.end
+

data/test/snapshots.rb

@@ -1,4 +1,3 @@
-require 'minitest/autorun'
 
 require_relative '../lib/livetext'
 
@@ -43,6 +42,76 @@ class TestingLivetext < MiniTest::Test
     EXP_OUT,    EXP_ERR    = "expected-output.txt", "expected-error.txt"
     MATCH_OUT,  MATCH_ERR  =  "match-output.txt", "match-error.txt"
 
+    TTY = File.open("/dev/tty","w")
+
+    def self.get_dir   # FIXME - uh what? remove this??
+      cmdline = ARGV.first == "cmdline"
+      if cmdline
+        dir = "../"
+        Dir.chdir `livetext --path`.chomp.chomp
+      else
+        dir = ""
+      end
+    end
+
+    args = ARGV - ["cmdline"]
+    dir = self.get_dir
+    Data = "#{dir}test/snapshots"
+    Dir.chdir(Data)
+    TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
+
+    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("subset.txt")
+      control.each_line do |raw_line|
+        line = raw_line.dup
+        line.sub!(/#.*/, "")
+        line.strip!
+        line.chomp!
+        lower = line.downcase
+        dejavu = false
+        case
+          when lower.empty?
+            # ignore
+          when lower == "default include all"
+            raise "Only one 'default' allowed" if dejavu
+            @iflag, @eflag = true, false   # defaults to INCLUDE
+            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" && lower[1] == " "
+            TTY.puts "Warning: Can't include with 'i' when that is default" if @iflag
+            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
+            val, why = raw_line.split(" ", 3).values_at(1, 2)
+            @excluded << val unless val.nil?  # add to @excluded
+            @reasons << why.chomp
+        end
+      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
+
+    def after_suites
+      puts "Woohoo!"
+    end
+
     def initialize(base, assertion = nil)
       @assertion = assertion
       @base = base
@@ -109,9 +178,6 @@ class TestingLivetext < MiniTest::Test
       system("rm -f #{ACTUAL_OUT} #{ACTUAL_ERR} *sdiff.txt")
     end
 
-    def filter  # TODO move subset/omit logic here??
-    end
-
     def run
       @errors = false   # oops, need to reset
       Dir.chdir(@base) do
@@ -124,48 +190,7 @@ class TestingLivetext < MiniTest::Test
     end
   end
 
-  def self.get_dir   # FIXME - uh what?
-    cmdline = ARGV.first == "cmdline"   # FIXME remove??
-    if cmdline
-      dir = "../"
-      Dir.chdir `livetext --path`.chomp.chomp
-    else
-      dir = ""
-    end
-  end
-
-  TTY = File.open("/dev/tty","w")
-
-  args = ARGV - ["cmdline"]
-
-  dir = self.get_dir
-
-  Data = "#{dir}test/snapshots"
-  Dir.chdir(Data)
-
-  TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
-
-  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