byebug 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7ebb05ed06b0a41e17825cbe8b946f70b7778eb
-  data.tar.gz: a0f18c28ca31209d72bb95c979fb5de138d0769d
+  metadata.gz: c94e35f817b35598528398f89bf25b1eb6be58cd
+  data.tar.gz: 835bd30d2e482817798f87c0ff6c96a1ee2ee44d
 SHA512:
-  metadata.gz: 0f3e3edd460a1fa7748f603dc9e6e4e5993fd7ef64872f4bf46b5768c94086a60a0544fd3a76e425fcc5458e0ba650fd29c72f5c58b2827bcae9f498fdf48032
-  data.tar.gz: 832bb3c1c505a040168ada9f6a7858b4aa00af29ab6f2040fdeb2d704ad807f71739039bd2cbe00ab4e7777b389e1539c9f3a67451df41873b4657ca8011565b
+  metadata.gz: f51b7abcaf7771ef033323ab1bd37c0795c5445d18b0266d29110e61f1f2d433f894d221113c793375040c3832e16f6af3a4f0fea0a55cbdb3dba285cf3658fc
+  data.tar.gz: fc49688e24e43f16d091c27c6e642dc1943ae0d00db65431c50f18399049a6bd29b486eac934509360fba8e60a30bcd151bd03250d93a9da9b3583724a079f31

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Master (Unreleased)
+
+## 8.1.0 - 2015-11-09
+### Fixed
+* Command history should be specific per project.
+* Better error message in certain edge cases when printing the backtrace.
+* Bug in evaluator which would show information about having stopped at a
+breakpoint in some cases.
+
+### Added
+* Ability to autolist source code after `frame` command.
+* Ability to stop at lines where methods return.
+
 ## 8.0.1 - 2015-11-07
 ### Fixed
 * Error stream wouldn't be properly reset when using standalone `byebug`.

data/ext/byebug/breakpoint.c

@@ -342,7 +342,7 @@ classname_cmp(VALUE name, VALUE klass)
     return 0;
 
   mod_name = rb_mod_name(klass);
-  return (mod_name != Qnil && rb_str_cmp(class_name, mod_name) == 0);
+  return (!NIL_P(mod_name) && rb_str_cmp(class_name, mod_name) == 0);
 }
 
 static int

data/ext/byebug/byebug.c

@@ -63,7 +63,7 @@ Raised_exception(VALUE self)
   return raised_exception;
 }
 
-#define IS_STARTED  (catchpoints != Qnil)
+#define IS_STARTED (!NIL_P(catchpoints))
 
 static void
 check_started()
@@ -149,15 +149,15 @@ cleanup(debug_context_t * dc)
   thread_context_lookup(rb_thread_current(), &context); \
   Data_Get_Struct(context, debug_context_t, dc);        \
                                                         \
+  trace_arg = rb_tracearg_from_tracepoint(trace_point); \
+  if (verbose == Qtrue)                                 \
+    trace_print(trace_arg, dc, 0, 0);                   \
+                                                        \
   if (CTX_FL_TEST(dc, CTX_FL_IGNORE))                   \
     return;                                             \
                                                         \
   acquire_lock(dc);                                     \
                                                         \
-  trace_arg = rb_tracearg_from_tracepoint(trace_point); \
-  if (verbose == Qtrue)                                 \
-    trace_print(trace_arg, dc, 0, 0);                   \
-
 
 #define CALL_EVENT_SETUP                                      \
   dc->calced_stack_size++;                                    \
@@ -241,7 +241,7 @@ call_at_line_check(VALUE ctx, debug_context_t * dc, VALUE breakpoint)
 {
   dc->stop_reason = CTX_STOP_STEP;
 
-  if (breakpoint != Qnil)
+  if (!NIL_P(breakpoint))
     call_at_breakpoint(ctx, dc, breakpoint);
 
   reset_stepping_stop_points(dc);
@@ -279,14 +279,16 @@ line_event(VALUE trace_point, void *data)
 
   if (dc->steps == 0 || dc->lines == 0)
     call_at_line_check(context, dc, Qnil);
+  else
+  {
+    brkpnt = Qnil;
 
-  brkpnt = Qnil;
-
-  if (!NIL_P(breakpoints))
-    brkpnt = find_breakpoint_by_pos(breakpoints, file, line, binding);
+    if (!NIL_P(breakpoints))
+      brkpnt = find_breakpoint_by_pos(breakpoints, file, line, binding);
 
-  if (!NIL_P(brkpnt))
-    call_at_line_check(context, dc, brkpnt);
+    if (!NIL_P(brkpnt))
+      call_at_line_check(context, dc, brkpnt);
+  }
 
   EVENT_TEARDOWN;
 }
@@ -334,6 +336,8 @@ call_event(VALUE trace_point, void *data)
 static void
 return_event(VALUE trace_point, void *data)
 {
+  VALUE brkpnt, file, line, binding;
+
   EVENT_SETUP;
 
   RETURN_EVENT_SETUP;
@@ -344,6 +348,36 @@ return_event(VALUE trace_point, void *data)
 
     call_at_return(context, dc, rb_tracearg_return_value(trace_arg));
   }
+  else if (!NIL_P(breakpoints))
+  {
+    file = rb_tracearg_path(trace_arg);
+    /*
+     * TODO: Sometimes the TracePoint API gives some return events without
+     * file:line information, so we need to guard for nil until we know what's
+     * going on. This happens, for example, with active_support core extensions:
+     *
+     * [#7] call@.../core_ext/numeric/conversions.rb:124 Fixnum#to_s
+     *  [#7] b_call@.../core_ext/numeric/conversions.rb:124 BigDecimal#to_s
+     *   [#7] line@.../core_ext/numeric/conversions.rb:125 BigDecimal#to_s
+     *   [#7] c_call@.../core_ext/numeric/conversions.rb:125 Kernel#is_a?
+     *    [#7] c_return@.../core_ext/numeric/conversions.rb:125 Kernel#is_a?
+     *   [#7] line@.../core_ext/numeric/conversions.rb:131 BigDecimal#to_s
+     *   [#7] c_call@.../core_ext/numeric/conversions.rb:131 Fixnum#to_default_s
+     *    [#7] c_return@.../core_ext/numeric/conversions.rb:131 Fixnum#to_default_s
+     *   [#7] b_return@/hort/core_ext/numeric/conversions.rb:133 BigDecimal#to_s
+     *  [#7] return@:0 Fixnum#to_s # => This guy...
+     */
+    if (!NIL_P(file))
+    {
+      line = rb_tracearg_lineno(trace_arg);
+      binding = rb_tracearg_binding(trace_arg);
+
+      brkpnt = find_breakpoint_by_pos(breakpoints, file, line, binding);
+
+      if (!NIL_P(brkpnt))
+        call_at_return(context, dc, rb_tracearg_return_value(trace_arg));
+    }
+  }
 
   RETURN_EVENT_TEARDOWN;
 
@@ -411,7 +445,7 @@ raise_event(VALUE trace_point, void *data)
     rb_debug_inspector_open(context_backtrace_set, (void *)new_dc);
   }
 
-  if (catchpoints == Qnil || dc->calced_stack_size == 0
+  if (NIL_P(catchpoints) || dc->calced_stack_size == 0
       || RHASH_TBL(catchpoints)->num_entries == 0)
   {
     EVENT_TEARDOWN;
@@ -429,7 +463,7 @@ raise_event(VALUE trace_point, void *data)
     hit_count = rb_hash_aref(catchpoints, module_name);
 
     /* increment exception */
-    if (hit_count != Qnil)
+    if (!NIL_P(hit_count))
     {
       rb_hash_aset(catchpoints, module_name, INT2FIX(FIX2INT(hit_count) + 1));
 
@@ -633,17 +667,17 @@ Stoppable(VALUE self)
   if (!IS_STARTED)
     return Qfalse;
 
-  if (breakpoints != Qnil && rb_funcall(breakpoints, idEmpty, 0) == Qfalse)
+  if (!NIL_P(breakpoints) && rb_funcall(breakpoints, idEmpty, 0) == Qfalse)
     return Qfalse;
 
-  if (catchpoints != Qnil && rb_funcall(catchpoints, idEmpty, 0) == Qfalse)
+  if (!NIL_P(catchpoints) && rb_funcall(catchpoints, idEmpty, 0) == Qfalse)
     return Qfalse;
 
   if (post_mortem == Qtrue)
     return Qfalse;
 
   context = Current_context(self);
-  if (context != Qnil)
+  if (!NIL_P(context))
   {
     Data_Get_Struct(context, debug_context_t, dc);
 
@@ -745,6 +779,35 @@ Set_tracing(VALUE self, VALUE value)
   return value;
 }
 
+/*
+ *  call-seq:
+ *    Byebug.verbose? -> bool
+ *
+ *  Returns +true+ if global verbose flag for TracePoint API events is enabled.
+ */
+static VALUE
+Verbose(VALUE self)
+{
+  UNUSED(self);
+
+  return verbose;
+}
+
+/*
+ *  call-seq:
+ *    Byebug.verbose = bool
+ *
+ *  Sets the global verbose flag for TracePoint API events is enabled.
+ */
+static VALUE
+Set_verbose(VALUE self, VALUE value)
+{
+  UNUSED(self);
+
+  verbose = RTEST(value) ? Qtrue : Qfalse;
+  return value;
+}
+
 /*
  *  call-seq:
  *    Byebug.post_mortem? -> bool
@@ -821,6 +884,8 @@ Init_byebug()
   rb_define_module_function(mByebug, "thread_context", Thread_context, 1);
   rb_define_module_function(mByebug, "tracing?", Tracing, 0);
   rb_define_module_function(mByebug, "tracing=", Set_tracing, 1);
+  rb_define_module_function(mByebug, "verbose?", Verbose, 0);
+  rb_define_module_function(mByebug, "verbose=", Set_verbose, 1);
 
   Init_threads_table(mByebug);
   Init_context(mByebug);

data/ext/byebug/threads.c

@@ -164,10 +164,8 @@ release_lock(void)
   {
     remove_from_locked(next_thread);
     thread = next_thread;
-  }
-
-  if (thread == next_thread)
     next_thread = Qnil;
+  }
 
   if (!NIL_P(thread) && is_living_thread(thread))
     rb_thread_run(thread);

data/lib/byebug/commands/frame.rb

@@ -48,6 +48,8 @@ module Byebug
       return errmsg(err) unless pos
 
       switch_to_frame(pos)
+
+      ListCommand.new(processor).execute if Setting[:autolist]
     end
   end
 end

data/lib/byebug/frame.rb

@@ -161,10 +161,13 @@ module Byebug
     end
 
     def ruby_args
-      return [] unless _binding.eval('__method__')
-      return [] unless _binding.eval('method(__method__)')
+      meth_name = _binding.eval('__method__')
+      return [] unless meth_name
 
-      _binding.eval('method(__method__).parameters')
+      meth_obj = _self.method(meth_name)
+      return [] unless meth_obj
+
+      meth_obj.parameters
     end
 
     def use_short_style?(arg)

data/lib/byebug/helpers/eval.rb

@@ -49,7 +49,7 @@ module Byebug
       private
 
       def safe_eval(str, binding)
-        binding.eval(str)
+        binding.eval(str, '(byebug)', 1)
       rescue StandardError, ScriptError => e
         yield(e)
       end

data/lib/byebug/helpers/file.rb

@@ -54,7 +54,7 @@ module Byebug
       # True for special files like -e, false otherwise
       #
       def virtual_file?(name)
-        ['(irb)', '-e'].include?(name)
+        ['(irb)', '-e', '(byebug)'].include?(name)
       end
     end
   end

data/lib/byebug/helpers/path.rb

@@ -8,13 +8,34 @@ module Byebug
         @bin_file ||= Gem.bin_path('byebug', 'byebug')
       end
 
+      def root_path
+        @root_path ||= File.expand_path('../..', bin_file)
+      end
+
       def lib_files
-        @lib_files ||= Dir.glob(File.expand_path('../../../**/*.rb', __FILE__))
+        @lib_files ||= expand_from_root('lib/**/*.{rb,yml}')
+      end
+
+      def ext_files
+        @ext_files ||= expand_from_root('ext/**/*.{c,h,rb}')
+      end
+
+      def test_files
+        @test_files ||= expand_from_root('test/**/*.rb')
+      end
+
+      def gem_files
+        @gem_files ||= [bin_file] + lib_files + ext_files
       end
 
       def all_files
-        @all_files ||=
-          Dir.glob(File.expand_path('../../../../**/*.rb', __FILE__))
+        @all_files ||= gem_files + test_files
+      end
+
+      private
+
+      def expand_from_root(glob)
+        Dir.glob(File.expand_path(glob, root_path))
       end
     end
   end

data/lib/byebug/settings/histfile.rb

@@ -5,10 +5,10 @@ module Byebug
   # Setting to customize the file where byebug's history is saved.
   #
   class HistfileSetting < Setting
-    DEFAULT = File.expand_path("#{ENV['HOME'] || '.'}/.byebug_hist")
+    DEFAULT = File.expand_path('.byebug_history')
 
     def banner
-      'File where cmd history is saved to. Default: ~/.byebug_hist'
+      'File where cmd history is saved to. Default: ./.byebug_history'
     end
 
     def to_s

data/lib/byebug/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby 2.0 fast debugger - base + CLI