byebug 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9879e1bf4c99c2ce971bb11d2d0d9e1be2ab6b3f
-  data.tar.gz: 5402c4b2c35821bb2a594dff94b2fe8f5928fa16
+  metadata.gz: db82855de95f0558289aa633b2432e871bf4a3bb
+  data.tar.gz: 805e3ed4d731545dd2a7f5d9a60ecfe4925e4fdd
 SHA512:
-  metadata.gz: 500afcaa81db3c20f1e36a691d4599d29feeafa0670e7b37e134bd2a9e5afa8f7812caaa85b147ac72b1b870552ff655ffe767e10e4dd07e13359cebcd903039
-  data.tar.gz: f8ac3188a9cd9520f8bd3d3b440ad5f9c29e4ec4feb5fd83236eaa4a43920c81a0fa72a47c5092898bab539fc3fcf1b99fb1d518646444d4d8f6eb2d3c658888
+  metadata.gz: 5662e984cfcb5562c7afe0ccfcb79b926e19ff8fefbf2cb55fae3f18705650983a5385daf5b1545c9dea85bb6d783a46e9ddc0204f08c3116a66e9cc1522a8f6
+  data.tar.gz: 2fe8c9c5934687b8dfdfccdec322a227a0892662010bc08db4be14ac5af4b49b674868da94773517691e57f6b4f4d3b53794e3c819cd9ccd1979092ed816a21e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.3
+
+* "autoreload" is set by default now
+* "list" command: no negative line numbers shown, and line range behaves as
+expected at the begining/end of file
+* In some weird cases, "backtrace" command segfaults when trying to show info on
+some frame args. Don't know the reason yet, but the exception is handled now and
+and the command doesn't segfault anymore.
+* Try some thread support (not even close to usable)
+
+
 ## 1.0.2
 
 * "autolist" and "autoeval" are default settings now

data/README.md

@@ -1,4 +1,4 @@
-# Byebug [![Build Status](https://secure.travis-ci.org/deivid-rodriguez/byebug.png)](http://travis-ci.org/deivid-rodriguez/byebug) [![Code Climate](https://codeclimate.com/github/deivid-rodriguez/byebug.png)](https://codeclimate.com/github/deivid-rodriguez/byebug) [![Dependency Status](https://gemnasium.com/deivid-rodriguez/byebug.png)](https://gemnasium.com/deivid-rodriguez/byebug)
+# Byebug [![Gem Version](https://badge.fury.io/rb/byebug.png)](http://badge.fury.io/rb/byebug) [![Build Status](https://secure.travis-ci.org/deivid-rodriguez/byebug.png)](http://travis-ci.org/deivid-rodriguez/byebug) [![Code Climate](https://codeclimate.com/github/deivid-rodriguez/byebug.png)](https://codeclimate.com/github/deivid-rodriguez/byebug) [![Dependency Status](https://gemnasium.com/deivid-rodriguez/byebug.png)](https://gemnasium.com/deivid-rodriguez/byebug)
 
 A Ruby 2.0 debugger.
 

data/bin/byebug

@@ -297,8 +297,7 @@ begin
   if RUBY_PLATFORM =~ /mswin/
     byebug_path += '.cmd' unless byebug_path =~ /\.cmd$/i
   end
-  Byebug::RDEBUG_SCRIPT = byebug_path
-  Byebug::BYEBUG_BIN = __FILE__
+  Byebug::BYEBUG_SCRIPT = byebug_path
   Byebug::INITIAL_DIR = Dir.pwd
   opts.parse! ARGV
 rescue StandardError => e

data/byebug.gemspec

@@ -29,7 +29,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.13.3'
-  s.add_development_dependency 'minitest', '~> 4.7.0'
+  s.add_development_dependency 'minitest', '~> 4.7.3'
 
   s.license = "BSD"
 end

data/ext/byebug/byebug.c

@@ -19,19 +19,37 @@ static VALUE tpRaise;
 
 static VALUE idAlive;
 
-static void
-print_debug_info(char *event, VALUE path, VALUE lineno, VALUE method_id,
-                                            VALUE defined_class, int stack_size)
-{
-  char *file;
-  const char *method_name, *class_name;
-
-  file = strrchr(RSTRING_PTR(path), '/');
-  method_name = rb_id2name(SYM2ID(method_id));
-  class_name = NIL_P(defined_class) ? "undef" : rb_class2name(defined_class);
-  fprintf(stderr, "%s: file=%s, line=%d, class=%s, method=%s, stack=%d\n",
-           event, ++file, FIX2INT(lineno), class_name, method_name, stack_size);
-  return;
+static VALUE
+tp_inspect(VALUE trace_point) {
+  rb_trace_arg_t *trace_arg = rb_tracearg_from_tracepoint(trace_point);
+  if (trace_arg) {
+    VALUE event = rb_tracearg_event(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))
+         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 ||
+        ID2SYM(rb_intern("return")) == event ||
+        ID2SYM(rb_intern("c_return")) == event)
+      return rb_sprintf("%"PRIsVALUE" `%"PRIsVALUE"'@%"PRIsVALUE":%d",
+                        rb_tracearg_event(trace_arg),
+                        rb_tracearg_method_id(trace_arg),
+                        rb_tracearg_path(trace_arg),
+                        FIX2INT(rb_tracearg_lineno(trace_arg)));
+    return rb_sprintf("%"PRIsVALUE"@%"PRIsVALUE":%d",
+                      rb_tracearg_event(trace_arg),
+                      rb_tracearg_path(trace_arg),
+                      FIX2INT(rb_tracearg_lineno(trace_arg)));
+  }
+  return rb_sprintf("No info");
 }
 
 static VALUE
@@ -158,13 +176,12 @@ process_line_event(VALUE trace_point, void *data)
 
   load_frame_info(
       trace_point, &path, &lineno, &method_id, &defined_class, &binding, &self);
+  if (debug == Qtrue)
+    printf("%s (stack_size: %d)\n", RSTRING_PTR(tp_inspect(trace_point)),
+                                    context->stack_size);
   update_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
                                defined_class, binding, self);
 
-  if (debug == Qtrue)
-    print_debug_info(
-      "line", path, lineno, method_id, defined_class, context->stack_size);
-
   if (context->last_line != FIX2INT(lineno) || context->last_file == NULL ||
        strcmp(context->last_file, RSTRING_PTR(path)))
   {
@@ -220,21 +237,20 @@ process_return_event(VALUE trace_point, void *data)
   Data_Get_Struct(context_object, debug_context_t, context);
   if (!check_start_processing(context, rb_thread_current())) return;
 
+  load_frame_info(
+      trace_point, &path, &lineno, &method_id, &defined_class, &binding, &self);
+  if (debug == Qtrue)
+    printf("%s (stack_size: %d)\n", RSTRING_PTR(tp_inspect(trace_point)),
+                                    context->stack_size);
+
   if (context->stack_size == context->stop_frame)
   {
       context->stop_next = 1;
       context->stop_frame = 0;
   }
 
-  load_frame_info(trace_point, &path, &lineno, &method_id, &defined_class,
-                               &binding, &self);
   pop_frame(context_object);
 
-  if (debug == Qtrue)
-    print_debug_info("return", path, lineno, method_id, defined_class,
-                                                           context->stack_size);
-  //rb_funcall(context_object, idAtReturn, 2, path, lineno);
-
   cleanup(context);
 }
 
@@ -250,15 +266,14 @@ process_call_event(VALUE trace_point, void *data)
   Data_Get_Struct(context_object, debug_context_t, context);
   if (!check_start_processing(context, rb_thread_current())) return;
 
-  load_frame_info(trace_point, &path, &lineno, &method_id, &defined_class,
-                               &binding, &self);
+  load_frame_info(
+      trace_point, &path, &lineno, &method_id, &defined_class, &binding, &self);
+  if (debug == Qtrue)
+    printf("%s (stack_size: %d)\n", RSTRING_PTR(tp_inspect(trace_point)),
+                                    context->stack_size);
   push_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
                              defined_class, binding, self);
 
-  if (debug == Qtrue)
-    print_debug_info("call", path, lineno, method_id, defined_class,
-                                                           context->stack_size);
-
   breakpoint = find_breakpoint_by_method(breakpoints, defined_class,
                                                       SYM2ID(method_id),
                                                       binding, self);
@@ -287,14 +302,14 @@ process_raise_event(VALUE trace_point, void *data)
   Data_Get_Struct(context_object, debug_context_t, context);
   if (!check_start_processing(context, rb_thread_current())) return;
 
-  load_frame_info(trace_point, &path, &lineno, &method_id, &defined_class,
-                               &binding, &self);
+  load_frame_info(
+      trace_point, &path, &lineno, &method_id, &defined_class, &binding, &self);
+  if (debug == Qtrue)
+    printf("%s (stack_size: %d)\n", RSTRING_PTR(tp_inspect(trace_point)),
+                                    context->stack_size);
   update_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
                                defined_class, binding, self);
 
-  if (debug == Qtrue)
-    print_debug_info("call", path, lineno, method_id, defined_class,
-                                                           context->stack_size);
   expn_class = rb_obj_class(err);
 
   if (catchpoints == Qnil ||

data/ext/byebug/context.c

@@ -5,6 +5,18 @@ static int thnum_current = 0;
 
 static VALUE idAlive;
 
+static VALUE
+id2ref(VALUE id)
+{
+    return id;
+}
+
+static VALUE
+context_thread_0(debug_context_t *context)
+{
+    return id2ref(context->thread);
+}
+
 /* "Step", "Next" and "Finish" do their work by saving information about where
  * to stop next. reset_stepping_stop_points removes/resets this information. */
 extern void
@@ -251,25 +263,27 @@ Context_frame_self(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-Context_frame_locals(int argc, VALUE *argv, VALUE self)
+Context_frame_class(int argc, VALUE *argv, VALUE self)
 {
-  VALUE binding = Context_frame_binding(argc, argv, self);
-  const char src[] =
-              "local_variables.inject({}){|h, v| h[v] = eval(\"#{v}\"); h}";
-  return NIL_P(binding) ?
-         rb_hash_new() :
-         rb_funcall(binding, rb_intern("eval"), 1, rb_str_new2(src));
+  debug_context_t *context;
+  debug_frame_t *frame;
+  VALUE frame_no;
+  int frame_n;
+
+  Data_Get_Struct(self, debug_context_t, context);
+  frame_n = rb_scan_args(argc, argv, "01", &frame_no) == 0 ? 0 : FIX2INT(frame_no);
+  frame = get_frame_no(context, frame_n);
+  return frame->defined_class;
 }
 
 static VALUE
-Context_frame_args(int argc, VALUE *argv, VALUE self)
+Context_frame_locals(int argc, VALUE *argv, VALUE self)
 {
   VALUE binding = Context_frame_binding(argc, argv, self);
   const char src[] =
-      "__method__ ? " \
-      "self.method(__method__).parameters.map{|(attr, mid)| mid} : []";
+              "local_variables.inject({}){|h, v| h[v] = eval(\"#{v}\"); h}";
   return NIL_P(binding) ?
-         rb_ary_new() :
+         rb_hash_new() :
          rb_funcall(binding, rb_intern("eval"), 1, rb_str_new2(src));
 }
 
@@ -287,53 +301,91 @@ Context_frame_args_info(int argc, VALUE *argv, VALUE self)
 static VALUE
 Context_tracing(VALUE self)
 {
-    debug_context_t *context;
+  debug_context_t *context;
 
-    Data_Get_Struct(self, debug_context_t, context);
-    return CTX_FL_TEST(context, CTX_FL_TRACING) ? Qtrue : Qfalse;
+  Data_Get_Struct(self, debug_context_t, context);
+  return CTX_FL_TEST(context, CTX_FL_TRACING) ? Qtrue : Qfalse;
 }
 
 static VALUE
 Context_set_tracing(VALUE self, VALUE value)
 {
-    debug_context_t *context;
+  debug_context_t *context;
+
+  Data_Get_Struct(self, debug_context_t, context);
+
+  if (RTEST(value))
+      CTX_FL_SET(context, CTX_FL_TRACING);
+  else
+      CTX_FL_UNSET(context, CTX_FL_TRACING);
+  return value;
+}
+
+static VALUE
+Context_stop_reason(VALUE self)
+{
+  debug_context_t *context;
+  const char *symbol;
+
+  Data_Get_Struct(self, debug_context_t, context);
+
+  switch(context->stop_reason)
+  {
+    case CTX_STOP_STEP:
+      symbol = "step";
+      break;
+    case CTX_STOP_BREAKPOINT:
+      symbol = "breakpoint";
+      break;
+    case CTX_STOP_CATCHPOINT:
+      symbol = "catchpoint";
+      break;
+    case CTX_STOP_NONE:
+    default:
+      symbol = "none";
+  }
+  if(CTX_FL_TEST(context, CTX_FL_DEAD))
+    symbol = "post-mortem";
 
-    Data_Get_Struct(self, debug_context_t, context);
+  return ID2SYM(rb_intern(symbol));
+}
 
-    if (RTEST(value))
-        CTX_FL_SET(context, CTX_FL_TRACING);
+static void
+context_suspend_0(debug_context_t *context)
+{
+    VALUE status;
+
+    status = rb_funcall(context_thread_0(context), rb_intern("status"), 0);
+    if (rb_str_cmp(status, rb_str_new2("run")) == 0)
+      CTX_FL_SET(context, CTX_FL_WAS_RUNNING);
+    else if(rb_str_cmp(status, rb_str_new2("sleep")) == 0)
+      CTX_FL_UNSET(context, CTX_FL_WAS_RUNNING);
     else
-        CTX_FL_UNSET(context, CTX_FL_TRACING);
-    return value;
+      return;
+    CTX_FL_SET(context, CTX_FL_SUSPEND);
 }
 
 static VALUE
-Context_stop_reason(VALUE self)
+Context_suspend(VALUE self)
 {
-    debug_context_t *context;
-    const char *symbol;
-
-    Data_Get_Struct(self, debug_context_t, context);
-
-    switch(context->stop_reason)
-    {
-        case CTX_STOP_STEP:
-            symbol = "step";
-            break;
-        case CTX_STOP_BREAKPOINT:
-            symbol = "breakpoint";
-            break;
-        case CTX_STOP_CATCHPOINT:
-            symbol = "catchpoint";
-            break;
-        case CTX_STOP_NONE:
-        default:
-            symbol = "none";
-    }
-    if(CTX_FL_TEST(context, CTX_FL_DEAD))
-        symbol = "post-mortem";
+  debug_context_t *context;
 
-    return ID2SYM(rb_intern(symbol));
+  Data_Get_Struct(self, debug_context_t, context);
+
+  if (CTX_FL_TEST(context, CTX_FL_SUSPEND))
+    rb_raise(rb_eRuntimeError, "Already suspended.");
+  context_suspend_0(context);
+
+  return Qnil;
+}
+
+static VALUE
+Context_is_suspended(VALUE self)
+{
+  debug_context_t *context;
+
+  Data_Get_Struct(self, debug_context_t, context);
+  return CTX_FL_TEST(context, CTX_FL_SUSPEND) ? Qtrue : Qfalse;
 }
 
 #if 0
@@ -436,6 +488,8 @@ Init_context(VALUE mByebug)
   rb_define_method(cContext, "ignored?", Context_ignored, 0);
   rb_define_method(cContext, "thnum", Context_thnum, 0);
   rb_define_method(cContext, "stop_reason", Context_stop_reason, 0);
+  rb_define_method(cContext, "suspend", Context_suspend, 0);
+  rb_define_method(cContext, "suspended?", Context_is_suspended, 0);
   rb_define_method(cContext, "tracing", Context_tracing, 0);
   rb_define_method(cContext, "tracing=", Context_set_tracing, 1);
   rb_define_method(cContext, "frame_file", Context_frame_file, -1);
@@ -443,7 +497,7 @@ Init_context(VALUE mByebug)
   rb_define_method(cContext, "frame_method", Context_frame_method, -1);
   rb_define_method(cContext, "frame_binding", Context_frame_binding, -1);
   rb_define_method(cContext, "frame_self", Context_frame_self, -1);
-  rb_define_method(cContext, "frame_args", Context_frame_args, -1);
+  rb_define_method(cContext, "frame_class", Context_frame_class, -1);
   rb_define_method(cContext, "frame_args_info", Context_frame_args_info, -1);
   rb_define_method(cContext, "frame_locals", Context_frame_locals, -1);
   rb_define_method(cContext, "stop_next=", Context_stop_next, -1);

data/lib/byebug.rb

@@ -10,8 +10,6 @@ require 'linecache19'
 
 module Byebug
 
-  @reload_source_on_change = false
-
   self.handler = CommandProcessor.new
 
   # Default options to Byebug.start
@@ -29,10 +27,6 @@ module Byebug
 
   class << self
 
-    # If true, checks the modification time of source files and reloads them if
-    # they were modified
-    attr_accessor :reload_source_on_change
-
     attr_accessor :last_exception
     Byebug.last_exception = nil
 
@@ -66,7 +60,8 @@ module Byebug
     end
 
     def source_reload
-      Object.send(:remove_const, "SCRIPT_LINES__") if Object.const_defined?("SCRIPT_LINES__")
+      Object.send(:remove_const, "SCRIPT_LINES__") if
+        Object.const_defined?("SCRIPT_LINES__")
       Object.const_set("SCRIPT_LINES__", {})
       LineCache::clear_file_cache
     end
@@ -74,8 +69,8 @@ module Byebug
     # Get line +line_number+ from file named +filename+.
     # @return "\n" if there was a problem. Leaking blanks are stripped off.
     def line_at(filename, line_number)
-      @reload_on_change = nil unless defined?(@reload_on_change)
-      line = LineCache::getline(filename, line_number, @reload_on_change)
+      @@reload_source_on_change = nil unless defined?(@@reload_source_on_change)
+      line = LineCache::getline(filename, line_number, @@reload_source_on_change)
       return "\n" unless line
       return "#{line.gsub(/^\s+/, '').chomp}"
     end
@@ -390,7 +385,7 @@ module Kernel
   end
   alias breakpoint byebug unless respond_to?(:breakpoint)
 
-  #
+  ##
   # Returns a binding of n-th call frame
   #
   def binding_n(n = 0)

data/lib/byebug/command.rb

@@ -210,6 +210,14 @@ module Byebug
         end
       end
 
+      def debug_warning_eval(str, b = get_binding)
+        begin
+          debug_eval(str, b)
+        rescue :debug_error => e
+          print "#{e.class} Exception: #{e.message}\n"
+        end
+      end
+
       def get_binding
         @state.context.frame_binding(@state.frame_pos)
       end
@@ -226,18 +234,18 @@ module Byebug
   # Use Byebug.settings[] and Byebug.settings[]= methods to query and set
   # byebug settings. These settings are available:
   #
-  # :autolist                - automatically calls 'list' command on breakpoint
-  # :autoeval                - evaluates input in the current binding if it's
-  #                            not recognized as a byebug command
-  # :autoirb                 - automatically calls 'irb' command on breakpoint
-  # :stack_trace_on_error    - shows full stack trace if eval command results in
-  #                            an exception
-  # :frame_full_path         - displays full paths when showing frame stack
-  # :frame_class_names       - displays method's class name when showing frame
-  #                            stack
-  # :reload_source_on_change - makes 'list' command always display up-to-date
-  #                            source code
-  # :force_stepping          - stepping command always move to the new line
+  #  :autolist                - automatically calls 'list' command on breakpoint
+  #  :autoeval                - evaluates input in the current binding if it's
+  #                             not recognized as a byebug command
+  #  :autoirb                 - automatically calls 'irb' command on breakpoint
+  #  :stack_trace_on_error    - shows full stack trace if eval command results
+  #                             in an exception
+  #  :frame_full_path         - displays full paths when showing frame stack
+  #  :frame_class_names       - displays method's class name when showing frame
+  #                             stack
+  #  :reload_source_on_change - makes 'list' command always display up-to-date
+  #                             source code
+  #  :force_stepping          - stepping command always move to the new line
   #
   def self.settings
     Command.settings