eturem 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cafde349114833d7d2ec857ff349c9b90be5d1ec
-  data.tar.gz: d80d846f4b2e628dab97a0e81cec9f64d3a162f9
+  metadata.gz: 64d7d985440e56ceded0d1713d1bb8e3a7f42285
+  data.tar.gz: f8a30a97dba553b7e7c2f0de962b2551e6ff383a
 SHA512:
-  metadata.gz: e7614e84b0e772b45d733c2fa25587855c314c7b10bdaf5052a4647ab2a666da4c08b233dfafb921ca7f8a3bcfd47833232a9488146d14221d242adf7d81b884
-  data.tar.gz: 2c6cc910538e61fb935788b9f47390129f7d1896caeebb170bd14dde8c986232b04eaa1d91d2c190deb3a7f42d941a9d47bbf4b7afbc24e872d1bee0953c7131
+  metadata.gz: fc2a5be8cd2f5471f15f0a635a6dac10e3e28eccaf169f792d64c34cd854c7b9798b2f96049ee47ffca20daf07e7885cc9677549608b161aed2478201634b051
+  data.tar.gz: d62c5c694dbf69cee649e34dbf1cb36c2223c0cc78bf375d8d07c41d03a381fce26a3167378f42235af36f1d53f33ce0bdb9ec60b9987a2292efe7d57e6a94f9

data/lib/eturem.rb

@@ -1,4 +1,5 @@
 enable = true
+debug  = false
 lang   = "en"
 output_backtrace = true
 output_original  = true
@@ -12,6 +13,7 @@ config_file = File.join(Dir.home, ".eturem")
 if File.exist?(config_file)
   config = File.read(config_file)
   enable = false                    if config.match(/^enable\s*\:\s*(?:false|off|0)/i)
+  debug  = true                     if config.match(/^debug\s*\:\s*(?:true|on|1)/i)
   lang   = Regexp.last_match(:lang) if config.match(/^lang\s*\:\s*(?<lang>\S+)/i)
   output_backtrace = false          if config.match(/^output_backtrace\s*\:\s*(?:false|off|0)/i)
   output_original  = false          if config.match( /^output_original\s*\:\s*(?:false|off|0)/i)
@@ -24,16 +26,16 @@ end
 require "eturem/#{lang}" if enable && !defined?(Eturem)
 
 if defined? Eturem
-  Eturem.eturem_class.output_backtrace = output_backtrace
-  Eturem.eturem_class.output_original  = output_original
-  Eturem.eturem_class.output_script    = output_script
-  Eturem.eturem_class.use_coderay      = use_coderay
-  Eturem.eturem_class.max_backtrace    = max_backtrace
-  Eturem.eturem_class.before_line_num  = before_line_num
-  Eturem.eturem_class.after_line_num   = after_line_num
+  Eturem.set_config({
+    output_backtrace: output_backtrace,
+    output_original:  output_original,
+    output_script:    output_script,
+    use_coderay:      use_coderay,
+    max_backtrace:    max_backtrace,
+    before_line_num:  before_line_num,
+    after_line_num:   after_line_num
+  })
   
-  require "coderay" if use_coderay
-  exception = Eturem.load($0)
-  exception.output if exception
+  exception = Eturem.load_and_output($0, debug)
   exit
 end

data/lib/eturem/base.rb

@@ -7,28 +7,36 @@ module Eturem
   # @return [nil] if exception did not raise
   def self.load(file)
     begin
-      Kernel.load(File.expand_path(file))
+      Kernel.load(File.absolute_path(file))
     rescue Exception => exception
-      return @eturem_class.new(exception) unless exception.is_a? SystemExit
+      return @eturem_class.new(exception, file) unless exception.is_a? SystemExit
     end
     return nil
   end
   
+  def self.load_and_output(file, debug = false)
+    begin
+      Kernel.load(File.absolute_path(file))
+    rescue Exception => exception
+      begin
+        puts @eturem_class.new(exception, file).inspect unless exception.is_a? SystemExit
+      rescue Exception => e
+        raise debug ? e : exception
+      end
+    end
+  end
+  
   def self.eval(expr, bind = nil, fname = "(eval)", lineno = 1)
     begin
       bind ? Kernel.eval(expr, bind, fname, lineno) : Kernel.eval(expr)
     rescue Exception => exception
-      return @eturem_class.new(exception) unless exception.is_a? SystemExit
+      return @eturem_class.new(exception, fname) unless exception.is_a? SystemExit
     end
     return nil
   end
   
-  def self.eturem_class
-    @eturem_class
-  end
-  
-  def self.eturem_class=(klass)
-    @eturem_class = klass
+  def self.set_config(config)
+    @eturem_class.set_config(config)
   end
   
   class Base
@@ -48,35 +56,17 @@ module Eturem
       return @inspect_methods
     end
     
-    def self.output_backtrace=(value)
-      @@output_backtrace = value
-    end
-    
-    def self.output_original=(value)
-      @@output_original = value
-    end
-    
-    def self.output_script=(value)
-      @@output_script = value
-    end
-    
-    def self.use_coderay=(value)
-      @@use_coderay = value
-    end
-    
-    def self.max_backtrace=(value)
-      @@max_backtrace = value
-    end
-    
-    def self.before_line_num=(value)
-      @@before_line_num = value
+    def self.set_config(config)
+      @@output_backtrace = config[:output_backtrace] if config.has_key?(:output_backtrace)
+      @@output_original  = config[:output_original]  if config.has_key?(:output_original)
+      @@output_script    = config[:output_script]    if config.has_key?(:output_script)
+      @@use_coderay      = config[:use_coderay]      if config.has_key?(:use_coderay)
+      @@max_backtrace    = config[:max_backtrace]    if config.has_key?(:max_backtrace)
+      @@before_line_num  = config[:before_line_num]  if config.has_key?(:before_line_num)
+      @@after_line_num   = config[:after_line_num]   if config.has_key?(:after_line_num)
     end
     
-    def self.after_line_num=(value)
-      @@after_line_num = value
-    end
-    
-    def initialize(exception)
+    def initialize(exception, load_file)
       @exception   = exception
       @exception_s = exception.to_s
       
@@ -86,7 +76,12 @@ module Eturem
         path.start_with?(eturem_path) || path.end_with?("/rubygems/core_ext/kernel_require.rb")
       end
       @backtrace_locations.each do |location|
-        if $0 == location.path
+        if File.absolute_path(load_file) == location.path
+          if load_file == $0
+            def location.path
+              $0
+            end
+          end
           def location.label
             super.sub("<top (required)>", "<main>")
           end
@@ -104,26 +99,28 @@ module Eturem
       prepare
     end
     
-    # output backtrace + error message + script
-    def output
-      output_backtrace if @@output_backtrace
+    def inspect
+      str = ""
+      str = backtrace_inspect if @@output_backtrace
       error_message = exception_inspect
-      if error_message.to_s.empty?
-        puts original_exception_inspect
+      if error_message.empty?
+        str += original_exception_inspect
       else
-        puts original_exception_inspect if @@output_original
-        puts error_message
+        str += original_exception_inspect + "\n" if @@output_original
+        str += error_message + "\n"
       end
-      output_script if @@output_script
+      str += script_inspect if @@output_script
+      return str
     end
     
-    def output_backtrace
-      return if @backtrace_locations.empty?
+    def backtrace_inspect
+      return "" if @backtrace_locations.empty?
       
-      puts traceback_most_recent_call_last
+      str = traceback_most_recent_call_last + "\n"
       @backtrace_locations[0, @@max_backtrace].reverse.each_with_index do |location, i|
-        puts sprintf("%9d: %s", @backtrace_locations.size - i, location_inspect(location))
+        str += sprintf("%9d: %s\n", @backtrace_locations.size - i, location_inspect(location))
       end
+      return str
     end
     
     def exception_inspect
@@ -132,10 +129,10 @@ module Eturem
         if (key.is_a?(Class)  && @exception.is_a?(key)) || 
            (key.is_a?(String) && @exception.class.to_s == key)
           method = inspect_methods[key]
-          return method ? public_send(method) : nil
+          return method ? public_send(method) : ""
         end
       end
-      return nil
+      return ""
     end
     
     def original_exception_inspect
@@ -143,48 +140,33 @@ module Eturem
         return @exception_s
       else
         location_str = "#{@path}:#{@lineno}:in `#{@label}'"
-        if @exception_s.match(/\A(?<first_line>.*?)\n/)
-          return "#{location_str}: #{Regexp.last_match(:first_line)} (#{@exception.class})\n" +
-            "#{Regexp.last_match.post_match}"
-        else
-          return "#{location_str}: #{@exception_s} (#{@exception.class})"
-        end
+        @exception_s.match(/\A(?<first_line>.*)/)
+        return "#{location_str}: #{Regexp.last_match(:first_line)} (\e[4m#{@exception.class}\e[0m)" +
+               "#{Regexp.last_match.post_match.chomp}\n"
       end
     end
     
-    def output_script
-      return if @script.empty?
+    def script_inspect
+      return "" if @script.empty?
       
-      max_lineno_length = @output_lines.compact.max.to_s.length
-      @output_lines.each do |i|
-        if @lineno == i
-          puts sprintf("\e[0m => \e[1;34m%#{max_lineno_length}d\e[0m: %s", i, @script_lines[i])
-        elsif i
-          puts sprintf("\e[0m    \e[1;34m%#{max_lineno_length}d\e[0m: %s", i, @script_lines[i])
-        else
-          puts         "\e[0m    #{" " * max_lineno_length}  :"
-        end
+      str = ""
+      max_lineno_length = @output_lines.max.to_s.length
+      last_i = @output_lines.min - 1
+      @output_lines.sort.each do |i|
+        str += "\e[0m    #{' ' * max_lineno_length}  :\n" if last_i + 1 != i
+        str += @lineno == i ? "\e[0m => \e[1;34m" : "\e[0m    \e[1;34m"
+        str += sprintf("%#{max_lineno_length}d\e[0m: %s", i, @script_lines[i])
+        last_i = i
       end
+      return str
     end
     
     private
     
     def prepare
       case @exception
-      when SyntaxError   then prepare_syntax_error
       when NameError     then prepare_name_error
       when ArgumentError then prepare_argument_error
-      when TypeError     then prepare_type_error
-      end
-    end
-    
-    def prepare_syntax_error
-      @unexpected = @exception_s.match(/unexpected (?<unexpected>(?:','|[^,])+)/) ?
-        Regexp.last_match(:unexpected) : nil
-      @expected   = @exception_s.match(/[,\s]expecting (?<expected>\S+)/) ?
-        Regexp.last_match(:expected)   : nil
-      if !@expected && @exception_s.match(/(?<invalid>(?:break|next|retry|redo|yield))/)
-        @invalid = Regexp.last_match(:invalid)
       end
     end
     
@@ -194,23 +176,11 @@ module Eturem
       @did_you_mean = Regexp.last_match.post_match.strip.scan(/\S+/)
       return if @script.empty?
       
-      new_range = []
       @did_you_mean.each do |name|
         index = @script_lines.index { |line| line.include?(name) }
         next unless index
         highlight!(@script_lines[index], name, "\e[1;33m")
-        new_range.push(index)
-      end
-      new_range.sort!
-      before = new_range.select { |i| i < @output_lines.first }
-      after  = new_range.select { |i| i > @output_lines.last  }
-      unless before.empty?
-        @output_lines.unshift(nil) if before.last + 1 != @output_lines.first
-        @output_lines.unshift(*before)
-      end
-      unless after.empty?
-        @output_lines.push(nil) if @output_lines.last + 1 != after.first
-        @output_lines.push(*after)
+        @output_lines.push(index)
       end
     end
     
@@ -220,14 +190,6 @@ module Eturem
       backtrace_locations_shift
       load_script unless old_path == @path
       @output_lines = default_output_lines
-      if @exception_s.match(/given (?<given>\d+)\, expected (?<expected>[^)]+)/)
-        @given    = Regexp.last_match(:given).to_i
-        @expected = Regexp.last_match(:expected)
-      end
-    end
-    
-    def prepare_type_error
-      @method = @label
     end
     
     def backtrace_locations_shift
@@ -255,7 +217,10 @@ module Eturem
         end
         @script.force_encoding(encoding)
       end
-      @script = CodeRay.scan(@script, :ruby).terminal if @@use_coderay
+      if @@use_coderay
+        require "coderay" 
+        @script = CodeRay.scan(@script, :ruby).terminal
+      end
       @script_lines = @script.lines
       @script_lines.unshift("")
       @output_lines = default_output_lines
@@ -274,7 +239,7 @@ module Eturem
       to   = [@script_lines.size - 1, @lineno + @@after_line_num].min
       (from..to).to_a
     end
-    
-    Eturem.eturem_class = self
   end
+  
+  @eturem_class = Base
 end

data/lib/eturem/en.rb

@@ -208,9 +208,9 @@ module Eturem
     def exception_inspect
       super
     end
-    
-    Eturem.eturem_class = self
   end
+  
+  @eturem_class = En
 end
 
 require "eturem"

data/lib/eturem/ja.rb

@@ -214,11 +214,10 @@ module Eturem
     end
     
     def exception_inspect
-      if @path == "(eval)"
-        return %[eval 中の #{@lineno}行目でエラーが発生しました。\n] + super.to_s
-      else
-        return %[ファイル"#{@path}" #{@lineno}行目でエラーが発生しました。\n] + super.to_s
-      end
+      error_message = super
+      error_message = "#{@exception_s} (#{@exception.class})" if error_message.empty?
+      return (@path == "(eval)" ? "eval 中の" : %[ファイル"#{@path}"]) +
+        " #{@lineno}行目でエラーが発生しました。\n" + error_message
     end
     
     def no_memory_error_inspect
@@ -231,37 +230,50 @@ module Eturem
     end
     
     def syntax_error_inspect
-      if @invalid
-        highlight!(@script_lines[@lineno], @invalid, "\e[1;31m\e[4m")
-        return "#{@invalid} が不適切な場所にあります。"
-      end
-      
-      @unexpected ||= "end-of-input"
-      @expected   ||= "end-of-input"
-      if @unexpected.match(/^'(.)'$/)
-        highlight!(@script_lines[@lineno], Regexp.last_match(1), "\e[1;31m\e[4m")
-      elsif @unexpected.match(/^(?:keyword|modifier)_/)
-        highlight!(@script_lines[@lineno], Regexp.last_match.post_match, "\e[1;31m\e[4m")
-      end
-      unexpected = transform_syntax_error_keyword(@unexpected)
-      expected = @expected.split(/\s+or\s+/).map{ |ex| transform_syntax_error_keyword(ex) }
-      keywords = %w[if unless case while until for begin def class module do].select{ |keyword|
-        @script.index(keyword)
-      }.join(" / ")
-      keywords = keywords.empty? ? "ifなど" : "「#{keywords}」"
-      
-      if expected.join == "end-of-input"
-        ret = "構文エラーです。余分な#{unexpected}があります。"
-        ret += "#{keywords}と「end」の対応関係を確認してください。" if unexpected == "end"
-        return ret
-      elsif unexpected == "end-of-input"
-        ret = "（ただし、実際のエラーの原因はおそらくもっと前にあります。）\n" +
-              "構文エラーです。#{expected.join('または')}が足りません。"
-        ret += "#{keywords}に対応する「end」があるか確認してください。" if expected.include?("end")
-        return ret
+      if @exception_s.match(/unexpected (?<unexpected>(?:','|[^,])+)/)
+        unexpected = transform_syntax_error_keyword(Regexp.last_match(:unexpected))
+        expecting = ["end-of-input"]
+        if @exception_s.match(/[,\s]expecting (?<expecting>\S+)/)
+          expecting = Regexp.last_match(:expecting).split(/\s+or\s+/).map do |exp|
+            transform_syntax_error_keyword(exp)
+          end
+        end
+        if unexpected.match(/^'(.)'$/)
+          highlight!(@script_lines[@lineno], Regexp.last_match(1), "\e[1;31m\e[4m")
+        elsif
+          highlight!(@script_lines[@lineno], unexpected, "\e[1;31m\e[4m")
+        end
+        
+        keywords = %w[if unless case while until for begin def class module do].select do |keyword|
+          @script.index(keyword)
+        end
+        keywords = "「#{keywords.join(' / ')}」"
+        keywords = "ifなど" if keywords == "「」"
+        if unexpected == "end-of-input"
+          ret = "（ただし、実際のエラーの原因はおそらくもっと前にあります。）\n" +
+                "構文エラーです。#{expecting.join('または')}が足りません。"
+          ret += "#{keywords}に対応する「end」があるか確認してください。" if expecting.include?("end")
+          return ret
+        elsif expecting.join == "end-of-input"
+          ret = "構文エラーです。余分な#{unexpected}があります。"
+          ret += "#{keywords}と「end」の対応関係を確認してください。" if unexpected == "end"
+          return ret
+        elsif !expecting.empty?
+          return "構文エラーです。#{expecting.join('または')}が来るべき場所に、" +
+                 "#{unexpected}が来てしまいました。"
+        end
+        return ""
+      elsif @exception_s.match(/Invalid (?<invalid>(?:break|next|retry|redo|yield))/)
+        invalid = Regexp.last_match(:invalid)
+        highlight!(@script_lines[@lineno], invalid, "\e[1;31m\e[4m")
+        return "#{invalid} が不適切な場所にあります。"
+      elsif @exception_s.match(/unterminated string meets end of file/)
+        return "「\"」「'」が閉じられていません。"
+      elsif @exception_s.match(/unterminated regexp meets end of file/)
+        return "「/」が閉じられていません。"
+      else
+        return ""
       end
-      return "構文エラーです。#{expected.join('または')}が来るべき場所に、" +
-             "#{unexpected}が来てしまいました。"
     end
     
     def transform_syntax_error_keyword(keyword)
@@ -282,20 +294,24 @@ module Eturem
     end
     
     def argument_error_inspect
-      if @given
+      if @exception_s.match(/given (?<given>\d+), expected (?<expected>[^)]+)/)
+        given    = Regexp.last_match(:given).to_i
+        expected = Regexp.last_match(:expected)
         ret = "引数の数が正しくありません。「#{@method}」は本来"
-        case @expected
+        case expected
         when "0"
           ret += "引数が不要です"
         when /^(\d+)\.\.(\d+)$/
           ret += "#{Regexp.last_match(1)}～#{Regexp.last_match(2)}個の引数を取ります"
         when /^(\d+)\+$/
           ret += "#{Regexp.last_match(1)}個以上の引数を取ります"
+        else
+          ret += "#{expected}個の引数を取ります"
         end
-        if @given == 0
+        if given == 0
           ret += "が、引数が１つも渡されていません。"
         else
-          ret += "が、#{@given}個の引数が渡されています。"
+          ret += "が、#{given}個の引数が渡されています。"
         end
         return ret
       else
@@ -328,7 +344,7 @@ module Eturem
     end
     
     def type_error_inspect
-      "「#{@method}」への引数のタイプ（型）が正しくありません。"
+      "「#{@label}」への引数のタイプ（型）が正しくありません。"
     end
     
     def zero_division_error_inspect
@@ -338,9 +354,9 @@ module Eturem
     def system_stack_error_inspect
       "システムスタックがあふれました。意図しない無限ループが生じている可能性があります。"
     end
-    
-    Eturem.eturem_class = self
   end
+  
+  @eturem_class = Ja
 end
 
 require "eturem"

data/lib/eturem/version.rb

@@ -1,3 +1,3 @@
 module Eturem
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eturem
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - nodai2hITC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler