mucgly 0.0.2 → 0.1.0

data/lib/version.rb

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

data/test/golden/test_basic.txt

@@ -0,0 +1,18 @@
+Line 1 from file "test_basic.rx.txt".
+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.
+Line 2 in test file test_included.txt.
+...which is not terminated with a NL. This is again in file "test_basic.rx.txt".
+Next line should be three times "bar" in a row.
+barbarbar
+A line of text.
+Just some text from Mucgly.
+Source "test_include.rb" and instantiate the class defined in there.
+Print out a sum using the previously instantiated class.
+Sum of 1+2 is: 3...
+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 "".

data/test/golden/test_specials_cli.txt

@@ -0,0 +1,11 @@
+Line 1 from file "test_specials_cli.rx.txt".
+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.
+Line 2 in test file test_included.txt.
+...which is not terminated with a NL. This is again in file "test_specials_cli.rx.txt ".
+Next line should be three times "bar" in a row.
+barbarbar
+A line of text.
+Just some text from Mucgly.
+The last line in "test_specials_cli.rx.txt"

data/test/golden/test_specials_cmd.txt

@@ -0,0 +1,36 @@
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+1: Changing hook from "\" to "@"...
+Escaped chars (escape, hook hook): "\", "@" "@"
+
+2: Changing hook from "@" to "#"...
+Escaped chars (escape, hook hook): "\", "#" "#"
+
+3: Changing hook from "#" to "\"...
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+4: Changing escape from "\" to "#"...
+Escaped chars (escape, hook hook): "#", "\" "\"
+
+5: Changing escape from "#" to "\"...
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+6: Changing hooks from "\" and "\" to "{" and "}"...
+Escaped chars (escape, hook hook): "\", "{" "}"
+
+7: Changing hooks from "{" and "}" to "#{" and "}#"...
+Escaped chars (escape, hook hook): "\", "#{" "}#"
+
+8: Changing hookbeg from "#{" to "{"...
+Escaped chars (escape, hook hook): "\", "{" "}#"
+
+9: Changing hookend from "}#" to "}"...
+Escaped chars (escape, hook hook): "\", "{" "}"
+
+11: Next line is comment and will disappear from output.
+
+12: Output is diverted to another output file.
+
+14: Skipped item 13: and now back in original file.
+
+15: Exiting at this point so following lines are not output.

data/test/result/test_basic.txt

@@ -0,0 +1,18 @@
+Line 1 from file "test_basic.rx.txt".
+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.
+Line 2 in test file test_included.txt.
+...which is not terminated with a NL. This is again in file "test_basic.rx.txt".
+Next line should be three times "bar" in a row.
+barbarbar
+A line of text.
+Just some text from Mucgly.
+Source "test_include.rb" and instantiate the class defined in there.
+Print out a sum using the previously instantiated class.
+Sum of 1+2 is: 3...
+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 "".

data/test/result/test_specials_cli.txt

@@ -0,0 +1,11 @@
+Line 1 from file "test_specials_cli.rx.txt".
+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.
+Line 2 in test file test_included.txt.
+...which is not terminated with a NL. This is again in file "test_specials_cli.rx.txt ".
+Next line should be three times "bar" in a row.
+barbarbar
+A line of text.
+Just some text from Mucgly.
+The last line in "test_specials_cli.rx.txt"

data/test/result/test_specials_cmd.txt

@@ -0,0 +1,36 @@
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+1: Changing hook from "\" to "@"...
+Escaped chars (escape, hook hook): "\", "@" "@"
+
+2: Changing hook from "@" to "#"...
+Escaped chars (escape, hook hook): "\", "#" "#"
+
+3: Changing hook from "#" to "\"...
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+4: Changing escape from "\" to "#"...
+Escaped chars (escape, hook hook): "#", "\" "\"
+
+5: Changing escape from "#" to "\"...
+Escaped chars (escape, hook hook): "\", "\" "\"
+
+6: Changing hooks from "\" and "\" to "{" and "}"...
+Escaped chars (escape, hook hook): "\", "{" "}"
+
+7: Changing hooks from "{" and "}" to "#{" and "}#"...
+Escaped chars (escape, hook hook): "\", "#{" "}#"
+
+8: Changing hookbeg from "#{" to "{"...
+Escaped chars (escape, hook hook): "\", "{" "}#"
+
+9: Changing hookend from "}#" to "}"...
+Escaped chars (escape, hook hook): "\", "{" "}"
+
+11: Next line is comment and will disappear from output.
+
+12: Output is diverted to another output file.
+
+14: Skipped item 13: and now back in original file.
+
+15: Exiting at this point so following lines are not output.

data/test/result/test_specials_cmd2.txt

@@ -0,0 +1 @@
+13: This is the only line to this file.

data/test/test_basic.rx.txt

@@ -1,19 +1,23 @@
-Line 1 from file "-<write _ifilename>-".
+Line 1 from file "-<write ifilename>-".
 -<:hook \\>-\
 Test escapes (backslash, empty): "\\" "\ \ " \
  ... and the rest of the line. 
 Next the test file "test_include.txt" is included.
 \:comment :include test_include.txt\ \
 \:include test_include.txt\ \
- This is again in file "\write _ifilename\ ".
+ This is again in file "\write ifilename\ ".
 Next line should be three times "bar" in a row.
-\@foo="bar";\ \.foo\ \write @foo\ \.foo\ 
+\@foo="bar";\ \.@foo\ \write @foo\ \.@foo\ 
 A line of text.
 \puts "Just some text from Mucgly."\ \
 Source "test_include.rb" and instantiate the class defined in there.
 \:source test_include.rb\ \@obj = MyClass.new\ \
 Print out a sum using the previously instantiated class.
 \puts "Sum of 1+2 is: #{@obj.sum(1,2)}..."\ \
-The last line in "\write _ifilename\ "
-The name of this file is: "\write _ifilename\ ".
-We are outputting to file \write _ofilename\  and \write _olinenumber.to_s\ 
+The last line in "\write ifilename\ "
+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.">-\
+This comment will be consumed "-</A comment>-".

data/test/test_mucgly.rb

@@ -8,7 +8,7 @@ def runTest( cmdopts, test, sep = "" )
     rf = "result/#{test}#{sep}.txt"
     gf = "golden/#{test}#{sep}.txt"
 
-    system( "export RUBYLIB=#{ENV['RUBYLIB']}:../lib; ../bin/mucgly #{cmdopts} -i #{test}.rx.txt -o #{rf}" )
+    system( "export RUBYLIB=#{ENV['RUBYLIB']}:../lib; ../bin/mucgly -i -m #{cmdopts} -f #{test}.rx.txt -o #{rf}" )
 
     if false
         # Populate golden files after inspection.
@@ -23,10 +23,8 @@ end
 
 class MucglyTest < Test::Unit::TestCase
 
-    def test_basic() runTest( "", "test_basic" ); end 
-    def test_specials_cli1() runTest( "-s @ -e /", "test_specials_cli", "_1" ); end 
-    def test_specials_cli2() runTest( "-sb @ -se @ -e /", "test_specials_cli", "_2" ); end 
-    def test_specials_cmd() runTest( "", "test_specials_cmd" ); end 
-    def test_multi() runTest( "-m", "test_multi" ); 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
 
 end

data/test/test_specials_cli.rx.txt

@@ -1,11 +1,11 @@
-Line @write (_ilinenumber+1).to_s@ from file "@write _ifilename@".
+Line @write (ilinenumber).to_s@ from file "@write ifilename@".
 Test escapes (backslash, empty): "//" "@ @" /
  ... and the rest of the line. 
 Next the test file "test_include.txt" is included.
 @:include test_include.txt@/
- This is again in file "@write _ifilename@ ".
+ This is again in file "@write ifilename@ ".
 Next line should be three times "bar" in a row.
-@/@foo="bar"@@.foo@@.foo@@puts /@foo@/
+@/@foo="bar"@@./@foo@@./@foo@@puts /@foo@/
 A line of text.
 @puts  "Just some text from Mucgly."@/
-The last line in "@write _ifilename@"
+The last line in "@write ifilename@"

data/test/test_specials_cmd.rx.txt

@@ -14,11 +14,11 @@ Escaped chars (escape, hook hook): "\\", "\#" "\#"
 Escaped chars (escape, hook hook): "\\", "\\" "\\"
 
 4: Changing escape from "\\" to "#"...
-\:escape #\ #
+\:hookesc #\ #
 Escaped chars (escape, hook hook): "##", "#\" "#\"
 
 5: Changing escape from "##" to "#\"...
-\:escape #\\\
+\:hookesc #\\\
 Escaped chars (escape, hook hook): "\\", "\\" "\\"
 
 6: Changing hooks from "\\" and "\\" to "{" and "}"...
@@ -26,7 +26,7 @@ Escaped chars (escape, hook hook): "\\", "\\" "\\"
 Escaped chars (escape, hook hook): "\\", "\{" "\}"
 
 7: Changing hooks from "\{" and "\}" to "#\{" and "\}#"...
-{:hook #{ \}#}\
+{:hook #\{ \}#}\
 Escaped chars (escape, hook hook): "\\", "\#{" "\}#"
 
 8: Changing hookbeg from "\#{" to "{"...
@@ -41,9 +41,9 @@ Escaped chars (escape, hook hook): "\\", "\{" "\}"
 {:comment This is a comment and will not appear in the output}\
 
 12: Output is diverted to another output file.
-{_pushOutput( _ofilename.gsub( /cmd/, "cmd2" ) )}\
+{pushoutput( ofilename.gsub( /cmd/, "cmd2" ) )}\
 13: This is the only line to this file.
-{_closeOutput}\
+{closeoutput}\
 
 14: Skipped item 13: and now back in original file.
 

metadata

@@ -1,116 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: mucgly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: como
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+date: 2015-02-27 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 mostly regular Ruby code, but a few special commands
-  is also provided.
+  of body text. The macros are expected to be mostly regular Ruby code, but a few
+  special commands is also available.
 email: tero.isannainen@gmail.com
 executables:
 - mucgly
-extensions: []
+extensions:
+- ext/mucgly/extconf.rb
 extra_rdoc_files:
 - README.rdoc
 files:
-- README.rdoc
 - CHANGELOG.rdoc
 - LICENSE
-- Rakefile
-- lib/mucgly.rb
-- lib/easyfile.rb
-- doc/top-level-namespace.html
-- doc/js/full_list.js
-- doc/js/app.js
-- doc/js/jquery.js
-- doc/index.html
+- README.rdoc
+- bin/mucgly
+- doc/Mucgly.html
+- doc/_index.html
+- doc/class_list.html
 - doc/css/common.css
 - doc/css/full_list.css
 - doc/css/style.css
-- doc/EasyFile.html
+- doc/file.CHANGELOG.html
 - doc/file.README.html
-- doc/method_list.html
 - doc/file_list.html
-- doc/Mucgly/MucglyFile.html
-- doc/Mucgly/Env.html
-- doc/Mucgly/MucglyFile/Token.html
-- doc/Mucgly/MucglyFile/ParseState.html
-- doc/Mucgly/Separators.html
-- doc/Mucgly.html
-- doc/EasyFile/String.html
-- doc/EasyFile/Read.html
-- doc/EasyFile/ReadStack.html
-- doc/EasyFile/InOut.html
-- doc/EasyFile/Write.html
-- doc/EasyFile/WriteStack.html
-- doc/EasyFile/Stacked.html
-- doc/class_list.html
-- doc/_index.html
-- doc/file.CHANGELOG.html
 - doc/frames.html
-- test/test_specials_cmd.rx.txt
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
+- ext/mucgly/extconf.rb
+- ext/mucgly/mucgly.c
+- lib/version.rb
+- test/golden/test_basic.txt
+- test/golden/test_specials_cli.txt
+- test/golden/test_specials_cmd.txt
+- test/result/test_basic.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_include.rb
 - test/test_include.txt
-- test/test_basic.rx.txt
-- test/test_multi.rx.txt
-- test/test_specials_cli.rx.txt
 - test/test_mucgly.rb
-- bin/mucgly
+- test/test_specials_cli.rx.txt
+- test/test_specials_cmd.rx.txt
 homepage: 
 licenses:
 - Ruby
+metadata: {}
 post_install_message: Check README...
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mucgly processes inline macros.
 test_files:
+- test/golden/test_basic.txt
+- test/golden/test_specials_cli.txt
+- test/golden/test_specials_cmd.txt
 - test/test_specials_cmd.rx.txt
 - test/test_include.rb
 - test/test_include.txt
 - test/test_basic.rx.txt
-- test/test_multi.rx.txt
 - test/test_specials_cli.rx.txt
 - test/test_mucgly.rb
+- test/result/test_basic.txt
+- test/result/test_specials_cli.txt
+- test/result/test_specials_cmd2.txt
+- test/result/test_specials_cmd.txt
 has_rdoc: 

data/Rakefile

@@ -1,29 +0,0 @@
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-    t.libs << 'test'
-    t.libs << 'lib'
-end
-
-desc "Run tests"
-task :default => :test
-
-task :cleanup_test do
-    sh "rm -rf test/test"
-end
-
-task :build => :doc do
-    sh "gem build mucgly.gemspec"
-end
-
-task :doc do
-    sh "yardoc lib/* - README.rdoc CHANGELOG.rdoc"
-end
-
-task :publish do
-    if Dir.glob('mucgly-*gem').length == 1
-        sh "gem push mucgly*.gem"
-    else
-        raise "Multiple gems in the directory..."
-    end
-end