[bugfix] 'main.rb' to 'erubis -z' prints 'Syntax OK' correctly

2 files changed, 27 insertions, 1 deletions

diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb
index 5234944..c8f1ff5 100644
--- a/lib/erubis/main.rb
+++ b/lib/erubis/main.rb
@@ -468,7 +468,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
diff --git a/test/test-main.rb b/test/test-main.rb
index 5db3f52..5fe62ac 100644
--- a/test/test-main.rb
+++ b/test/test-main.rb
@@ -201,11 +201,35 @@ END
   end
 
 
+  def _with_dummy_file
+    bindir = File.join(File.dirname(File.dirname(__FILE__)), 'bin')
+    env_path = ENV['PATH']
+    env__    = ENV['_']
+    begin
+      ENV['PATH'] = bindir + File::PATH_SEPARATOR + ENV['PATH']
+      ENV['_'] = 'erubis'
+      Tempfile.open(self.name.gsub(/[^\w]/,'_')) do |f|
+        f.write(INPUT)
+        f.flush
+        yield(f.path)
+      end
+    ensure
+      ENV['PATH'] = env_path
+      ENV['_']    = env__    if env__
+    end
+  end
+
+
   def test_syntax1    # -z (syntax ok)
     @input    = INPUT
     @expected = "Syntax OK\n"
     @options  = '-z'
     _test()
+    #
+    _with_dummy_file do |filepath|
+      actual = `erubis #{@options} #{filepath}`
+      assert_equal @expected, actual
+    end
   end