livetext 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1c4c67b59a4f9386d624c09e3ba3bd0a1f4ed7
-  data.tar.gz: 9d36cfe4d798dfb355d45dc024e2f38a41572d7c
+  metadata.gz: 342432e589fbafc4dea447d96303c9da09f88b3b
+  data.tar.gz: 364013916fd421dd922424ad1d9e709a1260723a
 SHA512:
-  metadata.gz: f46d91a2cb182faf39f1e5b129bf56c94773c5fa9448074899eb4a02707521224bb02923fba6198bd4dd4c49d00fabef39fe343bfe43df416beeded4ea280c17
-  data.tar.gz: 791b5256347e641ffdd378e566bf06affcdb3844ee7557555865606ecbcabfd1dbb640086233b64b054d1e4a662fb942795fe19926d81c05b9328b272daae7ca
+  metadata.gz: f60a26574a8bb62ebb2060c5566643321b2719a70998a7b594ecce614128717b95f8f02edfe1f4eb68dbd4547cd04e06ac70c472f6f6d00895dd6457a6eca49b
+  data.tar.gz: 46098f43661bc4d4eb0a3c22b499996a230f3f56a5636fd53528bf54632ed59af6f6357f19fffb08d8448aa790f5b88980087302fbe53cbe12b8c50980762e05

data/lib/livetext.rb

@@ -15,7 +15,7 @@ class Enumerator
 end
 
 class Livetext
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 
   Space = " "
 
@@ -101,12 +101,12 @@ class Livetext
   def self.handle_sname(sigil, line)
     obj = @main   # Livetext::Objects[sigil]
     name = _get_name(obj, sigil, line)
-    unless obj.respond_to?(name)
-      abort "#{obj.where}: '#{name}' is unknown"
-      return
-    end
+#   unless obj.respond_to?(name)
+#     abort "#{obj.where}: '#{name}' is unknown"
+#     return
+#   end
 
-    if name == "notes"
+    if name == "notes"    # FIXME wtf
       obj.notes
     else
       obj.send(name)
@@ -134,6 +134,11 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
 end
 
 module Livetext::Helpers
+
+  def _check_existence(file)
+    raise "No such file found" unless File.exist?(file)
+  end
+
   def _source
     @input
   end
@@ -497,6 +502,25 @@ module Livetext::Standard
   end
 
   def mixin
+    name = _args.first   # Expect a module name
+    file = "#{Plugins}/" + name.downcase + ".rb"
+    return if @_mixins.include?(file)
+    file = "./#{name}.rb" unless File.exist?(file)
+    _check_existence(file)
+
+    @_mixins << file
+    _pushfile(file)
+    newmod = Module.new
+    $mods << newmod
+    Object.const_set(name.capitalize, newmod)
+    newmod.instance_eval(File.read(file))
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+    _optional_blank_line
+    _popfile
+  end
+
+  def old_mixin
     name = _args.first
     file = "#{Plugins}/" + name + ".rb"
     return if @_mixins.include?(file)
@@ -510,7 +534,6 @@ module Livetext::Standard
     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
@@ -520,8 +543,8 @@ TTY.puts "commands = #{$meths.inspect}"
   def copy
     file = _args.first
     _pushfile(file)
-# TTY.puts "copy: ****** file = #{file}"
-    @output.puts ::File.readlines(file)
+    text = ::File.readlines(file)
+    @output.puts text
     _optional_blank_line
     _popfile
   end
@@ -606,14 +629,22 @@ class Livetext::System < BasicObject
   end
 
   def method_missing(name, *args)
-    # Idea: Capture source line for error messages
+# TTY.puts $mods.inspect
+    $mods.reverse.each do |mod|
+#TTY.puts "mod methods = #{mod.module_methods.inspect}"
+      if mod.respond_to?(name)
+        mod.send(name, *args)
+        return
+      end
+    end
+TTY.puts "Got here"
     _puts "  Error: Method '#{name}' is not defined."
     puts caller.map {|x| "  " + x }
     exit
   end
 end
 
-$meths = {}
+$mods = []
 
 if $0 == __FILE__
   Livetext.handle_file(ARGV[0] || STDIN)

data/livetext.gemspec

@@ -1,7 +1,9 @@
+require_relative "./lib/livetext"
+
 Gem::Specification.new do |s|
   system("rm -f *.gem")
   s.name        = 'livetext'
-  s.version     = '0.5.9'
+  s.version     = Livetext::VERSION
   s.date        = '2017-03-09'
   s.summary     = "A smart processor for text"
   s.description = "A smart text processor extensible in Ruby"
@@ -28,9 +30,6 @@ Gem::Specification.new do |s|
                      ./test
                      ./test/cleanup
                      ./test/newtest
-                     ./test/rawtext.inc
-                     ./test/simple_mixin.rb
-                     ./test/simplefile.inc
                      ./test/test.rb
                      ./test/testfiles
                      ./test/testfiles/basic_formatting

data/test/test.rb

@@ -7,27 +7,29 @@ require 'livetext'
 
 class TestingLiveText < MiniTest::Test
 
+  TTY = File.open("/dev/tty","w")
+
   def external_files
     tag = caller[0]
     n1, n2 = tag.index("`")+6, tag.index("'")-1
     base = tag[n1..n2]
-    name = "test/testfiles/#{base}/xxx"
-
-    src, out, exp = name.sub(/xxx/, "source.ltx"), name.sub(/xxx/, "actual-output.txt"), name.sub(/xxx/, "expected-output.txt")
-    err, erx = name.sub(/xxx/, "actual-error.txt"), name.sub(/xxx/, "expected-error.txt")
-    cmd = "./bin/livetext #{src} >#{out} 2>#{err}"
-    # puts cmd
-    system(cmd)
-    output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
-
-    out_ok = output == expected
-    err_ok = errors == errexp
-    bad_out = "--- Expected: \n#{expected}\n--- Output:  \n#{output}\n"
-    bad_err = "--- Error Expected: \n#{errexp}\n--- Error Output:  \n#{errors}\n"
-
-    assert(out_ok, bad_out)
-    assert(err_ok, bad_err)
-    system("rm -f #{out} #{err}")  # only on success
+    origin = Dir.pwd
+    Dir.chdir("test/testfiles/#{base}") do
+      src, out, exp = "source.ltx", "actual-output.txt", "expected-output.txt"
+      err, erx = "actual-error.txt", "expected-error.txt"
+      cmd = "../../../bin/livetext #{src} >#{out} 2>#{err}"
+      system(cmd)
+      output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
+
+      out_ok = output == expected
+      err_ok = errors == errexp
+      bad_out = "--- Expected: \n#{expected}\n--- Output:  \n#{output}\n"
+      bad_err = "--- Error Expected: \n#{errexp}\n--- Error Output:  \n#{errors}\n"
+
+      assert(out_ok, bad_out)
+      assert(err_ok, bad_err)
+      system("rm -f #{out} #{err}")  # only on success
+    end
   end
 
   def test_hello_world;         external_files end
@@ -39,8 +41,6 @@ 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_def_method;          external_files end
 
   def test_single_raw_line;     external_files end

data/test/testfiles/copy_is_raw/source.ltx

@@ -1,4 +1,4 @@
 A copy command 
 does not interpret its input:
-.copy test/rawtext.inc
+.copy rawtext.inc
 That's all.

data/test/testfiles/simple_copy/source.ltx

@@ -2,5 +2,5 @@ The copy command
 copies any file
 without interpretation,
 such as:
-.copy test/simplefile.inc
+.copy simplefile.inc
 That is all.

data/test/testfiles/simple_include/source.ltx

@@ -1,6 +1,6 @@
 Here I am
 trying to 
 include
-.include test/simplefile.inc
+.include simplefile.inc
 I hope that
 worked.

data/test/testfiles/simple_mixin/source.ltx

@@ -1,6 +1,6 @@
 Here I am
 testing a simple mixin
-.mixin test/simple_mixin
+.mixin simple_mixin
 Now call it:
 .hello_world
 That's all.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Hal Fulton
@@ -32,9 +32,6 @@ files:
 - "./notes.txt"
 - "./test/cleanup"
 - "./test/newtest"
-- "./test/rawtext.inc"
-- "./test/simple_mixin.rb"
-- "./test/simplefile.inc"
 - "./test/test.rb"
 - "./test/testfiles/basic_formatting/expected-error.txt"
 - "./test/testfiles/basic_formatting/expected-output.txt"
@@ -105,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
-has_rdoc: 

data/test/rawtext.inc

@@ -1,4 +0,0 @@
-This is not a comment:
-.comment woohoo!
-This is not a method:
-.no_such_method

data/test/simple_mixin.rb

@@ -1,3 +0,0 @@
-def hello_world
-  puts "Hello, world."
-end

data/test/simplefile.inc

@@ -1,2 +0,0 @@
-a simple 
-include file.