livetext 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f706dc4d367cb931a999a1ba4918fbb46981a57
-  data.tar.gz: 5c0d148218f148c2f8e99877b8d331e3385bbfef
+  metadata.gz: 13347ab8dd844db4d4bd6b65038c3d8a57b6c102
+  data.tar.gz: 146caebefc11e7c98604ed238c135b084c0e35ff
 SHA512:
-  metadata.gz: c0e6c42f2b8a91c4d2fce8e03e0bba6f1ad60afd82edb0323566b45b48088b11b381655213c2ff969e8b6f2c73e2d16951d0429f410aee712e6bd09a016ce415
-  data.tar.gz: 6d9e96b0d091dfbc94bcdea217305aff01bc230c43c44f0b2e1cbd509b00b83a130dd97d7f36b30907af0be2b871a441260c1060a8b475e43f68e8e30126550c
+  metadata.gz: 21b01a30d65224433e06f456354882169298f96f822aa92f556303d596393bfa9244525884cd2ebc53a2d8cda777f920d4cd04e059267d3457110fa8e20a011c
+  data.tar.gz: d57ad1df788529d5e0748eee9b01482f9c509ca246254f672ff9315eb3b441e426e0c5e8977df2e776d9f033edc6915f301b5fb2df28dcccc77ec3fdc1d1c681

data/README.ltx

@@ -1,4 +1,4 @@
-.mixin lib/tutorial
+.mixin dsl/tutorial
 .title Livetext: A smart processor for text
 
 .p Livetext is simply a tool for transforming text from one format into another. The source file
@@ -59,8 +59,8 @@ in commented form.
 a block of lines rather than just a few parameters. (A text block is like a here-document.)
 There is no method name corresponding to the `.end command.
 
-.p The file extension I've chosen is `.lt (though this may change). *Note: The source for this 
-README is a `.lt file which uses its own little _(ad hoc) library (called `(readme.rb)). Refer to
+.p The file extension I've chosen is `.ltx (though this may change). *Note: The source for this 
+README is a `.ltx file which uses its own little _(ad hoc) library (called `(readme.rb)). Refer to
 the repo to see these.
 
 .section Syntax, comments, and more
@@ -117,7 +117,7 @@ Here is the current list:
 .dlist
  `comment ~~ Start a comment block
  `errout ~~ Write an error message to STDERR
- `sigil ~~ Change the default sigil from `. to some other character
+ `sigil ~~ Change the default sigil from `. to some other character (*(removed for now))
  `_def ~~ Define a new method inline
  `set ~~ Assign values to variables for later interpolation
  `include ~~ Include an outside text file (to be interpreted as Livetext)
@@ -259,7 +259,7 @@ def alpha
 end
 .end
 
-.p Now the `.lt file can be written this way:
+.p Now the `.ltx file can be written this way:
 
 .code
  .mixin mylib

data/bin/livetext

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

data/lib/livetext.rb

@@ -15,7 +15,7 @@ class Enumerator
 end
 
 class Livetext
-  VERSION = "0.6.5"
+  VERSION = "0.6.7"
 
   Space = " "
 
@@ -37,6 +37,7 @@ class Livetext
   end
 
   def self.handle_line(line)
+# ::TTY.puts "---- hline - #{line.inspect}"
     nomarkup = true
     sigil = "."
     scomment  = rx(sigil, Livetext::Space)  # apply these in order
@@ -48,6 +49,41 @@ class Livetext
     end
   end
 
+  def self.peek_nextline
+    @sources.last[0].peek
+  rescue StopIteration
+#   @sources.pop   # FIXME??
+    nil
+  end
+
+  def self.nextline
+    return nil if @sources.empty?
+    line = @sources.last[0].next
+    @sources.last[2] += 1
+    line
+  rescue StopIteration
+#   @sources.pop   # FIXME??
+#   retry  
+  end
+
+  def self.process_file(fname, &block)
+    block ||= proc {|line| handle_line(line) }
+    @sources ||= []
+    enum = File.readlines(fname).each
+    @main ||= Livetext::System.new(enum)
+    @sources.push [enum, fname, 0]
+    loop do 
+      line = nextline
+      break if line.nil?
+      block.call(line)    # handle_line(line)
+    end
+#   @sources.pop  # FIXME ?
+  end
+
+  def self.grab_file(fname)
+    File.read(fname)
+  end
+
   def self.handle_file(file)
     fname = "<<none>>"
     if file.is_a? String
@@ -56,13 +92,12 @@ class Livetext
     end
     source = file.each_line
     @main = Livetext::System.new(source)
-#   @main._switch_file(fname)
     @main.file = fname
     @main.lnum = 0
 
     loop do
-      line = @main._next_line
-      handle_line(line)
+      line = ::Livetext.nextline
+      ::Livetext.handle_line(line)
     end
 
     val = @main.finalize if @main.respond_to?(:finalize)
@@ -71,7 +106,6 @@ class Livetext
     STDERR.puts "handle_file: #{err}"
   end
 
-
   def self.rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
@@ -84,7 +118,7 @@ class Livetext
   end
 
   def self._get_name(sigil, line)
-    blank = line.index(" ") || line.index("\n")
+    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]
@@ -106,9 +140,9 @@ class Livetext
   rescue => err
     STDERR.puts "ERROR on #{@main.file} line #{@main.lnum} : #{err}"
 #   STDERR.puts "  self = #{self.inspect}  @main = #{@main.inspect}"
-    STDERR.puts "  sources = #{@main.source_files.inspect}"
+#   STDERR.puts "  sources = #{@main.source_files.inspect}"
     STDERR.puts err.backtrace
-    STDERR.puts "--- Methods = #{(@main.methods - Object.methods).sort}\n "
+#   STDERR.puts "--- Methods = #{(@main.methods - Object.methods).sort}\n "
   end
 
 end
@@ -157,7 +191,7 @@ module Livetext::Helpers
   end
 
   def _optional_blank_line
-    @line = _next_line if _peek_next_line =~ /^ *$/
+    @line = ::Livetext.nextline if ::Livetext.peek_nextline =~ /^ *$/
   end
 
   def _comment?(str, sigil=".")
@@ -181,7 +215,7 @@ module Livetext::Helpers
   def _raw_body(tag = "__EOF__", sigil = ".")
     lines = []
     loop do
-      @line = _next_line
+      @line = ::Livetext.nextline
       break if @line.chomp.strip == tag
       lines << @line
     end
@@ -196,7 +230,7 @@ module Livetext::Helpers
   def _body(sigil=".")
     lines = []
     loop do
-      @line = _next_line  # no chomp needed
+      @line = ::Livetext.nextline  # no chomp needed
       break if _end?(@line, sigil)
       next if _comment?(@line, sigil)
       lines << @line  # _formatting(line)  # FIXME ?? 
@@ -304,16 +338,21 @@ module Livetext::Helpers
     @output.print *args
   end
 
-  def _peek_next_line
-    @input.peek
-  end
+#   def peek_next_line
+#     @sources.last[0].peek
+#   rescue StopIteration
+#     @sources.pop
+#     nil
+#   end
 
-  def _next_line
-    @line = @input.next
-    @lnum += 1
-    _debug "Line: #@lnum: #@line"
-    @line
-  end
+#  def _next_line
+#    @line = @sources.last[0].next
+#    @sources.last[2] += 1
+#    _debug "Line: #@lnum: #@line"
+#    @line
+#  rescue StopIteration
+#    nil
+#  end
 
   def _debug=(val)
     @_debug = val
@@ -457,35 +496,15 @@ module Livetext::Standard
     _optional_blank_line
   end
 
-  def _switch_file(fname)
-::STDERR.puts "  switching to #{fname}, pushing #@file"
-    @source_files ||= []
-    @source_files.push(@file)
-    @file = fname
-::STDERR.puts "  sources = #{@source_files.inspect}"
-    @file
-  end
-
-  def _popfile
-    @file = @source_files.pop
-  end
-
   def _include
     file = _args.first
-    lines = ::File.readlines(file)
-    _switch_file(file)
-# STDERR.puts "_include: ****** Set @file = #@file"
-    lines.each {|line| _debug " inc: #{line}" }
-    rem = @input.remaining
-    array = lines + rem
-    @input = array.each # FIXME .with_index
+    ::Livetext.process_file(file)  # {|line| ::Livetext.handle_line(line) }
     _optional_blank_line
-    _popfile
   end
 
-  def include!
+  def include!    # FIXME huh?
     file = _args.first
-    _switch_file(file)
+#   _switch_file(file)
     existing = File.exist?(file)
     return if not existing
     lines = ::File.readlines(file)
@@ -495,27 +514,25 @@ module Livetext::Standard
     array = lines + rem
     @input = array.each # FIXME .with_index
     _optional_blank_line
-    _popfile
   end
 
   def mixin
     name = _args.first   # Expect a module name
     file = "#{Plugins}/" + name.downcase + ".rb"
-    return if @_mixins.include?(file)
+    return if @_mixins.include?(name)
     file = "./#{name}.rb" unless File.exist?(file)
     _check_existence(file)
 
-    @_mixins << file
-    _switch_file(file)
-    modname = name.capitalize
-    string = "module ::#{modname}\n" + File.read(file) + "\nend"
+    @_mixins << name
+    meths = ::Livetext.grab_file(file)
+    modname = name.gsub("/","_").capitalize
+    string = "module ::#{modname}\n#{meths}\nend"
     eval(string)
     newmod = Object.const_get("::" + modname)
-    Livetext.main.extend(newmod)    # CRAP
+    Livetext.main.extend(newmod)
     init = "init_#{name}"
     self.send(init) if self.respond_to? init
     _optional_blank_line
-    _popfile
   end
 
   def old_mixin
@@ -526,7 +543,7 @@ module Livetext::Standard
     raise "No such file: #{name}.rb found" unless File.exist?(file)
 
     @_mixins << file
-    _switch_file(file)
+#   process_file(file)
     main = Livetext.main
     m0 = main.methods.reject {|x| x.to_s[0] == "_" }
     self.class.class_eval(::File.read(file))
@@ -535,16 +552,12 @@ module Livetext::Standard
     init = "init_#{name}"
     self.send(init) if self.respond_to? init
     _optional_blank_line
-    _popfile
   end
 
   def copy
     file = _args.first
-    _switch_file(file)
-    text = ::File.readlines(file)
-    @output.puts text
+    @output.puts ::Livetext.grab_file(file)
     _optional_blank_line
-    _popfile
   end
 
   def r
@@ -644,6 +657,6 @@ class Livetext::System # < BasicObject
 end
 
 if $0 == __FILE__
-  Livetext.handle_file(ARGV[0] || STDIN)
+  Livetext.process_file(ARGV[0] || STDIN) # {|line| Livetext.handle_line(line) }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-13 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: