livetext 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 941adaa3e54331bd76d20b4af2e8d34efb956f6e
-  data.tar.gz: 7b9f26b201ef3aa3264f1ddf3c7402ddb8e29b66
+  metadata.gz: 6e46bad5eb2f6ef4b055c2f2a0b5b86582cc54f6
+  data.tar.gz: 150f82d63567a4199e8cdba23c57bc14c589486e
 SHA512:
-  metadata.gz: b464efdb73781affec9be9b62e4d98865951a50ba61ce0657be2f476f9b878e550a4a551a24079fdd97435878c29051601d327e2f665877c3687d0e75255b5a6
-  data.tar.gz: f1a712645a73e293f657604a15a0dd47714dbd197a495f3da710eaa45d0850133d395e30aff64d80b08d2f79603cbead5e978daa9b7746f75b0b9e168849fbfb
+  metadata.gz: 495ff531811abbdae1c034f49584a7074505f644edeb18d12d1c33cf3c1d05ff9b47bd0e3f3f38cb569c66a41803a192fc646420c922e41ebc3a879d36a30027
+  data.tar.gz: 88d0f3742a2585ad1eb291cdb64491262ffdd943fb8068361236f97db3b63df87f8375b1dbabc6fcb900ea13928313d62b7b27c90fd066a7aaf7e89eacc69b4d

data/bin/livetext

@@ -5,7 +5,8 @@ require_relative '../lib/livetext'
 def handle_ltx(src)
   abort "Unknown file extension" unless src =~ /.ltx$/
 
-  Livetext.process_file(src)
+  x = Livetext.new
+  x.process_file(src)
 end
 
 # Main

data/dsl/bookish.rb

@@ -128,6 +128,27 @@ def subsec
   _puts "<h3>#@subsec #{@_data}</h3>\n"
 end
 
+def table2
+  title = _data
+  wide = "90"
+  extra = _args[2]
+  delim = " :: "
+  _puts "<br><center><table border=1 width=#{wide}% cellpadding=5>"
+  lines = _body
+  lines.map! {|line| _formatting(line) }
+
+  lines.each do |line|
+    cells = line.split(delim)
+    percent = (100/cells.size.to_f).round
+    _puts "<tr>"
+    cells.each {|cell| _puts "  <td width=#{percent}% #{extra}>#{cell}</td>" }
+    _puts "</tr>"
+  end
+  _puts "</table></center><br><br>"
+
+  _optional_blank_line
+end
+
 def table
   @table_num ||= 0
   @table_num += 1

data/dsl/pyggish.rb

@@ -164,7 +164,7 @@ def elixir
 end
 
 def fragment
-# debug
+  debug
   lexer = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
   _debug "-- fragment: lexer = #{lexer.inspect}"
   code = ""

data/lib/livetext.rb

@@ -8,7 +8,7 @@ require_relative "#{Plugins}/pyggish"
 
 
 class Livetext
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 
   Space = " "
 
@@ -25,11 +25,17 @@ class Livetext
                 :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
                 :instance_exec, :__send__, :__id__, :__binding__]
 
-  class << self
-    attr_reader :main
+  class Functions    # Functions will go here... user-def AND pre-def??
+    def date
+      Time.now.strftime("%F")
+    end
+
+    def time
+      Time.now.strftime("%F")
+    end
   end
 
-  def self.handle_line(line, sigil=".")
+  def handle_line(line, sigil=".")
     nomarkup = true
     # FIXME inefficient
     scomment  = rx(sigil, Livetext::Space)  # apply these in order
@@ -39,18 +45,18 @@ class Livetext
     elsif line =~ sname 
       handle_sname(line)
     else
-      @main._passthru(line)
+      _passthru(line)
     end
   end
 
-  def self.peek_nextline
+  def peek_nextline
     @sources.last[0].peek
   rescue StopIteration
     @sources.pop
     nil
   end
 
-  def self.nextline
+  def nextline
     return nil if @sources.empty?
     line = @sources.last[0].next
     @sources.last[2] += 1
@@ -60,10 +66,9 @@ class Livetext
     nil
   end
 
-  def self.process_file(fname)
-    @sources ||= []
+  def process_file(fname)
     enum = File.readlines(fname).each
-    @main ||= Livetext.new(enum)
+    _check_existence(fname, "No such file '#{fname}' to process")
     @sources.push [enum, fname, 0]
     loop do 
       line = nextline
@@ -72,78 +77,58 @@ class Livetext
     end
   end
 
-  def self.grab_file(fname)
+  def grab_file(fname)
     File.read(fname)
   end
 
-  def self.rx(str, space=nil)
+  def rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
 
-  def self.handle_scomment(line, sigil=".")
+  def handle_scomment(line, sigil=".")
   end
 
-  def self._disallowed?(name)
+  def _disallowed?(name)
     Livetext::Disallowed.include?(name.to_sym)
   end
 
-  def self._get_name(line, sigil=".")
-    blank = line.index(" ") || -1     # line.index("\n")
-    name = line[1..(blank-1)]
-    abort "#{@main.where}: Name '#{name}' is not permitted" if _disallowed?(name)
-    @main._data = line[(blank+1)..-1]
+  def _get_name(line, sigil=".")
+    name, @_data = line.split(" ", 2)
+    name = name[1..-1]  # chop off sigil
+    @_args = @_data.split
+    _error! "Name '#{name}' is not permitted" if _disallowed?(name)
     name = "_def" if name == "def"
     name = "_include" if name == "include"
-    abort "#{@main.where}: mismatched 'end'" if name == "end"
+    _error! "Mismatched 'end'" if name == "end"
     name
   end
 
-  def self.handle_sname(line, sigil=".")
+  def handle_sname(line, sigil=".")
     name = _get_name(line, sigil=".")
-    unless @main.respond_to?(name)
-      raise "'#{name}' is unknown"
+    unless self.respond_to?(name)
+      _error! "Name '#{name}' is unknown"
       return
     end
-    @main.send(name)
+    self.send(name)
   rescue => err
-    STDERR.puts "ERROR on #{@sources.last[1]} line #{@sources.last[2]} : #{err}"
-    exit
+    _error!(err)
   end
 
-class Functions    # Functions will go here... user-def AND pre-def??
-  def date
-    Time.now.strftime("%F")
-  end
-
-  def time
-    Time.now.strftime("%F")
-  end
-
-  def basename
-    file = ::Livetext.main.file
-    ::File.basename(file, ".*")
+# include ::Livetext::Helpers
+  def _error!(err, abort=true, trace=false)
+    STDERR.puts "Error: #{err} (at #{@sources.last[1]} line #{@sources.last[2]})"
+    STDERR.puts err.backtrace if trace
+    exit if abort
   end
-end
 
-# include ::Livetext::Helpers
-  def _check_existence(file)
-    raise "No such file found" unless File.exist?(file)
+  def _check_existence(file, msg)
+    _error! msg unless File.exist?(file)
   end
 
   def _source
     @input
   end
 
-  def _data=(str)
-    str ||= ""
-    @_data = str 
-    @_args = str.split
-  end
-
-  def _data
-    @_data
-  end
-
   def _args
     if block_given?
       @_args.each {|arg| yield arg }
@@ -153,7 +138,7 @@ end
   end
 
   def _optional_blank_line
-    @line = ::Livetext.nextline if ::Livetext.peek_nextline =~ /^ *$/
+    @line = nextline if peek_nextline =~ /^ *$/
   end
 
   def _comment?(str, sigil=".")
@@ -177,7 +162,7 @@ end
   def _raw_body(tag = "__EOF__", sigil = ".")
     lines = []
     loop do
-      @line = ::Livetext.nextline
+      @line = nextline
       break if @line.chomp.strip == tag
       lines << @line
     end
@@ -192,7 +177,7 @@ end
   def _body(sigil=".")
     lines = []
     loop do
-      @line = ::Livetext.nextline  # no chomp needed
+      @line = nextline
       break if _end?(@line, sigil)
       next if _comment?(@line, sigil)
       lines << @line
@@ -303,33 +288,35 @@ end
   end
 
 # include ::Livetext::Standard
+
   def comment
     junk = _body  # do nothing with contents
   end
 
   def shell
-    cmd = _data
+    cmd = @_data
     _errout("Running: #{cmd}")
     system(cmd)
   end
 
   def func
-    fname = @_args[0]   # FIXME: don't permit 'initialize' (others?)
+    funcname = @_args[0]
+    _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
-      def #{fname}
+      def #{funcname}
         #{_body!}
       end
     EOS
-    ::Livetext::Functions.class_eval func_def
+    Livetext::Functions.class_eval func_def
   end
 
   def shell!
-    cmd = _data
+    cmd = @_data
     system(cmd)
   end
 
   def errout
-    TTY.puts _data
+    TTY.puts @_data
   end
 
   def say
@@ -410,13 +397,14 @@ end
   end
 
   def _def
-    name = _args[0]
+    name = @_args[0]
     str = "def #{name}\n"
+    raise "Illegal name '#{name}'" if _disallowed?(name)
     str += _body!
     str += "end\n"
     eval str
   rescue => err
-    STDERR.puts "Syntax error in definition:\n#{err}\n#$!"
+    _error!(err)
   end
 
   def nopass
@@ -424,7 +412,7 @@ end
   end
 
   def set
-    assigns = _data.chomp.split(/, */)
+    assigns = @_data.chomp.split(/, */)
     assigns.each do |a| 
       var, val = a.split("=")
       val = val[1..-2] if val[0] == ?" and val[-1] == ?"
@@ -435,13 +423,14 @@ end
   end
 
   def _include
-    file = _args.first
-    ::Livetext.process_file(file)
+    file = @_args.first
+    _check_existence(file, "No such include file '#{file}'")
+    process_file(file)
     _optional_blank_line
   end
 
   def include!    # FIXME huh?
-    file = _args.first
+    file = @_args.first
     return unless File.exist?(file)
 
     lines = process_file(file)
@@ -450,32 +439,33 @@ end
   end
 
   def mixin
-    name = _args.first   # Expect a module name
+    name = @_args.first   # Expect a module name
     file = "#{Plugins}/" + name.downcase + ".rb"
     return if @_mixins.include?(name)
     file = "./#{name}.rb" unless File.exist?(file)
-    _check_existence(file)
+    _check_existence(file, "No such mixin '#{name}'")
 
     @_mixins << name
-    meths = ::Livetext.grab_file(file)
+    meths = grab_file(file)
     modname = name.gsub("/","_").capitalize
     string = "module ::#{modname}\n#{meths}\nend"
     eval(string)
     newmod = Object.const_get("::" + modname)
-    Livetext.main.extend(newmod)
+    self.extend(newmod)
     init = "init_#{name}"
     self.send(init) if self.respond_to? init
     _optional_blank_line
   end
 
   def copy
-    file = _args.first
-    @output.puts ::Livetext.grab_file(file)
+    file = @_args.first
+    _check_existence(file, "No such file '#{file}' to copy")
+    @output.puts grab_file(file)
     _optional_blank_line
   end
 
   def r
-    _puts _data  # No processing at all
+    _puts @_data  # No processing at all
   end
 
   def raw
@@ -484,7 +474,7 @@ end
   end
 
   def debug
-    arg = _args.first
+    arg = @_args.first
     self._debug = true
     self._debug = false if arg == "off"
   end
@@ -495,7 +485,7 @@ end
 
   def heading
     _print "<center><font size=+1><b>"
-    _print _data
+    _print @_data
     _print "</b></font></center>"
   end
 
@@ -530,6 +520,7 @@ end
     @vars = {}
     @_mixins = []
     @source_files = []
+    @sources = []
     @_outdir = "."
     @_file_num = 0
     @_nopass = false
@@ -538,10 +529,6 @@ end
     @lnum = 0
   end
 
-  def where
-    "Line #@lnum of #@file"
-  end
-
 #   def method_missing(name, *args)
 # ::TTY.puts "MM: #{name}"
 #     name = "_def" if name.to_s == "def"
@@ -561,6 +548,7 @@ end
 end
 
 if $0 == __FILE__
-  Livetext.process_file(ARGV[0] || STDIN)
+  x = Livetext.new
+  x.process_file(ARGV[0] || STDIN)
 end
 

data/test/test.rb

@@ -40,6 +40,10 @@ class TestingLiveText < MiniTest::Test
 
   def test_error_line_num;      external_files end
   def test_error_inc_line_num;  external_files end
+  def test_error_invalid_name;  external_files end
+  def test_error_no_such_mixin; external_files end
+  def test_error_no_such_inc;   external_files end
+  def test_error_no_such_copy;  external_files end
 
   def test_simple_vars;         external_files end
   def test_more_complex_vars;   external_files end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -102,8 +102,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
+has_rdoc: