livetext 0.9.44 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c132b3f86809adfbbed149564227c061911a51bc57124fdd17ed9fb67bae55
-  data.tar.gz: dc92358a343e8096f7e982005585fa9633d8860f6fe569e0db61bc40a764bd73
+  metadata.gz: 2b37a1a3e7407f6425178e5013641f1df43ec03a4aeac69936bfa1b4b000a9d5
+  data.tar.gz: e7ecf71a35779e59c21d2e013996cfcaa21554d99eddb8f5c89a91edd7b3e1bd
 SHA512:
-  metadata.gz: e8ec2c7c373c5587c1a492c0cd183bb6143c16a59ed49084fcc11294ed48e05c3e076ad48f03de56a5b60f2bad828629f54c086e51b8785e4eb6b39b6366bb7f
-  data.tar.gz: e129c8269d51269f635b4a4995abe568cdbd0b1aa61060986ffa34528157d79ae4a455a88d309010085928d8897204fadff094f79a94bb0d89aa9a83edd4903d
+  metadata.gz: 103265f837aceed3e5452d8c73d50d91077ca0191b0eebc30f78e1b230e566c841560372c258d45f687131257041abb1aa189af76521181ec22973441e5cc548
+  data.tar.gz: 75029926a177ca59d984dc564a693091b0518a9d91563a8d754092b5fceca0e6867ebd96d1709c45b225a4c57687b2b2d4bfc97dc6b734457f31bd15b048529a

data/bin/livetext

@@ -115,7 +115,7 @@ def parse_command_line
       STDERR.puts "Command line - #{arg.inspect} is  unknown"
     end
   end
-  @live.dump if success
+  @live.api.dump if success
 rescue => err
   STDERR.puts "Unexpected error! #{err.inspect}\n#{err.backtrace.join("\n")}"
 end

data/lib/livetext/errors.rb

@@ -1,3 +1,51 @@
+  private def whence(back = 0)
+    file, line, inmeth = caller[back].split(":")
+    meth = inmeth[4..-2]
+    [file, line, meth]
+  end
+
+  private def display(file, line, meth, msg)
+    puts "--- #{meth}  #{line} in #{file}"
+    puts "::: " + msg if msg
+  end
+
+  def checkpoint(msg = nil)
+    file, line, meth = whence(1)
+    display(file, line, meth, msg)
+  end
+
+  def checkpoint?(msg = nil)        # with sleep 3
+    file, line, meth = whence(1)
+    display(file, line, meth, msg)
+  end
+
+  def checkpoint!(msg = nil)        # with pause
+    file, line, meth = whence(1)
+    display(file, line, meth, msg)
+    print "::: Pause..."
+    gets
+  end
+
+  def warning(err)
+    file, line, meth = whence(2)  # 2 = skip rescue
+    puts "Error in #{meth} in #{file} (non-fatal?)"
+    puts "      err = #{err.inspect}"
+    puts "      #{err.backtrace[0]}" if err.respond_to?(:backtrace)
+    puts
+  end
+
+  def fatal(err)
+    file, line, meth = whence(2)  # 2 = skip rescue
+    puts "Error in #{meth} in #{file}"
+    puts "WTF??"
+    puts  "     err = #{err.inspect}"
+    if err.respond_to?(:backtrace)
+      context = err.backtrace.map {|x| "     " + x + "\n" }
+      puts context
+    end
+    abort "Terminated."
+  end
+
 
 # More later?
 
@@ -16,3 +64,13 @@ 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')")
+
+# Move others here?  DisallowedName, etc.
+
+make_exception(:ExpectedDotEnd,    "Error: expected .end but found end of file")
+make_exception(:ExpectedAlphaNum,  "Error: expected an alphanumeric but foun '%1'")   # parser/set.rb
+make_exception(:ExpectedCommaEOS,  "Error: expected comma or end of string")          # parser/set.rb
+
+
+
+

data/lib/livetext/global_helpers.rb

@@ -2,7 +2,6 @@
 module GlobalHelpers
 
   def check_disallowed(name)
-api.tty "GLOBAL cdis"
     raise DisallowedName(name) if disallowed?(name)
   end
 

data/lib/livetext/helpers.rb

@@ -17,8 +17,8 @@ module Livetext::Helpers
     return graceful_error(err) if self.respond_to?(:graceful_error)
     return self.parent.graceful_error(err) if self.respond_to?(:parent)
     raise err
-  rescue => myerr
-    TTY.puts "--- Warning: friendly_error #{myerr.inspect}"
+#  rescue => myerr
+#    TTY.puts "--- Warning: friendly_error #{myerr.inspect}"
   end
 
   def escape_html(string)
@@ -75,7 +75,10 @@ module Livetext::Helpers
 ## FIXME process_file[!] should call process[_text] ?
 
   def process_file(fname, btrace=false)
-    graceful_error FileNotFound(fname) unless File.exist?(fname)
+    unless File.exist?(fname)
+      api.dump
+      raise FileNotFound(fname) 
+    end
     setfile(fname)
     text = File.readlines(fname)
     enum = text.each
@@ -107,7 +110,7 @@ module Livetext::Helpers
     end
     success
   rescue => err
-    STDERR.puts "ERROR: #{err}\n#{err.backtrace.join("\n")}"
+    STDERR.puts "ERROR: #{err.inspect}\n#{err.backtrace.join("\n")}"
     exit
   end
 
@@ -186,8 +189,9 @@ module Livetext::Helpers
   def grab_file(fname)
     File.read(fname)
   rescue
-    ::STDERR.puts "Can't find #{fname.inspect} \n "
-	  return nil
+    graceful_error NoSuchFile(fname)
+    # ::STDERR.puts "Can't find #{fname.inspect} \n "
+	  # return nil
   end
 
   def search_upward(file)
@@ -212,6 +216,7 @@ module Livetext::Helpers
   end
 
   def include_file(file)
+    api.data = file
     api.args = [file]
     dot_include
   end
@@ -253,5 +258,18 @@ module Livetext::Helpers
     api.setvar(:File, file)
   end
 
+#   def dump(file = nil)   # not a dot command!
+#     file ||= ::STDOUT
+#     TTY.puts "--- Writing body (#{@body.size} bytes)" if @body
+#     file.puts @body
+#   rescue => err
+#     TTY.puts "#dump had an error: #{err.inspect}"
+#   end
+
+  def graceful_error(err, msg = nil)
+    api.dump
+    STDERR.puts msg if msg
+    raise err
+  end
 end
 

data/lib/livetext/more.rb

@@ -10,7 +10,21 @@ class Livetext
 
     def initialize(hash = {})
       @vars = {}
-      hash.each_pair {|k, v| @vars[k.to_sym] = v }
+      hash.each_pair do |k, v| 
+        sym = k.to_sym
+        str = k.to_s
+        @vars[sym] = v 
+        @vars[str] = v 
+      end
+    end
+
+    def inspect
+      syms = @vars.keys.select {|x| x.is_a? Symbol }
+      out = "\nVariables:"
+      syms.each do |sym|
+        out << "    #{sym}: #{@vars[sym].inspect}\n"
+      end
+      out
     end
   
     def [](var)
@@ -84,19 +98,6 @@ class Livetext
     @save_location = where  # delegate
   end
 
-  def dump(file = nil)   # not a dot command!
-    file ||= ::STDOUT
-    file.puts @body
-  rescue => err
-    TTY.puts "#dump had an error: #{err.inspect}"
-  end
-
-  def graceful_error(err, msg = nil)
-    dump
-    STDERR.puts msg if msg
-    raise err
-  end
-
   def self.customize(mix: [], call: [], vars: {})
     obj = self.new
     mix  = Array(mix)
@@ -126,13 +127,25 @@ class Livetext
     @_outdir = "."
     @no_puts = output.nil?
     @body = ""
-    @main = Processor.new(self, output)
+    @main = Processor.new(self, output)  # nil = make @main its own parent??
     @indentation = [0]
     @_vars = Livetext::Vars
     @api = UserAPI.new(self)
     initial_vars
   end
 
+  def inspect
+    "Livetext:\n" + 
+    "  source = #{@source.inspect}\n" +
+    "  mixins = #{@_mixins.inspect}\n" + 
+    "  import = #{@_mixins.inspect}\n" + 
+    "  main   = (not shown)\n" + 
+    "  indent = #{@indentation.inspect}\n" + 
+    "  vars   = #{@_vars.inspect}\n" + 
+    "  api    = (not shown)\n" +
+    "  body   = (#{@body.size} bytes)"
+  end
+
   def api
     @api
   end
@@ -181,7 +194,9 @@ class Livetext
   def xform_file(file, vars: nil)
     Livetext::Vars.replace(vars) unless vars.nil?
     @_vars.replace(vars) unless vars.nil?
+# checkpoint! "Calling process_file..."
     self.process_file(file)
+# checkpoint! "...returned"
     self.body
   end
 

data/lib/livetext/processor.rb

@@ -26,7 +26,7 @@ class Processor
   attr_reader :parent, :sources
 
   def initialize(parent, output = nil)
-    @parent = parent
+    @parent = parent || self
     # STDERR.puts "PARENT.api = #{parent.api.inspect}"
     @parent.api ||= Livetext::UserAPI.new(@parent)
     @nopass = false
@@ -65,7 +65,6 @@ class Processor
 
   def disallowed?(name)
     flag = Disallowed.include?(name.to_sym)
-# api.tty "disa name = #{name.inspect} flag = #{flag}"
     flag
   end
 
@@ -95,4 +94,6 @@ class Processor
     @sources.pop
     nil
   end
+
+
 end

data/lib/livetext/standard.rb

@@ -179,39 +179,6 @@ 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]
     fname = api.args[1]
@@ -221,7 +188,7 @@ get_globals - 2
       path0  = fdir + fname
       # puts ">> variables: fdir = #{fdir} fname = #{fname} path = #{path0}"
       pname = Pathname.new(path0)
-      rpath = pname.realpath(pname)
+      rpath = pname.realpath
       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)
@@ -235,13 +202,7 @@ get_globals - 2
     api.setvars(pairs)
     api.optional_blank_line
   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."
+    fatal(err)
   end
 
   def heredoc(args = nil, body = nil)

data/lib/livetext/userapi.rb

@@ -25,6 +25,14 @@ class Livetext::UserAPI
     @live.api
   end
 
+  def dump(file = nil)   # not a dot command!
+    file ||= ::STDOUT
+    # TTY.puts "--- Writing body (#{@live.body.size} bytes)"
+    file.puts @live.body
+  rescue => err
+    TTY.puts "#dump had an error: #{err.inspect}"
+  end
+
   def html
     @html
   end
@@ -34,9 +42,9 @@ class Livetext::UserAPI
   end
 
   def include_file(file)
+# checkpoint "DATA = #{file.inspect}"
     api.data = file
     api.args = [file]
-STDERR.puts "incfile: #{api.methods.sort.inspect}\n "
     api.dot_include
   end
 
@@ -191,11 +199,13 @@ STDERR.puts "incfile: #{api.methods.sort.inspect}\n "
   end
 
   def puts(*args)
-    @live.output.puts *args
+    # @live.output.puts *args
+    @live.api.out *args
   end
 
   def print(*args)
-    @live.output.print *args
+    # @live.output.print *args
+    @live.api.out! *args
   end
 
   def debug=(val)

data/lib/livetext/version.rb

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

data/lib/livetext.rb

@@ -12,7 +12,8 @@ require_relative 'livetext/userapi'
 require_relative 'livetext/formatter'
 require_relative 'livetext/processor'
 require_relative 'livetext/helpers'
+require_relative 'livetext/more'
+
 require_relative 'livetext/handler'
 
-require_relative 'livetext/more'
 

data/test/snapshots.rb

@@ -1,11 +1,11 @@
-require 'simplecov'            # These two lines must go first
-SimpleCov.use_merging(true)
-SimpleCov.start  do
-  puts "SimpleCov: Snapshots"
-  add_filter "/test/"
-  enable_coverage :branch
-  primary_coverage :branch
-end
+# require 'simplecov'            # These two lines must go first
+# SimpleCov.use_merging(true)
+# SimpleCov.start  do
+#   puts "SimpleCov: Snapshots"
+#   add_filter "/test/"
+#   enable_coverage :branch
+#   primary_coverage :branch
+# end
 
 require 'minitest/autorun'
 

metadata

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