livetext 0.9.42 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cef25ba4a47577159b300d63d723939aef6e5bef6c083685d8f6539e988601e
-  data.tar.gz: a20a3a5e09c47639180428833a62c855a0a13d26ec317b49a3e400b9f0b4a64c
+  metadata.gz: 77c132b3f86809adfbbed149564227c061911a51bc57124fdd17ed9fb67bae55
+  data.tar.gz: dc92358a343e8096f7e982005585fa9633d8860f6fe569e0db61bc40a764bd73
 SHA512:
-  metadata.gz: b4ddc892156911f77e9bd4b3878e77ddfba0d739b03c5df0fbeefb1b22562c03f173ffdc36fceff940273557a27c12cec0a4aea3a35a5470efdfd5ec360f0261
-  data.tar.gz: f222133e7b2e784e15b43241e711e29bad362c10f41857e1e72883aac95d523580127a50a146a5b539e266eea98067e094b6dc3b1490e6b8a2d1b88c1a813b08
+  metadata.gz: e8ec2c7c373c5587c1a492c0cd183bb6143c16a59ed49084fcc11294ed48e05c3e076ad48f03de56a5b60f2bad828629f54c086e51b8785e4eb6b39b6366bb7f
+  data.tar.gz: e129c8269d51269f635b4a4995abe568cdbd0b1aa61060986ffa34528157d79ae4a455a88d309010085928d8897204fadff094f79a94bb0d89aa9a83edd4903d

data/lib/livetext/errors.rb

@@ -15,4 +15,4 @@ end
 
 make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
 make_exception(:UnknownMethod,     "Error: name '%1' is unknown")
-
+make_exception(:NoSuchFile,        "Error: can't find file '%1' (method '%2')")

data/lib/livetext/standard.rb

@@ -179,27 +179,69 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
+=begin
+      Filename: foobar
+get_globals - 1 - transforming /private/tmp/.blogs/views/foobar/data/global.lt3
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/view.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/view.txt
+
+              rpath = /private/tmp/.blogs/views/foobar/settings/view.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/view.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = view.txt
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/recent.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/recent.txt
+              rpath = /private/tmp/.blogs/views/foobar/settings/recent.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/recent.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = recent.txt
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/publish.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/publish.txt
+              rpath = /private/tmp/.blogs/views/foobar/settings/publish.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/publish.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = publish.txt
+
+get_globals - 2
+
+=end
+
   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}"
+    fname = api.args[1]
     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)
+    fdir  = ::Livetext::Vars[:FileDir] + "/"   # where is the file we are reading?
+    if fname
+      path0  = fdir + fname
+      # puts ">> variables: fdir = #{fdir} fname = #{fname} path = #{path0}"
+      pname = Pathname.new(path0)
+      rpath = pname.realpath(pname)
+      path, dir, base = rpath.to_s, rpath.dirname.to_s, rpath.basename.to_s
+      # puts "              rpath = #{rpath} path = #{path}  dir = #{dir}  base = #{base}"
+      dok, fok = Dir.exist?(dir), File.exist?(path)
+      raise "No such dir #{dir.inspect} (file #{path})" unless dok
+      raise "No such file #{path.inspect} (file #{path})" unless fok
+      lines = File.readlines(path)
     else
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
     api.setvars(pairs)
     api.optional_blank_line
-  rescue => e
-    puts e
-    puts $!
+  rescue => err
+    puts "Error in #{__method__} in #{__FILE__}
+    puts  "     #{err.inspect}"
+    if err.respond_to?(:backtrace)
+      context = err.backtrace.map {|x| "     " + x}.join("\n")
+      puts context
+    end
+    abort "\nTerminated."
   end
 
   def heredoc(args = nil, body = nil)
@@ -416,6 +458,36 @@ puts ">> variables: pre=#{prefix.inspect}  file=#{file.inspect} pwd=#{Dir.pwd}"
     api.optional_blank_line
   end
 
+  def table(args = nil, body = nil)   # Same as xtable
+    title = api.data
+    delim = " :: "
+    api.out "<br>\n\n<center><table width=90% cellpadding=5>"
+    lines = api.body(true)
+    maxw = nil
+    processed = []
+    lines.each do |line|
+      line = api.format(line)
+      line.gsub!(/\n+/, "<br>\n")
+      processed << line
+      cells = line.split(delim)
+      wide = cells.map {|cell| cell.length }
+      maxw = [0] * cells.size
+      maxw = maxw.map.with_index {|x, i| [x, wide[i]].max }
+    end
+
+    sum = maxw.inject(0, :+)
+    maxw.map! {|x| (x/sum*100).floor }
+
+    processed.each do |line|
+      cells = line.split(delim)
+      html.wrap :tr do
+        cells.each {|cell| api.out "  <td valign=top>#{cell}</td>" }
+      end
+    end
+    api.out "</table></center>"
+    api.optional_blank_line
+  end
+
   def image(args = nil, body = nil)
     name, wide, high = api.args
     geom = ""

data/lib/livetext/version.rb

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

data/plugin/booktool.rb

@@ -4,21 +4,22 @@ def mobi(args = nil, body = nil)
   out = api.format(api.args[0])
   src = api.args[1]
   @cover = api.args[2]
+  @name = api.args[3]
   if ::File.directory?(src)
     files = ::Dir["#{src}/*"].grep /\.html$/
     files = files.sort  # why is this necessary now?
-    cmd = "cat #{files.join(' ')} >TEMP.html"
+    cmd = "cat #{files.join(' ')} >#@name.html"
     system(cmd)
   else
     raise "Not supported yet"
   end
 
   cmd = "ebook-convert "
-  cmd << "TEMP.html #{out}.mobi "
+  cmd << "#@name.html #{out}.mobi "
   cmd << "--cover #@cover " if @cover
   system(cmd)
 
-  system("links -dump TEMP.html >/tmp/links.out")
+  system("links -dump #@name.html >/tmp/links.out")
   str = `wc -w /tmp/links.out`
   nw = str.split[0]
 end
@@ -27,21 +28,22 @@ def epub(args = nil, body = nil)
   out = api.format(api.args[0])
   src = api.args[1]
   @cover = api.args[2]
+  @name = api.args[3]
   if ::File.directory?(src)
     files = ::Dir["#{src}/*"].grep /\.html$/
     files = files.sort  # why is this necessary now?
-    cmd = "cat #{files.join(' ')} >TEMP.html"
+    cmd = "cat #{files.join(' ')} >#@name.html"
     system(cmd)
   else
     raise "Not supported yet"
   end
 
   cmd = "ebook-convert "
-  cmd << "TEMP.html #{out}.epub "
+  cmd << "#@name.html #{out}.epub "
   cmd << "--cover #@cover " if @cover
   system(cmd)
 
-  system("links -dump TEMP.html >/tmp/links.out")
+  system("links -dump #@name.html >/tmp/links.out")
   str = `wc -w /tmp/links.out`
   nw = str.split[0]
   puts "Approx words: #{nw}"

data/test/extra/bracketed.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 # Just another testing class. Chill.

data/test/extra/double.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 # Just another testing class. Chill.

data/test/extra/functions.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 # Just another testing class. Chill.

data/test/extra/single.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 # Just another testing class. Chill.

data/test/extra/testgen.rb

@@ -41,6 +41,8 @@ end
 output.puts <<~RUBY
   require 'minitest/autorun'
 
+  MiniTest = Minitest unless defined?(MiniTest)
+
   require 'livetext'
 
   # Just another testing class. Chill.

data/test/extra/variables.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 # Just another testing class. Chill.

data/test/snapshots.rb

@@ -9,6 +9,8 @@ end
 
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../lib/livetext'
 
 =begin

data/test/unit/html.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require 'livetext'
 
 class TestingLivetext < MiniTest::Test

data/test/unit/parser/general.rb

@@ -1,6 +1,8 @@
 
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../parser'      # nested
 
 ParseGeneral = ::Livetext::ParseGeneral

data/test/unit/parser/mixin.rb

@@ -1,6 +1,8 @@
 
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../parser'      # nested
 
 class TestParseSet < MiniTest::Test

data/test/unit/parser/set.rb

@@ -1,6 +1,8 @@
 
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../parser'      # nested
 
 ParseSet = ::Livetext::ParseSet

data/test/unit/parser/string.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../parser'      # nested
 
 class TestStringParser < MiniTest::Test

data/test/unit/standard.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest
+
 require_relative '../../lib/livetext'
 
 class TestingLivetext < MiniTest::Test

data/test/unit/stringparser.rb

@@ -1,5 +1,7 @@
 require 'minitest/autorun'
 
+MiniTest = Minitest unless defined?(MiniTest)
+
 require_relative '../../lib/stringparser'
 
 class TestStringParser < MiniTest::Test

metadata

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