byebug 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e311c958672db924c18ba6c50b079b8d0b02071
-  data.tar.gz: 9b5b874f7334cf8f2de778c6587d87717b79b780
+  metadata.gz: 93b7b0bff9694ec5f6674d3e7c7aa3de420cc0f9
+  data.tar.gz: ed65140ba0ef5b5f84253e0980938ffa84739c40
 SHA512:
-  metadata.gz: 6804f3c19226009adecad6208753584bf3b9364e290c70b7be4e3ae92a8d7e300f4f6bb5a2aec029b7c3ac9df4ded55efa144ff7fff530364fec7d7058f42b10
-  data.tar.gz: 25f86abebed81ad2667b6fea393c8f4404d46d2556688fa900da8e5c5c45a223485eadab5ec0f599d9a62f978b597f379b625d182649ce7b95fa8cf0687980a9
+  metadata.gz: c88d13966721950651f3713cbca994af3d70d11c0337e48c46c5bc364220835b3908ceb69be70b962356495a00118e7f4fdbc66ff7f8b504ebdd7931b48151c3
+  data.tar.gz: 579d418f58bab70f03c0deafa48695b5879d64590b84732b619891c5cc45b217111f2388b10db5b8de2c6dd9dddd0ee482a4804344419ed9409bb1f7202169c4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.5.1
+- Fix windows installation (#79)
+- Fix bug in "condition" command where invalid breakpoint ids wouldn't be
+properly detected.
+
+
 # 3.5.0
 - Bugfixes
   * Fix #81, byebug's history does not mess with other programs that use

data/ext/byebug/byebug.c

@@ -18,6 +18,45 @@ VALUE locker = Qnil;
 /* Hash table with active threads and their associated contexts */
 VALUE threads = Qnil;
 
+/*
+ *  call-seq:
+ *    Byebug.breakpoints -> array
+ *
+ *  Returns an array of breakpoints.
+ */
+static VALUE
+bb_breakpoints(VALUE self)
+{
+  if (NIL_P(breakpoints))
+    breakpoints = rb_ary_new();
+
+  return breakpoints;
+}
+
+/*
+ *  call-seq:
+ *    Byebug.catchpoints -> array
+ *
+ *  Returns an array of catchpoints.
+ */
+static VALUE
+bb_catchpoints(VALUE self)
+{
+  return catchpoints;
+}
+
+/*
+ *  call-seq:
+ *    Byebug.raised_exception -> exception
+ *
+ *  Returns raised exception when in post_mortem mode.
+ */
+static VALUE
+bb_raised_exception(VALUE self)
+{
+  return raised_exception;
+}
+
 #define IS_STARTED  (catchpoints != Qnil)
 static void
 check_started()
@@ -182,7 +221,7 @@ call_at_line_check(VALUE context_obj, debug_context_t *dc,
 static void
 line_event(VALUE trace_point, void *data)
 {
-  VALUE breakpoint, file, line, binding;
+  VALUE breakpoint, file, line, binding, self;
   int moved = 0;
 
   EVENT_SETUP
@@ -191,6 +230,7 @@ line_event(VALUE trace_point, void *data)
   file    = rb_tracearg_path(trace_arg);
   line    = rb_tracearg_lineno(trace_arg);
   binding = rb_tracearg_binding(trace_arg);
+  self    = rb_tracearg_self(trace_arg);
 
   EVENT_COMMON
 
@@ -223,7 +263,7 @@ line_event(VALUE trace_point, void *data)
   if (dc->steps == 0 || dc->lines == 0 ||
       (CTX_FL_TEST(dc, CTX_FL_ENABLE_BKPT) &&
       (!NIL_P(
-       breakpoint = find_breakpoint_by_pos(breakpoints, file, line, binding)))))
+       breakpoint = find_breakpoint_by_pos(bb_breakpoints(self), file, line, binding)))))
   {
     call_at_line_check(context, dc, breakpoint, file, line);
   }
@@ -254,7 +294,7 @@ call_event(VALUE trace_point, void *data)
   file    = rb_tracearg_path(trace_arg);
   line    = rb_tracearg_lineno(trace_arg);
 
-  breakpoint = find_breakpoint_by_method(breakpoints, klass, mid, binding, self);
+  breakpoint = find_breakpoint_by_method(bb_breakpoints(self), klass, mid, binding, self);
   if (breakpoint != Qnil)
   {
     call_at_breakpoint(context, dc, breakpoint);
@@ -578,7 +618,6 @@ bb_start(VALUE self)
   else
   {
     locker      = Qnil;
-    breakpoints = rb_ary_new();
     catchpoints = rb_hash_new();
     threads     = create_threads_table();
 
@@ -713,33 +752,6 @@ bb_set_post_mortem(VALUE self, VALUE value)
   return value;
 }
 
-/*
- *  call-seq:
- *    Byebug.breakpoints -> array
- *
- *  Returns an array of breakpoints.
- */
-static VALUE
-bb_breakpoints(VALUE self)
-{
-  if (NIL_P(breakpoints))
-    breakpoints = rb_ary_new();
-
-  return breakpoints;
-}
-
-/*
- *  call-seq:
- *    Byebug.catchpoints -> array
- *
- *  Returns an array of catchpoints.
- */
-static VALUE
-bb_catchpoints(VALUE self)
-{
-  return catchpoints;
-}
-
 /*
  *  call-seq:
  *    Byebug.add_catchpoint(exception) -> exception
@@ -756,18 +768,6 @@ bb_add_catchpoint(VALUE self, VALUE value)
   return value;
 }
 
-/*
- *  call-seq:
- *    Byebug.raised_exception -> exception
- *
- *  Returns raised exception when in post_mortem mode.
- */
-static VALUE
-bb_raised_exception(VALUE self)
-{
-  return raised_exception;
-}
-
 /*
  *   Document-class: Byebug
  *

data/lib/byebug/commands/condition.rb

@@ -17,10 +17,12 @@ module Byebug
       breakpoints = Byebug.breakpoints.sort_by { |b| b.id }
       return errmsg('No breakpoints have been set') unless breakpoints.any?
 
-      pos, err = get_int(@match[1], 'Condition', 1, breakpoints.last.id)
-      return errmsg(err) unless pos
+      pos, err = get_int(@match[1], 'Condition', 1)
+      return errmsg(err) if err
 
-      breakpoint = breakpoints.select { |b| b.id == pos }.first
+      breakpoint = breakpoints.find { |b| b.id == pos }
+      return errmsg('Invalid breakpoint id. Use "info breakpoint" to find ' \
+                    'out the correct id') unless breakpoint
 
       return errmsg("Incorrect expression \"#{@match[2]}\", " \
                     'breakpoint not changed') unless syntax_valid?(@match[2])

data/lib/byebug/commands/list.rb

@@ -68,7 +68,7 @@ module Byebug
     # @return last line number to list
     #
     def set_range(size, max_line)
-      first = amend(lower(size, @match[1] || '+'), size, max_line - size + 1)
+      first = amend(lower(size, @match[1] || '+'), max_line - size + 1)
 
       [first, move(first, size - 1)]
     end
@@ -78,10 +78,10 @@ module Byebug
       return [-1, -1] if err
 
       if input.split(/[-,]/)[1]
-        last, err = get_int(input.split(/[-,]/)[1], 'List', 1, max_line)
+        last, _ = get_int(input.split(/[-,]/)[1], 'List', 1, max_line)
         return [-1, -1] unless last
 
-        last = amend(last, size, max_line)
+        last = amend(last, max_line)
       else
         first -= (size / 2)
       end
@@ -89,7 +89,7 @@ module Byebug
       [first, last || move(first, size - 1)]
     end
 
-    def amend(line, size, max_line)
+    def amend(line, max_line)
       return 1 if line < 1
 
       [max_line, line].min
@@ -111,7 +111,7 @@ module Byebug
     def display_lines(min, max, lines)
       puts "\n[#{min}, #{max}] in #{@state.file}"
 
-      (min..max).to_a.zip(lines[min-1..max-1]).map do |l|
+      (min..max).to_a.zip(lines[min - 1..max - 1]).map do |l|
         mark = l[0] == @state.line ? '=> ' : '   '
         puts format("#{mark}%#{max.to_s.size}d: %s", l[0], l[1])
       end

data/lib/byebug/helper.rb

@@ -1,4 +1,7 @@
 module Byebug
+  #
+  # Miscelaneous Utilities
+  #
   module MiscUtils
     #
     # Cross-platform way of finding an executable in the $PATH.
@@ -20,7 +23,7 @@ module Byebug
   end
 
   #
-  # Miscelaneous Utilities
+  # Utilities to assist command parsing
   #
   module ParseFunctions
     #

data/lib/byebug/history.rb

@@ -24,7 +24,7 @@ module Byebug
     # Saves history to disk.
     #
     def save
-      n_cmds = Setting[:histsize] > self.size ? self.size : Setting[:histsize]
+      n_cmds = Setting[:histsize] > size ? size : Setting[:histsize]
 
       open(Setting[:histfile], 'w') do |file|
         n_cmds.times { file.puts(pop) }
@@ -37,7 +37,7 @@ module Byebug
     # Discards history.
     #
     def clear
-      self.size.times { pop }
+      size.times { pop }
     end
 
     #
@@ -65,7 +65,7 @@ module Byebug
       commands = Readline::HISTORY.to_a.last(show_size)
 
       (self.size - show_size + 1..self.size).to_a.zip(commands).map do |l|
-        format("%5d  %s", l[0], l[1])
+        format('%5d  %s', l[0], l[1])
       end.join("\n") + "\n"
     end
 

data/lib/byebug/interfaces/local_interface.rb

@@ -26,7 +26,7 @@ module Byebug
       puts('^C')
       retry
     ensure
-      save_history(line) unless !hist
+      save_history(line) if hist
     end
   end
 end

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '3.5.0'
+  VERSION = '3.5.1'
 end

data/test/commands/condition_test.rb

@@ -74,9 +74,12 @@ module Byebug
     end
 
     def test_shows_error_if_breakpoint_id_is_incorrect
-      enter 'break 7', 'cond 8 b == 3', 'cont'
+      enter 'break 7', 'cond 2 b == 3'
 
-      debug_proc(@example) { assert_equal 7, state.line }
+      debug_proc(@example)
+      check_error_includes \
+        'Invalid breakpoint id. ' \
+        'Use "info breakpoint" to find out the correct id'
     end
   end
 end

data/test/commands/restart_test.rb

@@ -24,17 +24,15 @@ module Byebug
     end
 
     def test_restarts_with_manual_arguments
-      force_set_const(Byebug, 'BYEBUG_SCRIPT', 'byebug_script')
-      cmd = "#{BYEBUG_SCRIPT} #{Byebug.debugged_program} 1 2 3"
+      cmd = "ruby -rbyebug -I#{$LOAD_PATH.join(' -I')} test/test_helper.rb 1 2"
       must_restart(cmd)
 
-      enter 'restart 1 2 3'
+      enter 'restart 1 2'
       debug_proc(@example)
       check_output_includes "Re exec'ing:\n\t#{cmd}"
-      force_unset_const(Byebug, 'BYEBUG_SCRIPT')
     end
 
-    def test_still_restarts_when_byebug_attached_to_running_program
+    def test_still_restarts_shows_messages_when_attached_to_running_program
       must_restart
       enter 'restart'
 

data/test/support/test_interface.rb

@@ -20,10 +20,10 @@ module Byebug
     def read_command(*)
       return readline(true) unless @input_queue.empty?
 
-      if test_block
-        test_block.call
-        self.test_block = nil
-      end
+      return unless test_block
+
+      test_block.call
+      self.test_block = nil
     end
 
     def puts(*args)
@@ -52,7 +52,7 @@ module Byebug
     def readline(hist)
       cmd = @input_queue.shift
       cmd = cmd.is_a?(Proc) ? cmd.call : cmd
-      save_history(cmd) unless !hist
+      save_history(cmd) if hist
       cmd
     end
   end

data/test/support/utils.rb

@@ -82,6 +82,18 @@ module Byebug
       end
     end
 
+    #
+    # Set default settings for testing
+    #
+    def set_defaults
+      Byebug::Setting.load
+
+      Byebug::Setting[:autolist] = false
+      Byebug::Setting[:autosave] = false
+      Byebug::Setting[:testing] = true
+      Byebug::Setting[:width] = 80
+    end
+
     def interface
       Byebug.handler.interface
     end
@@ -95,12 +107,8 @@ module Byebug
     end
 
     def force_set_const(klass, const, value)
-      force_unset_const(klass, const)
-      klass.const_set(const, value)
-    end
-
-    def force_unset_const(klass, const)
       klass.send(:remove_const, const) if klass.const_defined?(const)
+      klass.const_set(const, value)
     end
 
     def change_line_in_file(file, line, new_line_content)

data/test/test_helper.rb

@@ -26,11 +26,7 @@ module Byebug
       Byebug.breakpoints.clear if Byebug.breakpoints
       Byebug.catchpoints.clear if Byebug.catchpoints
 
-      Byebug::Setting.load
-      Byebug::Setting[:autolist] = false
-      Byebug::Setting[:autosave] = false
-      Byebug::Setting[:testing] = true
-      Byebug::Setting[:width] = 80
+      set_defaults
 
       # Include test files as ignored files
       glob_exp = File.expand_path('../../{lib,test/support}/**/*.rb', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize