debugger 1.4.0 → 1.5.0

data/lib/ruby-debug/commands/info.rb

@@ -254,7 +254,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         return 
       end
       obj = debug_eval('self')
-      var_list(obj.instance_variables)
+      var_list(obj.instance_variables.map(&:to_s))
     end
     
     def info_line(*args)
@@ -319,14 +319,10 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         errmsg "info stack not available here.\n"
         return
       end
-      (0...@state.context.stack_size).each do |idx|
-        if idx == @state.frame_pos
-          print "--> "
-        else
-          print "    "
-        end
-        print_frame(idx)
-      end
+      print(prc("frame.line", (0...@state.context.stack_size)) do |item, _|
+        mark = item == @state.frame_pos ? "--> " : "    "
+        get_pr_arguments(mark, item, @state.context)
+      end)
     end
 
     def info_thread_preamble(arg)
@@ -355,8 +351,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         display_context(c, !verbose)
         if verbose and not c.ignored?
           (0...c.stack_size).each do |idx|
-            print "\t"
-            print_frame(idx, false, c)
+            print_frame("\t", idx, false, c)
           end
         end
       end
@@ -374,8 +369,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
       display_context(c, !verbose)
       if verbose and not c.ignored?
         (0...c.stack_size).each do |idx|
-          print "\t"
-          print_frame(idx, false, c) 
+          print_frame("\t", idx, false, c)
         end
       end
     end
@@ -385,7 +379,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         errmsg "info global_variables not available here.\n"
         return 
       end
-      var_list(global_variables)
+      var_global
     end
     
     def info_variables(*args)

data/lib/ruby-debug/commands/irb.rb

@@ -90,7 +90,7 @@ module Debugger
       else
         file = @state.context.frame_file(0)
         line = @state.context.frame_line(0)
-        CommandProcessor.print_location_and_text(file, line)
+        CommandProcessor.print_location_and_text(file, line, @state.context)
         @state.previous_line = nil
       end
 

data/lib/ruby-debug/commands/jump.rb

@@ -19,17 +19,17 @@ module Debugger
 
     def execute
       if !@match[1]
-        errmsg "\"jump\" must be followed by a line number\n"
+        errmsg pr("jump.errors.no_line_number")
         return
       end
       if !numeric?(@match[1])
-        errmsg "Bad line number: " + @match[1]
+        errmsg pr("jump.errors.bad_line_number", line: @match[1])
         return
       end
       line = @match[1].to_i
       line = @state.context.frame_line(0) + line if @match[1][0] == '+' or @match[1][0] == '-'
       if line == @state.context.frame_line(0)
-        CommandProcessor.print_location_and_text(@state.context.frame_file(0), line)
+        CommandProcessor.print_location_and_text(@state.context.frame_file(0), line, @state.context)
         return
       end
       file = @match[2]
@@ -39,11 +39,11 @@ module Debugger
       when 0
         @state.proceed
       when 1
-        errmsg "Not possible to jump from here\n"
+        errmsg pr("jump.errors.not_possible")
       when 2
-        errmsg "Couldn't find debugged frame\n"
+        errmsg pr("jump.errors.no_frame")
       when 3
-        errmsg "Couldn't find active code at " + file + ":" + line.to_s + "\n"
+        errmsg pr("jump.errors.no_active_code", file: file, line: line)
       end
     end
 

data/lib/ruby-debug/commands/kill.rb

@@ -13,7 +13,6 @@ module Debugger
     end
 
     def execute
-      puts @match[1]
       if @match[1] 
         signame = @match[1]
         unless Signal.list.member?(signame)

data/lib/ruby-debug/commands/list.rb

@@ -69,7 +69,7 @@ module Debugger
     # If we can show from B to E then we return B, otherwise we return the
     # previous line @state.previous_line.
     def display_list(b, e, file, current)
-      print "[%d, %d] in %s\n", b, e, file
+      print("[%d, %d] in %s\n" % [b, e, file])
       lines = LineCache::getlines(file, 
                                   Command.settings[:reload_source_on_change])
       if lines
@@ -78,14 +78,14 @@ module Debugger
         [b, 1].max.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == current
-              print "=> %d  %s\n", n, lines[n-1].chomp
+              print("=> %d  %s\n" % [n, lines[n-1].chomp])
             else
-              print "   %d  %s\n", n, lines[n-1].chomp
+              print("   %d  %s\n" % [n, lines[n-1].chomp])
             end
           end
         end
       else
-        errmsg "No sourcefile available for %s\n", file
+        errmsg("No sourcefile available for %s\n" % [file])
         return @state.previous_line
       end
       return e == lines.size ? @state.previous_line : b

data/lib/ruby-debug/commands/method.rb

@@ -46,24 +46,21 @@ module Debugger
     end
 
     def execute
-      if @match[1] == "iv"
+      result = if @match[1] == "iv"
         obj = debug_eval(@match.post_match)
-        obj.instance_variables.sort.each do |v|
-          print "%s = %s\n", v, obj.instance_variable_get(v).inspect
-        end
+        variables = obj.instance_variables.sort.map { |var_name| [var_name, obj.instance_variable_get(var_name)] }
+        prv(variables, 'instance')
       elsif @match[1]
-        obj = debug_eval(@match.post_match)
-        print "%s\n", columnize(obj.methods.sort(), 
-                                self.class.settings[:width])
+        prc("method.methods", debug_eval(@match.post_match).methods.sort) { |item, _| {name: item} }
       else
         obj = debug_eval(@match.post_match)
-        unless obj.kind_of? Module
-          print "Should be Class/Module: %s\n", @match.post_match
+        if obj.kind_of?(Module)
+          prc("method.methods", obj.instance_methods(false).sort) { |item, _| {name: item} }
         else
-          print "%s\n", columnize(obj.instance_methods(false).sort(), 
-                                  self.class.settings[:width])
+          errmsg(pr("variable.errors.not_class_module", object: @match.post_match)) && return
         end
       end
+      print result
     end
 
     class << self

data/lib/ruby-debug/commands/quit.rb

@@ -13,7 +13,7 @@ module Debugger
     end
 
     def execute
-      if @match[1] or confirm("Really quit? (y/n) ") 
+      if @match[1] or confirm(pr("quit.confirmations.really"))
         @state.interface.finalize
         exit! # exit -> exit!: No graceful way to stop threads...
       end

data/lib/ruby-debug/commands/reload.rb

@@ -16,7 +16,7 @@ module Debugger
     
     def execute
       Debugger.source_reload
-      print "Source code is reloaded. Automatic reloading is #{source_reloading}.\n"
+      print pr("reload.messages.done", source_reloading: source_reloading)
     end
     
     private

data/lib/ruby-debug/commands/save.rb

@@ -64,7 +64,7 @@ module Debugger
       save_catchpoints(file)
       # save_displays(file)
       save_settings(file)
-      print "Saved to '#{file.path}'\n"
+      print pr("save.messages.done", path: file.path)
       if @state and @state.interface
         @state.interface.restart_file = file.path
       end

data/lib/ruby-debug/commands/set.rb

@@ -58,11 +58,8 @@ set history size -- Set the size of the command history"],
 
     def execute
       if not @match[1]
-        print "\"set\" must be followed by the name of an set command:\n"
-        print "List of set subcommands:\n\n"
-        for subcmd in Subcommands do
-          print "set #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
+        subcommands = subcmd.map { |s| "set #{s.name} -- #{s.short_help}" }.join("\n")
+        print pr("set.errors.no_subcommand", subcommands: subcommands)
       else
         args = @match[1].split(/[ \t]+/)
         subcmd = args.shift
@@ -115,8 +112,7 @@ set history size -- Set the size of the command history"],
                     return
                   end
                 end
-                print "Invalid call style #{arg}. Should be one of: " +
-                  "'short' or 'last'.\n"
+                print pr("set.errors.invalid_call_style", style: arg)
               when /^trace$/
                 Command.settings[:stack_trace_on_error] = set_on
               when /^fullpath$/
@@ -139,15 +135,14 @@ set history size -- Set the size of the command history"],
                   when /^save$/
                     interface.history_save = get_onoff(args[1])
                   when /^size$/
-                    interface.history_length = get_int(args[1],
-                                                       "Set history size")
+                    interface.history_length = get_int(args[1], "Set history size")
                   when /^filename$/
-                    interface.histfile = File.join(ENV["HOME"]||ENV["HOMEPATH"]||".", args[1])
+                    interface.histfile = File.join(ENV["HOME"] || ENV["HOMEPATH"] || ".", args[1])
                   else
-                    print "Invalid history parameter #{args[0]}. Should be 'filename', 'save' or 'size'.\n" 
+                    print pr("set.errors.wrong_history_arg", arg: args[0])
                   end
                 else
-                  print "Need two parameters for 'set history'; got #{args.size}.\n" 
+                  print pr("set.errors.wrong_history_args_number", size: args.size)
                   return
                 end
               when /^linetrace\+$/
@@ -170,17 +165,17 @@ set history size -- Set the size of the command history"],
                   return
                 end
               else
-                print "Unknown setting #{@match[1]}.\n"
+                print pr("set.errors.unknown_setting", setting: @match[1])
                 return
               end
-              print "%s\n" % show_setting(try_subcmd.name)
+              print show_setting(try_subcmd.name)
               return
             rescue RuntimeError
               return
             end
           end
         end
-        print "Unknown set command #{subcmd}\n"
+        print pr("set.errors.unknown_subcommand", subcmd: subcmd)
       end
     end
 

data/lib/ruby-debug/commands/show.rb

@@ -5,7 +5,7 @@ module Debugger
       case setting_name
       when /^annotate$/
         Debugger.annotate ||= 0
-        return ("Annotation level is #{Debugger.annotate}")
+        return pr("show.messages.annotation", level: Debugger.annotate)
       when /^args$/
         if Command.settings[:argv] and Command.settings[:argv].size > 0
           if defined?(Debugger::RDEBUG_SCRIPT)
@@ -18,25 +18,25 @@ module Debugger
         else
           args = ''
         end
-        return "Argument list to give program being debugged when it is started is \"#{args}\"."
+        return pr("show.messages.args", args: args)
       when /^autolist$/
         on_off = Command.settings[:autolist] > 0
-        return "autolist is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "autolist", status: show_onoff(on_off))
       when /^autoeval$/
         on_off = Command.settings[:autoeval]
-        return "autoeval is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "autoeval", status: show_onoff(on_off))
       when /^autoreload$/
         on_off = Command.settings[:reload_source_on_change]
-        return "autoreload is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "autoreload", status: show_onoff(on_off))
       when /^autoirb$/
         on_off = Command.settings[:autoirb] > 0
-        return "autoirb is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "autoirb", status: show_onoff(on_off))
       when /^basename$/
         on_off = Command.settings[:basename]
-        return "basename is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "basename", status: show_onoff(on_off))
       when /^callstyle$/
         style = Command.settings[:callstyle]
-        return "Frame call-display style is #{style}."
+        return pr("show.messages.call_style", style: style)
       when /^commands(:?\s+(\d+))?$/
         if @state.interface.readline_support?
           s = '';
@@ -68,18 +68,18 @@ module Debugger
             i += 1
           end
         else
-          s='No readline support'
+          s = pr("show.errors.no_readline")
         end
         return s
       when /^debuggertesting$/
         on_off = Command.settings[:debuggertesting]
-        return "Currently testing the debugger is #{show_onoff(on_off)}."
+        return pr("show.messages.debuggertesting", status: show_onoff(on_off))
       when /^forcestep$/
         on_off = self.class.settings[:force_stepping]
-        return "force-stepping is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "force-stepping", status: show_onoff(on_off))
       when /^fullpath$/
         on_off = Command.settings[:full_path]
-        return "Displaying frame's full file names is #{show_onoff(on_off)}."
+        return pr("show.messages.fullpath", status: show_onoff(on_off))
       when /^history(:?\s+(filename|save|size))?$/
         args = @match[1].split
         interface = @state.interface
@@ -99,46 +99,35 @@ module Debugger
         end
         s = []
         if show_filename
-          msg = (prefix ? "filename: " : "") + 
-            "The filename in which to record the command history is " +
-                      "#{interface.histfile.inspect}"
-          s << msg
+          s << pr("show.messages.history.filename", prefix: ("filename: " if prefix), filename: interface.histfile)
         end
         if show_save
-          msg = (prefix ? "save: " : "") + 
-            "Saving of history save is #{show_onoff(interface.history_save)}."
-          s << msg
+          s << pr("show.messages.history.save", prefix: ("save: " if prefix), status: show_onoff(interface.history_save))
         end
         if show_size
-          msg = (prefix ? "size: " : "") + 
-            "Debugger history size is #{interface.history_length}"
-          s << msg
+          s << pr("show.messages.history.size", prefix: ("size: " if prefix), size: interface.history_length)
         end
-        return s.join("\n")
+        return s.join("")
       when /^linetrace$/
         on_off = Debugger.tracing
-        return "line tracing is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "line tracing", status: show_onoff(on_off))
       when /^linetrace\+$/
         on_off = Command.settings[:tracing_plus]
-        if on_off
-          return "line tracing style is different consecutive lines."
-        else
-          return "line tracing style is every line."
-        end
+        return pr("show.messages.tracing_plus.#{on_off ? "on" : "off"}")
       when /^listsize$/
         listlines = Command.settings[:listsize]
-        return "Number of source lines to list by default is #{listlines}."
+        return pr("show.messages.listsize", size: listlines)
       when /^port$/
-        return "server port is #{Debugger::PORT}."
+        return pr("show.messages.port", port: Debugger::PORT)
       when /^trace$/
         on_off = Command.settings[:stack_trace_on_error]
-        return "Displaying stack trace is #{show_onoff(on_off)}."
+        return pr("show.messages.general", setting: "Displaying stack trace", status: show_onoff(on_off))
       when /^version$/
-        return "ruby-debug #{Debugger::VERSION}"
+        return pr("show.messages.version", version: Debugger::VERSION)
       when /^width$/
-        return "width is #{self.class.settings[:width]}."
+        return pr("show.messages.general", setting: "width", status: self.class.settings[:width])
       else
-        return "Unknown show subcommand #{setting_name}."
+        return pr("show.errors.unknown_subcommand", name: setting_name)
       end
     end
   end
@@ -193,19 +182,16 @@ show history size -- Show the size of the command history"],
 
     def execute
       if not @match[1]
-        print "\"show\" must be followed by the name of an show command:\n"
-        print "List of show subcommands:\n\n"
-        for subcmd in Subcommands do
-          print "show #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
+        subcommands = subcmd.map { |s| "show #{s.name} -- #{s.short_help}" }.join("\n")
+        print pr("show.errors.no_subcommand", subcommands: subcommands)
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift
         subcmd = find(Subcommands, param)
         if subcmd
-          print "%s\n" % show_setting(subcmd.name)
+          print show_setting(subcmd.name)
         else
-          print "Unknown show command #{param}\n"
+          print pr("show.errors.unknown", name: param)
         end
       end
     end

data/lib/ruby-debug/commands/skip.rb

@@ -13,7 +13,7 @@ module Debugger
 
     def execute
       Debugger::skip_next_exception
-      print "ok\n"
+      print pr("skip.messages.ok")
     end
 
     class << self

data/lib/ruby-debug/commands/source.rb

@@ -10,7 +10,7 @@ module Debugger
     def execute
       file = File.expand_path(@match[1]).strip
       unless File.exist?(file)
-        errmsg "Command file '#{file}' is not found\n"
+        errmsg pr("source.errors.not_found", file: file)
         return
       end
       if @state and @state.interface

data/lib/ruby-debug/commands/start.rb

@@ -0,0 +1,26 @@
+module Debugger
+  class StartCommand < Command # :nodoc:
+    self.allow_in_control = true
+
+    def regexp
+      /^\s*(start)\s*$/ix
+    end
+
+    def execute
+      #print_debug "Starting: running program script"
+      Debugger.proceed
+    end
+
+    class << self
+      def help_command
+        'start'
+      end
+
+      def help(cmd)
+        %{
+          run prog script
+        }
+      end
+    end
+  end
+end