livetext 0.8.92 → 0.8.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ce1136c00d4d9696ce4642802da8805ae6ca23992d831d6848f86e87a75863
-  data.tar.gz: 6656d250c5b2b5864809791b7ae192629afe5db372f4aa700eb21a872752a221
+  metadata.gz: e1f54d0984df3ed72f1e75e93088d4df2287d00baad296c0002da2c558fca79e
+  data.tar.gz: 6190f65650f8680d9e72093913667d336a7998fbefd3c4d1ae2409004d86d38c
 SHA512:
-  metadata.gz: 0073a3ef6256769c2cdb8179416ecaa554a9452d37a787b6bdc431636f40f92ae7023d5c591d04f357cf8b480fec54f7a6366e5e53a27bacc4af8a6d5e77593d
-  data.tar.gz: b6cee10d8bb591b1bd9869fe35aee04ab1359089953787ed32af397258f61e97da21467c2b7ee899763a8a7607eca06260f1924ec50975a71fb0b93991cd9797
+  metadata.gz: 4e87c966f8ad0b0200135e70c6f07f7b73d898fa9081b50fce3f06c05eda799cdfa8d02d189ecea5fe080040aa878e543a55e8ab369600945e4c1594eae7807a
+  data.tar.gz: edb16b91ac8501388e3aecb72b96a99b3ff09f7b9d23d09a65b0e4668b94df35f7e1818eb8943519849711042bb8f5dfd413d98fc4cab4496124ef57b6f26203

data/bin/livetext

@@ -70,6 +70,11 @@ loop do
       puts Livetext::Path
     when "-b", "--backtrace"
       @backtrace = true
+    when "-m", "--mixin"
+      mod = ARGV.shift
+STDERR.puts "Got mod: #{mod}"
+      x.mixin(ARGV.shift)
+      next
     when "-s", "--stdin"
       src = STDIN.read
       x.process(src)
@@ -78,6 +83,8 @@ loop do
     when "-i", "--install"
       lib = ARGV.shift
       system("cp #{lib} #{Livetext::Path}/../plugin/")
+#   when /-.*/
+#     raise "Unknown argument '#{arg}'"
     when Object
       x.process_file(arg, true)  # , @backtrace)
   end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.92"
+  VERSION = "0.8.93"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -44,6 +44,10 @@ class Livetext
     @indentation = [0]
   end
 
+  def mixin(mod)
+    @main._mixin(mod)
+  end
+
   def _setvar(var, val)
     str, sym = var.to_s, var.to_sym
     Livetext::Vars[str] = val

data/lib/processor.rb

@@ -25,6 +25,7 @@ class Livetext
       @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
       @sources = []
       @indentation = @parent.indentation
+      @_mixins = []
     end
 
     def output=(io)

data/lib/standard.rb

@@ -156,6 +156,7 @@ EOS
   end
 
   def set
+    # FIXME bug -- .set var="RIP, Hope Gallery"
     assigns = @_data.chomp.split(/, */)
     # Do a better way?
     # FIXME *Must* allow for vars/functions
@@ -205,11 +206,21 @@ STDERR.puts "-- var=val  #{[var, val].inspect}"
   end
 
   def _seek(file)
-	  if File.exist?(file)
-		  return file
-		else
-      value = nil
-		  value = _seek("../#{file}") unless Dir.pwd == "/"
+    require 'pathname'   # ;)
+    value = nil
+    if File.exist?(file)
+      return file
+    else
+      count = 1
+      loop do
+        front = "../" * count
+        count += 1
+        here = Pathname.new(front).expand_path.dirname
+        break if here == "/"
+        path = front + file
+        value = path if File.exist?(path)
+        break if value
+      end
 		end
 	  return value
   rescue
@@ -220,6 +231,7 @@ STDERR.puts "-- var=val  #{[var, val].inspect}"
     # like include, but search upward as needed
     file = @_args.first
 		file = _seek(file)
+STDERR.puts "---- _seek found: #{file.inspect}"
     _error!(file, "No such include file '#{file}'") unless file
     @parent.process_file(file)
     _optional_blank_line
@@ -264,6 +276,11 @@ STDERR.puts "-- var=val  #{[var, val].inspect}"
 #     _optional_blank_line
 #   end
 
+  def _mixin(name)
+    @_args = [name]
+    mixin
+  end
+
   def mixin
     name = @_args.first   # Expect a module name
     file = "#{Plugins}/" + name.downcase + ".rb"

metadata

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