livetext 0.9.41 → 0.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f65ba04aa3e01ed5a56dd2163dd7ff35e2e4292f41f971e61713789867e6def
-  data.tar.gz: 127e52d056f1da7417881d24663789ef6b8fb606832fa28c7f9228bbbd77af02
+  metadata.gz: 3cef25ba4a47577159b300d63d723939aef6e5bef6c083685d8f6539e988601e
+  data.tar.gz: a20a3a5e09c47639180428833a62c855a0a13d26ec317b49a3e400b9f0b4a64c
 SHA512:
-  metadata.gz: 6bd983272c4169d31eeb01ccf18fb04bf960a3cde7c6769a8533d5a6dbc55add87cda2788c73fa3d9b8b679efc8f40afd1ec0e74997cfd36926175c8dde569a2
-  data.tar.gz: 57f5909d4b25efb53c8e7aaad64bcd1bc1f5387f1934a67193c2c10e37868135585cff57476fe3fec6e2cd9fcccc8ede3f734fcb891b27157841aee18d054d13
+  metadata.gz: b4ddc892156911f77e9bd4b3878e77ddfba0d739b03c5df0fbeefb1b22562c03f173ffdc36fceff940273557a27c12cec0a4aea3a35a5470efdfd5ec360f0261
+  data.tar.gz: f222133e7b2e784e15b43241e711e29bad362c10f41857e1e72883aac95d523580127a50a146a5b539e266eea98067e094b6dc3b1490e6b8a2d1b88c1a813b08

data/bin/livetext

@@ -5,6 +5,25 @@ require 'rubygems'
 require_relative '../lib/livetext'
 
 def usage
+  STDERR.puts <<~EOF
+  Usage: 
+    livetext [options] [filename]
+
+    Options:
+      -v, --version            Print version information
+      -t, --test               Run all tests
+      -p, --path               Print the path of the installed gem
+      -b, --backtrace          Enable backtrace information
+      -m name, --mixin name    Load the specified mixin before processing
+      -s, --stdin              Read from standard input
+      -h, --help               Print this help information
+      -i name, --install name  Install the specified plugin         
+
+  EOF
+  exit
+end
+
+def old_usage
   STDERR.puts <<~EOF
   Usage: 
     livetext filename
@@ -22,6 +41,10 @@ def usage
       livetext -p
       livetext --path
 
+    Load a mixin:
+      livetext -m name
+      livetext --mixin name
+
     Run tests:
       livetext -t
       livetext --test

data/lib/livetext/more.rb

@@ -101,12 +101,10 @@ class Livetext
     obj = self.new
     mix  = Array(mix)
     call = Array(call)
-# STDERR.puts "#{__method__}: obj meth = #{obj.methods.sort.inspect}"
     mix.each do |lib| 
       obj.invoke_dotcmd(:mixin, lib.dup)
     end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
     obj.api.setvars(vars)
     obj
   end

data/lib/livetext/standard.rb

@@ -182,7 +182,12 @@ module Livetext::Standard
   def variables(args = nil, body = nil)
     prefix = api.args[0]
     file = api.args[1]
+puts ">> variables: pre=#{prefix.inspect}  file=#{file.inspect} pwd=#{Dir.pwd}"
     prefix = nil if prefix == "-"  # FIXME dumb hack
+    here = File.dirname(file)
+    dok, fok = Dir.exist?(here), File.exist?(file)
+    raise "No such dir #{here.inspect} (file #{file})" unless dok
+    raise "No such file #{file.inspect} (file #{file})" unless fok
     if file
       here = ::Livetext::Vars[:FileDir] + "/"
       lines = File.readlines(here + file)
@@ -192,6 +197,9 @@ module Livetext::Standard
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
     api.setvars(pairs)
     api.optional_blank_line
+  rescue => e
+    puts e
+    puts $!
   end
 
   def heredoc(args = nil, body = nil)

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.41"
+  VERSION = "0.9.42"
 end

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

@@ -1,7 +1,9 @@
 Testing heredocs (used in a table)
 <p>
 
-<br><center><table width=90% cellpadding=5>
+<br>
+
+<center><table width=90% cellpadding=5>
 <tr>
   <td valign=top>This is <br>only <br>a test.<br></td>
   <td valign=top>This is <br>just <br>some <br>random text.<br></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.41
+  version: 0.9.42
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com