livetext 0.8.77 → 0.8.78

data/test/data/example_alpha2/expected-output.txt

@@ -1,12 +1,12 @@
+Here is an alphabetized list:
+<p>
+
 aardvark       anamorphic     anarchist      
 bellicose      cytology       ectomorph      
 fishmonger     fusillade      glyph          
 gryphon        halcyon        manicotti      
 mataeotechny   pareidolia     quark          
 zootrope       zymurgy        
-Here is an alphabetized list:
-<p>
-
 <p>
 
 And that is all.

data/test/data/example_alpha2/source.lt3

@@ -7,8 +7,8 @@
    text.gsub!(/\n/, " ")
    words = text.split.sort
    words.each_slice(cols) do |row| 
-     row.each {|w| _print '%-15s' % w }
-     _puts 
+     row.each {|w| _out! '%-15s' % w }
+     _out
    end
 .end
 Here is an alphabetized list:

data/test/data/lines.txt

@@ -1,186 +1,10 @@
-tick: Single token, beginning of line
-`def is like a reserved word
-<font size=+1><tt>def</tt></font> is like a reserved word
-
-tick: Single token, middle of line
-They say `def is like a reserved word
-They say <font size=+1><tt>def</tt></font> is like a reserved word
-
-tick: Single token, end of line
-like a reserved word, is `def
-like a reserved word, is <font size=+1><tt>def</tt></font>
-
-tick: Bracketed, normal
-This is `[code font] here
-This is <font size=+1><tt>code font</tt></font> here
-
-tick: Bracketed, hits EOL
-This is `[code font here
-This is <font size=+1><tt>code font here</tt></font>
-
-tick: followed by space
-This is not ` code
-This is not ` code
-
-tick: followed by EOL
-This also isn't code: `
-This also isn't code: `
-
-tick: Doubled, ignores comma
-This is ``code, of course
-This is <font size=+1><tt>code</tt></font>, of course
-
-tick: Doubled, ignores period
-This is ``code. Hooray, I guess.
-This is <font size=+1><tt>code</tt></font>. Hooray, I guess.
-
-tick: Doubled, ignores right paren
-(By the way, this is ``code)
-(By the way, this is <font size=+1><tt>code</tt></font>)
-
-tick: Doubled, ignores EOL
-Up to EOL, this is ``code
-Up to EOL, this is <font size=+1><tt>code</tt></font>
-
-uscore: Single token, beginning of line
-_This is italics
-<i>This</i> is italics
-
-uscore: Single token, middle of line
-And _this is italics
-And <i>this</i> is italics
-
-uscore: Single token, end of line
-And so is _this
-And so is <i>this</i>
-
-uscore: Bracketed, normal
-The _[USS Enterprise] was here
-The <i>USS Enterprise</i> was here
-
-uscore: Bracketed, hits EOL
-Hey, it's the _[USS Enterprise
-Hey, it's the <i>USS Enterprise</i>
-
-uscore: followed by space
-This: _ is just an underscore
-This: _ is just an underscore
-
-uscore: followed by EOL
-This is just an underscore: _
-This is just an underscore: _
-
-uscore: Doubled, ignores comma
-Just a __second, ok?
-Just a <i>second</i>, ok?
-
-uscore: Doubled, ignores period
-Just a __second. OK?
-Just a <i>second</i>. OK?
-
-uscore: Doubled, ignores right paren
-I'll (just a __second) be right there.
-I'll (just a <i>second</i>) be right there.
-
-uscore: Doubled, ignores EOL
-Be there in a __second
-Be there in a <i>second</i>
-
-Tick has precedence over underscore
-This is a `piece_of_code here
-This is a <font size=+1><tt>piece_of_code</tt></font> here
-
-under: Starts after double quote?
-He said, "_Please go away."
-He said, "<i>Please</i> go away."
-
-Dollar sign followed by blank
-This: $ is a dollar sign
-This: $ is a dollar sign
-
-Dollar sign followed by non-alpha
-I'd pay $3 for that
-I'd pay $3 for that
-
-Dollar sign followed by EOL
-This is a dollar sign: $
-This is a dollar sign: $
-
-Double dollar sign followed by blank
-This: $$ is not a function call
-This: $$ is not a function call
-
-Double dollar sign followed by non-alpha
-If I say $$-, that's not a function call
-If I say $$-, that's not a function call
-
-Double dollar sign followed by EOL
-This is two dollar signs: $$
-This is two dollar signs: $$
-
-Escaped *
-Asterisk followed by abc: \*abc
-Asterisk followed by abc: *abc
-
-Escaped _
-Underscore followed by abc: \_abc
-Underscore followed by abc: _abc
-
-Escaped `
-Tick followed by abc: \`abc
-Tick followed by abc: `abc
-
-Escaped $
-This:  \$var is not a variable
-This:  $var is not a variable
-
-Escaped $$
-This: \$\$func is not a function
-This: $$func is not a function
-
-strike: Single token, beginning of line
-~this - no, I mean that
-<strike>this</strike> - no, I mean that
-
-strike: Single token, middle of line
-They say ~redacted is fun
-They say <strike>redacted</strike> is fun
-
-strike: Single token, end of line
-Ignore this: ~foobar
-Ignore this: <strike>foobar</strike>
-
-strike: Bracketed, normal
-This is ~[crossed out] text
-This is <strike>crossed out</strike> text
-
-strike: Bracketed, hits EOL
-This is ~[more stuff crossed out
-This is <strike>more stuff crossed out</strike>
-
-strike: followed by space
-This is not ~ overstrike
-This is not ~ overstrike
-
-strike: followed by EOL
-This also isn't overstrike: `
-This also isn't overstrike: `
-
-strike: Doubled, ignores comma
-This is ~~overstrike, of course
-This is <strike>overstrike</strike>, of course
-
-strike: Doubled, ignores period
-This is ~~overstrike. Hooray, I guess.
-This is <strike>overstrike</strike>. Hooray, I guess.
-
-strike: Doubled, ignores right paren
-(By the way, this is ~~overstrike)
-(By the way, this is <strike>overstrike</strike>)
+Check output of $$date
+Today is $$date, I guess
+/Today is \d\d\d\d-\d\d-\d\d, I guess/
 
-strike: Doubled, ignores EOL
-Up to EOL, this is ~~redacted
-Up to EOL, this is <strike>redacted</strike>
+Check output of $$time
+Tick tock, it's $$time right now
+/Tick tock, it's \d\d:\d\d:\d\d right now/
 
 Trying $$b function, no param
 This is $$b being called
@@ -274,11 +98,3 @@ Escape brackets inside ~
 There are brackets ~[\[\]] here
 There are brackets <strike>[]</strike> here
 
-Check output of $$date
-Today is $$date, I guess
-/Today is \d\d\d\d-\d\d-\d\d, I guess/
-
-Check output of $$time
-Tick tock, it's $$time right now
-/Tick tock, it's \d\d:\d\d:\d\d right now/
-

data/test/data/simple_mixin/expected-output.txt

@@ -1,2 +1,5 @@
 Here I am
 testing a simple mixin
+Now call a method:
+Hello, world.
+That's all.

data/test/data/simple_mixin/simple_mixin.rb

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

data/test/data/simple_mixin/source.lt3

@@ -1,6 +1,6 @@
 Here I am
 testing a simple mixin
 .mixin simple_mixin
-Now call it:
+Now call a method:
 .hello_world
 That's all.

data/test/test.rb

@@ -31,28 +31,42 @@ class TestingLivetext < MiniTest::Test
     break if f.eof?
   end
 
-  TestLines.each.with_index do |item, i|
-    msg, src, exp, blank = *item
-    define_method("test_formatting_#{i}") do
-      x = FormatLine.new
-      actual = x.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)
+  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
 
-  TestDirs.each do |tdir|
+# 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"
@@ -63,12 +77,15 @@ class TestingLivetext < MiniTest::Test
 
       out_ok = output == expected
       err_ok = errors == errexp
-      bad_out = "--- Expected: \n#{expected}\n--- Output:  \n#{output}\n"
-      bad_err = "--- Error Expected: \n#{errexp}\n--- Error Output:  \n#{errors}\n"
+      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)
-      system("rm -f #{out} #{err}")  # only on success
+      # only on success
+      system("rm -f #{out} #{err}") if out_ok && err_ok
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.77
+  version: 0.8.78
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -20,6 +20,8 @@ files:
 - "./README.lt3"
 - "./README.md"
 - bin/livetext
+- lib/SAVE.formatline
+- lib/SAVE2.formatline.rb
 - lib/formatline.rb
 - lib/functions.rb
 - lib/livetext.rb
@@ -36,6 +38,7 @@ files:
 - test/affirm/kbks.jpg
 - test/affirm/lm-kbks.lt
 - test/cleanup
+- test/data/SAVE.lines
 - test/data/basic_formatting/expected-error.txt
 - test/data/basic_formatting/expected-output.txt
 - test/data/basic_formatting/source.lt3
@@ -123,6 +126,7 @@ files:
 - test/data/single_raw_line/expected-error.txt
 - test/data/single_raw_line/expected-output.txt
 - test/data/single_raw_line/source.lt3
+- test/data/subset.txt
 - test/data/table_with_heredocs/expected-error.txt
 - test/data/table_with_heredocs/expected-output.txt
 - test/data/table_with_heredocs/source.lt3