livetext 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd50a45d248673a1629b46e3f46684f7c505fa35
-  data.tar.gz: 3368732003a8e8b006c5b46a5370dc6b5f71fa1b
+  metadata.gz: 5a8938581492de05ebcf702ca43f6524a662689e
+  data.tar.gz: 44cb2fc546d711d343794e07fa65de02b9f31e83
 SHA512:
-  metadata.gz: 9ae32de005cb4b5339b2efdf8e1c1a346fee048c6431080ffa74d8b6590f8cb5f296ef0fb3878840232e23a232175d5f1a418826656e538d48d2bb7aa7b48e92
-  data.tar.gz: dab5779af0d426f72947c939fbabf6375ada785204a54daa97ee4c102d7765d3c71940bd1a3294f62f259f707a4bd8467defc60335546f7e274894de45179931
+  metadata.gz: 39a807828e56ffc15d43f429ca7b948c75e35c13398a44e5f605f0dde9b09075d263eab137503184e426322014f5915262f33375b12581e2b4f2608dc8ee565a
+  data.tar.gz: e551aba9882ff52cc0c1d1496eebde47da96658b37094889d6976be1a877d7c8a2a8482bb7c090c0881b38bec9bc3bf37b0f4f1349e1e1ffeff2d876cb2bed7f

data/dsl/tutorial.rb

@@ -75,7 +75,7 @@ end
 def testcase
   name = _args.first
   _puts "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
-  src, exp = "test/testfiles/#{name}/source.ltx", "test/testfiles/#{name}/expected-output.txt"
+  src, exp = "#{Data}/#{name}/source.ltx", "{Data}/#{name}/expected-output.txt"
   @_args = [src, exp]   # Better way to do this??
   put_table(src, exp)
   _puts "<br>"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end
 
 require 'fileutils'

data/lib/standard.rb

@@ -147,10 +147,6 @@ module Livetext::Standard
     _error!(err)
   end
 
-  def nopass
-    @_nopass = true
-  end
-
   def set
     assigns = @_data.chomp.split(/, */)
     # Do a better way?
@@ -220,6 +216,32 @@ module Livetext::Standard
     self._debug = false if arg == "off"
   end
 
+  def passthru
+    # FIXME - add check for args size (helpers); _onoff helper??
+    onoff = _args.first
+    case onoff
+      when nil;   @_nopass = false
+      when "on";  @_nopass = false
+      when "off"; @_nopass = true
+      else _error!("Unknown arg '#{onoff}'")
+    end
+  end
+
+  def nopass
+    @_nopass = true
+  end
+
+  def para
+    # FIXME - add check for args size (helpers); _onoff helper??
+    onoff = _args.first
+    case onoff
+      when nil;   @_nopara = false
+      when "on";  @_nopara = false
+      when "off"; @_nopara = true
+      else _error!("Unknown arg '#{onoff}'")
+    end
+  end
+
   def nopara
     @_nopara = true
   end

data/livetext.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   
   # Files...
   main = Find.find("bin").to_a + Find.find("lib").to_a + Find.find("dsl").to_a 
-  misc = %w[./README.html ./README.ltx ./README.md livetext.gemspec]
+  misc = %w[./README.ltx ./README.md livetext.gemspec]
   test = Find.find("test").to_a
 
   s.files       =  main + misc + test
   s.homepage    = 'https://github.com/Hal9000/livetext'
-  s.license       = "Ruby's license"
+  s.license     = "Ruby's license"
 end

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

@@ -0,0 +1,13 @@
+The .r can be used to output single lines
+without interpretation:
+<p>
+
+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/data/raw_lines/source.ltx

@@ -0,0 +1,11 @@
+The .r can be used to output single lines
+without interpretation:
+
+.r Ordinary line... plus two blank lines:
+.r
+.r 
+.r No formatting: *foo `foo _foo ~foo
+.r No variables: $alpha $beta
+.r No functions: $$this $$that
+
+That's all.

data/test/newtest

@@ -1,8 +1,8 @@
-mkdir test/testfiles/$1
+mkdir test/data/$1
 
 # actual-error.txt        actual-output.txt       expected-error.txt      expected-output.txt     source.ltx
 
-cd test/testfiles/$1
+cd test/data/$1
 
 touch expected-output.txt expected-error.txt
 

data/test/test.rb

@@ -1,18 +1,24 @@
-require 'minitest/autorun'
+def minitest?
+  require 'minitest/autorun'
+end
+
+abort "minitest gem is not installed" unless minitest?
+
 
 $LOAD_PATH << "./lib"
 
 require 'livetext'
 
-# How these tests work - see the block comment at the bottom.
-
 class TestingLivetext < MiniTest::Test
 
   TTY = File.open("/dev/tty","w")
+  Data = "test/data"
 
   TestLines = []
 
-  f = File.open("test/testfiles/lines.txt")
+  Dir.chdir(Data)
+
+  f = File.open("lines.txt")
   loop do 
     item = []
     4.times { item << f.gets.chomp }
@@ -35,12 +41,16 @@ class TestingLivetext < MiniTest::Test
     end
   end
 
-  def external_files
-    tag = caller[0]
-    n1, n2 = tag.index("`")+6, tag.index("'")-1
-    base = tag[n1..n2]
-    origin = Dir.pwd
-    Dir.chdir("test/testfiles/#{base}") do
+  TestDirs = Dir.entries(".").reject {|f| ! File.directory?(f) } - %w[. ..]
+
+  TestDirs.each do |tdir|
+    define_method("test_#{tdir}") do
+      external_files(tdir)
+    end
+  end
+
+  def external_files(base)
+    Dir.chdir(base) do
       src, out, exp = "source.ltx", "actual-output.txt", "expected-output.txt"
       err, erx = "actual-error.txt", "expected-error.txt"
       cmd = "../../../bin/livetext #{src} >#{out} 2>#{err}"
@@ -58,39 +68,6 @@ class TestingLivetext < MiniTest::Test
     end
   end
 
-  def test_hello_world;         external_files end
-  def test_basic_formatting;    external_files end
-
-  def test_comments_ignored_1;  external_files end
-  def test_block_comment;       external_files end
-
-  def test_error_line_num;      external_files end
-  def test_error_inc_line_num;  external_files end
-  def test_error_invalid_name;  external_files end
-  def test_error_no_such_mixin; external_files end
-  def test_error_no_such_inc;   external_files end
-  def test_error_no_such_copy;  external_files end
-  def test_error_name_not_permitted;  external_files end
-  def test_error_missing_end;   external_files end
-  def test_error_mismatched_end; external_files end
-
-  def test_simple_vars;         external_files end
-  def test_more_complex_vars;   external_files end
-
-  def test_def_method;          external_files end
-
-  def test_single_raw_line;     external_files end
-
-  def test_simple_include;      external_files end
-  def test_simple_mixin;        external_files end
-  def test_simple_copy;         external_files end
-  def test_copy_is_raw;         external_files end
-  def test_raw_text_block;      external_files end
-
-  def test_example_alpha;       external_files end
-  def test_example_alpha2;      external_files end
-
-  def test_functions;           external_files end
 end
 
 
@@ -101,7 +78,7 @@ 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 testfiles/my_silly_feature
+    look for a directory called data/my_silly_feature
   - In here, there must be a source.ltx, 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -17,7 +17,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- "./README.html"
 - "./README.ltx"
 - "./README.md"
 - bin/livetext
@@ -37,93 +36,95 @@ files:
 - test/affirm/kbks.jpg
 - test/affirm/lm-kbks.lt
 - test/cleanup
-- test/ftest.rb
+- test/data/basic_formatting/expected-error.txt
+- test/data/basic_formatting/expected-output.txt
+- test/data/basic_formatting/source.ltx
+- test/data/block_comment/expected-error.txt
+- test/data/block_comment/expected-output.txt
+- test/data/block_comment/source.ltx
+- test/data/comments_ignored_1/expected-error.txt
+- test/data/comments_ignored_1/expected-output.txt
+- test/data/comments_ignored_1/source.ltx
+- test/data/copy_is_raw/expected-error.txt
+- test/data/copy_is_raw/expected-output.txt
+- test/data/copy_is_raw/rawtext.inc
+- test/data/copy_is_raw/source.ltx
+- test/data/crap
+- test/data/def_method/expected-error.txt
+- test/data/def_method/expected-output.txt
+- test/data/def_method/source.ltx
+- test/data/error_inc_line_num/expected-error.txt
+- test/data/error_inc_line_num/expected-output.txt
+- test/data/error_inc_line_num/file2.ltx
+- test/data/error_inc_line_num/source.ltx
+- test/data/error_invalid_name/expected-error.txt
+- test/data/error_invalid_name/expected-output.txt
+- test/data/error_invalid_name/source.ltx
+- test/data/error_line_num/expected-error.txt
+- test/data/error_line_num/expected-output.txt
+- test/data/error_line_num/source.ltx
+- test/data/error_mismatched_end/expected-error.txt
+- test/data/error_mismatched_end/expected-output.txt
+- test/data/error_mismatched_end/source.ltx
+- test/data/error_missing_end/expected-error.txt
+- test/data/error_missing_end/expected-output.txt
+- test/data/error_missing_end/source.ltx
+- test/data/error_name_not_permitted/expected-error.txt
+- test/data/error_name_not_permitted/expected-output.txt
+- test/data/error_name_not_permitted/source.ltx
+- test/data/error_no_such_copy/expected-error.txt
+- test/data/error_no_such_copy/expected-output.txt
+- test/data/error_no_such_copy/source.ltx
+- test/data/error_no_such_inc/expected-error.txt
+- test/data/error_no_such_inc/expected-output.txt
+- test/data/error_no_such_inc/source.ltx
+- test/data/error_no_such_mixin/expected-error.txt
+- test/data/error_no_such_mixin/expected-output.txt
+- test/data/error_no_such_mixin/source.ltx
+- test/data/example_alpha/expected-error.txt
+- test/data/example_alpha/expected-output.txt
+- test/data/example_alpha/source.ltx
+- test/data/example_alpha2/expected-error.txt
+- test/data/example_alpha2/expected-output.txt
+- test/data/example_alpha2/source.ltx
+- test/data/fixit
+- test/data/functions/expected-error.txt
+- test/data/functions/expected-output.txt
+- test/data/functions/source.ltx
+- test/data/hello_world/expected-error.txt
+- test/data/hello_world/expected-output.txt
+- test/data/hello_world/source.ltx
+- test/data/lines.txt
+- test/data/more_complex_vars/expected-error.txt
+- test/data/more_complex_vars/expected-output.txt
+- test/data/more_complex_vars/source.ltx
+- test/data/raw_lines/expected-error.txt
+- test/data/raw_lines/expected-output.txt
+- test/data/raw_lines/source.ltx
+- test/data/raw_text_block/expected-error.txt
+- test/data/raw_text_block/expected-output.txt
+- test/data/raw_text_block/rawtext.inc
+- test/data/raw_text_block/source.ltx
+- test/data/simple_copy/expected-error.txt
+- test/data/simple_copy/expected-output.txt
+- test/data/simple_copy/simplefile.inc
+- test/data/simple_copy/source.ltx
+- test/data/simple_include/expected-error.txt
+- test/data/simple_include/expected-output.txt
+- test/data/simple_include/simplefile.inc
+- test/data/simple_include/source.ltx
+- test/data/simple_mixin/expected-error.txt
+- test/data/simple_mixin/expected-output.txt
+- test/data/simple_mixin/simple_mixin.rb
+- test/data/simple_mixin/source.ltx
+- test/data/simple_vars/expected-error.txt
+- test/data/simple_vars/expected-output.txt
+- test/data/simple_vars/source.ltx
+- test/data/single_raw_line/expected-error.txt
+- test/data/single_raw_line/expected-output.txt
+- test/data/single_raw_line/source.ltx
 - test/newtest
 - test/test.rb
-- test/testfiles/basic_formatting/expected-error.txt
-- test/testfiles/basic_formatting/expected-output.txt
-- test/testfiles/basic_formatting/source.ltx
-- test/testfiles/block_comment/expected-error.txt
-- test/testfiles/block_comment/expected-output.txt
-- test/testfiles/block_comment/source.ltx
-- test/testfiles/comments_ignored_1/expected-error.txt
-- test/testfiles/comments_ignored_1/expected-output.txt
-- test/testfiles/comments_ignored_1/source.ltx
-- test/testfiles/copy_is_raw/expected-error.txt
-- test/testfiles/copy_is_raw/expected-output.txt
-- test/testfiles/copy_is_raw/rawtext.inc
-- test/testfiles/copy_is_raw/source.ltx
-- test/testfiles/crap
-- test/testfiles/def_method/expected-error.txt
-- test/testfiles/def_method/expected-output.txt
-- test/testfiles/def_method/source.ltx
-- test/testfiles/error_inc_line_num/expected-error.txt
-- test/testfiles/error_inc_line_num/expected-output.txt
-- test/testfiles/error_inc_line_num/file2.ltx
-- test/testfiles/error_inc_line_num/source.ltx
-- test/testfiles/error_invalid_name/expected-error.txt
-- test/testfiles/error_invalid_name/expected-output.txt
-- test/testfiles/error_invalid_name/source.ltx
-- test/testfiles/error_line_num/expected-error.txt
-- test/testfiles/error_line_num/expected-output.txt
-- test/testfiles/error_line_num/source.ltx
-- test/testfiles/error_mismatched_end/expected-error.txt
-- test/testfiles/error_mismatched_end/expected-output.txt
-- test/testfiles/error_mismatched_end/source.ltx
-- test/testfiles/error_missing_end/expected-error.txt
-- test/testfiles/error_missing_end/expected-output.txt
-- test/testfiles/error_missing_end/source.ltx
-- test/testfiles/error_name_not_permitted/expected-error.txt
-- test/testfiles/error_name_not_permitted/expected-output.txt
-- test/testfiles/error_name_not_permitted/source.ltx
-- test/testfiles/error_no_such_copy/expected-error.txt
-- test/testfiles/error_no_such_copy/expected-output.txt
-- test/testfiles/error_no_such_copy/source.ltx
-- test/testfiles/error_no_such_inc/expected-error.txt
-- test/testfiles/error_no_such_inc/expected-output.txt
-- test/testfiles/error_no_such_inc/source.ltx
-- test/testfiles/error_no_such_mixin/expected-error.txt
-- test/testfiles/error_no_such_mixin/expected-output.txt
-- test/testfiles/error_no_such_mixin/source.ltx
-- test/testfiles/example_alpha/expected-error.txt
-- test/testfiles/example_alpha/expected-output.txt
-- test/testfiles/example_alpha/source.ltx
-- test/testfiles/example_alpha2/expected-error.txt
-- test/testfiles/example_alpha2/expected-output.txt
-- test/testfiles/example_alpha2/source.ltx
-- test/testfiles/fixit
-- test/testfiles/functions/expected-error.txt
-- test/testfiles/functions/expected-output.txt
-- test/testfiles/functions/source.ltx
-- test/testfiles/hello_world/expected-error.txt
-- test/testfiles/hello_world/expected-output.txt
-- test/testfiles/hello_world/source.ltx
-- test/testfiles/lines.txt
-- test/testfiles/more_complex_vars/expected-error.txt
-- test/testfiles/more_complex_vars/expected-output.txt
-- test/testfiles/more_complex_vars/source.ltx
-- test/testfiles/raw_text_block/expected-error.txt
-- test/testfiles/raw_text_block/expected-output.txt
-- test/testfiles/raw_text_block/rawtext.inc
-- test/testfiles/raw_text_block/source.ltx
-- test/testfiles/simple_copy/expected-error.txt
-- test/testfiles/simple_copy/expected-output.txt
-- test/testfiles/simple_copy/simplefile.inc
-- test/testfiles/simple_copy/source.ltx
-- test/testfiles/simple_include/expected-error.txt
-- test/testfiles/simple_include/expected-output.txt
-- test/testfiles/simple_include/simplefile.inc
-- test/testfiles/simple_include/source.ltx
-- test/testfiles/simple_mixin/expected-error.txt
-- test/testfiles/simple_mixin/expected-output.txt
-- test/testfiles/simple_mixin/simple_mixin.rb
-- test/testfiles/simple_mixin/source.ltx
-- test/testfiles/simple_vars/expected-error.txt
-- test/testfiles/simple_vars/expected-output.txt
-- test/testfiles/simple_vars/source.ltx
-- test/testfiles/single_raw_line/expected-error.txt
-- test/testfiles/single_raw_line/expected-output.txt
-- test/testfiles/single_raw_line/source.ltx
 - test/try.lt
 - test/try2.lt
 homepage: https://github.com/Hal9000/livetext
@@ -146,8 +147,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
+has_rdoc: