livetext 0.8.99 → 0.9.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2324f86e2e454f70a4bfd13c81e77c705a88f81a7356c4e869d2f7f84cf1bc23
-  data.tar.gz: 6bbdebde873af6d65ee316fe0c5d97757086db703f4232e3020ccb304bfd43d7
+  metadata.gz: 9b5dbf29a35e17c163982a4c2d5355949a72be58c662e75cf1f1d59bef1894dd
+  data.tar.gz: 882f20c410919dc4aa5f5d4e4277cdff88dca8efce5b1d0d96d1228767dd80c3
 SHA512:
-  metadata.gz: c6eec9a455fdd2e35f5329d588167344e8602abec10c81508ab2a83943fe73a1ffeac1408487d9035f817d5c7fa671f138b4252051ce2ceeb0bf4a13d1636988
-  data.tar.gz: eb712c1858390b425e3b1b61a4320ae9e1e298c2a3efc42eb9b53f398bb2b37364b890dab498ce6e9f9fb3509f6df284f47bfa8c2d34043259232e7209fa9c52
+  metadata.gz: 58671323ec46267e898c2999e86fc3f5e1379eae4adca5df0adf7be90d0d8b35a9aefaa9f4bf778f67963624fa764ba8087349500e5c4c280c90297c9fc07789
+  data.tar.gz: 3ddfa97b6ef5a86c311baf9df53851bf39f01780fbec54a34de64bd9b4970aa8e055b77147891927e1ed378b87a050a414d11a51d942010ba0d774a99714e3bb

data/lib/formatline.rb

@@ -106,7 +106,6 @@ class FormatLine
         when :str
           @out << val unless val == "\n"   # BUG
         when :var
-# STDERR.puts "=== lt: sym = #{sym} val = #{val}  sub = #{varsub(val).inspect} #{Livetext::Vars[sym].inspect}"
           @out << varsub(val)
         when :func 
           param = nil
@@ -133,6 +132,7 @@ class FormatLine
   end
 
   def prev
+    return nil if @i <= 0
     @line[@i-1]
   end
 
@@ -144,6 +144,10 @@ class FormatLine
     @line[@i+=1]
   end
 
+  def ungrab
+    @line[@i-=1]
+  end
+
   def grab_colon_param
     grab  # grab :
     param = ""
@@ -248,7 +252,6 @@ class FormatLine
         case next!
           when ":"; param = grab_colon_param; add_token(:colon, param)
           when "["; param = grab_func_param; add_token(:brackets, param)
-          else  # do nothing
         end
       else
         grab; add_token :str, "$$" + curr; return
@@ -266,6 +269,7 @@ class FormatLine
 #     add char    # ??? add_token "*", :string
       return 
     end
+
     grab
     case curr
       when Space
@@ -278,25 +282,24 @@ class FormatLine
       when char;   double_marker(char)
       when LBrack; long_marker(char)
     else
-      add curr
-      str = collect!(sym, Blank)
+      str = curr + collect!(sym, Blank)
+      add str
       add_token sym, str
-      add curr  # next char onto next token... 
+      grab
     end
   end
 
   def double_marker(char)
     sym = Syms[char]
-    grab
-    kind = sym   # "string_#{char}".to_sym
+    kind = sym
     case next!   # first char after **
       when Space, LF, nil
         pre, post = SimpleFormats[sym]
         add_token kind
       else
         str = collect!(sym, Punc)
-        grab unless next!.nil?
         add_token kind, str
+        grab 
     end
   end
 
@@ -308,21 +311,60 @@ class FormatLine
     add_token kind, arg
   end
 
-  def collect!(sym, terminators, param=false)
+  def collect_bracketed(sym, terminators)
     str = Null.dup   # next is not " ","*","["
-    grab
+    grab   # ZZZ
     loop do
       if curr == Escape
         str << grab # ch = escaped char
         grab
         next
       end
-      break if terminate?(terminators, curr)
+      if terminate?(terminators, curr)
+        break 
+      end
+                  # STDERR.puts "#{curr.inspect} is not a terminator"
       str << curr    # not a terminator
       grab
+                  # STDERR.puts "After grab, curr is #{curr.inspect}"
+    end
+
+    if curr == "]" # skip right bracket
+      grab 
     end
-    grab if param && curr == "]" # skip right bracket
     add str
+    str
+  rescue => err
+    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
+    STDERR.puts "=== str = #{str.inspect}"
+  end
+
+  def escaped
+    ch = grab
+    grab
+    ch
+  end
+
+  def collect!(sym, terminators, bracketed=nil)
+    return collect_bracketed(sym, terminators) if bracketed
+
+    str = Null.dup   # next is not " ","*","["
+    grab   # ZZZ
+    loop do
+      case
+        when curr == Escape
+          str << escaped
+          next
+        when terminate?(terminators, curr)
+          break 
+      else
+        str << curr    # not a terminator
+      end
+      grab
+    end
+    ungrab
+    add str
+    str
   rescue => err
     STDERR.puts "ERR = #{err}\n#{err.backtrace}"
     STDERR.puts "=== str = #{str.inspect}"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.99"
+  VERSION = "0.9.01"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -109,7 +109,8 @@ end
 
   def _setfile(file)
     _setvar(:File, file)
-    _setvar(:FileDir, File.expand_path(file))
+    dir = File.dirname(File.expand_path(file))
+    _setvar(:FileDir, dir)
   end
 
   def _setfile!(file)

data/lib/standard.rb

@@ -197,7 +197,15 @@ EOS
 
   def variables
     prefix = _args[0]
-    _body.each do |line|
+    file = _args[1]
+    prefix = nil if prefix == "-"  # FIXME dumb hack
+    if file
+      here = ::Livetext::Vars[:FileDir] + "/"
+      lines = File.readlines(here + file)
+    else
+      lines = _body
+    end
+    lines.each do |line|
       next if line.strip.empty?
       var, val = line.split(" ", 2)
       val = FormatLine.var_func_parse(val)

data/test/data/lines.txt

@@ -98,3 +98,23 @@ Escape brackets inside ~
 There are brackets ~[\[\]] here
 There are brackets <strike>[]</strike> here
 
+Line starts with underscore
+_This for example
+<i>This</i> for example
+
+Line starts with double underscore
+__This, for example
+<i>This,</i> for example
+
+Line has embedded underscores
+This has some_embedded_underscores
+This has some_embedded_underscores
+
+Line has escaped underscores
+This has some\_escaped\_underscores
+This has some_escaped_underscores
+
+Doubled underscore, midline
+This is __doubled, it seems
+This is <i>doubled,</i> it seems
+

data/test/extratests.txt

@@ -0,0 +1,20 @@
+Line starts with underscore
+_This for example
+<i>This</i> for example
+
+Line starts with double underscore
+__This, for example
+<i>This,</i> for example
+
+Line has embedded underscores
+This has some_embedded_underscores
+This has some_embedded_underscores
+
+Doubled underscore, midline
+This is __doubled, it seems
+This is <i>doubled,</i> it seems
+
+Line has escaped underscores
+This has some\_escaped\_underscores
+This has some_escaped_underscores
+

data/test/formatting.rb

@@ -0,0 +1,110 @@
+def minitest?
+  require 'minitest/autorun'
+end
+
+abort "minitest gem is not installed" unless minitest?
+
+
+$LOAD_PATH << "./lib"
+
+require 'livetext'
+
+class TestingLivetext < MiniTest::Test
+
+  TTY = File.open("/dev/tty","w")
+
+  dir  = ARGV.first == "cmdline" ? "../" : ""
+  Data = "#{dir}test/data"
+
+  TestLines = []
+
+  Dir.chdir `livetext --path`.chomp if ARGV.first == "cmdline"
+
+  Dir.chdir(Data)
+
+  f = File.open("lines.txt")
+  loop do 
+    item = []
+    4.times { item << f.gets.chomp }
+    raise "Oops? #{item.inspect}" unless item.last == ""
+    TestLines << item
+    break if f.eof?
+  end
+
+  if File.size("subset.txt") #  == 0
+    puts "Defining via TestLines"
+    TestLines.each.with_index do |item, i|
+      msg, src, exp, blank = *item
+      define_method("test_formatting_#{i}") do
+        actual = FormatLine.parse!(src)
+        if exp[0] == "/" # regex!
+          exp = Regexp.compile(exp[1..-2])   # skip slashes
+          assert_match(exp, actual, msg)
+        else
+          assert_equal(exp, actual, msg)
+        end
+      end
+    end
+  end
+
+  TestDirs = Dir.entries(".").reject {|f| ! File.directory?(f) } - %w[. ..]
+  selected = File.readlines("subset.txt").map(&:chomp)
+  Subset   = selected.empty? ? TestDirs : selected
+
+# puts "Subset = #{Subset.inspect}"
+
+  Subset.each do |tdir|
+    define_method("test_#{tdir}") do
+      external_files(tdir)
+    end
+  end
+
+  def green(str)
+    "" + str + ""
+  end
+
+  def red(str)
+    "" + str + ""
+  end
+
+  def external_files(base)
+    Dir.chdir(base) do
+      src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
+      err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
+      cmd = "livetext #{src} >#{out} 2>#{err}"
+      system(cmd)
+      output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
+
+      out_ok = output == expected
+      err_ok = errors == errexp
+      nout = output.split("\n").size
+      nexp = expected.split("\n").size
+      bad_out = "--- Expected (#{nexp} lines): \n#{green(expected)}\n--- Output (#{nout} lines):  \n#{red(output)}\n"
+      bad_err = "--- Error Expected: \n#{green(errexp)}\n--- Error Output:  \n#{red(errors)}\n"
+
+      assert(out_ok, bad_out)
+      assert(err_ok, bad_err)
+      # only on success
+      system("rm -f #{out} #{err}") if out_ok && err_ok
+    end
+  end
+
+end
+
+
+=begin
+
+You can add any ordinary test method above. But so far, all these tests simply 
+call external_files.
+
+The external_files method works this way: 
+  - If the test (caller) method is test_my_silly_feature, then we will
+    look for a directory called data/my_silly_feature
+  - In here, there must be a source.lt3, expected-output.txt, and expected-error.txt
+  - Technically, any of these can be empty
+  - We run livetext on the source and compare actual vs expected (stdout, stderr)
+  - The "real" output gets checked first
+  - Of course, both must compare correctly for the test to pass
+
+=end
+

data/test/testlines.rb

@@ -0,0 +1,27 @@
+require 'livetext'
+require 'formatline'
+
+  def red(str)
+    "" + str + ""
+  end
+
+input = ARGV.first || "test/data/lines.txt"
+data = File.readlines(input)
+
+data.each_slice(4) do |lines|
+  title, input, expected, blank = *lines
+  input.chomp!
+  expected.chomp!
+  expected = eval(expected) if expected[0] == "/"
+  
+  puts "-----------------------------"
+  print "Test:      #{title}"
+
+  actual = FormatLine.parse!(input)
+  next if expected === actual
+
+  puts "Input:     #{input}"
+  puts "  #{red('FAIL Expected: ')} #{expected.inspect}"
+  puts "  #{red('     Actual  : ')} #{actual.inspect}"
+  puts 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.99
+  version: 0.9.01
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -127,9 +127,12 @@ files:
 - test/data/table_with_heredocs/expected-error.txt
 - test/data/table_with_heredocs/expected-output.txt
 - test/data/table_with_heredocs/source.lt3
+- test/extratests.txt
+- test/formatting.rb
 - test/newtest
 - test/sdtest
 - test/test.rb
+- test/testlines.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby