byebug 3.2.0 → 3.3.0

data/lib/byebug/commands/frame.rb

@@ -9,17 +9,13 @@ module Byebug
     end
 
     def switch_to_frame(frame_no)
-      if frame_no < 0
-        abs_frame_no = Context.stack_size + frame_no
-      else
-        abs_frame_no = frame_no
-      end
+      frame_no >= 0 ? frame_no : Context.stack_size + frame_no
     end
 
     def navigate_to_frame(jump_no)
       return if jump_no == 0
       total_jumps, current_jumps, new_pos = jump_no.abs, 0, @state.frame_pos
-      step = jump_no/total_jumps
+      step = jump_no / total_jumps
       loop do
         new_pos += step
         return new_pos if new_pos < 0 || new_pos >= Context.stack_size
@@ -29,21 +25,22 @@ module Byebug
         current_jumps += 1
         break if current_jumps == total_jumps
       end
-      return new_pos
+      new_pos
     end
 
     def adjust_frame(frame_pos, absolute)
       if absolute
         abs_frame_pos = switch_to_frame(frame_pos)
-        return errmsg "Can't navigate to c-frame\n" if c_frame?(abs_frame_pos)
+        return errmsg("Can't navigate to c-frame") if c_frame?(abs_frame_pos)
       else
         abs_frame_pos = navigate_to_frame(frame_pos)
       end
 
-      return errmsg "Can't navigate beyond the oldest frame\n" if
-        abs_frame_pos >= Context.stack_size
-      return errmsg "Can't navigate beyond the newest frame\n" if
-        abs_frame_pos < 0
+      if abs_frame_pos >= Context.stack_size
+        return errmsg("Can't navigate beyond the oldest frame")
+      elsif abs_frame_pos < 0
+        return errmsg("Can't navigate beyond the newest frame")
+      end
 
       @state.frame_pos = abs_frame_pos
       @state.file = @state.context.frame_file @state.frame_pos
@@ -54,14 +51,14 @@ module Byebug
 
     def get_frame_class(style, pos)
       frame_class = style == 'short' ? '' : "#{@state.context.frame_class pos}"
-      return frame_class == '' ? '' : "#{frame_class}."
+      frame_class == '' ? '' : "#{frame_class}."
     end
 
     def get_frame_block_and_method(pos)
       frame_deco_regexp = /((?:block(?: \(\d+ levels\))?|rescue) in )?(.+)/
       frame_deco_method = "#{@state.context.frame_method pos}"
       frame_block_and_method = frame_deco_regexp.match(frame_deco_method)[1..2]
-      return frame_block_and_method.map{ |x| x.nil? ? '' : x }
+      frame_block_and_method.map { |x| x.nil? ? '' : x }
     end
 
     def get_frame_args(style, pos)
@@ -71,18 +68,19 @@ module Byebug
       locals = @state.context.frame_locals pos if style == 'long'
       my_args = args.map do |arg|
         case arg[0]
-          when :block
-            prefix, default = '&', 'block'
-          when :rest
-            prefix, default = '*', 'args'
-          else
-            prefix, default = '', nil
+        when :block
+          prefix, default = '&', 'block'
+        when :rest
+          prefix, default = '*', 'args'
+        else
+          prefix, default = '', nil
         end
+
         klass = style == 'long' && arg[1] ? "##{locals[arg[1]].class}" : ''
         "#{prefix}#{arg[1] || default}#{klass}"
       end
 
-      return "(#{my_args.join(', ')})"
+      "(#{my_args.join(', ')})"
     end
 
     def get_frame_call(prefix, pos)
@@ -94,10 +92,10 @@ module Byebug
 
       max_call_str_size = Setting[:width] - prefix.size
       if call_str.size > max_call_str_size
-        call_str = call_str[0..max_call_str_size - 5] + "...)"
+        call_str = call_str[0..max_call_str_size - 5] + '...)'
       end
 
-      return call_str
+      call_str
     end
 
     def print_backtrace
@@ -119,36 +117,43 @@ module Byebug
       end
     end
 
+    require 'pathname'
+
     def shortpath(fullpath)
-      separator = File::ALT_SEPARATOR || File::SEPARATOR
-      "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
+      components = Pathname(fullpath).each_filename.to_a
+      return File.join(components) if components.size <= 2
+
+      File.join('...', components[-3..-1])
     end
 
     def print_frame(pos, mark_current = true)
-      fullpath = @state.context.frame_file pos
+      fullpath = @state.context.frame_file(pos)
       file = Setting[:fullpath] ? fullpath : shortpath(fullpath)
-      line = @state.context.frame_line pos
+      line = @state.context.frame_line(pos)
 
       if mark_current
         frame_str = (pos == @state.frame_pos) ? '--> ' : '    '
       else
-        frame_str = ""
+        frame_str = ''
       end
       frame_str += c_frame?(pos) ? ' ͱ-- ' : ''
 
-      frame_str += sprintf "#%-2d ", pos
+      frame_str += format('#%-2d ', pos)
       frame_str += get_frame_call frame_str, pos
       file_line = "at #{CommandProcessor.canonic_file(file)}:#{line}"
       if frame_str.size + file_line.size + 1 > Setting[:width]
-        frame_str += "\n      #{file_line}\n"
+        frame_str += "\n      #{file_line}"
       else
-        frame_str += " #{file_line}\n"
+        frame_str += " #{file_line}"
       end
 
-      print frame_str
+      puts frame_str
     end
   end
 
+  #
+  # Show current backtrace.
+  #
   class WhereCommand < Command
     def regexp
       /^\s* (?:w(?:here)?|bt|backtrace) \s*$/x
@@ -164,26 +169,30 @@ module Byebug
       end
 
       def description
-        %{w[here]|bt|backtrace\tdisplay stack frames
+        %(w[here]|bt|backtrace        Display stack frames.
 
           Print the entire stack frame. Each frame is numbered; the most recent
           frame is 0. A frame number can be referred to in the "frame" command;
           "up" and "down" add or subtract respectively to frame numbers shown.
           The position of the current frame is marked with -->. C-frames hang
           from their most immediate Ruby frame to indicate that they are not
-          navigable}
+          navigable.)
       end
     end
   end
 
+  #
+  # Move the current frame up in the backtrace.
+  #
   class UpCommand < Command
     def regexp
       /^\s* u(?:p)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute
-      pos = get_int(@match[1], 'Up')
-      return unless pos
+      pos, err = parse_steps(@match[1], 'Up')
+      return errmsg(err) unless pos
+
       adjust_frame(pos, false)
     end
 
@@ -193,19 +202,23 @@ module Byebug
       end
 
       def description
-        %{up[ count]\tmove to higher frame}
+        %(up[ count]        Move to higher frame.)
       end
     end
   end
 
+  #
+  # Move the current frame down in the backtrace.
+  #
   class DownCommand < Command
     def regexp
       /^\s* down (?:\s+(\S+))? \s*$/x
     end
 
     def execute
-      pos = get_int(@match[1], 'Down')
-      return unless pos
+      pos, err = parse_steps(@match[1], 'Down')
+      return errmsg(err) unless pos
+
       adjust_frame(-pos, false)
     end
 
@@ -215,11 +228,14 @@ module Byebug
       end
 
       def description
-        %{down[ count]\tmove to lower frame}
+        %(down[ count]        Move to lower frame.)
       end
     end
   end
 
+  #
+  # Move to specific frames in the backtrace.
+  #
   class FrameCommand < Command
     def regexp
       /^\s* f(?:rame)? (?:\s+(\S+))? \s*$/x
@@ -227,7 +243,10 @@ module Byebug
 
     def execute
       return print_frame @state.frame_pos unless @match[1]
-      return unless pos = get_int(@match[1], 'Frame')
+
+      pos, err = get_int(@match[1], 'Frame')
+      return errmsg(err) unless pos
+
       adjust_frame(pos, true)
     end
 
@@ -237,17 +256,18 @@ module Byebug
       end
 
       def description
-        %{f[rame][ frame-number]
+        %(f[rame][ frame-number]
 
           Move the current frame to the specified frame number, or the 0 if no
           frame-number has been given.
 
-          A negative number indicates position from the other end, so "frame -1"
-          moves to the oldest frame, and "frame 0" moves to the newest frame.
+          A negative number indicates position from the other end, so
+          "frame -1" moves to the oldest frame, and "frame 0" moves to the
+          newest frame.
 
           Without an argument, the command prints the current stack frame. Since
           the current position is redisplayed, it may trigger a resyncronization
-          if there is a front end also watching over things.}
+          if there is a front end also watching over things.)
       end
     end
   end

data/lib/byebug/commands/help.rb

@@ -1,4 +1,7 @@
 module Byebug
+  #
+  # Ask for help from byebug's prompt.
+  #
   class HelpCommand < Command
     include Columnize
 
@@ -12,24 +15,18 @@ module Byebug
       if @match[1]
         args = @match[1].split
         cmds = @state.commands.select { |cmd| cmd.names.include?(args[0]) }
-        unless cmds.empty?
-          help = cmds.map{ |cmd| cmd.help(args) }.join("\n")
-          help = help.split("\n").map{|l| l.gsub(/^ +/, '')}
-          help.shift if help.first && help.first.empty?
-          help.pop if help.last && help.last.empty?
-          return print help.join("\n") + "\n"
-        else
-          return errmsg "Undefined command: \"#{args[0]}\". Try \"help\".\n" if
-            args[0]
+        if cmds.empty?
+          return errmsg("Undefined command: \"#{args[0]}\". Try \"help\"")
         end
-      end
 
-      print "byebug help v#{VERSION}\n" unless Setting[:testing]
+        return puts(cmds.map { |cmd| cmd.help(args[1..-1]) }.join("\n"))
+      end
 
-      print "Type \"help <command-name>\" for help on a specific command\n\n"
-      print "Available commands:\n"
-      cmds = @state.commands.map{ |cmd| cmd.names }.flatten.uniq.sort
-      print columnize(cmds, Setting[:width])
+      puts "byebug help v#{VERSION}" unless Setting[:testing]
+      puts "Type \"help <command-name>\" for help on a specific command\n"
+      puts 'Available commands:'
+      cmds = @state.commands.map { |cmd| cmd.names }.flatten.uniq.sort
+      puts columnize(cmds, Setting[:width])
     end
 
     class << self
@@ -38,9 +35,11 @@ module Byebug
       end
 
       def description
-        %{h[elp]\t\tprint this help
-          h[elp] command\tprint help on command
-          h[elp] command subcommand\tprint help on subcommand}
+        %(h[elp][ <command>[ <subcommand>]]
+
+          "help" alone prints this help.
+          "help <command>" prints help on <command>.
+          "help <command> <subcommand> prints help on <subcommand>.)
       end
     end
   end

data/lib/byebug/commands/history.rb

@@ -1,18 +1,24 @@
 module Byebug
+  #
+  # Show history of byebug commands.
+  #
   class HistoryCommand < Command
     def regexp
       /^\s* hist(?:ory)? (?:\s+(?<num_cmds>.+))? \s*$/x
     end
 
     def execute
-      if Setting[:autosave]
-        if arg = @match[:num_cmds]
-          size = get_int(arg, 'history', 1, Setting[:histsize])
-        end
-        print History.to_s(size || Setting[:histsize])
-      else
-        errmsg "Not currently saving history. Enable it with \"set autosave\"\n"
+      unless Setting[:autosave]
+        return errmsg('Not currently saving history. ' \
+                      "Enable it with \"set autosave\"")
       end
+
+      if @match[:num_cmds]
+        size, err = get_int(@match[:num_cmds], 'history', 1, Setting[:histsize])
+        return errmsg(err) unless size
+      end
+
+      puts History.to_s(size || Setting[:histsize])
     end
 
     class << self
@@ -21,7 +27,7 @@ module Byebug
       end
 
       def description
-        %{hist[ory] [num_cmds]\t\tShow byebug's command history}
+        %(hist[ory] [num_cmds]        Show byebug's command history.)
       end
     end
   end

data/lib/byebug/commands/info.rb

@@ -1,81 +1,17 @@
 module Byebug
+  #
+  # Utility methods to assist the info command
+  #
   module InfoFunctions
-    def info_catch(*args)
-      return print "No frame selected.\n" unless @state.context
+    def info_catch(*_args)
+      return puts('No frame selected.') unless @state.context
 
-      if Byebug.catchpoints and not Byebug.catchpoints.empty?
-        Byebug.catchpoints.each do |exception, hits|
-          print "#{exception}: #{exception.is_a?(Class)}\n"
+      if Byebug.catchpoints && !Byebug.catchpoints.empty?
+        Byebug.catchpoints.each do |exception, _hits|
+          puts("#{exception}: #{exception.is_a?(Class)}")
         end
       else
-        print "No exceptions set to be caught.\n"
-      end
-    end
-  end
-
-  class InfoCommand < Command
-    include Columnize
-    self.allow_in_control = true
-
-    Subcommands = [
-       ['args'              , 1, 'Argument variables of current stack frame'  ],
-       ['breakpoints'       , 1, 'Status of user-settable breakpoints',
-                                 'Without argument, list info about all '   \
-                                 'breakpoints. With an integer argument, '  \
-                                 'list info on that breakpoint.'              ],
-       ['catch'             , 3, 'Exceptions that can be caught in the '    \
-                                 'current stack frame'                        ],
-       ['display'           , 2, 'Expressions to display when program stops'  ],
-       ['file'              , 4, 'Info about a particular file read in',
-                                 'After the file name is supplied, you can' \
-                                 'list file attributes that you wish to '   \
-                                 'see. Attributes include: "all", "basic",' \
-                                 ' "breakpoint", "lines", "mtime", "path" ' \
-                                 'and "sha1".'                                ],
-       ['files'             , 5, 'File names and timestamps of files read in' ],
-       ['global_variables'  , 2, 'Global variables'                           ],
-       ['instance_variables', 2, 'Instance variables in current stack frame'  ],
-       ['line'              , 2, 'Line number and file name of current '    \
-                                 'position in source file'                    ],
-       ['locals'            , 2, 'Local variables of the current stack frame' ],
-       ['program'           , 2, 'Execution status of the program'            ],
-       ['variables'         , 1, 'Local and instance variables of the '     \
-                                 'current stack frame'                        ]
-    ].map do |name, min, help|
-      Subcmd.new(name, min, help)
-    end unless defined?(Subcommands)
-
-    InfoFileSubcommands = [
-      ['all'        , 1, 'All file information available - breakpoints, '   \
-                         'lines, mtime, path and sha1'                        ],
-      ['basic'      , 2, 'basic information - path, number of lines'          ],
-      ['breakpoints', 2, 'Show trace line numbers',
-                         'These are the line number where a breakpoint '    \
-                         'can be set.'                                        ],
-      ['lines'      , 1, 'Show number of lines in the file'                   ],
-      ['mtime'      , 1, 'Show modification time of file'                     ],
-      ['path'       , 4, 'Show full file path name for file'                  ],
-      ['sha1'       , 1, 'Show SHA1 hash of contents of the file'             ]
-    ].map do |name, min, help|
-      Subcmd.new(name, min, help)
-    end unless defined?(InfoFileSubcommands)
-
-    def regexp
-      /^\s* i(?:nfo)? (?:\s+(.+))? \s*$/x
-    end
-
-    def execute
-      return print InfoCommand.help(nil) unless @match[1]
-
-      args = @match[1].split(/[ \t]+/)
-      param = args.shift
-      subcmd = Command.find(Subcommands, param)
-      return errmsg "Unknown info command #{param}\n" unless subcmd
-
-      if @state.context
-        send("info_#{subcmd.name}", *args)
-      else
-        errmsg "info_#{subcmd.name} not available without a context.\n"
+        puts 'No exceptions set to be caught.'
       end
     end
 
@@ -86,104 +22,81 @@ module Byebug
 
       args.map do |_, name|
         s = "#{name} = #{locals[name].inspect}"
-        s[Setting[:width]-3..-1] = "..." if s.size > Setting[:width]
-        print "#{s}\n"
+        s[Setting[:width] - 3..-1] = '...' if s.size > Setting[:width]
+        puts s
       end
     end
 
     def info_breakpoint(brkpt)
       expr = brkpt.expr.nil? ? '' : " if #{brkpt.expr}"
-      print "%-3d %-3s at %s:%s%s\n" %
-        [brkpt.id, brkpt.enabled? ? 'y' : 'n', brkpt.source, brkpt.pos, expr]
+      y_n = brkpt.enabled? ? 'y' : 'n'
+      interp = format('%-3d %-3s at %s:%s%s',
+                      brkpt.id, y_n, brkpt.source, brkpt.pos, expr)
+      puts interp
       hits = brkpt.hit_count
-      if hits > 0
-        s = (hits > 1) ? 's' : ''
-        print "\tbreakpoint already hit #{hits} time#{s}\n"
-      end
+      return unless hits > 0
+
+      s = (hits > 1) ? 's' : ''
+      puts "\tbreakpoint already hit #{hits} time#{s}"
     end
-    private :info_breakpoint
 
     def info_breakpoints(*args)
-      return print "No breakpoints.\n" if Byebug.breakpoints.empty?
+      return puts('No breakpoints.') if Byebug.breakpoints.empty?
 
-      brkpts = Byebug.breakpoints.sort_by{|b| b.id}
+      brkpts = Byebug.breakpoints.sort_by { |b| b.id }
       unless args.empty?
-        indices = args.map{|a| a.to_i}
-        brkpts = brkpts.select{|b| indices.member?(b.id)}
-        return errmsg "No breakpoints found among list given.\n" if
-          brkpts.empty?
+        indices = args.map { |a| a.to_i }
+        brkpts = brkpts.select { |b| indices.member?(b.id) }
+        return errmsg('No breakpoints found among list given') if brkpts.empty?
       end
-      print "Num Enb What\n"
+
+      puts 'Num Enb What'
       brkpts.each { |b| info_breakpoint(b) }
     end
 
-    def info_display(*args)
-      return print "There are no auto-display expressions now.\n" unless
-        @state.display.find{|d| d[0]}
+    def info_display(*_args)
+      return puts('There are no auto-display expressions now.') unless
+        @state.display.find { |d| d[0] }
 
-      print "Auto-display expressions now in effect:\n" \
-            "Num Enb Expression\n"
+      puts 'Auto-display expressions now in effect:'
+      puts 'Num Enb Expression'
       n = 1
-      for d in @state.display
-        print "%3d: %s  %s\n" % [n, (d[0] ? 'y' : 'n'), d[1]]
+      @state.display.each do |d|
+        puts(format('%3d: %s  %s', n, d[0] ? 'y' : 'n', d[1]))
         n += 1
       end
     end
 
     def info_file_path(file)
-      print "File #{file}"
+      s = "File #{file}"
       path = File.expand_path(file)
-      print " - #{path}\n" if path and path != file
+      s = "#{s} - #{path}" if path && path != file
+      puts s
     end
-    private :info_file_path
 
     def info_file_lines(file)
       lines = File.foreach(file)
-      print "\t#{lines.count} lines\n" if lines
+      puts "\t#{lines.count} lines" if lines
     end
-    private :info_file_lines
 
     def info_file_breakpoints(file)
       breakpoints = LineCache.trace_line_numbers(file)
-      if breakpoints
-        print "\tbreakpoint line numbers:\n"
-        print columnize(breakpoints.to_a.sort, Setting[:width])
-      end
+      return unless breakpoints
+
+      puts "\tbreakpoint line numbers:"
+      puts columnize(breakpoints.to_a.sort, Setting[:width])
     end
-    private :info_file_breakpoints
 
     def info_file_mtime(file)
       stat = File.stat(file)
-      print "\t#{stat.mtime}\n" if stat
+      puts "\t#{stat.mtime}" if stat
     end
-    private :info_file_mtime
 
     def info_file_sha1(file)
-      print "\t#{Digest::SHA1.hexdigest(file)}\n"
-    end
-    private :info_file_sha1
-
-    def info_file(*args)
-      return info_files unless args[0]
-
-      subcmd = Command.find(InfoFileSubcommands, args[1] || 'basic')
-      return errmsg "Invalid parameter #{args[1]}\n" unless subcmd
-
-      if %w(all basic).member?(subcmd.name)
-        info_file_path(args[0])
-        info_file_lines(args[0])
-        if subcmd.name == 'all'
-          info_file_breakpoints(args[0])
-          info_file_mtime(args[0])
-          info_file_sha1(args[0])
-        end
-      else
-        print "File #{args[0]}\n" if subcmd.name != 'path'
-        send("info_file_#{subcmd.name}", args[0])
-      end
+      puts "\t#{Digest::SHA1.hexdigest(file)}"
     end
 
-    def info_files(*args)
+    def info_files(*_args)
       files = SCRIPT_LINES__.keys
       files.uniq.sort.each do |file|
         info_file_path(file)
@@ -191,18 +104,8 @@ module Byebug
       end
     end
 
-    def info_instance_variables(*args)
-      obj = bb_eval('self')
-      var_list(obj.instance_variables)
-    end
-
-    def info_line(*args)
-      print "Line #{@state.line} of \"#{@state.file}\"\n"
-    end
-
-    def info_locals(*args)
-      locals = @state.context.frame_locals
-      print_hash(locals)
+    def info_line(*_args)
+      puts "Line #{@state.line} of \"#{@state.file}\""
     end
 
     def print_hash(vars)
@@ -211,55 +114,130 @@ module Byebug
           s = "#{name} = #{vars[name].inspect}"
         rescue
           begin
-          s = "#{name} = #{vars[name].to_s}"
-          rescue
-            s = "#{name} = *Error in evaluation*"
+            s = "#{name} = #{vars[name]}"
+            rescue
+              s = "#{name} = *Error in evaluation*"
           end
         end
-        s[Setting[:width]-3..-1] = "..." if s.size > Setting[:width]
-        print "#{s}\n"
+        s[Setting[:width] - 3..-1] = '...' if s.size > Setting[:width]
+        puts s
       end
     end
-    private :print_hash
 
     def info_stop_reason(stop_reason)
       case stop_reason
-        when :step
-          print "It stopped after stepping, next'ing or initial start.\n"
-        when :breakpoint
-          print("It stopped at a breakpoint.\n")
-        when :catchpoint
-          print("It stopped at a catchpoint.\n")
-        else
-          print "unknown reason: %s\n" % @state.context.stop_reason.to_s
+      when :step
+        puts "It stopped after stepping, next'ing or initial start."
+      when :breakpoint
+        puts 'It stopped at a breakpoint.'
+      when :catchpoint
+        puts 'It stopped at a catchpoint.'
+      else
+        puts "Unknown reason: #{@state.context.stop_reason}"
       end
     end
-    private :info_stop_reason
 
-    def info_program(*args)
+    def info_program(*_args)
       if @state.context.dead?
-        print "The program crashed.\n"
-        print "Exception: #{Byebug.last_exception.inspect}\n" if Byebug.last_exception
-        return
+        puts 'The program crashed.'
+        excpt = Byebug.last_exception
+        return puts("Exception: #{excpt.inspect}") if excpt
       end
 
-      print "Program stopped. "
+      puts 'Program stopped. '
       info_stop_reason @state.context.stop_reason
     end
 
-    def info_global_variables(*args)
-      var_global
-    end
-
-    def info_variables(*args)
+    def info_variables(*_args)
       locals = @state.context.frame_locals
       locals[:self] = @state.context.frame_self(@state.frame_pos)
       print_hash(locals)
 
       obj = bb_eval('self')
-      var_list(obj.instance_variables, obj.instance_eval{binding()})
+      var_list(obj.instance_variables, obj.instance_eval { binding })
       var_class_self
     end
+  end
+
+  #
+  # Show info about different aspects of the debugger.
+  #
+  class InfoCommand < Command
+    include Columnize
+    self.allow_in_control = true
+
+    Subcommands = [
+      ['args', 1, 'Argument variables of current stack frame'],
+      ['breakpoints', 1, 'Status of user-settable breakpoints',
+       'Without argument, list info about all breakpoints. With an integer ' \
+       'argument, list info on that breakpoint.'],
+      ['catch', 3, 'Exceptions that can be caught in the current stack frame'],
+      ['display', 2, 'Expressions to display when program stops'],
+      ['file', 4, 'Info about a particular file read in',
+       'After the file name is supplied, you can list file attributes that ' \
+       'you wish to see. Attributes include: "all", "basic", "breakpoint", ' \
+       '"lines", "mtime", "path" and "sha1".'],
+      ['files', 5, 'File names and timestamps of files read in'],
+      ['line', 2, 'Line number and file name of current position in source ' \
+                  'file.'],
+      ['program', 2, 'Execution status of the program']
+    ].map do |name, min, help|
+      Subcmd.new(name, min, help)
+    end unless defined?(Subcommands)
+
+    InfoFileSubcommands = [
+      ['all', 1, 'All file information available - breakpoints, lines, '     \
+                 'mtime, path and sha1'],
+      ['basic', 2, 'basic information - path, number of lines'],
+      ['breakpoints', 2, 'Show trace line numbers',
+       'These are the line number where a breakpoint can be set.'],
+      ['lines', 1, 'Show number of lines in the file'],
+      ['mtime', 1, 'Show modification time of file'],
+      ['path', 4, 'Show full file path name for file'],
+      ['sha1', 1, 'Show SHA1 hash of contents of the file']
+    ].map do |name, min, help|
+      Subcmd.new(name, min, help)
+    end unless defined?(InfoFileSubcommands)
+
+    def info_file(*args)
+      return info_files unless args[0]
+
+      mode = args[1] || 'basic'
+      subcmd = Command.find(InfoFileSubcommands, mode)
+      return errmsg "Invalid parameter #{args[1]}\n" unless subcmd
+
+      if %w(all basic).member?(subcmd.name)
+        info_file_path(args[0])
+        info_file_lines(args[0])
+        if subcmd.name == 'all'
+          info_file_breakpoints(args[0])
+          info_file_mtime(args[0])
+          info_file_sha1(args[0])
+        end
+      else
+        puts("File #{args[0]}") if subcmd.name != 'path'
+        send("info_file_#{subcmd.name}", args[0])
+      end
+    end
+
+    def regexp
+      /^\s* i(?:nfo)? (?:\s+(.+))? \s*$/x
+    end
+
+    def execute
+      return puts(InfoCommand.help) unless @match[1]
+
+      args = @match[1].split(/[ \t]+/)
+      param = args.shift
+      subcmd = Command.find(Subcommands, param)
+      return errmsg "Unknown info command #{param}\n" unless subcmd
+
+      if @state.context
+        send("info_#{subcmd.name}", *args)
+      else
+        errmsg "info_#{subcmd.name} not available without a context.\n"
+      end
+    end
 
     class << self
       def names
@@ -267,25 +245,25 @@ module Byebug
       end
 
       def description
-        %{info[ subcommand]
+        <<-EOD.gsub(/^ {8}/, '')
 
-          Generic command for showing things about the program being debugged.}
+          info[ subcommand]
+
+          Generic command for showing things about the program being debugged.
+
+        EOD
       end
 
-      def help(args)
-        return description + format_subcmds unless args and args[1]
+      def help(subcmds = [])
+        return description + format_subcmds if subcmds.empty?
 
-        return format_subcmd(args[1]) unless 'file' == args[1] and args[2]
+        subcmd = subcmds.first
+        return format_subcmd(subcmd) unless 'file' == subcmd && subcmds[2]
 
-        str = subcmd.short_help + '.'
-        subsubcmd = Command.find(InfoFileSubcommands, args[2])
-        if subsubcmd
-          str += "\nInvalid \"file\" attribute \"#{args[2]}\"."
-        else
-          str += "\n" + subsubcmd.short_help + '.'
-        end
+        subsubcmd = Command.find(InfoFileSubcommands, subcmds[2])
+        return "\nInvalid \"file\" attribute \"#{args[2]}\"." unless subsubcmd
 
-        return str
+        subsubcmd.short_help
       end
     end
   end