+ Switched from erubis to erubi for erb processing. (clive-devops)

- Minor cleanup and top-level error handling changes.

[git-p4: depot-paths = "//src/flay/dev/": change = 13121]

Rakefile

@@ -21,7 +21,7 @@ Hoe.spec "flay" do
 
   dependency "sexp_processor", "~> 4.0"
   dependency "ruby_parser",    "~> 3.0"
-  dependency "erubis",         "~> 2.7.0"
+  dependency "erubi",          "~> 1.10"
   dependency "path_expander",  "~> 1.0"
 
   dependency "minitest",       "~> 5.8.0", :dev

lib/flay.rb

@@ -1,21 +1,12 @@
 #!/usr/bin/env ruby -w
 
 require "optparse"
-require "rubygems"
 require "sexp_processor"
 require "ruby_parser"
 require "path_expander"
 require "timeout"
 require "zlib"
 
-class File
-  RUBY19 = "<3".respond_to? :encoding unless defined? RUBY19 # :nodoc:
-
-  class << self
-    alias :binread :read unless RUBY19
-  end
-end
-
 class Flay
   VERSION = "2.12.1" # :nodoc:
 
@@ -159,8 +150,8 @@ def self.load_plugins
       end
     end
     @@plugins
-  rescue
-    # ignore
+  rescue => e
+    warn "Error loading plugins: #{e}" if option[:verbose]
   end
 
   # :stopdoc:

lib/flay_erb.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/ruby
-
-require "rubygems"
 require "flay"
-require "erubis"
+require "erubi"
 
 class Flay
 
@@ -13,32 +10,12 @@ class Flay
   def process_erb file
     erb = File.read file
 
-    ruby = Erubis.new(erb).src
+    ruby = Erubi::Engine.new(erb).src
     begin
       RubyParser.new.process(ruby, file)
     rescue => e
       warn ruby if option[:verbose]
       raise e
     end
   end
-
-  class Erubis < ::Erubis::Eruby # :nodoc:
-    BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
-
-    def add_expr_literal(src, code)
-      if code =~ BLOCK_EXPR
-        src << '@output_buffer.append= ' << code
-      else
-        src << '@output_buffer.append=(' << code << ');'
-      end
-    end
-
-    def add_expr_escaped(src, code)
-      if code =~ BLOCK_EXPR
-        src << "@output_buffer.safe_append= " << code
-      else
-        src << "@output_buffer.safe_append=(" << code << ");"
-      end
-    end
-  end
 end