livetext 0.9.15 → 0.9.21

data/lib/processor.rb

@@ -2,6 +2,10 @@
 
 class Livetext
 
+  def self.interpolate(str)
+    FormatLine.var_func_parse(str)
+  end
+
   # Class Processor does the actual work of processing input.
 
   class Processor
@@ -11,17 +15,21 @@ class Livetext
     include Livetext::Standard
     include Livetext::UserAPI
 
-    Disallowed = %i[ !  !=  !~  <=>  ==  ===   =~         __binding__   __id__    __send__   class
-                     clone      define_singleton_method   display       dup      enum_for    eql?       
-                     equal?     extend      freeze        frozen?       hash     inspect     instance_eval          
-                     instance_exec          instance_of?  instance_variable_defined?         
-                     instance_variable_get  instance_variable_set       instance_variables   is_a?          
-                     kind_of?               method        methods       nil?                 object_id          
-                     pretty_inspect         private_methods             protected_methods    public_method          
-                     public_methods         public_send                 remove_instance_variable          
-                     respond_to?            send          singleton_class                    singleton_method          
-                     singleton_methods      taint         tainted?      tap                  to_enum          
-                     to_s                   trust         untaint       untrust              untrusted?]
+    Disallowed = 
+       %i[ __binding__        __id__            __send__          class
+           clone              display           dup               enum_for
+           eql?               equal?            extend            freeze
+           frozen?            hash              inspect           instance_eval   
+           instance_exec      instance_of?      is_a?             kind_of?
+           method             methods           nil?              object_id          
+           pretty_inspect     private_methods   protected_methods public_method
+           public_methods     public_send       respond_to?       send
+           singleton_class    singleton_method  singleton_methods taint
+           tainted?           tap               to_enum           to_s
+           trust              untaint           untrust           untrusted?
+           define_singleton_method              instance_variable_defined?
+           instance_variable_get                instance_variable_set
+           remove_instance_variable             instance_variables ]
 
     def initialize(parent, output = nil)
       @parent = parent

data/lib/standard.rb

@@ -118,7 +118,7 @@ module Livetext::Standard
 
   def banner(args = nil, body = nil)
     str = _format(@_data.chomp)
-    num = str.length - 1
+    num = str.length
     decor = "-"*num + "\n"
     puts decor + str + "\n" + decor
   end
@@ -187,7 +187,7 @@ module Livetext::Standard
     text = _body.join("\n")
     rhs = ""
     text.each_line do |line|
-      str = FormatLine.var_func_parse(line.chomp)
+      str = Livetext.interpolate(line.chomp)
       rhs << str + "<br>"
     end
     indent = @parent.indentation.last
@@ -234,6 +234,17 @@ module Livetext::Standard
     _optional_blank_line
   end
 
+  def icanhaz(args = nil, body = nil)
+    name = @_args.first   # Expect a module name
+    return if @_mixins.include?(name)
+    @_mixins << name
+    mod = Livetext::Handler::ICanHaz.get_module(name)  # FIXME??
+    self.extend(mod)
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+    _optional_blank_line
+  end
+
   def import(args = nil, body = nil)
     name = @_args.first   # Expect a module name
     return if @_mixins.include?(name)

data/lib/userapi.rb

@@ -3,6 +3,7 @@
 require_relative 'formatline'
 
 # UserAPI deals mostly with user-level methods.
+
 module Livetext::UserAPI
 
   def setvar(var, val)
@@ -113,9 +114,9 @@ module Livetext::UserAPI
   end
 
   def _format(line)
-    return "" if line == "\n"
+    return "" if line == "\n" || line.nil?
     line2 = FormatLine.parse!(line)
-    line.replace(line2) unless line.nil?
+    line.replace(line2)
     line
   end
 

data/livetext.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.executables << "livetext"
   
   # Files...
-  main = Find.find("bin").to_a + Find.find("lib").to_a + Find.find("plugin").to_a 
+  main = Find.find("bin").to_a + Find.find("lib").to_a + 
+         Find.find("plugin").to_a + Find.find("imports").to_a 
   misc = %w[./README.lt3 ./README.md livetext.gemspec]
   test = Find.find("test").to_a
 

data/plugin/markdown.rb

@@ -8,12 +8,12 @@ SimpleFormats[:t] = %w[` `]
 SimpleFormats[:s] = %w[<strike> </strike>]
 
 
-def h1(args = nil, body = nil); _out "# #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end       # atx style for now
-def h2(args = nil, body = nil); _out "## #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h3(args = nil, body = nil); _out "### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h4(args = nil, body = nil); _out "#### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h5(args = nil, body = nil); _out "##### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h6(args = nil, body = nil); _out "###### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h1(args = nil, body = nil); _out "# #{Livetext.interpolate(@_data)}"; _optional_blank_line end       # atx style for now
+def h2(args = nil, body = nil); _out "## #{Livetext.interpolate(@_data)}"; _optional_blank_line end
+def h3(args = nil, body = nil); _out "### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
+def h4(args = nil, body = nil); _out "#### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
+def h5(args = nil, body = nil); _out "##### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
+def h6(args = nil, body = nil); _out "###### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
 
 def title(args = nil, body = nil)
   h1

data/plugin/tutorial.rb

@@ -52,8 +52,9 @@ def inout(args = nil, body = nil)
 end
 
 def put_table(src, exp)
-  t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
-  t2 = ::File.readlines(exp) rescue (abort "t2 = #{out}")
+STDERR.puts "put_table: #{[src, exp].inspect}"
+  t1 = ::File.readlines(src) rescue (abort "Fail - src = #{src}  t1 = #{src}")
+  t2 = ::File.readlines(exp) rescue (abort "Fail - src = #{exp}  t2 = #{out}")
   t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
   t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
 
@@ -80,7 +81,7 @@ end
 def testcase(args = nil, body = nil)
   name = _args.first
   _out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
-  src, exp = "test/data/#{name}/source.lt3", "test/data/#{name}/expected-output.txt"
+  src, exp = "test/snapshots/#{name}/source.lt3", "test/snapshots/#{name}/expected-output.txt"
   @_args = [src, exp]   # Better way to do this??
   put_table(src, exp)
   _out "<br>"

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

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

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

@@ -0,0 +1 @@
+1 /No such mixin 'nonexistent'/

data/test/snapshots/icanhaz/simple_import.rb

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

data/test/snapshots/icanhaz/source.lt3

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

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

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

data/test/snapshots/icanhaz2/simple_canhaz.rb

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

data/test/snapshots/icanhaz2/source.lt3

@@ -0,0 +1,6 @@
+Testing fake command .icanhaz:
+
+.icanhaz simple_canhaz
+Now call a method:
+.hello_world
+That's all.

data/test/snapshots/subset.txt

@@ -0,0 +1,84 @@
+# 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                 # works?
+
+# Others (usually passing):
+
+# import/include/mixin, others...
+
+   simple_copy              #                    
+x  simple_import            # not working yet (but *could* sub in .icanhaz)
+   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.rb

@@ -43,6 +43,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?
+      cmdline = ARGV.first == "cmdline"   # FIXME remove??
+      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 initialize(base, assertion = nil)
       @assertion = assertion
       @base = base
@@ -109,9 +179,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,40 +191,7 @@ class TestingLivetext < MiniTest::Test
     end
   end
 
-  TTY = File.open("/dev/tty","w")
-
-  cmdline = ARGV.first == "cmdline"   # FIXME remove??
-  if cmdline
-    dir = "../"
-    Dir.chdir `livetext --path`.chomp.chomp
-  else
-    dir = ""
-  end
-
-  Data = "#{dir}test/snapshots"
-  Dir.chdir(Data)
-
-  TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
-
-  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
+  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