erubis 2.6.4 → 2.6.5

data/CHANGES.txt

@@ -1,9 +1,16 @@
 # -*- coding: utf-8 -*-
-# $Rev: 129 $
-# $Release: 2.6.4 $
+# $Release: 2.6.5 $
 # copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 
 
+- release:   2.6.5
+  date: 2009-07-20
+  bugfixes:
+
+    - |
+	Fixed bug around '-z' option.
+
+
 - release:   2.6.4
   date: 2009-02-18
   enhancemens:

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	2.6.4
+release::	2.6.5
 copyright::	copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 
 

data/benchmark/bench.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
 ###
-### $Rev: 101 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/bin/erubis

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
 ###
-### $Rev: 121 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/contrib/erubis

@@ -1,23 +1,20 @@
 #!/usr/bin/env ruby
 
 ###
-### $Rev: 121 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
-### $Rev: 122 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
 #--begin of require 'erubis'
 ##
-## $Rev: 99 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -65,21 +62,19 @@ require 'yaml'
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.4 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.5 $' =~ /([.\d]+)/) && $1
 end
 
 #--begin of require 'erubis/engine'
 ##
-## $Rev: 104 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 
 #--begin of require 'erubis/generator'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -242,8 +237,7 @@ end
 #--end of require 'erubis/generator'
 #--begin of require 'erubis/converter'
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -602,15 +596,13 @@ end
 #--end of require 'erubis/converter'
 #--begin of require 'erubis/evaluator'
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'erubis/error'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -635,8 +627,7 @@ end
 #--end of require 'erubis/error'
 #--begin of require 'erubis/context'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -920,8 +911,7 @@ end
 #require 'erubis/context'
 #--begin of require 'erubis/helper'
 ##
-## $Rev: 89 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -970,8 +960,7 @@ end
 #--end of require 'erubis/helper'
 #--begin of require 'erubis/enhancer'
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1654,8 +1643,7 @@ end
 #require 'erubis/tiny'
 #--begin of require 'erubis/engine/eruby'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1790,8 +1778,7 @@ end
 
 #--begin of require 'erubis/local-setting'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1803,8 +1790,7 @@ end
 #--end of require 'erubis'
 #--begin of require 'erubis/tiny'
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1832,10 +1818,9 @@ module Erubis
       src = "_buf = '';"           # preamble
       pos = 0
       input.scan(EMBEDDED_PATTERN) do |indicator, code|
-        match = Regexp.last_match
-        len   = match.begin(0) - pos
-        text  = input[pos, len]
-        pos   = match.end(0)
+        m = Regexp.last_match
+        text = input[pos...m.begin(0)]
+        pos  = m.end(0)
         #src << " _buf << '" << escape_text(text) << "';"
         text.gsub!(/['\\]/, '\\\\\&')
         src << " _buf << '" << text << "';" unless text.empty?
@@ -1951,8 +1936,7 @@ end
 #--end of require 'erubis/tiny'
 #--begin of require 'erubis/engine/enhanced'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2075,8 +2059,7 @@ end
 #--end of require 'erubis/engine/enhanced'
 #--begin of require 'erubis/engine/optimized'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2206,8 +2189,7 @@ end
 #--already included require 'erubis/engine/eruby'
 #--begin of require 'erubis/engine/ephp'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2308,8 +2290,7 @@ end
 #--end of require 'erubis/engine/ephp'
 #--begin of require 'erubis/engine/ec'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2428,8 +2409,7 @@ end
 #--end of require 'erubis/engine/ec'
 #--begin of require 'erubis/engine/ejava'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2541,8 +2521,7 @@ end
 #--end of require 'erubis/engine/ejava'
 #--begin of require 'erubis/engine/escheme'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2658,8 +2637,7 @@ end
 #--end of require 'erubis/engine/escheme'
 #--begin of require 'erubis/engine/eperl'
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2756,8 +2734,7 @@ end
 #--end of require 'erubis/engine/eperl'
 #--begin of require 'erubis/engine/ejavascript'
 ##
-## $Rev: 95 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2950,7 +2927,7 @@ module Erubis
       filenames = argv
       options['h'] = true if properties[:help]
       opts = Object.new
-      arr = @option_names.collect { |ch, name| "def #{name}; @#{name}; end\n" }
+      arr = @option_names.collect {|ch, name| "def #{name}; @#{name}; end\n" }
       opts.instance_eval arr.join
       options.each do |ch, val|
         name = @option_names[ch]
@@ -3026,7 +3003,8 @@ module Erubis
       msg = "Syntax OK\n"
       if filenames && !filenames.empty?
         filenames.each do |filename|
-          test(?f, filename)  or raise CommandOptionError.new("#{filename}: file not found.")
+          File.file?(filename)  or
+            raise CommandOptionError.new("#{filename}: file not found.")
           engine.filename = filename
           engine.convert!(File.read(filename))
           val = do_action(action, engine, context, filename, opts)
@@ -3144,14 +3122,13 @@ module Erubis
     end
 
     def show_enhancers
+      dict = {}
+      ObjectSpace.each_object(Module) do |mod|
+        dict[$1] = mod if mod.name =~ /\AErubis::(.*)Enhancer\z/
+      end
       s = "enhancers:\n"
-      list = []
-      ObjectSpace.each_object(Module) do |m| list << m end
-      list.sort_by { |m| m.name.to_s }.each do |m|
-        next unless m.name =~ /\AErubis::(.*)Enhancer\z/
-        name = $1
-        desc = m.desc
-        s << ("  %-13s : %s\n" % [name, desc])
+      dict.sort_by {|name, mod| name }.each do |name, mod|
+        s << ("  %-13s : %s\n" % [name, mod.desc])
       end
       return s
     end
@@ -3168,10 +3145,9 @@ module Erubis
         optstr = optstr[1, optstr.length-1]
         #
         if optstr[0] == ?-    # context
-          unless optstr =~ /\A\-([-\w]+)(?:=(.*))?/
+          optstr =~ /\A\-([-\w]+)(?:=(.*))?/  or
             raise CommandOptionError.new("-#{optstr}: invalid context value.")
-          end
-          name = $1;  value = $2
+          name, value = $1, $2
           name  = name.gsub(/-/, '_').intern
           #value = value.nil? ? true : YAML.load(value)   # error, why?
           value = value.nil? ? true : YAML.load("---\n#{value}\n")
@@ -3180,15 +3156,12 @@ module Erubis
         else                  # options
           while optstr && !optstr.empty?
             optchar = optstr[0].chr
-            optstr[0,1] = ""
+            optstr = optstr[1..-1]
             if arg_none.include?(optchar)
               options[optchar] = true
             elsif arg_required.include?(optchar)
-              arg = optstr.empty? ? argv.shift : optstr
-              unless arg
-                mesg = "-#{optchar}: #{@option_names[optchar]} required."
-                raise CommandOptionError.new(mesg)
-              end
+              arg = optstr.empty? ? argv.shift : optstr  or
+                raise CommandOptionError.new("-#{optchar}: #{@option_names[optchar]} required.")
               options[optchar] = arg
               optstr = nil
             elsif arg_optional.include?(optchar)
@@ -3333,7 +3306,9 @@ module Erubis
 
     def check_syntax(filename, src)
       require 'open3'
-      command = (ENV['_'] || 'ruby') + ' -wc'   # ENV['_'] stores command name
+      #command = (ENV['_'] || 'ruby') + ' -wc'   # ENV['_'] stores command name
+      bin = ENV['_'] && File.basename(ENV['_']) =~ /^ruby/ ? ENV['_'] : 'ruby'
+      command = bin + ' -wc'
       stdin, stdout, stderr = Open3.popen3(command)
       stdin.write(src)
       stdin.close

data/contrib/inline-require

@@ -6,13 +6,18 @@
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
-### 2.6.4
-### $Rev: 2 $
+### 2.6.5
+### $Rev: 10 $
 ###
 
 
 class InlineRequire
 
+   def initialize(opts={})
+      @opts = opts.dup
+   end
+   attr_accessor :opts
+
    def expand(filename)
       sbuf = ''
       inlined = []
@@ -25,6 +30,10 @@ class InlineRequire
 
    def expand_require(filename, sbuf, inlined, level)
       raise "*** assertion error" if inlined.include?(filename)
+      remove_comment  = @opts[:remove_comment]
+      expand_indented = @opts[:expand_indented]
+      keep_filename   = @opts[:keep_filename]
+      loaded_features = @opts[:loaded_features]
       inlined << filename
       prog = File.read(filename)
       n = 0
@@ -48,7 +57,9 @@ class InlineRequire
 
          ## find 'require "foo"' and expand it to inline code
          flag_inline = false
-         if line =~ /^\s*require ['"](.*)["']\s*$/
+         pattern = expand_indented ? /^[ \t]*require ['"](.*)["']\s*$/ \
+                                   :       /^require ['"](.*)["']\s*$/
+         if line =~ pattern
             libname = $1
             libpath = find_library(libname)
             $stderr.puts "*** debug: libpath=#{libpath.inspect}" if $debug_mode
@@ -60,13 +71,19 @@ class InlineRequire
             end
          end
          if !flag_inline
-            sbuf << line
+            sbuf << line   unless remove_comment && line =~ /^[ \t]*\#/
          elsif inlined.include?(libpath)
-            sbuf << "#--already included #{line}"
+            sbuf << "#--already included #{line}"     unless remove_comment
          else
-            sbuf << "#--begin of #{line}"
+            if keep_filename
+               @n ||= 0;  @n += 1;  n = @n
+            end
+            sbuf << "#--begin of #{line}"             unless remove_comment
+            sbuf << "$LOADED_FEATURES << '#{libname}.rb'\n" if loaded_features
+            sbuf << "eval <<'END_OF_SCRIPT__#{n}', TOPLEVEL_BINDING, '#{libpath}', 1\n" if keep_filename
             expand_require(libpath, sbuf, inlined, level+1)
-            sbuf << "#--end of #{line}"
+            sbuf << "END_OF_SCRIPT__#{n}\n"               if keep_filename
+            sbuf << "#--end of #{line}"               unless remove_comment
          end
       end
       #sbuf << "\n" if sbuf[-1] != ?\n
@@ -105,38 +122,47 @@ end
 if __FILE__ == $0
 
    begin
-      rubylib_paths = []
-      flag_help = false
-      while ARGV[0] && ARGV[0][0] == ?-
-         opt = ARGV.shift
-         case opt
-         when '-h', '--help'
-            flag_help = true
-         when '-I'
-            arg = ARGV.shift
-            raise "-I: library path required." unless arg
-            rubylib_paths.concat(arg.split(/,/))
-         when '-D'
-            $debug_mode = true
-         else
-            raise "#{opt}: invalid option."
-         end
-      end
-
-      if flag_help
+      require "optparse"
+      op = OptionParser.new
+      options = {}
+      op.on("-h", "--help") {|v| options[:help] = v }
+      op.on("-I libpath")   {|v| options[:libpath] = v }
+      op.on("-i")           {|v| options[:expand_indented] = v }
+      op.on("-c")           {|v| options[:remove_comment] = v }
+      op.on("-k")           {|v| options[:keep_filename] = v }
+      op.on("-l")           {|v| options[:loaded_features] = v }
+      op.on("-D")           {|v| options[:debug] = v }
+      op.parse!()
+
+      $debug_mode = options[:debug]
+
+      if options[:help]
          command = File.basename($0)
          puts "Usage: #{command} [-h] [-I path[,path2,..]] script"
          puts "  -h                   : help"
+         puts "  -i                   : expand indented require(), too"
+         puts "  -c                   : remove comment lines start with '#'"
+         puts "  -k                   : keep filename (for debugging)"
+         puts "  -l                   : append libs to $LOADED_FEATURES"
          puts "  -I path[,path2,...]  : ruby library path"
          exit(0)
       end
 
+      if options[:libpath]
+         rubylib_paths = options[:libpath].split(/,/)
+      else
+         rubylib_paths = []
+      end
       $stderr.puts "*** debug: rubylib_paths=#{rubylib_paths.inspect}" if $debug_mode
       $LOAD_PATH.concat(rubylib_paths)
 
       filenames = ARGV
 
-      inline_require = InlineRequire.new
+      opts = { :expand_indented => options[:expand_indented],
+               :remove_comment  => options[:remove_comment],
+               :keep_filename   => options[:keep_filename],
+               :loaded_features => options[:loaded_features] }
+      inline_require = InlineRequire.new(opts)
       filenames.each do |filename|
          print inline_require.expand(filename)
       end