byebug 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929419c640bdf958d5322f770be797f1d8bfd0c0
-  data.tar.gz: 6697013f9ff97a9e453cf777041f4108c3274c65
+  metadata.gz: c4921997bbc597c75dbd51c1a5abde4fa366ce05
+  data.tar.gz: e56edf6e9529823d52edfe543ed9f450258bf893
 SHA512:
-  metadata.gz: 62ad75b1a082c60a1cfe65c13fd654c538006cfcb0c02fc751658994a838b8e365ce659428e3381a4a4393feab58f62dec9268afd040bf1c4ebcc21f46a41f56
-  data.tar.gz: 21a6754ad1fa31fda1564c44fb1786c55de5d2f30e13c82fe8a8319ec70b62df8ec43499df3d1e95fd126a4c00aacb597e555c6ff488b711471ad1cd2f39c12c
+  metadata.gz: 69d7c6ffe0e19f58695bc007a1b44b44e743cd669939a53b0c491d209d417f4f963ca18085d07c5b7ca5a9fe7820ca59455bd2ec269c9a6963d3bdfe0a75bffe
+  data.tar.gz: ce3049894fe8169c214ce6953dd468a3343caa1e45971f093d9a73e5f3c6b778d4fa51b0ecbdb3806094b776fb4adecb4965c77689e5470a2a7fed5503dc5fce

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.0
+
+* No more Byebug.start to get correct callstack information! Dropping `byebug`
+anywhere and inmediately printing the stack just works now. :)
+
+
 ## 1.4.2
 
 * Fixes crash when using "help command subcommand"

data/GUIDE.md

@@ -98,8 +98,8 @@ Okay, lets go on and talk about program arguments.
 []
 ```
 
-Ooops. We forgot to specify any parameters to this program. Let's try again. We can
-use the `restart` command here.
+Ooops. We forgot to specify any parameters to this program. Let's try again. We
+can use the `restart` command here.
 
 ```
 (byebug) restart 3
@@ -175,10 +175,8 @@ Stopped by breakpoint 1 at /home/davidr/Proyectos/byebug/old_doc/hanoi.rb:3
 (byebug) set nofullpath
 Displaying frame's full file names is off.
 (byebug) where
---> #0  Object.hanoi(n#Fixnum, a#Symbol, b#Symbol, c#Symbol)
-      at .../byebug/old_doc/hanoi.rb:4
-    #1  Object.hanoi(n#Fixnum, a#Symbol, b#Symbol, c#Symbol)
-      at .../byebug/old_doc/hanoi.rb:8
+--> #0  Object.hanoi(n#Fixnum, a#Symbol, b#Symbol, c#Symbol) at .../byebug/old_doc/hanoi.rb:4
+    #1  Object.hanoi(n#Fixnum, a#Symbol, b#Symbol, c#Symbol) at .../byebug/old_doc/hanoi.rb:8
     #2  <top (required)> at .../byebug/old_doc/hanoi.rb:34
 (byebug)
 ```
@@ -231,19 +229,12 @@ frame #3, the value of `i_args` can be shown. Also note that the value of
 variable `n` is different.
 
 
-### Unit Testing Session
+### Attaching to a running program with `byebug`
 
-In the previous sessions we've been calling byebug right at the outset, but this
-is probably not the mode of operation you will use the most. There are a number
-of situations where calling byebug at the outset is impractical for a couple of
-reasons:
-
-* Byebug just doesn't work when run at the outset. Any debugging changes the
-behavior or the program in slight and subtle ways, and sometimes this can hinder
-finding bugs.
-* There's a lot of code that needs to be run before the part you want to
-inspect.  Running this code takes time and you don't want the overhead of
-byebug.
+In the previous sessions we've been calling byebug right at the outset, but
+there is another mode of operation you might use. If there's a lot of code that
+needs to be run before the part you want to inspect, it might not be efficient
+or convenient to run byebug from the outset.
 
 In this section we'll show how to enter the code in the middle of your program,
 while delving more into byebug's operation. We will also use unit testing. Using
@@ -269,15 +260,15 @@ if __FILE__ == $0
 end
 ```
 
-Okay, we're now ready to write our unit test. We'll use `test/unit` which comes
+Okay, we're now ready to write our unit test. We'll use `minitest` which comes
 with the standard Ruby distribution.  Here's the test code; it should be in the
 same directory as `triangle.rb`.
 
 ```ruby
-require 'test/unit'
+require 'minitest/autorun'
 require_relative 'triangle.rb'
 
-class TestTri < Test::Unit::TestCase
+class TestTri < MiniTest::Unit::TestCase
   def test_basic
     solutions = []
     0.upto(5) do |i|
@@ -295,145 +286,62 @@ add the following:
 ```ruby
 ...
 def test_basic
-  require 'byebug'
   byebug
   solutions = []
 ...
 ```
 
-Now we run the program..
+Now we run the program, requiring `byebug`
 ```
-$ ruby test-triangle.rb
-Run options:
+$ ruby -rbyebug test-triangle.rb
+Run options: --seed 13073
 
 # Running tests:
 
-[1/1] TestTri#test_basic[5, 14] in test-triangle.rb
-    5: 
-    6: class TestTri < Test::Unit::TestCase
-    7:   def test_basic
-    8:     require 'byebug'
-    9:     byebug
-=> 10:     solutions = []
-   11:     0.upto(5) do |i|
-   12:       solutions << triangle(i)
-   13:     end
-   14:     assert_equal([0, 1, 3, 6, 10, 15], solutions,
+[2, 11] in test-triangle.rb
+    2: require_relative 'triangle.rb'
+    3: 
+    4: class TestTri < MiniTest::Unit::TestCase
+    5:   def test_basic
+    6:     byebug
+=>  7:     solutions = []
+    8:     0.upto(5) do |i|
+    9:       solutions << triangle(i)
+   10:     end
+   11:     assert_equal([0, 1, 3, 6, 10, 15], solutions,
 (byebug)
 ```
 
-and we see that we are stopped at line 10 just before the initialization of the
+and we see that we are stopped at line 7 just before the initialization of the
 list `solutions`.
 
 Now let's see where we are...
 ```
-(byebug) where
---> #0  TestTri.test_basic at test-tri2.rb:10
-Warning: saved frames may be incomplete; compare with caller(0)
+(byebug) set nofullpath
+Displaying frame's full file names is off.
+(byebug) bt
+--> #0  TestTri.test_basic at test-triangle.rb:7
+    #1  MiniTest::Unit::TestCase.run(runner#MiniTest::Unit) at .../2.0.0/minitest/unit.rb:1301
+    #2  MiniTest::Unit.block in _run_suite(suite#Class, type#Symbol) at .../2.0.0/minitest/unit.rb:919
+    #3  Array.map(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:912
+    #4  MiniTest::Unit._run_suite(suite#Class, type#Symbol) at .../2.0.0/minitest/unit.rb:912
+    #5  MiniTest::Unit.block in _run_suites(suites#Array, type#Symbol) at .../2.0.0/minitest/unit.rb:899
+    #6  Array.map(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:899
+    #7  MiniTest::Unit._run_suites(suites#Array, type#Symbol) at .../2.0.0/minitest/unit.rb:899
+    #8  MiniTest::Unit._run_anything(type#Symbol) at .../2.0.0/minitest/unit.rb:867
+    #9  MiniTest::Unit.run_tests at .../2.0.0/minitest/unit.rb:1060
+    #10 MiniTest::Unit.block in _run(args#Array) at .../2.0.0/minitest/unit.rb:1047
+    #11 Array.each(frame_no#Fixnum) at .../2.0.0/minitest/unit.rb:1046
+    #12 MiniTest::Unit._run(args#Array) at .../2.0.0/minitest/unit.rb:1046
+    #13 MiniTest::Unit.run(args#Array) at .../2.0.0/minitest/unit.rb:1035
+    #14 #<Class:MiniTest::Unit>.block in autorun at .../2.0.0/minitest/unit.rb:789
 (byebug)
 ```
 
-Something seems wrong here; `TestTri.test_basic` indicates that we are in class
-`TestTri` in method `test_basic`. However we don't see the call to this like we
-did in the last example when we used the `where` command. This is because byebug
-really didn't spring into existence until after we already had entered that
-method, and Ruby doesn't keep call stack information around in a way that would
-give the information we show when running `where`.
-
-If we want call stack information, we have to turn call-stack tracking on
-_beforehand_. This is done by adding `Byebug.start`.
-
-Here's what our test program looks like after we modify it to start tracking
-calls from the outset
-
-```ruby
-require 'test/unit'
-require_relative 'triangle.rb'
-require 'byebug'
-Byebug.start
-
-class TestTri < Test::Unit::TestCase
-  def test_basic
-    byebug
-    solutions = []
-    0.upto(5) do |i|
-      solutions << triangle(i)
-    end
-    assert_equal([0, 1, 3, 6, 10, 15], solutions,
-                 "Testing the first 5 triangle numbers")
-  end
-end
-```
+We get the same result as if we had run byebug from the outset, just faster!
 
-Now when we run this:
-```
-$ ruby test-triangle.rb
-Run options:
-
-# Running tests:
-
-[1/1] TestTri#test_basic[5, 14] in test-triangle.rb
-    5: 
-    6: class TestTri < Test::Unit::TestCase
-    7:   def test_basic
-    8:     require 'byebug'
-    9:     byebug
-=> 10:     solutions = []
-   11:     0.upto(5) do |i|
-   12:       solutions << triangle(i)
-   13:     end
-   14:     assert_equal([0, 1, 3, 6, 10, 15], solutions,
-(byebug) where
---> #0  TestTri.test_basic at test-triangle.rb:10
-    #1  MiniTest::Unit::TestCase.run_test(name#String)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:858
-    #2  MiniTest::Unit::TestCase.run(runner#Test::Unit::Runner)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1301
-    #3  Test::Unit::TestCase.run(runner#Test::Unit::Runner)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit/testcase.rb:17
-    #4  MiniTest::Unit._run_suite(suite#Class, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:919
-    #5  Array.map(suite#Class, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:912
-    #6  MiniTest::Unit._run_suite(suite#Class, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:912
-    #7  Test::Unit::Runner._run_suites(suites#Array, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:657
-    #8  Array.each(suites#Array, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:655
-    #9  Test::Unit::Runner._run_suites(suites#Array, type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:655
-    #10 MiniTest::Unit._run_anything(type#Symbol)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:867
-    #11 MiniTest::Unit.run_tests
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1060
-    #12 MiniTest::Unit._run(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1047
-    #13 Array.each(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1046
-    #14 MiniTest::Unit._run(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1046
-    #15 MiniTest::Unit._run(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1042
-    #16 MiniTest::Unit.run(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/minitest/unit.rb:1035
-    #17 Test::Unit::RunCount.run(args#NilClass)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:21
-    #18 Test::Unit::Runner.run(args#Array)
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:774
-    #19 #<Class:Test::Unit::Runner>.autorun
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:366
-    #20 Test::Unit::RunCount.run_once
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:27
-    #21 #<Class:Test::Unit::Runner>.autorun
-      at /home/davidr/.rvm/rubies/ruby-2.0.0-p195/lib/ruby/2.0.0/test/unit.rb:367
-    #22 <main> at test-triangle.rb:6
-(byebug)
-```
-
-Much better. But again let me emphasize that the parameter types are those of
-the corresponding variables that _currently_ exist, and this might have changed
-since the time when the call was made.
+__NOTICE: In ruby-debug, debugger and older versions of byebug, this would not
+work as expected. If you are having issues, please upgrade to byebug >= 1.5.0__
 
 
 ### Byebug.start with a block
@@ -461,12 +369,12 @@ For example, you can do this in `irb`:
 ```
 $ irb
 2.0.0p195 :001 > require 'byebug'
- => true 
+ => true
 2.0.0p195 :002 > def foo
 2.0.0p195 :003?>   x=1
 2.0.0p195 :004?>   puts 'foo'
 2.0.0p195 :005?>   end
- => nil 
+ => nil
 2.0.0p195 :006 > Byebug.start{byebug; foo}
 (irb) @ 6
 (byebug) s
@@ -477,8 +385,8 @@ $ irb
 1
 (byebug) s
 foo
- => true 
-2.0.0p195 :007 > 
+ => true
+2.0.0p195 :007 >
 ```
 
 There is a counter inside of `Byebug.start` method to make sure that this works
@@ -486,6 +394,7 @@ when another `Byebug.start` method is called inside of the outer one. However,
 if you are stopped inside byebug, issuing another `byebug` call will not have
 any effect even if it is nested inside another `Byebug.start`.
 
+
 ### Debugging Oddities: How debugging Ruby may be different from other languages
 
 If you are used to debugging in other languages like C, C++, Perl, Java or even
@@ -497,18 +406,12 @@ those other languages, writing a debugger has to also be a little different as
 well if it is to be useful. In this respect, using byebug may help you
 understand Ruby better.
 
-We've already seen two examples of such differences. One difference is the fact
-that we stop on method definitions or `def`'s and that is because these are in
-fact executable statements. In other compiled languages this would not happen
-because that's already been done when you compile the program (or in Perl when
-it scans in the program). The other difference we saw was our inability to show
-call stack parameter types without having made arrangements for byebug to track
-this. In other languages call stack information is usually available without
-asking assistance of the debugger (in C and C++, however, you generally have to
-ask the compiler to add such information.).
-
-In this section we'll consider some other things that might throw off new users
-to Ruby who are familiar with other languages and debugging in them.
+We've already seen one such difference: the fact that we stop on method
+definitions or `def`'s and that is because these are in fact executable
+statements. In other compiled languages this would not happen because that's
+already been done when you compile the program (or in Perl when it scans in the
+program). In this section we'll consider some other things that might throw off
+new users to Ruby who are familiar with other languages and debugging in them.
 
 * Bouncing Around in Blocks (iterators)
 * No Parameter Values in a Call Stack
@@ -642,7 +545,7 @@ To be continued...
 * line tracing and non-interactive tracing.
 * mixing in Byebug.debug with byebug
 * post-mortem debugging and setting up for that
-* references to videos
+
 
 ## Getting in & out
 
@@ -751,7 +654,7 @@ Here are the default values in `options`
 
 ```ruby
 #<OpenStruct annotate=nil, nx=false, quit=true, restart_script=nil, script=nil,
-stop=true, tracing=false, verbose_long=false>
+             stop=true, tracing=false, verbose_long=false>
 ```
 
 ## Command Files
@@ -799,35 +702,17 @@ change the script and make an explicit call to byebug. Because byebug isn't
 involved before the first call, there is no overhead and the script will run
 at the same speed as if there were no byebug.
 
-There are three parts to calling byebug from inside the script, ``requiring''
-the gem, telling byebug to start tracking things and then making an explicit
-breakpoints.
-
-Unless you're using bundler, do this to get byebug class accessible from your
-Ruby program
-
-```ruby
-require 'byebug'
-```
-
-To tell byebug to start tracking things, do
-
-```ruby
-Byebug.start
-```
-
-There is also a `Byebug.stop` to turn off byebug tracking. If speed is crucial,
-you may want to start and stop this around certain sections of code.
-Alternatively, instead of issuing an explicit `Byebug.stop` you can add a block
-to the `Byebug.start` and debugging is turned on for that block. If the block of
-code raises an uncaught exception that would cause the block to terminate, the
-`stop` will occur.  See [here](Byebug.start with a block).
-
-And finally to enter byebug
-
-```ruby
-byebug
-```
+To enter byebug this way, just drop `byebug` in whichever line you want to start
+debugging at. You also have to require byebug somehow. If using bundler, it will
+take care of that for you, otherwise you can use the ruby `-r` flag or add
+`require 'byebug'` in the line previous to the `byebug` call.
+
+If speed is crucial, you may want to start and stop this around certain sections
+of code, using `Byebug.start` and `Byebug.stop`. Alternatively, instead of
+issuing an explicit `Byebug.stop` you can add a block to the `Byebug.start` and
+debugging is turned on for that block. If the block of code raises an uncaught
+exception that would cause the block to terminate, the `stop` will occur.  See
+[Byebug.start with a block]().
 
 When `byebug`is run, `.byebugrc` is read.
 

data/bin/byebug

@@ -76,9 +76,6 @@ def debug_program(options)
   end
   print "\032\032starting\n" if Byebug.annotate and Byebug.annotate > 2
 
-  # Record where we are we can know if the call stack has been truncated or not.
-  Byebug.start_sentinal = caller[0]
-
   if bt = Byebug.debug_load(Byebug::PROG_SCRIPT, options.stop)
     print bt.backtrace.map{|l| "\t#{l}"}.join("\n"), "\n"
     print "Uncaught exception: #{bt}\n"

data/byebug.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency "columnize", "~> 0.3.6"
   s.add_dependency "debugger-linecache", '~> 1.2.0'
 
-  s.add_development_dependency 'rake', '~> 10.0.4'
+  s.add_development_dependency 'rake', '~> 10.1.0'
   s.add_development_dependency 'rake-compiler', '~> 0.8.3'
   s.add_development_dependency 'mocha', '~> 0.14.0'
 end

data/ext/byebug/byebug.c

@@ -25,13 +25,13 @@ tp_inspect(rb_trace_arg_t *trace_arg) {
     if (ID2SYM(rb_intern("line")) == event ||
         ID2SYM(rb_intern("specified_line")) == event)
     {
-       VALUE sym = rb_tracearg_method_id(trace_arg);
-       if (NIL_P(sym)) sym = rb_str_new_cstr("<main>");
-       return rb_sprintf("%"PRIsVALUE"@%"PRIsVALUE":%d in `%"PRIsVALUE"'",
-                           rb_tracearg_event(trace_arg),
-                           rb_tracearg_path(trace_arg),
-                           FIX2INT(rb_tracearg_lineno(trace_arg)),
-                           sym);
+      VALUE sym = rb_tracearg_method_id(trace_arg);
+      if (NIL_P(sym)) sym = rb_str_new_cstr("<main>");
+      return rb_sprintf("%"PRIsVALUE"@%"PRIsVALUE":%d in `%"PRIsVALUE"'",
+                          rb_tracearg_event(trace_arg),
+                          rb_tracearg_path(trace_arg),
+                          FIX2INT(rb_tracearg_lineno(trace_arg)),
+                          sym);
     }
     if (ID2SYM(rb_intern("call")) == event ||
         ID2SYM(rb_intern("c_call")) == event ||
@@ -53,9 +53,6 @@ tp_inspect(rb_trace_arg_t *trace_arg) {
 static VALUE
 Byebug_context(VALUE self)
 {
-  if (context == Qnil) {
-    context = context_create();
-  }
   return context;
 }
 
@@ -133,15 +130,17 @@ call_at_line_check(VALUE context_obj, debug_context_t *dc,
   call_at_line(context_obj, dc, file, line);
 }
 
+#define BYEBUG_STARTED (catchpoints != Qnil)
+
 #define EVENT_SETUP                                                     \
   rb_trace_arg_t *trace_arg = rb_tracearg_from_tracepoint(trace_point); \
-  VALUE context_obj;                                                    \
   debug_context_t *dc;                                                  \
-  context_obj = Byebug_context(mByebug);                                \
-  Data_Get_Struct(context_obj, debug_context_t, dc);                    \
+  if (!BYEBUG_STARTED)                                                  \
+    rb_raise(rb_eRuntimeError, "Byebug not started yet!");              \
+  Data_Get_Struct(context, debug_context_t, dc);                        \
   if (debug == Qtrue)                                                   \
     printf("%s (stack_size: %d)\n",                                     \
-            RSTRING_PTR(tp_inspect(trace_arg)), dc->stack_size);        \
+           RSTRING_PTR(tp_inspect(trace_arg)), dc->stack_size);         \
 
 #define EVENT_COMMON() \
   if (trace_common(trace_arg, dc) == 0) { return; }
@@ -187,7 +186,7 @@ process_line_event(VALUE trace_point, void *data)
   }
 
   if (RTEST(tracing))
-    call_at_tracing(context_obj, dc, file, line);
+    call_at_tracing(context, dc, file, line);
 
   if (moved || !CTX_FL_TEST(dc, CTX_FL_FORCE_MOVE))
   {
@@ -204,7 +203,7 @@ process_line_event(VALUE trace_point, void *data)
       (!NIL_P(
        breakpoint = find_breakpoint_by_pos(breakpoints, file, line, binding)))))
   {
-    call_at_line_check(context_obj, dc, breakpoint, file, line);
+    call_at_line_check(context, dc, breakpoint, file, line);
   }
 
   cleanup(dc);
@@ -265,8 +264,8 @@ process_call_event(VALUE trace_point, void *data)
     find_breakpoint_by_method(breakpoints, klass, mid, binding, self);
   if (breakpoint != Qnil)
   {
-    call_at_breakpoint(context_obj, dc, breakpoint);
-    call_at_line(context_obj, dc, file, line);
+    call_at_breakpoint(context, dc, breakpoint);
+    call_at_line(context, dc, file, line);
   }
 
   cleanup(dc);
@@ -324,8 +323,8 @@ process_raise_event(VALUE trace_point, void *data)
     if (hit_count != Qnil)
     {
       rb_hash_aset(catchpoints, mod_name, INT2FIX(FIX2INT(hit_count) + 1));
-      call_at_catchpoint(context_obj, dc, err);
-      call_at_line(context_obj, dc, path, lineno);
+      call_at_catchpoint(context, dc, err);
+      call_at_line(context, dc, path, lineno);
       break;
     }
   }
@@ -340,6 +339,7 @@ Byebug_setup_tracepoints(VALUE self)
 
   breakpoints = rb_ary_new();
   catchpoints = rb_hash_new();
+  context = context_create();
 
   tpLine = rb_tracepoint_new(Qnil,
     RUBY_EVENT_LINE,
@@ -392,7 +392,6 @@ Byebug_remove_tracepoints(VALUE self)
   return Qnil;
 }
 
-#define BYEBUG_STARTED (catchpoints != Qnil)
 static VALUE
 Byebug_started(VALUE self)
 {
@@ -463,7 +462,7 @@ Byebug_load(int argc, VALUE *argv, VALUE self)
   Data_Get_Struct(context_obj, debug_context_t, dc);
   if (RTEST(stop)) dc->steps = 1;
 
-  /* Resetting stack size */
+  /* Reset stack size to ignore byebug's own frames */
   dc->stack_size = 0;
 
   /* Initializing $0 to the script's path */
@@ -545,8 +544,6 @@ Byebug_breakpoints(VALUE self)
 static VALUE
 Byebug_catchpoints(VALUE self)
 {
-  if (catchpoints == Qnil)
-    rb_raise(rb_eRuntimeError, "Byebug.start is not called yet.");
   return catchpoints;
 }
 
@@ -595,7 +592,7 @@ Init_byebug()
 
   Init_breakpoint(mByebug);
 
-  context = Qnil;
+  context     = Qnil;
   catchpoints = Qnil;
   breakpoints = Qnil;
 

data/ext/byebug/context.c

@@ -42,6 +42,13 @@ context_free(void *data)
 
 }
 
+static int
+real_stack_size()
+{
+  VALUE locs = rb_funcall(rb_cObject, rb_intern("caller_locations"), 1, INT2FIX(0));
+  return (int)RARRAY_LEN(locs);
+}
+
 extern VALUE
 context_create()
 {
@@ -50,7 +57,7 @@ context_create()
   context->last_file  = Qnil;
   context->last_line  = Qnil;
   context->flags      = 0;
-  context->stack_size = 0;
+  context->stack_size = real_stack_size();
   reset_stepping_stop_points(context);
   context->stop_reason = CTX_STOP_NONE;
   context->backtrace = Qnil;
@@ -187,7 +194,7 @@ call_with_debug_inspector(struct call_with_inspection_data *data)
   if (frame_n < 0 || frame_n >= context->stack_size)                  \
   {                                                                   \
     rb_raise(rb_eArgError, "Invalid frame number %d, stack (0...%d)", \
-        frame_n, context->stack_size-1);                              \
+             frame_n, context->stack_size - 1);                       \
   }                                                                   \
 
 static VALUE
@@ -335,9 +342,9 @@ Context_step_into(int argc, VALUE *argv, VALUE self)
   context->steps = FIX2INT(steps);
 
   if (RTEST(force))
-      CTX_FL_SET(context, CTX_FL_FORCE_MOVE);
+    CTX_FL_SET(context, CTX_FL_FORCE_MOVE);
   else
-      CTX_FL_UNSET(context, CTX_FL_FORCE_MOVE);
+    CTX_FL_UNSET(context, CTX_FL_FORCE_MOVE);
 
   return steps;
 }
@@ -349,13 +356,14 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
   debug_context_t *context;
 
   Data_Get_Struct(self, debug_context_t, context);
+
   if (context->stack_size == 0)
     rb_raise(rb_eRuntimeError, "No frames collected.");
 
   rb_scan_args(argc, argv, "12", &lines, &frame, &force);
   context->lines = FIX2INT(lines);
 
-  if (FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
+  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->stack_size)
     rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
   context->dest_frame = context->stack_size - FIX2INT(frame);
 
@@ -371,9 +379,9 @@ static VALUE
 Context_step_out(VALUE self, VALUE frame)
 {
   debug_context_t *context;
-
   Data_Get_Struct(self, debug_context_t, context);
-  if (FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
+
+  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->stack_size)
     rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
 
   context->stop_frame = context->stack_size - FIX2INT(frame);

data/ext/byebug/extconf.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION < "2.0"
 end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
-  $CFLAGS = '-Wall -Werror'
+  $CFLAGS = ' -std=c99 -Wall -Werror'
   $CFLAGS += ' -g3' if ENV['debug']
 end
 

data/lib/byebug.rb

@@ -36,9 +36,6 @@ module Byebug
     # If in remote mode, wait for the remote connection
     attr_accessor :wait_connection
 
-    # A string to look for in caller() to see if the call stack is truncated
-    attr_accessor :start_sentinal
-
     def source_reload
       Object.send(:remove_const, "SCRIPT_LINES__") if
         Object.const_defined?("SCRIPT_LINES__")
@@ -111,7 +108,6 @@ module Byebug
         Byebug.const_set('INITIAL_DIR', Dir.pwd) unless defined? Byebug::INITIAL_DIR
       end
       Byebug.tracing = options[:tracing] unless options[:tracing].nil?
-      Byebug.start_sentinal = caller[0]
       if Byebug.started?
         retval = block && block.call(self)
       else
@@ -269,40 +265,3 @@ module Kernel
   end
   alias breakpoint byebug unless respond_to?(:breakpoint)
 end
-
-module Rails
-  module Rack
-    class Debugger
-      def initialize(app)
-        @app = app
-
-        # clear ARGV so that rails server options aren't passed to IRB
-        ARGV.clear
-
-        require 'byebug'
-
-        ::Byebug.start
-        puts "=> Byebug enabled"
-      rescue LoadError
-        puts "You're missing the 'byebug' gem. Add it to your Gemfile, " \
-             "bundle it and try again."
-        exit
-      end
-
-      def call(env)
-        @app.call(env)
-      end
-    end
-  end
-
-  class Console
-    def require_debugger
-      require 'byebug'
-      puts "=> Byebug enabled"
-    rescue LoadError
-      puts "You're missing the 'byebug' gem. Add it to your Gemfile, bundle, " \
-           "it and try again."
-      exit
-    end
-  end
-end

data/lib/byebug/commands/frame.rb

@@ -115,48 +115,6 @@ module Byebug
 
       print frame_str
     end
-
-    ##
-    # Check if call stack is truncated. This can happen if Byebug.start is not
-    # called low enough in the call stack. An array of additional callstack
-    # lines from caller is returned if definitely truncated, false if not, and
-    # nil if we don't know.
-    #
-    # We determine truncation based on a passed in sentinal set via caller which
-    # can be nil.
-    #
-    # First we see if we can find our position in caller. If so, then we compare
-    # context position to that in caller using sentinal as a place to start
-    # ignoring additional caller entries. sentinal is set by byebug, but if it's
-    # nil then additional entries are presumably ones that we haven't recorded
-    # in context
-    def truncated_callstack?(sentinal=nil, cs=caller)
-      recorded_size = @state.context.stack_size
-      to_find_fl =
-        "#{@state.context.frame_file(0)}:#{@state.context.frame_line(0)}"
-      top_discard = false
-      cs.each_with_index do |fl, i|
-        fl.gsub!(/in `.*'$/, '')
-        fl.gsub!(/:$/, '')
-        if fl == to_find_fl
-          top_discard = i
-          break
-        end
-      end
-      if top_discard
-        cs = cs[top_discard..-1]
-        return false unless cs
-        return cs unless sentinal
-        if cs.size > recorded_size+2 && cs[recorded_size+2] != sentinal
-          # caller seems to truncate recursive calls and we don't.
-          # See if we can find sentinal in the first 0..recorded_size+1 entries
-          return false if cs[0..recorded_size+1].any?{ |f| f==sentinal }
-          return cs
-        end
-        return false
-      end
-      return nil
-    end
   end
 
   # Implements byebug "where" or "backtrace" command.
@@ -167,10 +125,6 @@ module Byebug
 
     def execute
       print_backtrace
-      if truncated_callstack?(Byebug.start_sentinal)
-         print \
-           "Warning: saved frames may be incomplete; compare with caller(0)\n"
-      end
     end
 
     class << self

data/lib/byebug/context.rb

@@ -51,6 +51,5 @@ module Byebug
     def at_line(file, line)
       handler.at_line(self, file, line) unless IGNORED_FILES.include?(file)
     end
-
   end
 end

data/lib/byebug/processor.rb

@@ -358,7 +358,7 @@ module Byebug
         end
       end
 
-  end # end class CommandProcessor
+  end # class CommandProcessor
 
 
   class ControlCommandProcessor < Processor

data/lib/byebug/version.rb

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

data/old_doc/test-triangle.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require_relative 'triangle.rb'
 
-class TestTri < Test::Unit::TestCase
+class TestTri < MiniTest::Unit::TestCase
   def test_basic
-    require 'byebug'
     byebug
     solutions = []
     0.upto(5) do |i|

data/test/examples/frame_deep.rb

@@ -0,0 +1,20 @@
+class A
+  def a
+    z = 1
+    z += b
+  end
+  def b
+    z = 2
+    z += c
+  end
+  def c
+    z = 3
+    byebug
+    z += d('a')
+  end
+  def d(e)
+    z = 4
+  end
+end
+
+A.new.a

data/test/frame_test.rb

@@ -44,8 +44,8 @@ class TestFrame < TestDsl::TestCase
   end
 
   it 'must set frame to the last one' do
-    enter 'break 16', 'cont', 'frame -1'
-    debug_file('frame') { state.file.must_match /test_dsl.rb/ }
+    enter 'break 16', 'cont', 'bt', 'frame -1'
+    debug_file('frame') { state.file.must_match /minitest\/unit.rb/ }
     check_output_doesnt_include "at #{fullpath('frame')}:"
   end
 
@@ -65,6 +65,38 @@ class TestFrame < TestDsl::TestCase
       interface.error_queue
   end
 
+  describe 'when byebug is started deep in the callstack' do
+    it 'must print backtrace' do
+      enter 'break 16', 'cont', 'where'
+      debug_file 'frame_deep'
+      check_output_includes \
+        /--> #0  A.d(e#String) at #{fullpath('frame_deep')}:16/x,
+            /#1  A.c at #{fullpath('frame_deep')}:13/x,
+            /#2  A.b at #{fullpath('frame_deep')}:8/x
+    end
+
+    it 'must go up' do
+      enter 'break 16', 'cont', 'up'
+      debug_file('frame_deep') { state.line.must_equal 13 }
+    end
+
+    it 'must go down' do
+      enter 'break 16', 'cont', 'up', 'down'
+      debug_file('frame_deep') { state.line.must_equal 16 }
+    end
+
+    it 'must set frame' do
+      enter 'break 16', 'cont', 'frame 2'
+      debug_file('frame_deep') { state.line.must_equal 8 }
+    end
+
+    it 'must eval properly when scaling the stack' do
+      enter 'break 16', 'cont', 'p z', 'up', 'p z', 'up', 'p z'
+      debug_file('frame_deep')
+      check_output_includes 'nil', '3', '2'
+    end
+  end
+
   describe 'fullpath' do
     def short_path(fullpath)
       separator = File::ALT_SEPARATOR || File::SEPARATOR
@@ -79,7 +111,8 @@ class TestFrame < TestDsl::TestCase
         debug_file 'frame'
         check_output_includes \
           /--> #0  A.d(e#String) at #{fullpath('frame')}:16/x,
-              /#1  A.c at #{fullpath('frame')}:12/x
+              /#1  A.c at #{fullpath('frame')}:12/x,
+              /#2  A.b at #{fullpath('frame')}:8/x
       end
     end
 
@@ -91,7 +124,8 @@ class TestFrame < TestDsl::TestCase
         debug_file 'frame'
         check_output_includes \
           /--> #0  A.d(e#String) at #{short_path(fullpath('frame'))}:16/x,
-              /#1  A.c at #{short_path(fullpath('frame'))}:12/x
+              /#1  A.c at #{short_path(fullpath('frame'))}:12/x,
+              /#2  A.b at #{short_path(fullpath('frame'))}:8/x
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - test/examples/eval.rb
 - test/examples/finish.rb
 - test/examples/frame.rb
+- test/examples/frame_deep.rb
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
@@ -262,6 +263,7 @@ test_files:
 - test/examples/eval.rb
 - test/examples/finish.rb
 - test/examples/frame.rb
+- test/examples/frame_deep.rb
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb