byebug 1.1.0 → 1.1.1

data/lib/byebug/commands/irb.rb

@@ -83,7 +83,7 @@ module Byebug
         @state.proceed
       when :step
         force = Command.settings[:force_stepping]
-        @state.context.step 1, force
+        @state.context.step_into 1, force
         @state.proceed
       when :next
         force = Command.settings[:force_stepping]
@@ -103,20 +103,18 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'irb'
+      def names
+        %w(irb)
       end
 
-      def help(cmd)
+      def description
         %{
-          irb [-d]\tstarts an Interactive Ruby (IRB) session.
+          irb[ -d]\tstarts an Interactive Ruby (IRB) session.
 
-If -d is added you can get access to byebug's state via the global variable
-$byebug_state.
-
-irb is extended with methods "cont", "n" and "step" which
-run the corresponding byebug commands. In contrast to the real byebug
-commands these commands don't allow command arguments.
+          If -d is added you can get access to byebug's state via the global
+          variable $byebug_state. IRB is extended with methods "cont", "n" and
+          "step" which run the corresponding byebug commands. In contrast to the
+          real byebug commands these commands don't allow arguments.
         }
       end
     end

data/lib/byebug/commands/jump.rb

@@ -35,7 +35,7 @@ module Byebug
       file = @match[2]
       file = @state.context.frame_file(file.to_i) if numeric?(file)
       file = @state.context.frame_file(0) if !file
-      case Byebug.current_context.jump(line, file)
+      case Byebug.context.jump(line, file)
       when 0
         @state.proceed
       when 1
@@ -48,11 +48,11 @@ module Byebug
     end
 
     class << self
-      def help_command
-        %w[jump]
+      def names
+        %w(jump)
       end
 
-      def help(cmd)
+      def description
         %{
           j[ump] line\tjump to line number (absolute)
           j[ump] -line\tjump back to line (relative)

data/lib/byebug/commands/kill.rb

@@ -14,7 +14,7 @@ module Byebug
 
     def execute
       puts @match[1]
-      if @match[1] 
+      if @match[1]
         signame = @match[1]
         unless Signal.list.member?(signame)
           errmsg("signal name #{signame} is not a signal I know about\n")
@@ -26,7 +26,7 @@ module Byebug
       else
         if not confirm("Really kill? (y/n) ")
           return
-        else 
+        else
           signame = 'KILL'
         end
       end
@@ -34,17 +34,17 @@ module Byebug
     end
 
     class << self
-      def help_command
-        %w[kill]
+      def names
+        %w(kill)
       end
 
-      def help(cmd)
+      def description
         %{
-          kill [SIGNAL]
+          kill[ SIGNAL]
 
           Send [signal] to Process.pid
-Equivalent of Process.kill(Process.pid)
-         }
+          Equivalent of Process.kill(Process.pid)
+        }
       end
     end
   end

data/lib/byebug/commands/list.rb

@@ -34,8 +34,8 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'list'
+      def names
+        %w(list)
       end
 
       def help(cmd)

data/lib/byebug/commands/method.rb

@@ -27,11 +27,11 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'method'
+      def names
+        %w(method)
       end
 
-      def help(cmd)
+      def description
         %{
           m[ethod] sig[nature] <obj>\tshow the signature of a method
         }
@@ -68,11 +68,11 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'method'
+      def names
+        %w(method)
       end
 
-      def help(cmd)
+      def description
         %{
           m[ethod] i[nstance] <obj>\tshow methods of object
           m[ethod] iv <obj>\t\tshow instance variables of object

data/lib/byebug/commands/quit.rb

@@ -13,25 +13,25 @@ module Byebug
     end
 
     def execute
-      if @match[1] or confirm("Really quit? (y/n) ") 
+      if @match[1] or confirm("Really quit? (y/n) ")
         @state.interface.finalize
-        exit! # exit -> exit!: No graceful way to stop threads...
+        exit! # exit -> exit!: No graceful way to stop...
       end
     end
 
     class << self
-      def help_command
-        %w[quit exit]
+      def names
+        %w(quit exit)
       end
 
-      def help(cmd)
+      def description
         %{
-          q[uit] [!|unconditionally]\texit from byebug. 
+          q[uit][ !| unconditionally]\texit from byebug.
           exit[!]\talias to quit
 
           Normally we prompt before exiting. However if the parameter
-          "unconditionally" or is given or suffixed with !, we stop
-          without asking further questions.  
+          "unconditionally" is given or command is suffixed with !, we exit
+          without asking further questions.
          }
       end
     end

data/lib/byebug/commands/reload.rb

@@ -29,11 +29,11 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'reload'
+      def names
+        %w(reload)
       end
 
-      def help(cmd)
+      def description
         %{
           r[eload]\tforces source code reloading
         }

data/lib/byebug/commands/save.rb

@@ -38,7 +38,7 @@ module Byebug
 
     def save_settings(file)
       # FIXME put routine in set
-      %w(autoeval basename byebugtesting).each do |setting|
+      %w(autoeval basename testing).each do |setting|
         on_off = show_onoff(Command.settings[setting.to_sym])
         file.puts "set #{setting} #{on_off}"
       end
@@ -72,18 +72,19 @@ module Byebug
     end
 
     class << self
-      def help_command
-        'save'
+      def names
+        %w(save)
       end
 
-      def help(cmd)
+      def description
         %{
-save [FILE]
-Saves current byebug state to FILE as a script file.
-This includes breakpoints, catchpoints, display expressions and some settings.
-If no filename is given, we will fabricate one.
+          save[ FILE]
 
-Use the 'source' command in another debug session to restore them.}
+          Saves current byebug state to FILE as a script file. This includes
+          breakpoints, catchpoints, display expressions and some settings. If
+          no filename is given, we will fabricate one.
+          Use the "source" command in another debug session to restore them.
+        }
       end
     end
   end

data/lib/byebug/commands/set.rb

@@ -2,8 +2,12 @@ module Byebug
 
   # Implements byebug "set" command.
   class SetCommand < Command
-    SubcmdStruct2=Struct.new(:name, :min, :is_bool, :short_help,
-                             :long_help) unless defined?(SubcmdStruct2)
+    SubcmdStruct2 = Struct.new(:name,
+                               :min,
+                               :is_bool,
+                               :short_help,
+                               :long_help) unless defined?(SubcmdStruct2)
+
     Subcommands =
       [
        ['annotate', 2, false, 'Set annotation level',
@@ -18,7 +22,7 @@ module Byebug
        ['autoreload', 4, true, 'Reload source code when changed'],
        ['basename', 1, true, 'Report file basename only showing file names'],
        ['callstyle', 2, false, 'Set how you want call parameters displayed'],
-       ['byebugtesting', 8, false, 'Used when testing byebug'],
+       ['testing', 2, false, 'Used when testing byebug'],
        ['forcestep', 2, true,
         'Make sure "next/step" commands always move to a new line'],
        ['fullpath', 2, true, 'Display full file names in frames'],
@@ -46,8 +50,7 @@ module Byebug
     end
 
     def execute
-      # "Set" alone just prints subcommands
-      return print format_subcmds(Subcommands) unless @match[1]
+      return print SetCommand.help(nil) if SetCommand.names.include?(@match[0])
 
       args = @match[1].split(/[ \t]+/)
       try_subcmd = args.shift
@@ -105,11 +108,9 @@ module Byebug
         Command.settings[:reload_source_on_change] = set_on
       when /^autoirb$/
         Command.settings[:autoirb] = (set_on ? 1 : 0)
-      when /^byebugtesting$/
-        Command.settings[:byebugtesting] = set_on
-        if set_on
-          Command.settings[:basename] = true
-        end
+      when /^testing$/
+        Command.settings[:testing] = set_on
+        Command.settings[:basename] = true if set_on
       when /^forcestep$/
         self.class.settings[:force_stepping] = set_on
       when /^history$/
@@ -153,27 +154,29 @@ module Byebug
     end
 
     class << self
-      def help_command
-        "set"
+      def names
+        %w(set)
       end
 
-      def help(args)
-        # specific subcommand help
-        if args[1]
-          subcmd = find(Subcommands, args[1])
-          return "Invalid \"set\" subcommand \"#{args[1]}\"." unless subcmd
-
-          str = subcmd.short_help + '.'
-          return str += "\n" + subcmd.long_help if subcmd.long_help
-        end
-
-        # general help
-        str = %{
+      def description
+        %{
           Modifies parts of byebug environment. Boolean values take on, off, 1
-          or 0. You can see these environment settings with the "show" command.
+          or 0. You can see these environment settings with the "show" command
         }
-        str += format_subcmds(Subcommands)
+      end
+
+      def help(args)
+        if args && args[1]
+          subcmd = SetCommand.new(nil).find(Subcommands, args[1])
+          if subcmd
+            return "#{subcmd.short_help}.\n#{subcmd.long_help ? subcmd.long_help : ''}"
+          else
+            return "Invalid \"set\" subcommand \"#{args[1]}\".\n"
+          end
+        end
+        description + SetCommand.new(nil).format_subcmds(Subcommands)
       end
     end
+
   end
 end

data/lib/byebug/commands/show.rb

@@ -73,8 +73,8 @@ module Byebug
           s='No readline support'
         end
         return s
-      when /^byebugtesting$/
-        on_off = Command.settings[:byebugtesting]
+      when /^testing$/
+        on_off = Command.settings[:testing]
         return "Currently testing byebug is #{show_onoff(on_off)}."
       when /^forcestep$/
         on_off = self.class.settings[:force_stepping]
@@ -215,27 +215,26 @@ module Byebug
       end
     end
 
-    class << self
-      def help_command
-        "show"
+    def help(args)
+      if args[1]
+        subcmd = find(Subcommands, args[1])
+        return "Invalid \"show\" subcommand \"#{args[1]}\"." unless subcmd
+        str = subcmd.short_help + '.'
+        str += "\n" + subcmd.long_help if subcmd.long_help
+        return str
       end
+      ShowCommad.description + format_subcmds(Subcommands)
+    end
 
-      def help(args)
-        # specific subcommand help
-        if args[1]
-          subcmd = find(Subcommands, args[1])
-          return "Invalid \"show\" subcommand \"#{args[1]}\"." unless subcmd
-
-          str = subcmd.short_help + '.'
-          str += "\n" + subcmd.long_help if subcmd.long_help
-          return str
-        end
+    class << self
+      def names
+        %w(show)
+      end
 
-        # general help
-        s = %{
+      def description
+        %{
           Generic command for showing things about byebug.
         }
-        s += format_subcmds(Subcommands)
       end
     end
   end

data/lib/byebug/commands/skip.rb

@@ -17,19 +17,19 @@ module Byebug
     end
 
     class << self
-      def help_command
-        %w[skip]
+      def names
+        %w(skip)
       end
 
-      def help(cmd)
+      def description
         %{
           sk[ip]\tskip the next thrown exception
 
-          This is useful if you've explicitly caught an exception through
-          the "catch" command, and wish to pass the exception on to the
-          code that you're debugging.
-         }
-     end
+          This is useful if you've explicitly caught an exception through the
+          "catch" command, and wish to pass the exception on to the code that
+           you're debugging.
+        }
+      end
     end
   end
 end

data/lib/byebug/commands/source.rb

@@ -1,36 +1,38 @@
 module Byebug
+
   # Implements byebug "source" command.
   class SourceCommand < Command
     self.allow_in_control = true
-    
+
     def regexp
-      /^\s* so(?:urce)? \s+ (.+) $/x
+      /^\s* so(?:urce)? (?:\s+ (.+))? $/x
     end
-    
+
     def execute
+      return print SourceCommand.help(nil) if
+        SourceCommand.names.include?(@match[0])
+
       file = File.expand_path(@match[1]).strip
-      unless File.exist?(file)
-        errmsg "Command file '#{file}' is not found\n"
-        return
-      end
+      return errmsg "File \"#{file}\" not found\n" unless File.exist?(file)
+
       if @state and @state.interface
         @state.interface.command_queue += File.open(file).readlines
       else
         Byebug.run_script(file, @state)
       end
     end
-    
+
     class << self
-      def help_command
-        'source'
+      def names
+        %w(source)
       end
-      
-      def help(cmd)
+
+      def description
         %{
           source FILE\texecutes a file containing byebug commands
         }
       end
     end
   end
-  
+
 end