byebug 1.2.0 → 1.3.0

data/bin/byebug

@@ -25,7 +25,8 @@
 #      Show invocation help and exit.
 #
 #<tt>-I | --include</tt> <i>path</i>
-#    Add <i>path</i> to <tt>$LOAD_PATH</tt>
+#    Add <i>path</i> to <tt>$LOAD_PATH</tt>. Like the <tt>ruby -I</tt> command,
+#    it supports multiple load paths separated by colons.
 #
 #<tt>--keep-frame-binding</tt>::
 #    Keep frame bindings.
@@ -124,12 +125,14 @@ Usage: #{program} [options] <script.rb> -- <script.rb parameters>
 EOB
     opts.separator ""
     opts.separator "Options:"
+
     opts.on("-A", "--annotate LEVEL", Integer, "Set annotation level") {
       |annotate| Byebug.annotate = annotate }
     opts.on("-d", "--debug", "Set $DEBUG=true") {
       $DEBUG = true }
-    opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') {
-      |path| $LOAD_PATH.unshift(path) }
+    opts.on('-I', '--include PATH', String,
+            'Add PATH (single or multiple:path:list) to $LOAD_PATH.') {
+      |path| $LOAD_PATH.unshift(*path.split(':')) }
     opts.on('--no-quit', 'Do not quit when script finishes') {
       options.quit = false }
     opts.on('--no-rewrite-program', 'Don\'t set $0 to the program debugged') {
@@ -144,7 +147,8 @@ EOB
       else
         require name
       end }
-    opts.on('--restart-script FILE', String, 'Name of the script file to run. Erased after read') do
+    opts.on('--restart-script FILE', String,
+            'Name of the script file to run. Erased after read') do
       |restart_script|
       options.restart_script = restart_script
       unless File.exists?(options.restart_script)
@@ -162,6 +166,7 @@ EOB
     end
     opts.on('-x', '--trace', 'Turn on line tracing') {
       options.tracing = true }
+
     opts.separator ''
     opts.separator 'Common options:'
     opts.on_tail('--help', 'Show this message') do
@@ -197,6 +202,7 @@ rescue
 end
 
 opts = process_options(options)
+
 begin
   Byebug::ARGV = ARGV.clone if not defined? Byebug::ARGV
   Byebug::BYEBUG_SCRIPT = File.expand_path(__FILE__)

data/byebug.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.0.4'
   s.add_development_dependency 'rake-compiler', '~> 0.8.3'
   s.add_development_dependency 'mocha', '~> 0.14.0'
-  s.add_development_dependency 'minitest', '~> 5.0.1'
+  s.add_development_dependency 'minitest', '~> 5.0.2'
 
   s.license = "BSD"
 end

data/ext/byebug/breakpoint.c

@@ -282,8 +282,8 @@ check_breakpoint_by_hit_condition(VALUE breakpoint_object)
 
   if (breakpoint_object == Qnil)
     return 0;
-  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
 
+  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
   breakpoint->hit_count++;
 
   if (Qtrue != breakpoint->enabled)
@@ -320,19 +320,17 @@ check_breakpoint_by_pos(VALUE breakpoint_object, char *file, int line)
 {
     breakpoint_t *breakpoint;
 
-    if(breakpoint_object == Qnil)
-        return 0;
+    if (breakpoint_object == Qnil)
+      return 0;
+
     Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
 
-    if (Qtrue != breakpoint->enabled)
-        return 0;
-    if(breakpoint->type != BP_POS_TYPE)
-        return 0;
-    if(breakpoint->pos.line != line)
-        return 0;
-    if(filename_cmp(breakpoint->source, file))
-        return 1;
-    return 0;
+    if ( (Qtrue != breakpoint->enabled)    ||
+         (breakpoint->type != BP_POS_TYPE) ||
+         (breakpoint->pos.line != line) )
+      return 0;
+
+    return filename_cmp(breakpoint->source, file);
 }
 
 static int
@@ -343,18 +341,18 @@ check_breakpoint_by_method(VALUE breakpoint_object, VALUE klass, ID mid,
 
   if (breakpoint_object == Qnil)
     return 0;
+
   Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
 
-  if (!Qtrue == breakpoint->enabled)
+  if ( (Qfalse == breakpoint->enabled)      ||
+       (breakpoint->type != BP_METHOD_TYPE) ||
+       (breakpoint->pos.mid != mid) )
     return 0;
-  if (breakpoint->type != BP_METHOD_TYPE)
-    return 0;
-  if (breakpoint->pos.mid != mid)
-    return 0;
-  if (classname_cmp(breakpoint->source, klass))
-    return 1;
-  if ((rb_type(self) == T_CLASS) && classname_cmp(breakpoint->source, self))
+
+  if ( (classname_cmp(breakpoint->source, klass)) ||
+       ((rb_type(self) == T_CLASS) && classname_cmp(breakpoint->source, self)) )
     return 1;
+
   return 0;
 }
 
@@ -366,14 +364,18 @@ check_breakpoint_by_expr(VALUE breakpoint_object, VALUE binding)
 
   if (breakpoint_object == Qnil)
     return 0;
+
   Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
 
   if (Qtrue != breakpoint->enabled)
     return 0;
+
   if (NIL_P(breakpoint->expr))
     return 1;
+
   args = rb_ary_new3(2, breakpoint->expr, binding);
   expr_result = rb_protect(eval_expression, args, 0);
+
   return RTEST(expr_result);
 }
 

data/lib/byebug/command.rb

@@ -40,8 +40,10 @@ module Byebug
           "--\n"                                   \
           "List of \"#{cmd_name}\" subcommands:\n" \
           "--\n"
+      width = subcmds.map(&:name).max_by(&:size).size
       for subcmd in subcmds do
-        s += "#{cmd_name} #{subcmd.name} -- #{subcmd.short_help}\n"
+        s += sprintf \
+          "%s %-#{width}s -- %s\n", cmd_name, subcmd.name, subcmd.short_help
       end
       return s
     end
@@ -155,8 +157,8 @@ module Byebug
     register_setting_var(:listsize, 10)
     register_setting_var(:stack_trace_on_error, false)
     register_setting_var(:tracing_plus, false)
-    register_setting_var(:width,
-                         ENV['COLUMNS'].to_i > 10 ? ENV['COLUMNS'].to_i : 80)
+    cols = `stty size`.scan(/\d+/)[1].to_i
+    register_setting_var(:width, cols > 10 ? cols : 80)
     Byebug::ARGV = ARGV.clone unless defined? Byebug::ARGV
     register_setting_var(:argv, Byebug::ARGV)
 

data/lib/byebug/commands/frame.rb

@@ -167,7 +167,8 @@ module Byebug
     def execute
       print_backtrace
       if truncated_callstack?(@state.context, Byebug.start_sentinal)
-         print "Warning: saved frames may be incomplete; compare with caller(0)"
+         print \
+           "Warning: saved frames may be incomplete; compare with caller(0)\n"
       end
     end
 

data/lib/byebug/commands/kill.rb

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

data/lib/byebug/commands/set.rb

@@ -11,16 +11,16 @@ module Byebug
     Subcommands =
       [
        ['annotate', 2, false, 'Set annotation level',
-        '0 == normal. '                                                    \
+        '0 == normal; '                                                    \
         '2 == output annotated suitably for use by programs that control ' \
-        'byebug.'],
+        'byebug'],
        ['args', 2, false,
         'Set argument list to give program being debugged when it is started'],
        ['autoeval', 4, true, 'Evaluate every unrecognized command'],
        ['autolist', 4, true, 'Execute "list" command on every breakpoint'],
        ['autoirb', 4, true, 'Invoke IRB on every stop'],
        ['autoreload', 4, true, 'Reload source code when changed'],
-       ['basename', 1, true, 'Set filename display style.'],
+       ['basename', 1, true, 'Set filename display style'],
        ['callstyle', 2, false, 'Set how you want call parameters displayed'],
        ['testing', 2, false, 'Used when testing byebug'],
        ['forcestep', 2, true,
@@ -29,8 +29,8 @@ module Byebug
        ['history', 2, false,
         'Generic command for setting command history parameters',
         'set history filename -- Set the filename in which to record the ' \
-        'command history. '                                                \
-        'set history save -- Set saving of the history record on exit. '   \
+        'command history'                                                  \
+        'set history save -- Set saving of the history record on exit'     \
         'set history size -- Set the size of the command history'],
        ['linetrace+', 10, true,
         'Set line execution tracing to show different lines'],
@@ -150,7 +150,6 @@ module Byebug
         width = get_int(args[0], "Set width", 10, nil, 80)
         return unless width
         Command.settings[:width] = width
-        ENV['COLUMNS'] = width.to_s
       else
         return print "Unknown setting #{@match[1]}.\n"
       end

data/lib/byebug/commands/show.rb

@@ -148,14 +148,14 @@ module Byebug
     Subcommands =
       [
        ['annotate', 2, 'Show annotation level',
-        '0 == normal;' \
+        '0 == normal; '                                                    \
         '2 == output annotated suitably for use by programs that control ' \
-        'byebug.'],
+        'byebug'],
         ['args', 2,
-         'Show argument list to give to the program being debugged when it ' \
-         'is started',
-         'Follow this command with any number of args to be passed to the '  \
-         'program.'],
+         'Show argument list to give to the program being debugged when it is' \
+         ' started',
+         'Follow this command with any number of args to be passed to the '    \
+         'program'],
         ['autoeval', 4, 'Show whether unrecognized commands are evaluated'],
         ['autolist', 4, 'Show whether "list" command is run on stopping'],
         ['autoirb', 4, 'Show whether IRB is invoked on stopping'],
@@ -163,21 +163,21 @@ module Byebug
         ['basename',  1, 'Show whether basename is used when reporting files'],
         ['callstyle', 2, 'Show paramater style used when showing call frames'],
         ['commands',  2, 'Show the history of commands you typed',
-         'You can supply a command number to start with.'],
+         'You can supply a command number to start with'],
         ['forcestep', 1, 'Show whether "next/step" force to move onto a new ' \
          'line'],
         ['fullpath',  2, 'Show whether full paths are displayed in frames'],
         ['history', 2, 'Generic command to show command history parameters',
          'show history filename -- Show the filename in which to record the ' \
-         'command history.'                                                   \
+         'command history'                                                    \
          'show history save -- Show whether history record should be saved '  \
-         'on exit.'                                                           \
-         'show history size -- Show the size of the command history.'],
+         'on exit'                                                            \
+         'show history size -- Show the size of the command history'],
         ['keep-frame-bindings', 1, 'Save frame binding on each call'],
         ['linetrace', 3, 'Show line execution tracing'],
         ['linetrace+', 10,
          'Show whether different consecutive lines are shown in tracing'],
-        ['listsize', 3, 'Show number of source lines to list by default.'],
+        ['listsize', 3, 'Show number of source lines to list by default'],
         ['port', 3, 'Show server port'],
         ['post-mortem', 3,
          'Show whether we go into post-mortem debugging on an uncaught ' \

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/old_doc/byebug.texi

@@ -2670,8 +2670,8 @@ ability to change that state inside byebug.
 @table @code
 @kindex set width @var{column-width}
 @item set width @var{column-width}
-Set number of characters per line of byebug output. We also change OS
-environment variable @code{COLUMNS}.
+Set number of characters per line of byebug output. By default it is the number
+of columns in the current terminal.
 @kindex show width
 @item show width
 Shows the current width setting.

data/old_doc/{test-tri2.rb → test-triangle.rb}

@@ -1,12 +1,11 @@
-#!/usr/bin/env ruby
-require "test/unit"
-require "tri2.rb"
-require "rubygems"
-require "byebug"
+require 'test/unit'
+require_relative 'triangle.rb'
+require 'byebug'
 Byebug.start
 
 class TestTri < Test::Unit::TestCase
   def test_basic
+    require 'byebug'
     byebug
     solutions = []
     0.upto(5) do |i|

data/old_doc/tri3.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/env ruby
-def triangle(n) 
-  (0..n).inject do |sum, i| 
-    sum +=i 
+def triangle(n)
+  (0..n).inject do |sum, i|
+    sum +=i
   end
 end
 puts triangle(3)
-

data/old_doc/triangle.rb

@@ -7,5 +7,7 @@ def triangle(n)
   tri
 end
 
-t = triangle(3)
-puts t
+if __FILE__ == $0
+  t = triangle(3)
+  puts t
+end

data/test/breakpoints_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Breakpoints' do
-  include TestDsl
+class TestBreakpoints < TestDsl::TestCase
 
   describe 'setting breakpoint in the current file' do
     before { enter 'break 10' }

data/test/conditions_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Conditions' do
-  include TestDsl
+class TestConditions < TestDsl::TestCase
 
   describe 'setting condition' do
     before { enter 'break 3' }
@@ -24,7 +23,7 @@ describe 'Conditions' do
       end
     end
 
-    describe 'unsucessfully' do
+    describe 'unsuccessfully' do
       before { enter 'break 4' }
 
       it 'must not stop at the breakpoint if condition is false' do
@@ -53,7 +52,7 @@ describe 'Conditions' do
       debug_file('conditions') { Byebug.breakpoints.first.expr.must_be_nil }
     end
 
-    it 'must not stop on the breakpoint' do
+    it 'must unconditionally stop on the breakpoint' do
       debug_file('conditions') { state.line.must_equal 3 }
     end
   end

data/test/continue_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe "Continue Command" do
-  include TestDsl
+class TestContinue < TestDsl::TestCase
 
   describe "successful" do
     it "must continue up to breakpoint if no line specified" do
@@ -19,12 +18,11 @@ describe "Continue Command" do
       debug_file('continue') { state.line.must_equal 4 }
     end
 
-    # XXX: Decide whether to keep original behaviour (i don't like it but maybe
-    # I'm wrong) or make the test below pass
-    #it "must not keep temporal breakpoint when line specified" do
-    #  enter 'cont 4'
-    #  debug_file('continue') { Byebug.breakpoints.size.must_equal 0 }
-    #end
+    it "must not keep temporal breakpoint when line specified" do
+      skip 'Not working yet, breakpoint is currently kept'
+      enter 'cont 4'
+      debug_file('continue') { Byebug.breakpoints.size.must_equal 0 }
+    end
   end
 
   describe "unsuccessful" do

data/test/display_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Display Command' do
-  include TestDsl
+class TestDisplay < TestDsl::TestCase
 
   it 'must show expressions' do
     enter 'break 3', 'cont', 'display d + 1'

data/test/edit_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Edit Command' do
-  include TestDsl
+class TestEdit < TestDsl::TestCase
 
   describe 'open configured editor' do
     temporary_change_hash ENV, 'EDITOR', 'editr'

data/test/eval_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Eval Command' do
-  include TestDsl
+class TestEval < TestDsl::TestCase
 
   it 'must evaluate an expression' do
     enter 'eval 3 + 2'

data/test/examples/stepping.rb

@@ -18,4 +18,8 @@ class SteppingExample
 end
 
 ex = SteppingExample.new.a
+2.times do
+  ex += 1
+end
+
 ex

data/test/finish_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Finish Command' do
-  include TestDsl
+class TestFinish < TestDsl::TestCase
 
   it 'must stop at the next frame by default' do
     enter 'break 16', 'cont', 'finish'