livetext 0.9.45 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b37a1a3e7407f6425178e5013641f1df43ec03a4aeac69936bfa1b4b000a9d5
-  data.tar.gz: e7ecf71a35779e59c21d2e013996cfcaa21554d99eddb8f5c89a91edd7b3e1bd
+  metadata.gz: 05c23cb9790ecbd684af4888ff8237bcf0aa792462bb1da1d183d18b786ab462
+  data.tar.gz: c0adc17493388b920557b09029213ab558fa43df3c6a7c23dce75d54c38fc298
 SHA512:
-  metadata.gz: 103265f837aceed3e5452d8c73d50d91077ca0191b0eebc30f78e1b230e566c841560372c258d45f687131257041abb1aa189af76521181ec22973441e5cc548
-  data.tar.gz: 75029926a177ca59d984dc564a693091b0518a9d91563a8d754092b5fceca0e6867ebd96d1709c45b225a4c57687b2b2d4bfc97dc6b734457f31bd15b048529a
+  metadata.gz: a8717d55d1775c6947b79f008d6a01a64b5e3c084e936b79f7faa243b7776233734fb3e56518ac249faf95bf5b86cbfcde006b50e449762b6bb96788b8c84ec0
+  data.tar.gz: d552b53c1b82e5b650d65a9e49e45bdf80447ecc0a4af0a290e9d6415979ef71dd3c4da35ca6b1cacff42c062c4e7896613ce05175b0040147e00a349c8ecb3d

data/lib/livetext/helpers.rb

@@ -218,7 +218,7 @@ module Livetext::Helpers
   def include_file(file)
     api.data = file
     api.args = [file]
-    dot_include
+    api.dot_include
   end
 
   def onoff(arg)   # helper

data/lib/livetext/more.rb

@@ -98,6 +98,22 @@ class Livetext
     @save_location = where  # delegate
   end
 
+  def initialize(output = ::STDOUT)
+    @source = nil
+    @_mixins = []
+    @_imports = []
+    @_outdir = "."
+    @no_puts = output.nil?
+    @body = ""
+    @main = Processor.new(self, output)  # nil = make @main its own parent??
+    @indentation = [0]
+    @_vars = Livetext::Vars
+    @api = UserAPI.new(self)
+    initial_vars
+# puts "------ init: self = "
+# p self
+  end
+
   def self.customize(mix: [], call: [], vars: {})
     obj = self.new
     mix  = Array(mix)
@@ -107,6 +123,8 @@ class Livetext
     end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
     obj.api.setvars(vars)
+# puts "------ init: obj = "
+# p obj
     obj
   end
 
@@ -120,20 +138,6 @@ class Livetext
     self
   end
 
-  def initialize(output = ::STDOUT)
-    @source = nil
-    @_mixins = []
-    @_imports = []
-    @_outdir = "."
-    @no_puts = output.nil?
-    @body = ""
-    @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" +

data/lib/livetext/processor.rb

@@ -3,8 +3,6 @@
 
 class Processor
 
-  GenericError = Class.new(StandardError)
-
   include Livetext::Standard
 
   Disallowed = 
@@ -56,13 +54,6 @@ class Processor
     ::STDERR.puts *args
   end
 
-  def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
-    where = @sources.last || @live.save_location
-    error "Error: #{err} (at #{where[1]} line #{where[2]})"
-    error(err.backtrace) rescue nil
-    raise GenericError.new("Error: #{err}") if raise_error
-  end
-
   def disallowed?(name)
     flag = Disallowed.include?(name.to_sym)
     flag

data/lib/livetext/standard.rb

@@ -258,6 +258,7 @@ module Livetext::Standard
   def dot_include(args = nil, body = nil)   # dot command
     file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
+# checkpoint "====== self.methods = #{self.methods.sort.inspect}"
     @parent.process_file(file)
     api.optional_blank_line
   end

data/lib/livetext/version.rb

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

metadata

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