byebug 1.4.1 → 1.4.2

data/lib/byebug/commands/jump.rb

@@ -48,13 +48,11 @@ module Byebug
       end
 
       def description
-        %{
-          j[ump] line\tjump to line number (absolute)
+        %{j[ump] line\tjump to line number (absolute)
           j[ump] -line\tjump back to line (relative)
           j[ump] +line\tjump ahead to line (relative)
 
-          Change the next line of code to be executed.
-         }
+          Change the next line of code to be executed.}
       end
     end
   end

data/lib/byebug/commands/kill.rb

@@ -38,12 +38,10 @@ module Byebug
       end
 
       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

@@ -38,13 +38,11 @@ module Byebug
       end
 
       def description
-        %{
-          l[ist]\t\tlist forward
+        %{l[ist]\t\tlist forward
           l[ist] -\tlist backward
           l[ist] =\tlist current line
           l[ist] nn-mm\tlist given lines
-          * NOTE - to turn on autolist, use 'set autolist'
-        }
+          * NOTE - to turn on autolist, use 'set autolist'}
       end
     end
 

data/lib/byebug/commands/method.rb

@@ -32,9 +32,7 @@ module Byebug
       end
 
       def description
-        %{
-          m[ethod] sig[nature] <obj>\tshow the signature of a method
-        }
+        %{m[ethod] sig[nature] <obj>\tshow the signature of a method}
       end
     end
   end if have_methodsig
@@ -48,16 +46,14 @@ module Byebug
     end
 
     def execute
+      obj = debug_eval(@match.post_match)
       if @match[1] == "iv"
-        obj = debug_eval(@match.post_match)
         obj.instance_variables.sort.each do |v|
           print "#{v} = #{obj.instance_variable_get(v).inspect}\n"
         end
       elsif @match[1]
-        obj = debug_eval(@match.post_match)
         print "#{columnize(obj.methods.sort(), Command.settings[:width])}\n"
       else
-        obj = debug_eval(@match.post_match)
         return print "Should be Class/Module: #{@match.post_match}\n" unless
           obj.kind_of? Module
         print "#{columnize(obj.instance_methods(false).sort(),
@@ -71,11 +67,9 @@ module Byebug
       end
 
       def description
-        %{
-          m[ethod] i[nstance] <obj>\tshow methods of object
+        %{m[ethod] i[nstance] <obj>\tshow methods of object
           m[ethod] iv <obj>\t\tshow instance variables of object
-          m[ethod] <class|module>\t\tshow instance methods of class or module
-        }
+          m[ethod] <class|module>\t\tshow instance methods of class or module}
       end
     end
   end

data/lib/byebug/commands/quit.rb

@@ -25,14 +25,12 @@ module Byebug
       end
 
       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" is given or command is suffixed with !, we exit
-          without asking further questions.
-         }
+          without asking further questions.}
       end
     end
   end

data/lib/byebug/commands/reload.rb

@@ -31,9 +31,7 @@ module Byebug
       end
 
       def description
-        %{
-          r[eload]\tforces source code reloading
-        }
+        %{r[eload]\tforces source code reloading}
       end
     end
   end

data/lib/byebug/commands/repl.rb

@@ -102,14 +102,12 @@ module Byebug
       end
 
       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 arguments.
-        }
+          real byebug commands these commands don't allow arguments.}
       end
     end
   end
@@ -149,9 +147,7 @@ module Byebug
       end
 
       def description
-        %{
-          pry[ -d]\tstarts a Pry session.
-        }
+        %{pry[ -d]\tstarts a Pry session.}
       end
     end
   end if has_pry

data/lib/byebug/commands/save.rb

@@ -77,14 +77,12 @@ module Byebug
       end
 
       def description
-        %{
-          save[ FILE]
+        %{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.
-          Use the "source" command in another debug session to restore them.
-        }
+          Use the "source" command in another debug session to restore them.}
       end
     end
   end

data/lib/byebug/commands/set.rb

@@ -62,7 +62,7 @@ module Byebug
         set_on = true
       end
 
-      subcmd = find(Subcommands, try_subcmd)
+      subcmd = Command.find(Subcommands, try_subcmd)
 
       # Subcommand not found...
       return print "Unknown set command \"#{try_subcmd}\"\n" unless subcmd
@@ -114,7 +114,6 @@ module Byebug
         Command.settings[:autoirb] = (set_on ? 1 : 0)
       when /^testing$/
         Command.settings[:testing] = set_on
-        Command.settings[:basename] = set_on
       when /^forcestep$/
         Command.settings[:force_stepping] = set_on
       when /^history$/
@@ -147,8 +146,7 @@ module Byebug
         return unless listsize
         self.class.settings[:listsize] = listsize
       when /^width$/
-        width = get_int(args[0], "Set width", 10, nil, 80)
-        return unless width
+        return unless width = get_int(args[0], "Set width", 10, nil, 80)
         Command.settings[:width] = width
       else
         return print "Unknown setting #{@match[1]}.\n"
@@ -162,10 +160,8 @@ module Byebug
       end
 
       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
-        }
+        %{Modifies parts of byebug environment. Boolean values take on, off, 1
+          or 0. You can see these environment settings with the "show" command.}
       end
     end
 

data/lib/byebug/commands/show.rb

@@ -201,7 +201,7 @@ module Byebug
 
       args = @match[1].split(/[ \t]+/)
       param = args.shift
-      subcmd = find(Subcommands, param)
+      subcmd = Command.find(Subcommands, param)
       if subcmd
         print "%s\n" % show_setting(subcmd.name)
       else
@@ -215,9 +215,7 @@ module Byebug
       end
 
       def description
-        %{
-          Generic command for showing things about byebug.
-        }
+        %{Generic command for showing things about byebug.}
       end
     end
 

data/lib/byebug/commands/skip.rb

@@ -22,13 +22,11 @@ module Byebug
       end
 
       def description
-        %{
-          sk[ip]\tskip the next thrown exception
+        %{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.
-        }
+          you're debugging.}
       end
     end
   end

data/lib/byebug/commands/source.rb

@@ -28,9 +28,7 @@ module Byebug
       end
 
       def description
-        %{
-          source FILE\texecutes a file containing byebug commands
-        }
+        %{source FILE\texecutes a file containing byebug commands}
       end
     end
   end

data/lib/byebug/commands/stepping.rb

@@ -39,11 +39,9 @@ module Byebug
       end
 
       def description
-        %{
-          n[ext][+-]?[ nnn]\tstep over once or nnn times,
+        %{n[ext][+-]?[ nnn]\tstep over once or nnn times,
           \t\t'+' forces to move to another line.
-          \t\t'-' is the opposite of '+' and disables the force_stepping setting.
-        }
+          \t\t'-' is the opposite of '+' and disables the force_stepping setting.}
       end
     end
   end

data/lib/byebug/commands/trace.rb

@@ -40,10 +40,8 @@ module Byebug
       end
 
       def description
-        %{
-          tr[ace] (on|off)\tset trace mode
-          tr[ace] var(iable) VARNAME [stop|nostop]\tset trace variable on VARNAME
-        }
+        %{tr[ace] (on|off)\tset trace mode
+          tr[ace] var(iable) VARNAME [stop|nostop]\tset trace variable on VARNAME}
       end
     end
   end

data/lib/byebug/commands/variables.rb

@@ -46,9 +46,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] cl[ass] \t\t\tshow class variables of self
-        }
+        %{v[ar] cl[ass] \t\t\tshow class variables of self}
       end
     end
   end
@@ -79,9 +77,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] co[nst] <object>\t\tshow constants of object
-        }
+        %{v[ar] co[nst] <object>\t\tshow constants of object}
       end
     end
   end
@@ -101,9 +97,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] g[lobal]\t\t\tshow global variables
-        }
+        %{v[ar] g[lobal]\t\t\tshow global variables}
       end
     end
   end
@@ -124,9 +118,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] i[nstance] <object>\tshow instance variables of object
-        }
+        %{v[ar] i[nstance] <object>\tshow instance variables of object}
       end
     end
   end
@@ -151,9 +143,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] l[ocal]\t\t\tshow local variables
-        }
+        %{v[ar] l[ocal]\t\t\tshow local variables}
       end
     end
   end
@@ -191,9 +181,7 @@ module Byebug
       end
 
       def description
-        %{
-          v[ar] ct\t\t\tshow class heirarchy of object
-        }
+        %{v[ar] ct\t\t\tshow class heirarchy of object}
       end
     end
   end if have_classtree

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/old_doc/byebug.texi

@@ -923,7 +923,6 @@ Options:
         --keep-frame-binding   Keep frame bindings
     -m, --post-mortem          Activate post-mortem mode
         --no-quit              Do not quit when script finishes
-        --no-rewrite-program   Do not set $0 to the program being debugged
         --no-stop              Do not stop when script is loaded
     -nx                        Don't run any initialization files like .byebugrc
     -r, --require SCRIPT       Require the library, before executing your script
@@ -1023,12 +1022,6 @@ conjunction with @option{--no-stop}. See also @ref{Post-Mortem Debugging}.
 @cindex @option{--no-quit}
 Restart byebug when your program terminates normally.
 
-@item --no-rewrite-program
-@cindex @option{--no-rewrite-program}
-Normally @code{byebug} will reset the program name @code{$0} from its name to
-the debugged program, and set the its name in variable @code{$BYEBUG_SCRIPT}. In
-the unlikely even you don't want this use this option.
-
 @item --no-stop
 @cindex @option{--no-stop}
 Normally the @code{byebug} stops before executing the first statement. If
@@ -1100,8 +1093,7 @@ Here are the default values in @code{options}
 #<OpenStruct server=false, client=false, frame_bind=false, cport=8990,
              tracing=false, nx=false, post_mortem=false, port=8989,
              verbose_long=false, annotate=nil, control=true, restart_script=nil,
-             quit=true, no_rewrite_program=false, stop=true, script=nil,
-             host=nil, wait=false>
+             quit=true, stop=true, script=nil, host=nil, wait=false>
 @end smallexample
 
 @node Command Files

data/test/breakpoints_test.rb

@@ -76,9 +76,8 @@ class TestBreakpoints < TestDsl::TestCase
     end
 
     describe 'show a message' do
-      describe 'with full filename' do
-        temporary_change_hash Byebug::Command.settings, :basename, false
 
+      describe 'with full filename' do
         it 'must show a message with full filename' do
           enter 'break 14', 'cont'
           debug_file('breakpoint1') { @id = Byebug.breakpoints.first.id }

data/test/examples/info.rb

@@ -2,11 +2,11 @@ byebug
 def bla(a, b)
   a + b
 end
-2
-3
-4
-5
-6
+z = 5
+z = 6
+z = 7
+z = 8
+z = 9
 bla("a" * 30, "b")
 
 class A

data/test/examples/list.rb

@@ -1,23 +1,23 @@
 byebug
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
+a = 2
+a = 3
+a = 4
+a = 5
+a = 6
+a = 7
+a = 8
+a = 9
+a = 10
+a = 11
+a = 12
+a = 13
+a = 14
+a = 15
+a = 16
+a = 17
+a = 18
+a = 19
+a = 20
+a = 21
+a = 22
 a = '%23'