byebug 9.1.0 → 10.0.0

data/lib/byebug/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   #
   # Custom exception exception to signal "command not found" errors
@@ -17,11 +19,11 @@ module Byebug
     end
 
     def help
-      build_cmd('help', @parent)
+      build_cmd("help", @parent)
     end
 
     def build_cmd(*args)
-      args.compact.join(' ')
+      args.compact.join(" ")
     end
   end
 end

data/lib/byebug/frame.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'byebug/helpers/file'
+require "byebug/helpers/file"
 
 module Byebug
   #
@@ -70,11 +70,11 @@ module Byebug
     # +callstyle+ setting is 'short'
     #
     def deco_class
-      Setting[:callstyle] == 'short' || _class.to_s.empty? ? '' : "#{_class}."
+      Setting[:callstyle] == "short" || _class.to_s.empty? ? "" : "#{_class}."
     end
 
     def deco_block
-      _method[/(?:block(?: \(\d+ levels\))?|rescue) in /] || ''
+      _method[/(?:block(?: \(\d+ levels\))?|rescue) in /] || ""
     end
 
     def deco_method
@@ -87,12 +87,12 @@ module Byebug
     # setting
     #
     def deco_args
-      return '' if args.empty?
+      return "" if args.empty?
 
       my_args = args.map do |arg|
         prefix, default = prefix_and_default(arg[0])
 
-        kls = use_short_style?(arg) ? '' : "##{locals[arg[1]].class}"
+        kls = use_short_style?(arg) ? "" : "##{locals[arg[1]].class}"
 
         "#{prefix}#{arg[1] || default}#{kls}"
       end
@@ -118,7 +118,7 @@ module Byebug
     # Properly formatted frame number of frame
     #
     def deco_pos
-      format('%-2d', pos)
+      format("%-2d", pos)
     end
 
     #
@@ -129,10 +129,10 @@ module Byebug
     #     marks regular frames
     #
     def mark
-      return '-->' if current?
-      return '    ͱ--' if c_frame?
+      return "-->" if current?
+      return "    ͱ--" if c_frame?
 
-      '   '
+      "   "
     end
 
     #
@@ -156,13 +156,13 @@ module Byebug
     private
 
     def c_args
-      return [] unless _self.to_s != 'main'
+      return [] unless _self.to_s != "main"
 
       _class.instance_method(_method).parameters
     end
 
     def ruby_args
-      meth_name = _binding.eval('__method__')
+      meth_name = _binding.eval("__method__")
       return [] unless meth_name
 
       meth_obj = _class.instance_method(meth_name)
@@ -172,14 +172,14 @@ module Byebug
     end
 
     def use_short_style?(arg)
-      Setting[:callstyle] == 'short' || arg[1].nil? || locals.empty?
+      Setting[:callstyle] == "short" || arg[1].nil? || locals.empty?
     end
 
     def prefix_and_default(arg_type)
-      return ['&', 'block'] if arg_type == :block
-      return ['*', 'args'] if arg_type == :rest
+      return ["&", "block"] if arg_type == :block
+      return ["*", "args"] if arg_type == :rest
 
-      ['', nil]
+      ["", nil]
     end
   end
 end

data/lib/byebug/helpers/bin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -6,21 +8,40 @@ module Byebug
     module BinHelper
       #
       # Cross-platform way of finding an executable in the $PATH.
-      # Borrowed from: http://stackoverflow.com/questions/2108727
+      # Adapted from: https://gist.github.com/steakknife/88b6c3837a5e90a08296
       #
       def which(cmd)
         return File.expand_path(cmd) if File.exist?(cmd)
 
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            return exe if File.executable?(exe) && !File.directory?(exe)
-          end
+        [nil, *search_paths].each do |path|
+          exe = find_executable(path, cmd)
+          return exe if exe
+        end
+
+        nil
+      end
+
+      def find_executable(path, cmd)
+        executable_file_extensions.each do |ext|
+          exe = File.expand_path(cmd + ext, path)
+
+          return exe if real_executable?(exe)
         end
 
         nil
       end
+
+      def search_paths
+        ENV["PATH"].split(File::PATH_SEPARATOR)
+      end
+
+      def executable_file_extensions
+        ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      end
+
+      def real_executable?(f)
+        File.executable?(f) && !File.directory?(f)
+      end
     end
   end
 end

data/lib/byebug/helpers/eval.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -56,7 +58,7 @@ module Byebug
       private
 
       def safe_eval(str, binding)
-        binding.eval(str.gsub(/\Aeval /, ''), '(byebug)', 1)
+        binding.eval(str.gsub(/\Aeval /, ""), "(byebug)", 1)
       rescue StandardError, ScriptError => e
         yield(e)
       end
@@ -64,7 +66,7 @@ module Byebug
       def msg(e)
         msg = Setting[:stack_on_error] ? error_msg(e) : warning_msg(e)
 
-        pr('eval.exception', text_message: msg)
+        pr("eval.exception", text_message: msg)
       end
 
       def error_msg(e)
@@ -98,7 +100,7 @@ module Byebug
 
       #
       # Runs the given block in a new thread, waits for it to finish and
-      # returns the new thred's result.
+      # returns the new thread's result.
       #
       def in_new_thread
         res = nil
@@ -110,14 +112,14 @@ module Byebug
 
       def safe_inspect(var)
         var.inspect
-      rescue
+      rescue StandardError
         safe_to_s(var)
       end
 
       def safe_to_s(var)
         var.to_s
-      rescue
-        '*Error in evaluation*'
+      rescue StandardError
+        "*Error in evaluation*"
       end
     end
   end

data/lib/byebug/helpers/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -47,14 +49,14 @@ module Byebug
         components = Pathname(fullpath).each_filename.to_a
         return fullpath if components.size <= 2
 
-        File.join('...', components[-3..-1])
+        File.join("...", components[-3..-1])
       end
 
       #
       # True for special files like -e, false otherwise
       #
       def virtual_file?(name)
-        ['(irb)', '-e', '(byebug)', '(eval)'].include?(name)
+        ["(irb)", "-e", "(byebug)", "(eval)"].include?(name)
       end
     end
   end

data/lib/byebug/helpers/frame.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -6,7 +8,7 @@ module Byebug
     module FrameHelper
       def switch_to_frame(frame)
         new_frame = index_from_start(frame)
-        return frame_err('c_frame') if Frame.new(context, new_frame).c_frame?
+        return frame_err("c_frame") if Frame.new(context, new_frame).c_frame?
 
         adjust_frame(new_frame)
       end
@@ -18,8 +20,8 @@ module Byebug
       private
 
       def adjust_frame(new_frame)
-        return frame_err('too_low') if new_frame >= context.stack_size
-        return frame_err('too_high') if new_frame < 0
+        return frame_err("too_low") if new_frame >= context.stack_size
+        return frame_err("too_high") if new_frame < 0
 
         context.frame = new_frame
         processor.prev_line = nil

data/lib/byebug/helpers/parse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -14,15 +16,15 @@ module Byebug
       #
       def get_int(str, cmd, min = nil, max = nil)
         if str !~ /\A-?[0-9]+\z/
-          return nil, pr('parse.errors.int.not_number', cmd: cmd, str: str)
+          return nil, pr("parse.errors.int.not_number", cmd: cmd, str: str)
         end
 
         int = str.to_i
         if min && int < min
-          err = pr('parse.errors.int.too_low', cmd: cmd, str: str, min: min)
+          err = pr("parse.errors.int.too_low", cmd: cmd, str: str, min: min)
           return nil, err
         elsif max && int > max
-          err = pr('parse.errors.int.too_high', cmd: cmd, str: str, max: max)
+          err = pr("parse.errors.int.too_high", cmd: cmd, str: str, max: max)
           return nil, err
         end
 

data/lib/byebug/helpers/path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -5,19 +7,19 @@ module Byebug
     #
     module PathHelper
       def bin_file
-        @bin_file ||= File.join(root_path, 'bin', 'byebug')
+        @bin_file ||= File.join(root_path, "exe", "byebug")
       end
 
       def root_path
-        @root_path ||= File.expand_path(File.join('..', '..', '..'), __dir__)
+        @root_path ||= File.expand_path(File.join("..", "..", ".."), __dir__)
       end
 
       def lib_files
-        @lib_files ||= glob_for('lib')
+        @lib_files ||= glob_for("lib")
       end
 
       def test_files
-        @test_files ||= glob_for('test')
+        @test_files ||= glob_for("test")
       end
 
       def gem_files
@@ -31,7 +33,7 @@ module Byebug
       private
 
       def glob_for(dir)
-        Dir.glob(File.join(root_path, dir, '**', '*.rb'))
+        Dir.glob(File.join(root_path, dir, "**", "*.rb"))
       end
     end
   end

data/lib/byebug/helpers/reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #

data/lib/byebug/helpers/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -9,7 +11,7 @@ module Byebug
       # ACamelizedString.
       #
       def camelize(str)
-        str.dup.split(/[_-]/).map(&:capitalize).join('')
+        str.dup.split(/[_-]/).map(&:capitalize).join("")
       end
 
       #
@@ -27,7 +29,7 @@ module Byebug
       # use squiggly heredoc's.
       #
       def deindent(str, leading_spaces: 6)
-        str.gsub(/^ {#{leading_spaces}}/, '')
+        str.gsub(/^ {#{leading_spaces}}/, "")
       end
     end
   end

data/lib/byebug/helpers/thread.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Byebug
   module Helpers
     #
@@ -5,7 +7,7 @@ module Byebug
     #
     module ThreadHelper
       def display_context(ctx)
-        puts pr('thread.context', thread_arguments(ctx))
+        puts pr("thread.context", thread_arguments(ctx))
       end
 
       def thread_arguments(ctx)
@@ -29,11 +31,11 @@ module Byebug
         ctx = Byebug.contexts.find { |c| c.thnum.to_s == thnum }
 
         err = if ctx.nil?
-                pr('thread.errors.no_thread')
+                pr("thread.errors.no_thread")
               elsif ctx == context
-                pr('thread.errors.current_thread')
+                pr("thread.errors.current_thread")
               elsif ctx.ignored?
-                pr('thread.errors.ignored', arg: thnum)
+                pr("thread.errors.ignored", arg: thnum)
               end
 
         [ctx, err]
@@ -46,19 +48,19 @@ module Byebug
         return context.location if ctx == Byebug.current_context
 
         backtrace = ctx.thread.backtrace_locations
-        return '' unless backtrace && backtrace[0]
+        return "" unless backtrace && backtrace[0]
 
         "#{backtrace[0].path}:#{backtrace[0].lineno}"
       end
 
       def status_flag(ctx)
-        return '$' if ctx.suspended?
+        return "$" if ctx.suspended?
 
-        current_thread?(ctx) ? '+' : ' '
+        current_thread?(ctx) ? "+" : " "
       end
 
       def debug_flag(ctx)
-        ctx.ignored? ? '!' : ' '
+        ctx.ignored? ? "!" : " "
       end
     end
   end

data/lib/byebug/helpers/toggle.rb

@@ -1,4 +1,6 @@
-require 'byebug/helpers/parse'
+# frozen_string_literal: true
+
+require "byebug/helpers/parse"
 
 module Byebug
   module Helpers
@@ -9,22 +11,22 @@ module Byebug
       include ParseHelper
 
       def enable_disable_breakpoints(is_enable, args)
-        raise pr('toggle.errors.no_breakpoints') if Breakpoint.none?
+        raise pr("toggle.errors.no_breakpoints") if Breakpoint.none?
 
         select_breakpoints(is_enable, args).each do |b|
-          enabled = (is_enable == 'enable')
+          enabled = (is_enable == "enable")
           if enabled && !syntax_valid?(b.expr)
-            raise pr('toggle.errors.expression', expr: b.expr)
+            raise pr("toggle.errors.expression", expr: b.expr)
           end
 
-          puts pr('toggle.messages.toggled', bpnum: b.id,
-                                             endis: enabled ? 'en' : 'dis')
+          puts pr("toggle.messages.toggled", bpnum: b.id,
+                                             endis: enabled ? "en" : "dis")
           b.enabled = enabled
         end
       end
 
       def enable_disable_display(is_enable, args)
-        raise pr('toggle.errors.no_display') if n_displays.zero?
+        raise pr("toggle.errors.no_display") if n_displays.zero?
 
         selected_displays = args ? args.split(/ +/) : [1..n_displays + 1]
 
@@ -32,7 +34,7 @@ module Byebug
           pos, err = get_int(pos, "#{is_enable} display", 1, n_displays)
           raise err unless err.nil?
 
-          Byebug.displays[pos - 1][0] = (is_enable == 'enable')
+          Byebug.displays[pos - 1][0] = (is_enable == "enable")
         end
       end