livetext 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f41e0046b52fb9ac065abe45a4a7cc1b696420a
-  data.tar.gz: 344de25c408e734970d273a467165d8d89a3eb51
+  metadata.gz: 3c91ce7a249cbd6ed27e1f538022a9e3fbc6d435
+  data.tar.gz: 99a2002ac810d323423651ebcd9a0a9964ccb12a
 SHA512:
-  metadata.gz: a2155f28a062c3ccfa9e0e10b56eb451e2c78c450f2e4482f125d63fd31de2a5276725f78836108e08168ece87ddcb5de1deeb9e57f3c83bb845af57fcdffd3b
-  data.tar.gz: 1bab0cfb96ee87c6e1dab271c6e74cabb3cdb3f94a14527ec1aa24ecdce1f73efe74c34af50319fb7fd9e9a29646ca456d4127ae8a9972f97478dd3f146107aa
+  metadata.gz: 6c7f6358e3f32cd1a5e2cf0e7fb915a6eca1add56f4cbbeee43c51f929a134d66fc8ff34aaeb80df22f4b900d8d9fe0501c9593bfcb36acf1983b4dd53ee62c3
+  data.tar.gz: 9e4074bc5af1c26d961852dd057bf63e10b6d3d0a334095644bac488e02d715d2c8cda4551593da9c394c5997c709b03b084d8422ae8a78286bda6b4328f146b

data/bin/livetext

@@ -12,31 +12,37 @@ end
 
 x = Livetext.new
 
-case ARGV.first 
-  when  "-v", "--version"
-    puts "#{Livetext::VERSION}\n "
-  when "-t", "--test"  # FIXME doesn't work - path problem
-puts "bin: pwd = #{Dir.pwd}"
-puts "bin: path = #{Path}"
-    file = "#{Path}/../test/test.rb"
-    cmd = "ruby #{file} cmdline"
-    puts cmd
-    system(cmd)
-  when "--path"
-    puts Path
-  when "-s", "--stdin"
-    src = STDIN.read
-    x.process(src)
-  when nil
-    puts <<-EOF
-    Usage: 
-      livetext -v
-      livetext --version
-      livetext filename
-    EOF
-    puts
-  when Object
-    src = ARGV.first
-    x.process_file(src)
-end
+@backtrace = false
+
+loop do
+  arg = ARGV.shift
+  break if arg.nil?
 
+  case arg
+    when  "-v", "--version"
+      puts "#{Livetext::VERSION}\n "
+    when "-t", "--test"  # FIXME doesn't work - path problem
+      file = "#{Path}/../test/test.rb"
+      flag = @backtrace ? "-back" : ""
+      cmd = "ruby #{file} cmdline#{flag}"
+      puts cmd
+      system(cmd)
+    when "--path"
+      puts Path
+    when "--backtrace"
+      @backtrace = true
+    when "-s", "--stdin"
+      src = STDIN.read
+      x.process(src)
+    when nil
+      puts <<-EOF
+      Usage: 
+        livetext -v
+        livetext --version
+        livetext filename
+      EOF
+      puts
+    when Object
+      x.process_file(arg, @backtrace)
+  end
+end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end
 
 require 'fileutils'
@@ -110,9 +110,10 @@ class Livetext
     end
   end
 
-  def process_file(fname)
+  def process_file(fname, backtrace=false)
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
     enum = File.readlines(fname).each
+    @backtrace = backtrace
     @main.source(enum, fname, 0)
     loop do 
       line = @main.nextline

data/lib/standard.rb

@@ -43,7 +43,7 @@ module Livetext::Standard
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
       def #{funcname}
-        #{_body!}
+        #{_body_text}
       end
     EOS
     Livetext::Functions.class_eval func_def
@@ -142,7 +142,7 @@ module Livetext::Standard
     name = @_args[0]
     str = "def #{name}\n"
     raise "Illegal name '#{name}'" if _disallowed?(name)
-    str += _body!
+    str += _raw_body!
     str += "end\n"
     eval str
   rescue => err

data/lib/userapi.rb

@@ -67,7 +67,7 @@ module Livetext::UserAPI
       @line = nextline
       break if _end?(@line, sigil)
       next if _comment?(@line, sigil)   # FIXME?
-      lines << @line
+      lines << _formatting(@line)
     end
     _optional_blank_line
     if block_given?
@@ -79,10 +79,14 @@ module Livetext::UserAPI
     _error!("Expecting .end, found end of file")
   end
 
-  def _body!(sigil=".")
+  def _body_text(sigil=".")
     _body(sigil).join("\n")
   end
 
+  def _raw_body!(sigil=".")
+    _raw_body(sigil).join("\n")
+  end
+
   def _handle_escapes(str, set)
     str = str.dup
     set.each_char do |ch|

data/test/data/def_method/source.lt3

@@ -1,3 +1,4 @@
+.backtrace
 abc
 123
 .def foobar

data/test/data/example_alpha/source.lt3

@@ -1,5 +1,5 @@
 .def alpha
-   text = _body.join
+   text = _body_text
    text.gsub!(/\n/, " ")
    words = text.split.sort
    words.each {|w| _puts "    #{w}" }

data/test/data/example_alpha2/source.lt3

@@ -3,7 +3,7 @@
    cols = "1" if cols == ""
    cols = cols.to_i
    raise "Columns must be 1-5" unless cols.between?(1,5)
-   text = _body.join
+   text = _body_text
    text.gsub!(/\n/, " ")
    words = text.split.sort
    words.each_slice(cols) do |row| 

data/test/test.rb

@@ -58,9 +58,6 @@ class TestingLivetext < MiniTest::Test
       src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
       err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
       cmd = "livetext #{src} >#{out} 2>#{err}"
-      puts
-      puts Dir.pwd
-      puts cmd
       system(cmd)
       output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
 

metadata

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