byebug 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 075e48a583d6bdc5ec0cd4ce6cf195412476d722
-  data.tar.gz: 8e755e6afcc87f2fb06109c9fdc0dd8e052a1736
+  metadata.gz: d5f07ccaa5a4aa1349f40bc2cf000ba1b38923c8
+  data.tar.gz: a751bfe958abd5e9067ee0af534d021bfd2db7b5
 SHA512:
-  metadata.gz: def5daed567d526f9cf7ad3af964a997e18aeedaf9349f23c5e9e25534c9c3711a6e1688efbfc317da99b83508035ff9db4a9d64f12ba56fb671422044a8103b
-  data.tar.gz: bac9c0be89f64f58403218158b92686734bcf7a5771f4d6eac6e9c7cd4a91ebcf28d476d3e8c3e447c4bf01ba534a60651ce33dec7e04ad81edc4372ff89110a
+  metadata.gz: a14bb16fc28b18e031e94a4ec9e2e9615d2e9fd4543afee5dd39c11f4b8339d9d3d3098e7906c192289d659e4f10e8b13aba0d4d7d7c3e0aba4b1730d671e493
+  data.tar.gz: 785e5764ddad295fdf8559e63d470c111869a56c3bae74895b5f9a6da0d4f08485d0e12799268938ab8f0ce7e48e54267bb7c23b20b0de3860d5af19a0ca06fe

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 8.0.0 - 2015-11-05
+### Fixed
+* [#183]((https://github.com/deivid-rodriguez/byebug/issues/183). Compilation
+in Ruby 2.0. Regression introduced in 7.0.0
+* "Return value is: nil" would be displayed when stopping right before the end
+of a class definition. We want to avoid showing anything instead.
+
+## Changed
+* Plugins now need to implement an `at_end` method (separate from `at_return`)
+in their custom processors.
+
 ## 7.0.0 - 2015-11-04
 ### Fixed
 * [#177](https://github.com/deivid-rodriguez/byebug/issues/177). Some issues

data/ext/byebug/byebug.c

@@ -228,6 +228,14 @@ call_at_return(VALUE ctx, debug_context_t * dc, VALUE return_value)
   return call_at(ctx, dc, rb_intern("at_return"), 1, return_value);
 }
 
+static VALUE
+call_at_end(VALUE ctx, debug_context_t * dc)
+{
+  dc->stop_reason = CTX_STOP_BREAKPOINT;
+
+  return call_at(ctx, dc, rb_intern("at_end"), 0, Qnil);
+}
+
 static void
 call_at_line_check(VALUE ctx, debug_context_t * dc, VALUE breakpoint)
 {
@@ -326,8 +334,6 @@ call_event(VALUE trace_point, void *data)
 static void
 return_event(VALUE trace_point, void *data)
 {
-  VALUE return_value;
-
   EVENT_SETUP;
 
   RETURN_EVENT_SETUP;
@@ -336,13 +342,26 @@ return_event(VALUE trace_point, void *data)
   {
     reset_stepping_stop_points(dc);
 
-    if (rb_tracearg_event_flag(trace_arg) &
-        (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))
-      return_value = rb_tracearg_return_value(trace_arg);
-    else
-      return_value = Qnil;
+    call_at_return(context, dc, rb_tracearg_return_value(trace_arg));
+  }
+
+  RETURN_EVENT_TEARDOWN;
+
+  EVENT_TEARDOWN;
+}
+
+static void
+end_event(VALUE trace_point, void *data)
+{
+  EVENT_SETUP;
+
+  RETURN_EVENT_SETUP;
+
+  if ((dc->steps_out == 0) && (CTX_FL_TEST(dc, CTX_FL_STOP_ON_RET)))
+  {
+    reset_stepping_stop_points(dc);
 
-    call_at_return(context, dc, return_value);
+    call_at_end(context, dc);
   }
 
   RETURN_EVENT_TEARDOWN;
@@ -439,7 +458,8 @@ register_tracepoints(VALUE self)
   {
     int line_msk = RUBY_EVENT_LINE;
     int call_msk = RUBY_EVENT_CALL;
-    int ret_msk = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
+    int ret_msk = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN;
+    int end_msk = RUBY_EVENT_END;
     int raw_call_msk = RUBY_EVENT_C_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
     int raw_ret_msk = RUBY_EVENT_C_RETURN;
     int raise_msk = RUBY_EVENT_RAISE;
@@ -447,6 +467,7 @@ register_tracepoints(VALUE self)
     VALUE tpLine = rb_tracepoint_new(Qnil, line_msk, line_event, 0);
     VALUE tpCall = rb_tracepoint_new(Qnil, call_msk, call_event, 0);
     VALUE tpReturn = rb_tracepoint_new(Qnil, ret_msk, return_event, 0);
+    VALUE tpEnd = rb_tracepoint_new(Qnil, end_msk, end_event, 0);
     VALUE tpCCall = rb_tracepoint_new(Qnil, raw_call_msk, raw_call_event, 0);
     VALUE tpCReturn = rb_tracepoint_new(Qnil, raw_ret_msk, raw_return_event, 0);
     VALUE tpRaise = rb_tracepoint_new(Qnil, raise_msk, raise_event, 0);
@@ -455,6 +476,7 @@ register_tracepoints(VALUE self)
     rb_ary_push(traces, tpLine);
     rb_ary_push(traces, tpCall);
     rb_ary_push(traces, tpReturn);
+    rb_ary_push(traces, tpEnd);
     rb_ary_push(traces, tpCCall);
     rb_ary_push(traces, tpCReturn);
     rb_ary_push(traces, tpRaise);

data/lib/byebug/context.rb

@@ -39,34 +39,32 @@ module Byebug
     end
 
     #
-    # Tells whether a file is ignored by the debugger.
-    #
-    # @param path [String] filename to be checked.
+    # Reader for the current frame
     #
-    def ignored_file?(path)
-      self.class.ignored_files.include?(path)
-    end
-
     def frame
       @frame ||= Frame.new(self, 0)
     end
 
+    #
+    # Writer for the current frame
+    #
     def frame=(pos)
       @frame = Frame.new(self, pos)
     end
 
-    def file
-      frame.file
-    end
-
-    def line
-      frame.line
-    end
+    extend Forwardable
+    def_delegators :frame, :file, :line
 
+    #
+    # Current file & line information
+    #
     def location
       "#{normalize(file)}:#{line}"
     end
 
+    #
+    # Current file, line and source code information
+    #
     def full_location
       return location if virtual_file?(file)
 
@@ -88,37 +86,70 @@ module Byebug
       step_into 1
     end
 
-    def at_breakpoint(breakpoint)
-      processor.at_breakpoint(breakpoint)
-    end
+    #
+    # Line handler
+    #
+    def at_line
+      self.frame = 0
+      return if ignored_file?(file)
 
-    def at_catchpoint(exception)
-      processor.at_catchpoint(exception)
+      processor.at_line
     end
 
+    #
+    # Tracing handler
+    #
     def at_tracing
       return if ignored_file?(file)
 
       processor.at_tracing
     end
 
-    def at_line
-      self.frame = 0
-      return if ignored_file?(file)
+    #
+    # Breakpoint handler
+    #
+    def at_breakpoint(breakpoint)
+      processor.at_breakpoint(breakpoint)
+    end
 
-      processor.at_line
+    #
+    # Catchpoint handler
+    #
+    def at_catchpoint(exception)
+      processor.at_catchpoint(exception)
     end
 
+    #
+    # Return handler
+    #
     def at_return(return_value)
       return if ignored_file?(file)
 
       processor.at_return(return_value)
     end
 
+    #
+    # End of class definition handler
+    #
+    def at_end
+      return if ignored_file?(file)
+
+      processor.at_end
+    end
+
     private
 
     def processor
       @processor ||= self.class.processor.new(self)
     end
+
+    #
+    # Tells whether a file is ignored by the debugger.
+    #
+    # @param path [String] filename to be checked.
+    #
+    def ignored_file?(path)
+      self.class.ignored_files.include?(path)
+    end
   end
 end

data/lib/byebug/processors/command_processor.rb

@@ -33,17 +33,18 @@ module Byebug
       @printer ||= Printers::Plain.new
     end
 
-    def frame
-      @context.frame
-    end
-
     extend Forwardable
+
+    def_delegators :@context, :frame
+
     def_delegator :printer, :print, :pr
     def_delegator :printer, :print_collection, :prc
     def_delegator :printer, :print_variables, :prv
 
     def_delegators :interface, :errmsg, :puts, :confirm
 
+    def_delegators Byebug, :commands
+
     #
     # Available commands
     #
@@ -51,8 +52,14 @@ module Byebug
       @command_list ||= CommandList.new(commands)
     end
 
-    def commands
-      Byebug.commands
+    def at_line
+      process_commands
+    end
+
+    def at_tracing
+      puts "Tracing: #{context.full_location}"
+
+      run_auto_cmds(2)
     end
 
     def at_breakpoint(brkpt)
@@ -65,19 +72,13 @@ module Byebug
       puts "Catchpoint at #{context.location}: `#{exception}'"
     end
 
-    def at_tracing
-      puts "Tracing: #{context.full_location}"
-
-      run_auto_cmds(2)
-    end
+    def at_return(return_value)
+      puts "Return value is: #{safe_inspect(return_value)}"
 
-    def at_line
       process_commands
     end
 
-    def at_return(return_value)
-      puts "Return value is: #{safe_inspect(return_value)}"
-
+    def at_end
       process_commands
     end
 

data/lib/byebug/version.rb

@@ -2,5 +2,5 @@
 # Reopen main module to define the library version
 #
 module Byebug
-  VERSION = '7.0.0'
+  VERSION = '8.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler