livetext 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e687858325843870a52b6326917c6fd29064dd8
-  data.tar.gz: ab6d2aedac807c98a661267f3143037f7404be69
+  metadata.gz: 58616785a3710e488a7544ebbddf8252b0c1c3c1
+  data.tar.gz: f72aabb6d7ac5a8e82853432feba4cb3a7f764d8
 SHA512:
-  metadata.gz: 00972e0a5a2256bbac5a88aad28dd0feb601c14907b8c8daac46bb7dbf162842b0447f65db2f755f52296f168d078aa9ee298ca867b9c0feacbe3832ed7941c2
-  data.tar.gz: a597ae81fa81400a6c15571de5fad559e4c748d7113d19899aa415909ad2ac87c748bfd92b1d6e23fba39f4e27515211447a9495fb097d02692ab489b741fc23
+  metadata.gz: 5eb339456e6106843986d544b011644e1ebe1d1c0de18f3c5d44496bd8895d4b48e5423dd826a60a5da7e925e805c1e10f65533504f9670b5d2e7affcbfb57df
+  data.tar.gz: f6278c805e1aee2e0a2ca9a217a87c69591f3efdec5eda9fbd606f53b5544a6c6c31f42fee9249ed51081dc859e44e5797012004ac1686ef251b207bc0a393b6

data/lib/livetext.rb

@@ -15,7 +15,7 @@ class Enumerator
 end
 
 class Livetext
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 
   MainSigil = "."
   Sigils = [MainSigil]
@@ -460,21 +460,32 @@ module Livetext::Standard
     _optional_blank_line
   end
 
+  def _pushfile(fname)
+    @source_files ||= []
+    @source_files.push(@file)
+    @file = fname
+  end
+
+  def _popfile
+    @file = @source_files.pop
+  end
+
   def _include
     file = _args.first
     lines = ::File.readlines(file)
-    @file = file
+    _pushfile(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
     _optional_blank_line
+    _popfile
   end
 
   def include!
     file = _args.first
-    @file = file
+    _pushfile
 # TTY.puts "include!: ****** file = #{file}"
     existing = File.exist?(file)
     return if not existing
@@ -485,6 +496,7 @@ module Livetext::Standard
     array = lines + rem
     @input = array.each # FIXME .with_index
     _optional_blank_line
+    _popfile
   end
 
   def mixin
@@ -492,21 +504,23 @@ module Livetext::Standard
     file = "#{CWD}/" + name + ".rb"
     return if @_mixins.include?(file)
     @_mixins << file
-    @file = file
+    _pushfile(file)
 # TTY.puts "mixin: ****** file = #{file} "
     text = ::File.read(file)
     self.class.class_eval(text)
     init = "init_#{name}"
     self.send(init) if self.respond_to? init
     _optional_blank_line
+    _popfile
   end
 
   def copy
     file = _args.first
-    @file = file
+    _pushfile(file)
 # TTY.puts "copy: ****** file = #{file}"
     @output.puts ::File.readlines(file)
     _optional_blank_line
+    _popfile
   end
 
   def r

data/livetext.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'livetext'
-  s.version     = '0.5.3'
-  s.date        = '2017-02-05'
+  s.version     = '0.5.4'
+  s.date        = '2017-02-09'
   s.summary     = "A smart processor for text"
   s.description = "A smart text processor extensible in Ruby"
   s.authors     = ["Hal Fulton"]

data/test/test.rb

@@ -30,31 +30,31 @@ class TestingLiveText < MiniTest::Test
     system("rm -f #{out} #{err}")  # only on success
   end
 
-  def xtest_hello_world;         external_files end
-  def xtest_basic_formatting;    external_files end
+  def test_hello_world;         external_files end
+  def test_basic_formatting;    external_files end
 
-  def xtest_comments_ignored_1;  external_files end
-  def xtest_block_comment;       external_files end
+  def test_comments_ignored_1;  external_files end
+  def test_block_comment;       external_files end
 
-  def xtest_simple_vars;         external_files end
-  def xtest_more_complex_vars;   external_files end
+  def test_simple_vars;         external_files end
+  def test_more_complex_vars;   external_files end
 
-  def xtest_sigil_can_change;    external_files end
+  def test_sigil_can_change;    external_files end
 
-  def xtest_def_method;          external_files end
+  def test_def_method;          external_files end
 
-  def xtest_single_raw_line;     external_files end
+  def test_single_raw_line;     external_files end
 
   def test_simple_include;      external_files end
   def test_simple_mixin;        external_files end
   def test_simple_copy;         external_files end
   def test_copy_is_raw;         external_files end
-  def xtest_raw_text_block;      external_files end
+  def test_raw_text_block;      external_files end
 
-  def xtest_example_alpha;       external_files end
-  def xtest_example_alpha2;      external_files end
+  def test_example_alpha;       external_files end
+  def test_example_alpha2;      external_files end
 
-  def xtest_functions;           external_files end
+  def test_functions;           external_files end
 
 end
 

metadata

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