livetext 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3a2e314692e74bb6300763aa877f977a8f472d
-  data.tar.gz: b2d7d0aed5b79c3f9bfbb2b3d88063a590918a9a
+  metadata.gz: db1c4c67b59a4f9386d624c09e3ba3bd0a1f4ed7
+  data.tar.gz: 9d36cfe4d798dfb355d45dc024e2f38a41572d7c
 SHA512:
-  metadata.gz: 6663cc36b63cb7b8cd0a0b6f74e3eca5ac03c670f993fa136ae5f7ebb25c3c9fca44ac2b731489b0a764f84efe015f7887d5d4f1ac064b57a0b265b8e4d3dbda
-  data.tar.gz: 836148c5e892d5e06303b5cf376bc7009de7c040ef022f532bb1993fa2ec3de9e186698d6441da634ae73b3154495d3b97172d002b131ecb7c1f382879b6754c
+  metadata.gz: f46d91a2cb182faf39f1e5b129bf56c94773c5fa9448074899eb4a02707521224bb02923fba6198bd4dd4c49d00fabef39fe343bfe43df416beeded4ea280c17
+  data.tar.gz: 791b5256347e641ffdd378e566bf06affcdb3844ee7557555865606ecbcabfd1dbb640086233b64b054d1e4a662fb942795fe19926d81c05b9328b272daae7ca

data/lib/livetext.rb

@@ -4,7 +4,7 @@ Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../dsl"))
 
 TTY = ::File.open("/dev/tty", "w")
 
-require_relative "./pyggish"
+require_relative "#{Plugins}/pyggish"
 
 class Enumerator
   def remaining
@@ -15,14 +15,10 @@ class Enumerator
 end
 
 class Livetext
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 
-  MainSigil = "."
-  Sigils = [MainSigil]
   Space = " "
 
-  Objects = { MainSigil => nil }
-
   Disallowed = [:_data=, :nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
                 :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
                 :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
@@ -42,18 +38,17 @@ class Livetext
 
   def self.handle_line(line)
     nomarkup = true
-    Livetext::Sigils.each do |sigil|
-      scomment  = rx(sigil, Livetext::Space)  # apply these in order
-      sname     = rx(sigil)
-      case 
-        when line =~ scomment
-          handle_scomment(sigil, line)
-        when line =~ sname
-          handle_sname(sigil, line)
-        else
-          obj = Livetext::Objects[sigil]
-          obj._passthru(line)
-      end
+    sigil = "."
+    scomment  = rx(sigil, Livetext::Space)  # apply these in order
+    sname     = rx(sigil)
+    case 
+      when line =~ scomment
+        handle_scomment(sigil, line)
+      when line =~ sname
+        handle_sname(sigil, line)
+      else
+        obj = @main    # Livetext::Objects[sigil]
+        obj._passthru(line)
     end
   end
 
@@ -64,7 +59,7 @@ class Livetext
       file = File.new(fname) 
     end
     source = file.each_line
-    @main = Livetext::Objects[Livetext::MainSigil] = Livetext::System.new(source)
+    @main = Livetext::System.new(source)
     @main._pushfile(fname)
     @main.file = fname
     @main.lnum = 0
@@ -104,7 +99,7 @@ class Livetext
   end
 
   def self.handle_sname(sigil, line)
-    obj = Livetext::Objects[sigil]
+    obj = @main   # Livetext::Objects[sigil]
     name = _get_name(obj, sigil, line)
     unless obj.respond_to?(name)
       abort "#{obj.where}: '#{name}' is unknown"
@@ -165,7 +160,7 @@ module Livetext::Helpers
     @line = _next_line if _peek_next_line =~ /^ *$/
   end
 
-  def _comment?(str, sigil=Livetext::MainSigil)
+  def _comment?(str, sigil=".")
     c1 = sigil + Livetext::Space
     c2 = sigil + sigil + Livetext::Space
     str.index(c1) == 0 || str.index(c2) == 0
@@ -176,14 +171,14 @@ module Livetext::Helpers
     return false
   end
 
-  def _end?(str, sigil=Livetext::MainSigil)
+  def _end?(str, sigil=".")
     cmd = sigil + "end"
     return false if str.index(cmd) != 0 
     return false unless _trailing?(str[5])
     return true
   end
 
-  def _raw_body(tag = "__EOF__", sigil = Livetext::MainSigil)
+  def _raw_body(tag = "__EOF__", sigil = ".")
     lines = []
     loop do
       @line = _next_line
@@ -198,7 +193,7 @@ module Livetext::Helpers
     end
   end
 
-  def _body(sigil=Livetext::MainSigil)
+  def _body(sigil=".")
     lines = []
     loop do
       @line = _next_line  # no chomp needed
@@ -214,7 +209,7 @@ module Livetext::Helpers
     end
   end
 
-  def _body!(sigil=Livetext::MainSigil)
+  def _body!(sigil=".")
     _body(sigil).join("\n")
   end
 
@@ -330,6 +325,7 @@ module Livetext::Helpers
 end
 
 module Livetext::Standard
+
   def comment
     junk = _body  # do nothing with contents
   end
@@ -436,15 +432,6 @@ module Livetext::Standard
     _output(name)
   end
 
-  def sigil
-    char = _args.first
-    raise "'#{char}' is not a single character" if char.length > 1
-    obj = Livetext::Objects[Livetext::MainSigil]
-    Livetext::Objects.replace(char => obj)
-    Livetext::MainSigil.replace(char)
-    _optional_blank_line
-  end
-
   def _def
     name = _args[0]
     str = "def #{name}\n"
@@ -497,7 +484,6 @@ module Livetext::Standard
   def include!
     file = _args.first
     _pushfile
-# TTY.puts "include!: ****** file = #{file}"
     existing = File.exist?(file)
     return if not existing
     lines = ::File.readlines(file)
@@ -514,11 +500,17 @@ module Livetext::Standard
     name = _args.first
     file = "#{Plugins}/" + name + ".rb"
     return if @_mixins.include?(file)
+    file = "./#{name}.rb" unless File.exist?(file)
+    raise "No such file: #{name}.rb found" unless File.exist?(file)
+
     @_mixins << file
     _pushfile(file)
-# TTY.puts "mixin: ****** file = #{file} "
-    text = ::File.read(file)
-    self.class.class_eval(text)
+    main = Livetext.main
+    m0 = main.methods.reject {|x| x.to_s[0] == "_" }
+    self.class.class_eval(::File.read(file))
+    m1 = main.methods.reject {|x| x.to_s[0] == "_" }
+    $meths[file] = m1 - m0
+TTY.puts "commands = #{$meths.inspect}"
     init = "init_#{name}"
     self.send(init) if self.respond_to? init
     _optional_blank_line
@@ -621,8 +613,7 @@ class Livetext::System < BasicObject
   end
 end
 
-### FIXME - these are all top-level methods
-
+$meths = {}
 
 if $0 == __FILE__
   Livetext.handle_file(ARGV[0] || STDIN)

data/livetext.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
+  system("rm -f *.gem")
   s.name        = 'livetext'
-  s.version     = '0.5.8'
-  s.date        = '2017-03-08'
+  s.version     = '0.5.9'
+  s.date        = '2017-03-09'
   s.summary     = "A smart processor for text"
   s.description = "A smart text processor extensible in Ruby"
   s.authors     = ["Hal Fulton"]
@@ -77,10 +78,6 @@ Gem::Specification.new do |s|
                      ./test/testfiles/raw_text_block/expected-error.txt
                      ./test/testfiles/raw_text_block/expected-output.txt
                      ./test/testfiles/raw_text_block/source.ltx
-                     ./test/testfiles/sigil_can_change
-                     ./test/testfiles/sigil_can_change/expected-error.txt
-                     ./test/testfiles/sigil_can_change/expected-output.txt
-                     ./test/testfiles/sigil_can_change/source.ltx
                      ./test/testfiles/simple_copy
                      ./test/testfiles/simple_copy/expected-error.txt
                      ./test/testfiles/simple_copy/expected-output.txt

data/test/test.rb

@@ -39,7 +39,7 @@ class TestingLiveText < MiniTest::Test
   def test_simple_vars;         external_files end
   def test_more_complex_vars;   external_files end
 
-  def test_sigil_can_change;    external_files end
+# def test_sigil_can_change;    external_files end
 
   def test_def_method;          external_files end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -70,9 +70,6 @@ files:
 - "./test/testfiles/raw_text_block/expected-error.txt"
 - "./test/testfiles/raw_text_block/expected-output.txt"
 - "./test/testfiles/raw_text_block/source.ltx"
-- "./test/testfiles/sigil_can_change/expected-error.txt"
-- "./test/testfiles/sigil_can_change/expected-output.txt"
-- "./test/testfiles/sigil_can_change/source.ltx"
 - "./test/testfiles/simple_copy/expected-error.txt"
 - "./test/testfiles/simple_copy/expected-output.txt"
 - "./test/testfiles/simple_copy/source.ltx"

data/test/testfiles/sigil_can_change/expected-output.txt

@@ -1,6 +0,0 @@
-abc 123
-this is a test
-. this is not a comment
-more stuff
-.this means nothing
-still more stuff

data/test/testfiles/sigil_can_change/source.ltx

@@ -1,11 +0,0 @@
-. This is a comment
-.sigil #
-# Comments are ignored
-abc 123
-this is a test
-. this is not a comment
-# whether at beginning, middle, or
-more stuff
-.this means nothing
-still more stuff
-# end of the file