livetext 0.8.94 → 0.8.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e03684f43c00dc08a44a65d67d2e768f722bb676ffadd84ad39e464c538f831
-  data.tar.gz: 7aa534fd733a6ec1d0315a4a534ff2a7027a28dcec2f3ca4da272bdfcca09d9d
+  metadata.gz: 8d50c436a237a5e3f02b6619316c5ff37efa5d0c58e4d64eb5445c05f3a54dfa
+  data.tar.gz: c849446d4dd970e89c3cace0a8f1af13e3eadc2918df35f6614dc99192cbbd80
 SHA512:
-  metadata.gz: 2df6ccff1729ed6ac747a42f210389eb0cee162189bf707e9ebb6eaf7b2c36ee58464ee33e2dc4b5e0e940253707a7a124786d710dfc98441dedcbfeba1ed7e4
-  data.tar.gz: bbfb6363c513dde5d0c505ffa0c06231c045708cbe6357036a466a5fffff8cd31eb33540282d2263dba2dda8e25b7412fd68346f8f427b7b1fde44dcf49ca46d
+  metadata.gz: b778d4a49af38754d8a35df8e8cf42da35933888d26a6e13dd65cf944991f0521fc7138f49d174e7c3e640a93b84c451b3877d5424793e0cf4cd2af580964e66
+  data.tar.gz: 620dac5c5eca194d84cf758ceddf738ad5bc41c8574ac110d6599bb5e5542857781e7dd66a4710e3a416490cb7934063b3f826860aa26172bc8f633ad7f562d1

data/lib/formatline.rb

@@ -108,6 +108,7 @@ class FormatLine
         when :str
           @out << val unless val == "\n"   # BUG
         when :var
+# STDERR.puts "=== lt: sym = #{sym} val = #{val}  sub = #{varsub(val).inspect} #{Livetext::Vars[sym].inspect}"
           @out << varsub(val)
         when :func 
           param = nil

data/lib/functions.rb

@@ -17,6 +17,16 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
     Time.now.strftime("%T")
   end
 
+  def pwd(param=nil)
+    ::Dir.pwd
+  end
+
+  def rand(param=nil)
+# STDERR.puts "param = #{param.inspect}"
+    n1, n2 = param.split.map(&:to_i)
+    ::Kernel.rand(n1..n2).to_s
+  end
+
   def link(param=nil)
     text, url = param.split("|", 2)  # reverse these?
     "<a href='#{url}'>#{text}</a>"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.94"
+  VERSION = "0.8.95"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -130,8 +130,8 @@ class Livetext
   rescue => err
     puts "process_text: err = #{err}"
 #   puts err.backtrace.join("\n")
-puts @body
-@body = ""
+  puts @body
+  @body = ""
     return @body
   end
 
@@ -149,10 +149,10 @@ puts @body
       process_line(line)
     end
     val = @main.finalize if @main.respond_to? :finalize
-return @body
-    val
-  rescue
-    puts @body
+    @body
+  rescue => err
+    STDERR.puts "ERROR #{err} in process_file"
+    err.backtrace.each {|x| STDERR.puts "   " + x }
     @body = ""
   end
 
@@ -200,17 +200,14 @@ return @body
     if @main.respond_to?(name)
       result = @main.send(name)
     else
-      TTY.puts "version = #{Livetext::VERSION}"
-      TTY.puts "#{(@main.methods - Object.methods).sort.inspect}"
-      TTY.puts name.inspect
-      @main._error! "Name '#{name}' is unknown"
+      @main._error! "Name '#{name}' is unknown; version = #{Livetext::VERSION}"
       return
     end
     result
   rescue => err
     @main._error!(err)
-puts @body
-@body = ""
+  puts @body
+  @body = ""
     return @body
   end
 

data/lib/standard.rb

@@ -34,7 +34,7 @@ module Livetext::Standard
 
   def shell
     cmd = @_data
-    _errout("Running: #{cmd}")
+#   _errout("Running: #{cmd}")
     system(cmd)
   end
 
@@ -79,52 +79,6 @@ EOS
 #   exit!
   end
 
-#   def outdir
-#     @_outdir = @_args.first
-#     _optional_blank_line
-#   end
-# 
-#   def outdir!  # FIXME ?
-#     @_outdir = @_args.first
-#     raise "No output directory specified" if @_outdir.nil?
-#     raise "No output directory specified" if @_outdir.empty?
-#     system("rm -f #@_outdir/*.html")
-#     _optional_blank_line
-#   end
-# 
-#   def _output(name)
-#     @_outdir ||= "."  # FIXME
-#     @output.puts @body
-#     @body = ""
-#     @output.close unless @output == STDOUT
-#     @output = File.open(@_outdir + "/" + name, "w")
-#     @output.puts "<meta charset='UTF-8'>\n\n"
-#   end
-# 
-#   def _append(name)
-#     @_outdir ||= "."  # FIXME
-#     @output.close unless @output == STDOUT
-#     @output = File.open(@_outdir + "/" + name, "a")
-#     @output.puts "<meta charset='UTF-8'>\n\n"
-#   end
-# 
-#   def output
-#     name = @_args.first
-#     _debug "Redirecting output to: #{name}"
-#     _output(name)
-#   end
-# 
-#   def append
-#     file = @_args[0]
-#     _append(file)
-#   end
-# 
-#   def next_output
-#     tag, num = @_args
-#     _next_output(tag, num)
-#     _optional_blank_line
-#   end
-# 
 
   def cleanup
     @_args.each do |item| 
@@ -136,13 +90,6 @@ EOS
     end
   end
 
-#   def _next_output(tag = "sec", num = nil)
-#     @_file_num = num ? num : @_file_num + 1
-#     @_file_num = @_file_num.to_i
-#     name = "#{'%03d' % @_file_num}-#{tag}.html"
-#     _output(name)
-#   end
-
   def _def
     name = @_args[0]
     str = "def #{name}\n"
@@ -259,12 +206,17 @@ EOS
     end
   end
 
+  def reval
+    eval _data
+  end
+
   def heredoc
     var = @_args[0]
     str = _body_text
     s2 = ""
     str.each_line do |s|
-      s2 << s.chomp + "<br>"
+      str = FormatLine.var_func_parse(s.chomp)
+      s2 << str # + "<br>"
     end
     indent = @parent.indentation.last
     indented = " " * indent
@@ -278,6 +230,7 @@ EOS
     #    end
     #    s2 << line
     #  end
+# STDERR.puts "HERE: #{var} = #{s2.chomp.inspect}"
     @parent._setvar(var, s2.chomp)
     _optional_blank_line
   end
@@ -292,7 +245,7 @@ EOS
       loop do
         front = "../" * count
         count += 1
-        here = Pathname.new(front).expand_path.dirname
+        here = Pathname.new(front).expand_path.dirname.to_s
         break if here == "/"
         path = front + file
         value = path if File.exist?(path)
@@ -366,7 +319,7 @@ EOS
     if File.exist?(file)
       # Just keep going...
     else
-      if File.expand_path(".") != "/"
+      if File.expand_path(".").dirname != "/"
         Dir.chdir("..") { mixin }
         return
       else

data/lib/userapi.rb

@@ -88,8 +88,11 @@ module Livetext::UserAPI
         break 
       end
       next if _comment?(@line)
+flag = (@line.include?("og:title"))
       # FIXME Will cause problem with $. ?
+# STDERR.puts "lt3: _body @line = #{@line.inspect}" if flag
       @line = _format(@line) unless raw
+# STDERR.puts "           @line = #{@line.inspect}" if flag
       lines << @line 
     end
     raise unless end_found
@@ -100,9 +103,10 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-#   p err.inspect
-#   puts err.backtrace
-    _error!("Expecting .end, found end of file")
+    str = "Fake error? 'Expecting .end, found end of file'\n" 
+    str << err.inspect + "\n"
+    str << err.backtrace.map {|x| "  " + x }.join("\n")
+    _error!(str)
   end
 
   def _body_text(raw=false)

data/plugin/markdown.rb

@@ -6,12 +6,12 @@ SimpleFormats[:i] = %w[_ _]
 SimpleFormats[:t] = %w[` `]
 SimpleFormats[:s] = %w[<strike> </strike>]
 
-def h1; _out "# #{@_data}"; _optional_blank_line end       # atx style for now
-def h2; _out "## #{@_data}"; _optional_blank_line end
-def h3; _out "### #{@_data}"; _optional_blank_line end
-def h4; _out "#### #{@_data}"; _optional_blank_line end
-def h5; _out "##### #{@_data}"; _optional_blank_line end
-def h6; _out "###### #{@_data}"; _optional_blank_line end
+def h1; _out "# #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end       # atx style for now
+def h2; _out "## #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h3; _out "### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h4; _out "#### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h5; _out "##### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h6; _out "###### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
 
 def title
   h1

metadata

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