mucgly 0.1.0 → 0.1.1

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Mucgly
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
     def Mucgly.version
         Mucgly::VERSION
     end

data/test/golden/test_basic.txt

@@ -1,4 +1,4 @@
-Line 1 from file "test_basic.rx.txt".
+Line 1 from file "test_basic.rx.txt:1".
 Test escapes (backslash, empty): "\" ""  ... and the rest of the line. 
 Next the test file "test_include.txt" is included.
 Line 1 in test file test_included.txt.
@@ -15,4 +15,13 @@ The last line in "test_basic.rx.txt"
 The name of this file is: "test_basic.rx.txt".
 We are outputting to file result/test_basic.txt and 16
 Multipass macros are output with one "#" removed each round.
--<puts "This will be a macro execution in the next round.">-This comment will be consumed "".
+-<puts "This will be a macro execution in the next round.">-
+This comment will be consumed "".
+
+Some Mucgly module tests...
+Mucgly.puts
+Mucgly.write
+hookbeg is "-<"
+hookend is ">-"
+hookend is "\"
+End of test file...***

data/test/golden/test_file_ctrl.txt

@@ -0,0 +1,9 @@
+Line 1 from file "test_file_ctrl.rx.txt:1"
+
+Line 1 from test_skip.txt.
+Line 2 from test_skip.txt.
+
+
+
+
+Last line...

data/test/golden/test_redirect.txt

@@ -0,0 +1,2 @@
+Line 1 for test_redirect.txt.
+Line 2 for test_redirect.txt.

data/test/result/test_basic.txt

@@ -1,4 +1,4 @@
-Line 1 from file "test_basic.rx.txt".
+Line 1 from file "test_basic.rx.txt:1".
 Test escapes (backslash, empty): "\" ""  ... and the rest of the line. 
 Next the test file "test_include.txt" is included.
 Line 1 in test file test_included.txt.
@@ -15,4 +15,13 @@ The last line in "test_basic.rx.txt"
 The name of this file is: "test_basic.rx.txt".
 We are outputting to file result/test_basic.txt and 16
 Multipass macros are output with one "#" removed each round.
--<puts "This will be a macro execution in the next round.">-This comment will be consumed "".
+-<puts "This will be a macro execution in the next round.">-
+This comment will be consumed "".
+
+Some Mucgly module tests...
+Mucgly.puts
+Mucgly.write
+hookbeg is "-<"
+hookend is ">-"
+hookend is "\"
+End of test file...***

data/test/result/test_file_ctrl.txt

@@ -0,0 +1,9 @@
+Line 1 from file "test_file_ctrl.rx.txt:1"
+
+Line 1 from test_skip.txt.
+Line 2 from test_skip.txt.
+
+
+
+
+Last line...

data/test/result/test_redirect.txt

@@ -0,0 +1,2 @@
+Line 1 for test_redirect.txt.
+Line 2 for test_redirect.txt.

data/test/test_basic.rx.txt

@@ -1,4 +1,4 @@
-Line 1 from file "-<write ifilename>-".
+Line 1 from file "-<write ifilename; write ":"; write ilinenumber>-".
 -<:hook \\>-\
 Test escapes (backslash, empty): "\\" "\ \ " \
  ... and the rest of the line. 
@@ -19,5 +19,14 @@ The name of this file is: "\write ifilename\ ".
 We are outputting to file \write ofilename\  and \write olinenumber.to_s\ 
 Multipass macros are output with one "#" removed each round.
 \:hook -< >-\ \
--<#puts "This will be a macro execution in the next round.">-\
+-<#puts "This will be a macro execution in the next round.">-
 This comment will be consumed "-</A comment>-".
+
+Some Mucgly module tests...
+-<Mucgly.puts "Mucgly.puts">--<Mucgly.write "Mucgly.write">-
+-<if hookbeg == "\-<"; write "hookbeg is \\"\-<\\""; end>-
+-<if hookend == "\>-"; write "hookend is \\"\>-\\""; end>-
+-<if hookesc == "\\\\"; write "hookend is \\"\\\\\\""; end>-
+-<sethookbeg "-{"; sethookend "}-"; sethookesc "|">-|
+-{write "End of test file..."}-|
+***

data/test/test_file_ctrl.rx.txt

@@ -0,0 +1,10 @@
+Line 1 from file "-<write ifilename; write ":"; write ilinenumber>-"
+
+-<pushinput "test_skip.txt">-
+
+-<pushoutput "result/test_redirect.txt">-\
+Line 1 for test_redirect.txt.
+Line 2 for test_redirect.txt.
+-<closeoutput>-
+
+Last line...

data/test/test_mucgly.rb

@@ -1,14 +1,13 @@
 require 'test/unit'
 
 
+
 # Test execution routine.
 def runTest( cmdopts, test, sep = "" )
-    Dir.chdir( 'test' )
-    FileUtils.mkdir_p "result"
     rf = "result/#{test}#{sep}.txt"
     gf = "golden/#{test}#{sep}.txt"
 
-    system( "export RUBYLIB=#{ENV['RUBYLIB']}:../lib; ../bin/mucgly -i -m #{cmdopts} -f #{test}.rx.txt -o #{rf}" )
+    system( "export RUBYLIB=../lib; ../bin/mucgly -i -m #{cmdopts} -f #{test}.rx.txt -o #{rf}" )
 
     if false
         # Populate golden files after inspection.
@@ -16,15 +15,33 @@ def runTest( cmdopts, test, sep = "" )
     end
 
     assert( system( "diff #{rf} #{gf}" ), "FAILED: diff #{rf} #{gf}" )
-
-    Dir.chdir( '..' )
 end
 
 
 class MucglyTest < Test::Unit::TestCase
 
+    def setup
+        Dir.chdir( 'test' )
+        FileUtils.mkdir_p "result"
+    end
+
+    def teardown
+        Dir.chdir( '..' )
+    end
+
+
     def test_basic() runTest( "", "test_basic" ); end
     def test_specials_cli() runTest( "-b @ -e @ -s /", "test_specials_cli" ); end
     def test_specials_cmd() runTest( "", "test_specials_cmd" ); end
 
+    def test_file_ctrl()
+        rf1 = "result/test_file_ctrl.txt"
+        rf2 = "result/test_redirect.txt"
+        gf1 = "golden/test_file_ctrl.txt"
+        gf2 = "golden/test_redirect.txt"
+        system( "export MUCGLY=./test_include.rb; export RUBYLIB=../lib; ../bin/mucgly -m -f test_file_ctrl.rx.txt -o #{rf1}" )
+        assert( system( "diff #{rf1} #{gf1}" ), "FAILED: diff #{rf1} #{gf1}" )
+        assert( system( "diff #{rf2} #{gf2}" ), "FAILED: diff #{rf2} #{gf2}" )
+    end
+
 end

data/test/test_skip.txt

@@ -0,0 +1,4 @@
+Line 1 from test_skip.txt.
+Line 2 from test_skip.txt.
+-<Mucgly.closeinput>-
+Line 3 from test_skip.txt.

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mucgly
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies: []
-description: Mucgly is a macro expander for inline macros that exist in the middle
-  of body text. The macros are expected to be mostly regular Ruby code, but a few
-  special commands is also available.
+description: |-
+  Mucgly is a macro expander for inline macros that exist in the middle
+  of body text. Mucgly is useful for code generation and all kinds of
+  templating systems. The macros are expected to be mostly regular Ruby
+  code, but a few special commands are also available.
 email: tero.isannainen@gmail.com
 executables:
 - mucgly
@@ -45,16 +47,22 @@ files:
 - ext/mucgly/mucgly.c
 - lib/version.rb
 - test/golden/test_basic.txt
+- test/golden/test_file_ctrl.txt
+- test/golden/test_redirect.txt
 - test/golden/test_specials_cli.txt
 - test/golden/test_specials_cmd.txt
 - test/result/test_basic.txt
+- test/result/test_file_ctrl.txt
+- test/result/test_redirect.txt
 - test/result/test_specials_cli.txt
 - test/result/test_specials_cmd.txt
 - test/result/test_specials_cmd2.txt
 - test/test_basic.rx.txt
+- test/test_file_ctrl.rx.txt
 - test/test_include.rb
 - test/test_include.txt
 - test/test_mucgly.rb
+- test/test_skip.txt
 - test/test_specials_cli.rx.txt
 - test/test_specials_cmd.rx.txt
 homepage: 
@@ -82,8 +90,11 @@ signing_key:
 specification_version: 4
 summary: Mucgly processes inline macros.
 test_files:
+- test/test_skip.txt
 - test/golden/test_basic.txt
 - test/golden/test_specials_cli.txt
+- test/golden/test_file_ctrl.txt
+- test/golden/test_redirect.txt
 - test/golden/test_specials_cmd.txt
 - test/test_specials_cmd.rx.txt
 - test/test_include.rb
@@ -91,8 +102,11 @@ test_files:
 - test/test_basic.rx.txt
 - test/test_specials_cli.rx.txt
 - test/test_mucgly.rb
+- test/test_file_ctrl.rx.txt
 - test/result/test_basic.txt
 - test/result/test_specials_cli.txt
+- test/result/test_file_ctrl.txt
 - test/result/test_specials_cmd2.txt
+- test/result/test_redirect.txt
 - test/result/test_specials_cmd.txt
 has_rdoc: