livetext 0.8.84 → 0.8.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20830ef3a88634fa613b455047e28820be9f6a728b2490d2f4d7e93a2b711a55
-  data.tar.gz: fd041725cfe278c4c9517fcb7da6f7fc11602170a3b8cc435d0b79a35745d7d8
+  metadata.gz: fac565acf190ffd552eb81d2704d2ca612e1eb2a0d152b37b51e1fb9d8032f8e
+  data.tar.gz: 5383e8ce7b433185de30a74e85f41b7237f44522fc1d9bbc9a05bb22ce401007
 SHA512:
-  metadata.gz: 285ba05a8ed1b0c683bbb11deee1259f1e7d2d98657936222c855ca5c1a72c8d5991cf8291442481266ba1156f9a9f84b34a8bab565aa67c09c227bb0d063dd8
-  data.tar.gz: 45eb8e3fb17596afd84f0ded7fe09c96a575c522c6419494a4ac43be162772317f06e79aff99d9d3206eefe15f8dfe94eaef1d7470e9c9327f2497ef3efef4e8
+  metadata.gz: 25dbdf40f1dde5ff9a0928f00886a77b610fcd989b81c511cdb1d1c6474ae1f6d70feb513daea37cfa4e1ba77bc85833eb28d4a78bbe9657d53f6f99fcd33fa2
+  data.tar.gz: 20beb385d30ceb73543561f70d3a47e7bdd1d59832a0f7e765138d891da1d1682531048704e7cee08f9b7e9c28a0d88456a38b28ee5ecadf0be98b7949fd3ad1

data/lib/formatline.rb

@@ -328,7 +328,7 @@ class FormatLine
   end
 
   def varsub(name)
-    result = Livetext::Vars[name]
+    result = Livetext::Vars[name] || "[#{name} is undefined]"
     result
   end
 

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.84"
+  VERSION = "0.8.85"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -133,8 +133,11 @@ class Livetext
 
   def process_file(fname)
     _setfile(fname)
-    raise "No such file '#{fname}' to process" unless File.exist?(fname)
-    text = File.readlines(fname)
+    up = Dir.pwd
+    Dir.chdir(File.dirname(fname))
+    base = File.basename(fname)
+    raise "No such file '#{fname}' to process" unless File.exist?(base)
+    text = File.readlines(base)
     enum = text.each
     @backtrace = false
     @main.source(enum, fname, 0)
@@ -144,6 +147,7 @@ class Livetext
       process_line(line)
     end
     val = @main.finalize if @main.respond_to? :finalize
+    Dir.chdir(up)
     val
   end
 

data/lib/processor.rb

@@ -35,7 +35,7 @@ class Livetext
       where = @sources.last || @save_location
       puts @parent.body
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-#     STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
+      STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       exit if abort
     end
 

data/lib/standard.rb

@@ -193,8 +193,9 @@ EOS
 	  if File.exist?(file)
 		  return file
 		else
-		  _seek("../#{file}")
+		  Dir.chdir("..") { _seek(file) unless Dir.pwd == "/" }
 		end
+	  return nil
   rescue
 	  return nil
   end
@@ -210,6 +211,7 @@ EOS
 
   def _include
     file = @_args.first
+
     _check_existence(file, "No such include file '#{file}'")
     @parent.process_file(file)
     _optional_blank_line
@@ -226,14 +228,14 @@ EOS
     _optional_blank_line
   end
 
-  def include!    # FIXME huh?
-    file = @_args.first
-    return unless File.exist?(file)
-
-    lines = @parent.process_file(file)
-    File.delete(file)
-    _optional_blank_line
-  end
+#   def include!    # FIXME huh?
+#     file = @_args.first
+#     return unless File.exist?(file)
+# 
+#     lines = @parent.process_file(file)
+# #?    File.delete(file)
+#     _optional_blank_line
+#   end
 
   def mixin
     name = @_args.first   # Expect a module name

metadata

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