livetext 0.9.21 → 0.9.25

data/test/snapshots/{icanhaz → import}/expected-output.txt

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

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

@@ -0,0 +1 @@
+1 /file 'nonexistent' not found/

data/test/snapshots/{icanhaz → import}/simple_import.rb

@@ -1,5 +1,5 @@
 module SimpleImport
   def hello_world
-    _out "Hello, world."
+    api.out "Hello, world."
   end
 end

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/{icanhaz2/simple_canhaz.rb → import2/simple_import.rb}

@@ -1,5 +1,5 @@
 module SimpleImport
   def hello_world
-    _out "Hello, world."
+    api.out "Hello, world."
   end
 end

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/import_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/import_bookish/source.lt3

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

data/test/snapshots/mixin_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/mixin_bookish/source.lt3

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

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/raw_lines/expected-output.txt

@@ -8,6 +8,4 @@ Ordinary line... plus two blank lines:
 No formatting: *foo `foo _foo ~foo
 No variables: $alpha $beta
 No functions: $$this $$that
-<p>
-
 That's all.

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/simple_import.rb

@@ -1,5 +1,5 @@
 module SimpleImport
   def hello_world
-    _out "Hello, world."
+    api.out "Hello, world."
   end
 end

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/simple_mixin/simple_mixin.rb

@@ -1,3 +1,3 @@
 def hello_world
-  _out "Hello, world."
+  api.out "Hello, world."
 end

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

@@ -5,6 +5,4 @@ without interpretation:
 .comment This is not a real comment.
 This is not _italics or *boldface
 This is not a $variable reference
-<p>
-
 That's all.

data/test/snapshots/subset.txt

@@ -1,4 +1,4 @@
-# This file specifies which snapshots will/won't be run.
+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)
@@ -19,27 +19,23 @@
 
 # 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                 # works?
 
 # Others (usually passing):
 
 # import/include/mixin, others...
 
+   error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
+   error_no_such_copy       # ^ Same behavior as  error_no_such_inc
+   error_no_such_mixin      # ^ Same behavior as error_missing_end
    simple_copy              #                    
-x  simple_import            # not working yet (but *could* sub in .icanhaz)
+   simple_import            # 
    simple_include           #                            
    simple_mixin             #                            
-                     
+   import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
+   import2                  # 
+   mixin_bookish            # 
+   import_bookish           # 
+                    
 # raw input                     
                      
    single_raw_line          #  
@@ -72,10 +68,14 @@ x  simple_import            # not working yet (but *could* sub in .icanhaz)
    error_line_num           #  
    error_mismatched_end     #  
    error_name_not_permitted #  
+   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
 
 # functions
 
    functions                #  
+   more_functions           # 
 
 # More/misc...                     
                      

data/test/snapshots.rb

@@ -1,3 +1,12 @@
+require 'simplecov'            # These two lines must go first
+SimpleCov.use_merging(true)
+SimpleCov.start  do
+  puts "SimpleCov: Snapshots"
+  add_filter "/test/"
+  enable_coverage :branch
+  primary_coverage :branch
+end
+
 require 'minitest/autorun'
 
 require_relative '../lib/livetext'
@@ -7,10 +16,10 @@ Snapshots...
 
 NOTE that the external_files method has been replaced by the Snapshot class.
 
-You can add any ordinary test method above. But so far, most of these tests simply 
+You can add any ordinary test method above. But so far, most of these tests simply
 call Snapshot.new
 
-It works this way: 
+It works this way:
   - If the test (caller) method is test_my_silly_feature, then we will
     look for a directory called snapshots/my_silly_feature
   - In here, there must be a source.lt3
@@ -20,12 +29,12 @@ It works this way:
   - The expected-* files are "literal" data
       * compared byte-for-byte
       * watch spaces and bad regexes, etc. #duh
-      * each of these files corresponds to a single assertion 
-  - A match-* file has two entries per line: 
+      * each of these files corresponds to a single assertion
+  - A match-* file has two entries per line:
       * a ONE-BASED line number (in actual-* file)
       * a String OR a Regexp (to match against that line)
       * If there is nonsense here, it currently isn't caught
-      * each of these files MAY correspond to many assertions 
+      * each of these files MAY correspond to many assertions
   - We run livetext on the source and compare actual vs expected (stdout, stderr)
   - The error output gets checked first (expected or match), THEN standard output
   - Of course, both must compare correctly for the test to pass
@@ -45,8 +54,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,17 +64,24 @@ 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
+      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 = []
@@ -105,7 +121,7 @@ class TestingLivetext < MiniTest::Test
       end
       unless @excluded.empty?
         puts "\nExcluded:\n "
-        @excluded.each.with_index do |name, num| 
+        @excluded.each.with_index do |name, num|
           printf "  %-20s %s\n", name, @reasons[num]
         end
         puts
@@ -191,7 +207,8 @@ class TestingLivetext < MiniTest::Test
     end
   end
 
-  Subset = Snapshot.filter
+  Subset = Specified = Snapshot::Specified
+  Subset.replace(Snapshot.filter) if Specified.empty?
 
   Subset.each do |tdir|
     define_method("test_#{tdir}") do