byebug 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a070d89045517045b3dc43aa5cd111e27ba6dad
-  data.tar.gz: 4d1c945dc27077f736c8baae4b73ddfb5321b323
+  metadata.gz: 7001ae9053bb3dff2ca95eee6b105c0b1e75b06b
+  data.tar.gz: f1d8c6f4b00f51f1460f6833bdc28dcf84f28a4d
 SHA512:
-  metadata.gz: a7654e3d51f44a52567296713c0c98cbb712f5ecc4af7242f8174c97b73de07c7fca86227ef58082601e7f879bb91e1a0eb5bb7dbb50e12581885b892fc96e83
-  data.tar.gz: 8f86297d98eaa6a23e5683d3136fdb6d08a4cb8ececb64bec47a3897d1d3b3a6278843c1ef6f6772be8c098a36f3b8c0c13aee3fad2e31c9cf2f41a998a8e10f
+  metadata.gz: 8360f244410378f4b11caae0eabcd6dcc18cacd66562fd7a460d99c5861c03ff5a92a08f027bb9dc5fc25ae3527518e8ac45ed3e5643389fd0cfd9eac2354f75
+  data.tar.gz: f9bba361d8ace23476c667df962e610fe1a054de7224c8ae8cf392fa8ee930656d5d6ac7f3f6ddfceb863cdb3f9926c808f785476c3833123a021bbb7d24889d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.4.1
+* Fix #54, you can use threads when "evaling" stuff now.
+* Fix bug in list command where user could not list backwards if current
+listing was reaching the end of the file.
+
+
 # 3.4.0
 * Better fix for deivid-rodriguez/pry-byebug#32
 

data/CONTRIBUTING.md

@@ -4,6 +4,7 @@ To make your changes, follow this steps:
 
 * [Fork the project](https://help.github.com/fork-a-repo)
 * Create a topic branch - `git checkout -b my_branch`
+* Make sure the latest patch level of Ruby 2.0.0 or higher is installed.
 * Insert awesome code - See below
 * Push your branch to your forked repo - `git push origin my_branch`
 * [Make a pull request](https://help.github.com/articles/using-pull-requests)

data/GUIDE.md

@@ -537,7 +537,7 @@ this way finishes, byebug is turned off and the application proceeds at regular
 speed.
 
 Of course, inside the block you will probably want to enter the byebug using
-`Byebug.byebug()`, otherwise there would be little point in using the `start`.
+`Byebug.byebug`, otherwise there would be little point in using the `start`.
 For example, you can do this in `irb`:
 
 ```bash

data/README.md

@@ -12,18 +12,32 @@ Byebug is a simple to use, feature rich debugger for Ruby 2. It uses the new
 TracePoint API for execution control and the new Debug Inspector API for call
 stack navigation, so it doesn't depend on internal core sources. It's developed
 as a C extension, so it's fast. And it has a full test suite so it's reliable.
-Note that byebug works only for ruby 2.0.0 or newer. For debugging ruby 1.9.3 or
-older, use [debugger](https://github.com/cldwalker/debugger).
 
 It allows you to see what is going on _inside_ a Ruby program while it executes
-and can do four main kinds of things to help you catch bugs in the act:
+and offers many of the traditional debugging features such as:
 
-* Start your program or attach to it, specifying anything that might affect its
-behavior.
-* Make your program stop on specified conditions.
-* Examine what has happened when your program has stopped.
-* Change things in your program, so you can experiment with correcting the
-effects of one bug and go on to learn about another.
+* Stepping: Running your program one line at a time.
+* Breaking: Pausing the program at some event or specified instruction, to
+examine the current state.
+* Evaluating: Basic REPL functionality, although [pry][] does a better job at
+that.
+* Tracking: Keeping track of the different values of your variables or the
+different lines executed by your program.
+
+
+## Ruby Version Support
+
+Byebug works only for Ruby 2.0.0 or newer. For debugging ruby 1.9.3 or older,
+use [debugger][].
+
+Furthermore, Byebug uses the TracePoint API which was just first developed for
+Ruby 2.0.0. Since it was released, a lot of bugs directly impacting Byebug have
+been corrected, so for the best debugging experience, the following Ruby
+versions are recommended:
+
+* Ruby 2.0.0-p576 or higher.
+* Ruby 2.1.3 or higher.
+* Ruby 2.2.0-preview1 or higher.
 
 
 ## Install
@@ -41,8 +55,7 @@ wherever you want to start debugging and the execution will stop there. If you
 are debugging rails, start the server and once the execution gets to your
 `byebug` command you will get a debugging prompt.
 
-Former [debugger](https://github.com/cldwalker/debugger) or
-[ruby-debug](https://github.com/mark-moseley/ruby-debug) users, notice:
+Former [debugger][] or [ruby-debug][] users, notice:
 
 * Some gems (rails, rspec) implement debugging flags (-d, --debugger) that early
 require and start the debugger. These flags are a performance penalty and byebug
@@ -102,9 +115,8 @@ both rails and rspec have deprecated these flags in their latest versions.
 
 Byebug tries to follow [semantic versioning](http://semver.org) and tries to
 bump major version only when backwards incompatible changes are released.
-Backwards compatibility is targeted to
-[pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) and any other
-plugins relying on `byebug`.
+Backwards compatibility is targeted to [pry-byebug][] and any other plugins
+relying on `byebug`.
 
 
 ## Getting Started
@@ -116,14 +128,12 @@ started. Proper documentation will be eventually written.
 
 ## Related projects
 
-* [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) adds `next`,
-`step`, `finish`, `continue` and `break` commands to pry using byebug.
-* [ruby-debug-passenger](https://github.com/davejamesmiller/ruby-debug-passenger)
-adds a rake task that restarts Passenger with byebug connected.
-* [minitest-byebug](https://github.com/kaspth/minitest-byebug) starts a byebug
-session on minitest failures.
-* [sublime-debugger](https://github.com/shuky19/sublime_debugger) provides a plugin
-for ruby debugging on Sublime Text.
+* [pry-byebug][] adds `next`, `step`, `finish`, `continue` and `break` commands
+to `pry` using `byebug`.
+* [ruby-debug-passenger][] adds a rake task that restarts Passenger with Byebug
+connected.
+* [minitest-byebug][] starts a byebug session on minitest failures.
+* [sublime_debugger][] provides a plugin for ruby debugging on Sublime Text.
 
 
 ## TODO List (by priority)
@@ -132,15 +142,16 @@ for ruby debugging on Sublime Text.
 * Add printers support.
 * Support rubies other than MRI.
 
+[Getting Started with Development](CONTRIBUTING.md)
+
 ## Credits
 
 Everybody who has ever contributed to this forked and reforked piece of
 software, specially:
 
 * @ko1, author of the awesome TracePoint API for Ruby.
-* @cldwalker, [debugger](https://github.com/cldwalker/debugger)'s mantainer.
-* @denofevil, author of [debase](https://github.com/denofevil/debase), the
-starting point of this.
+* @cldwalker, [debugger][]'s mantainer.
+* @denofevil, author of [debase][], the starting point of this.
 * @kevjames3 for testing, bug reports and the interest in the project.
 * @FooBarWidget for working and helping with remote debugging.
 
@@ -156,3 +167,12 @@ starting point of this.
 [CoverageURL]: https://codeclimate.com/github/deivid-rodriguez/byebug
 [GittipBadge]: http://img.shields.io/gittip/deivid-rodriguez.svg
 [GittipURL]: https://www.gittip.com/deivid-rodriguez
+
+[debugger]: https://github.com/cldwalker/debugger
+[pry]: https://github.com/pry/pry
+[ruby-debug]: https://github.com/mark-moseley/ruby-debug
+[debase]: https://github.com/denofevil/debase
+[pry-byebug]: https://github.com/deivid-rodriguez/pry-byebug
+[ruby-debug-passenger]: https://github.com/davejamesmiller/ruby-debug-passenger
+[minitest-byebug]: https://github.com/kaspth/minitest-byebug
+[sublime_debugger]: https://github.com/shuky19/sublime_debugger

data/ext/byebug/byebug.c

@@ -316,6 +316,16 @@ c_return_event(VALUE trace_point, void *data)
   cleanup(dc);
 }
 
+static void
+thread_event(VALUE trace_point, void *data)
+{
+  EVENT_SETUP
+
+  EVENT_COMMON
+
+  cleanup(dc);
+}
+
 static void
 raise_event(VALUE trace_point, void *data)
 {
@@ -387,19 +397,21 @@ register_tracepoints(VALUE self)
 
   if (NIL_P(traces))
   {
-    int line_msk     = RUBY_EVENT_LINE;
-    int call_msk     = RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
-    int return_msk   = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
-    int c_call_msk   = RUBY_EVENT_C_CALL;
-    int c_return_msk = RUBY_EVENT_C_RETURN;
-    int raise_msk    = RUBY_EVENT_RAISE;
-
-    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, return_msk  , return_event  , 0);
-    VALUE tpCCall    = rb_tracepoint_new(Qnil, c_call_msk  , c_call_event  , 0);
-    VALUE tpCReturn  = rb_tracepoint_new(Qnil, c_return_msk, c_return_event, 0);
-    VALUE tpRaise    = rb_tracepoint_new(Qnil, raise_msk   , raise_event   , 0);
+    int line_msk   = RUBY_EVENT_LINE;
+    int call_msk   = RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
+    int return_msk = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
+    int c_call_msk = RUBY_EVENT_C_CALL;
+    int c_ret_msk  = RUBY_EVENT_C_RETURN;
+    int raise_msk  = RUBY_EVENT_RAISE;
+    int thread_msk = RUBY_EVENT_THREAD_BEGIN | RUBY_EVENT_THREAD_END;
+
+    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, return_msk, return_event  , 0);
+    VALUE tpCCall   = rb_tracepoint_new(Qnil, c_call_msk, c_call_event  , 0);
+    VALUE tpCReturn = rb_tracepoint_new(Qnil, c_ret_msk , c_return_event, 0);
+    VALUE tpRaise   = rb_tracepoint_new(Qnil, raise_msk , raise_event   , 0);
+    VALUE tpThread  = rb_tracepoint_new(Qnil, thread_msk, thread_event  , 0);
 
     traces = rb_ary_new();
     rb_ary_push(traces, tpLine);
@@ -408,6 +420,7 @@ register_tracepoints(VALUE self)
     rb_ary_push(traces, tpCCall);
     rb_ary_push(traces, tpCReturn);
     rb_ary_push(traces, tpRaise);
+    rb_ary_push(traces, tpThread);
 
     tracepoints = traces;
   }
@@ -768,23 +781,23 @@ Init_byebug()
 {
   mByebug = rb_define_module("Byebug");
 
-  rb_define_module_function(mByebug, "add_catchpoint"   , bb_add_catchpoint  ,  1);
-  rb_define_module_function(mByebug, "breakpoints"      , bb_breakpoints     ,  0);
-  rb_define_module_function(mByebug, "catchpoints"      , bb_catchpoints     ,  0);
-  rb_define_module_function(mByebug, "contexts"         , bb_contexts        ,  0);
-  rb_define_module_function(mByebug, "current_context"  , bb_current_context ,  0);
-  rb_define_module_function(mByebug, "debug_load"       , bb_load            , -1);
-  rb_define_module_function(mByebug, "post_mortem?"     , bb_post_mortem     ,  0);
-  rb_define_module_function(mByebug, "post_mortem="     , bb_set_post_mortem ,  1);
-  rb_define_module_function(mByebug, "raised_exception" , bb_raised_exception,  0);
-  rb_define_module_function(mByebug, "start"            , bb_start           ,  0);
-  rb_define_module_function(mByebug, "started?"         , bb_started         ,  0);
-  rb_define_module_function(mByebug, "stop"             , bb_stop            ,  0);
-  rb_define_module_function(mByebug, "thread_context"   , bb_thread_context  ,  1);
-  rb_define_module_function(mByebug, "tracing?"         , bb_tracing         ,  0);
-  rb_define_module_function(mByebug, "tracing="         , bb_set_tracing     ,  1);
-  rb_define_module_function(mByebug, "verbose?"         , bb_verbose         ,  0);
-  rb_define_module_function(mByebug, "verbose="         , bb_set_verbose     ,  1);
+  rb_define_module_function(mByebug, "add_catchpoint"  , bb_add_catchpoint  ,  1);
+  rb_define_module_function(mByebug, "breakpoints"     , bb_breakpoints     ,  0);
+  rb_define_module_function(mByebug, "catchpoints"     , bb_catchpoints     ,  0);
+  rb_define_module_function(mByebug, "contexts"        , bb_contexts        ,  0);
+  rb_define_module_function(mByebug, "current_context" , bb_current_context ,  0);
+  rb_define_module_function(mByebug, "debug_load"      , bb_load            , -1);
+  rb_define_module_function(mByebug, "post_mortem?"    , bb_post_mortem     ,  0);
+  rb_define_module_function(mByebug, "post_mortem="    , bb_set_post_mortem ,  1);
+  rb_define_module_function(mByebug, "raised_exception", bb_raised_exception,  0);
+  rb_define_module_function(mByebug, "start"           , bb_start           ,  0);
+  rb_define_module_function(mByebug, "started?"        , bb_started         ,  0);
+  rb_define_module_function(mByebug, "stop"            , bb_stop            ,  0);
+  rb_define_module_function(mByebug, "thread_context"  , bb_thread_context  ,  1);
+  rb_define_module_function(mByebug, "tracing?"        , bb_tracing         ,  0);
+  rb_define_module_function(mByebug, "tracing="        , bb_set_tracing     ,  1);
+  rb_define_module_function(mByebug, "verbose?"        , bb_verbose         ,  0);
+  rb_define_module_function(mByebug, "verbose="        , bb_set_verbose     ,  1);
 
   Init_threads_table(mByebug);
   Init_context(mByebug);

data/ext/byebug/context.c

@@ -431,7 +431,7 @@ Context_step_out(int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, debug_context_t, context);
 
-  if (n_frames < 0 || n_frames >= context->calced_stack_size)
+  if (n_frames < 0 || n_frames > context->calced_stack_size)
     rb_raise(rb_eRuntimeError,
              "You wan't to finish %d frames, but stack size is only %d",
              n_frames, context->calced_stack_size);

data/lib/byebug/attacher.rb

@@ -1,6 +1,13 @@
 module Byebug
-  # Stores program being debugged to make restarts possible
-  PROG_SCRIPT = $PROGRAM_NAME unless defined?(PROG_SCRIPT)
+  #
+  # Enters byebug right before (or right after if _before_ is false) return
+  # events occur. Before entering byebug the init script is read.
+  #
+  def self.attach(steps_out, before)
+    start
+    run_init_script(StringIO.new)
+    current_context.step_out(steps_out, before)
+  end
 end
 
 #
@@ -9,14 +16,8 @@ end
 # Dropping a `byebug` call anywhere in your code, you get a debug prompt.
 #
 module Kernel
-  #
-  # Enters byebug right before (or right after if _before_ is false) return
-  # events occur. Before entering byebug the init script is read.
-  #
   def byebug(steps_out = 1, before = true)
-    Byebug.start
-    Byebug.run_init_script(StringIO.new)
-    Byebug.current_context.step_out(steps_out, before)
+    Byebug.attach(steps_out + 1, before)
   end
 
   alias_method :debugger, :byebug

data/lib/byebug/commands/list.rb

@@ -19,8 +19,9 @@ module Byebug
       b, e = set_line_range(Setting[:listsize], lines.size)
       return @state.previous_line if b < 0
 
-      puts "\n[#{b}, #{e}] in #{@state.file}"
-      @state.previous_line = display_list(b, e, lines, @state.line)
+      display_lines(b, e, lines)
+
+      @state.previous_line = b > lines.size ? @previous_line : b
     end
 
     class << self
@@ -94,20 +95,16 @@ module Byebug
       [b, e]
     end
 
-    ##
-    # Show file lines in LINES from line B to line E where CURRENT is the
-    # current line number. If we can show from B to E then we return B,
-    # otherwise we return the previous line @state.previous_line.
     #
-    def display_list(b, e, lines, current)
-      width = e.to_s.size
-      b.upto(e) do |n|
-        next unless n > 0 && lines[n - 1]
-        line = n == current ? '=>' : '  '
-        line += format(" %#{width}d: %s", n, lines[n - 1].chomp)
-        puts(line)
+    # Show file lines in <lines> from line number <min> to line number <max>.
+    #
+    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|
+        mark = l[0] == @state.line ? '=> ' : '   '
+        puts format("#{mark}%#{max.to_s.size}d: %s", l[0], l[1])
       end
-      e == lines.size ? @state.previous_line : b
     end
   end
 end

data/lib/byebug/commands/restart.rb

@@ -10,17 +10,14 @@ module Byebug
     end
 
     def execute
-      prog = PROG_SCRIPT if defined?(PROG_SCRIPT)
-      byebug_script = BYEBUG_SCRIPT if defined?(BYEBUG_SCRIPT)
-
-      return errmsg("Don't know name of debugged program") unless prog
+      prog = Byebug.debugged_program
 
       unless File.exist?(File.expand_path(prog))
         return errmsg("Ruby program #{prog} doesn't exist")
       end
 
-      if byebug_script
-        cmd = "#{byebug_script} #{prog}"
+      if defined?(BYEBUG_SCRIPT)
+        cmd = "#{BYEBUG_SCRIPT} #{prog}"
       else
         puts 'Byebug was not called from the outset...'
         if File.executable?(prog)

data/lib/byebug/commands/variables.rb

@@ -28,7 +28,7 @@ module Byebug
 
     def var_global
       globals = global_variables.reject do |v|
-        [:$IGNORECASE, :$=, :$KCODE, :$-K].include?(v)
+        [:$IGNORECASE, :$=, :$KCODE, :$-K, :$binding].include?(v)
       end
 
       var_list(globals)

data/lib/byebug/core.rb

@@ -20,10 +20,18 @@ module Byebug
 
   class << self
     attr_accessor :handler
+    attr_writer :debugged_program
   end
 
   Byebug.handler = CommandProcessor.new
 
+  #
+  # Program being debugged (or a default one if not set yet)
+  #
+  def self.debugged_program
+    @debugged_program ||= $PROGRAM_NAME
+  end
+
   def self.source_reload
     hsh = 'SCRIPT_LINES__'
     Object.send(:remove_const, hsh) if Object.const_defined?(hsh)

data/lib/byebug/runner.rb

@@ -16,13 +16,15 @@ module Byebug
     # Debug a script only if syntax checks okay.
     #
     def debug_program(options)
-      output = `ruby -c "#{Byebug::PROG_SCRIPT}" 2>&1`
-      if $CHILD_STATUS.exitstatus != 0
-        Byebug.puts output
-        exit $CHILD_STATUS.exitstatus
+      unless File.executable?(Byebug.debugged_program)
+        output = `ruby -c "#{Byebug.debugged_program}" 2>&1`
+        if $CHILD_STATUS.exitstatus != 0
+          Byebug.puts output
+          exit $CHILD_STATUS.exitstatus
+        end
       end
 
-      status = Byebug.debug_load(Byebug::PROG_SCRIPT, options[:stop])
+      status = Byebug.debug_load(Byebug.debugged_program, options[:stop])
       Byebug.puts "#{status}\n#{status.backtrace}" if status
     end
 
@@ -45,6 +47,23 @@ module Byebug
       prog_script
     end
 
+    #
+    # Save path to program to be debugged
+    #
+    # Used for restarts.
+    #
+    def save_debugged_program
+      if ARGV.empty?
+        Byebug.puts 'You must specify a program to debug...'
+        abort
+      end
+
+      prog_script = ARGV.first
+      prog_script = whence_file(prog_script) unless File.exist?(prog_script)
+
+      Byebug.debugged_program = File.expand_path(prog_script)
+    end
+
     #
     # Starts byebug to debug a program
     #
@@ -61,19 +80,7 @@ module Byebug
         return
       end
 
-      if ARGV.empty?
-        Byebug.puts 'You must specify a program to debug...'
-        abort
-      end
-
-      # Save debugged program
-      prog_script = ARGV.pop
-      prog_script = whence_file(prog_script) unless File.exist?(prog_script)
-
-      if Byebug.const_defined?('PROG_SCRIPT')
-        Byebug.send(:remove_const, 'PROG_SCRIPT')
-      end
-      Byebug.const_set('PROG_SCRIPT', File.expand_path(prog_script))
+      save_debugged_program
 
       # Set up trace hook for byebug
       Byebug.start

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/test/commands/eval_test.rb

@@ -29,7 +29,6 @@ module Byebug
     end
 
     def test_eval_properly_evaluates_an_expression_using_timeout
-      skip 'for now'
       enter 'eval Timeout::timeout(60) { 1 }'
       debug_proc(@example)
       check_output_includes '1'

data/test/commands/list_test.rb

@@ -29,17 +29,6 @@ module Byebug
       super
     end
 
-    def lines_between(min, max, mark_current = true)
-      lines = [*File.open(__FILE__)][min-1..max-1]
-      numbers = (min..max).to_a
-      output = numbers.zip(lines).map { |l| format("%2d: %s", l[0], l[1]) }
-      if mark_current
-        middle = (output.size/2.0).ceil
-        output[middle] = "=> #{output[middle]}"
-      end
-      output
-    end
-
     def test_lists_source_code_lines
       Setting[:listsize] = 10
       enter 'list'
@@ -61,7 +50,10 @@ module Byebug
     end
 
     def test_moves_range_down_when_it_goes_after_the_end_of_file
-      skip "Can't test this with the current setup"
+      n_lines = %x{wc -l #{__FILE__}}.split.first.to_i
+      enter 'break 18', 'cont', "list #{n_lines-3}-#{n_lines+6}"
+      debug_proc(@example)
+      check_output_includes "[#{n_lines-9}, #{n_lines}] in #{__FILE__}"
     end
 
     def test_lists_the_whole_file_if_number_of_lines_is_smaller_than_listsize
@@ -75,47 +67,50 @@ module Byebug
     def test_lists_surrounding_lines_after_the_first_call_to_list
       enter 'break 8', 'cont', 'list'
       debug_proc(@example)
-      check_output_includes("[3, 12] in #{__FILE__}", *lines_between(3, 12))
+      check_output_includes "[3, 12] in #{__FILE__}"
     end
 
     def test_lists_forwards_after_the_second_call_to_list
       enter 'break 8', 'cont', 'list', 'list'
       debug_proc(@example)
-      check_output_includes("[13, 22] in #{__FILE__}",
-                            *lines_between(13, 22, false))
+      check_output_includes "[13, 22] in #{__FILE__}"
     end
 
     def test_lists_surrounding_lines_after_the_first_call_to_list_minus
       enter 'break 18', 'cont', 'list -'
       debug_proc(@example)
-      check_output_includes("[13, 22] in #{__FILE__}", *lines_between(13, 22))
+      check_output_includes "[13, 22] in #{__FILE__}"
     end
 
     def test_lists_backwards_after_the_second_call_to_list_minus
       enter 'break 18', 'cont', 'list -', 'list -'
       debug_proc(@example)
-      check_output_includes("[3, 12] in #{__FILE__}",
-                            *lines_between(3, 12, false))
+      check_output_includes "[3, 12] in #{__FILE__}"
+    end
+
+    def test_lists_backwards_from_end_of_file
+      n_lines = %x{wc -l #{__FILE__}}.split.first.to_i
+      enter 'break 18', 'cont', "list #{n_lines-9}-#{n_lines}", 'list -'
+      debug_proc(@example)
+      check_output_includes "[#{n_lines-19}, #{n_lines-10}] in #{__FILE__}"
     end
 
     def test_lists_surrounding_lines_when_list_equals_is_called
       enter 'break 8', 'cont', 'list ='
       debug_proc(@example)
-      check_output_includes("[3, 12] in #{__FILE__}", *lines_between(3, 12))
+      check_output_includes "[3, 12] in #{__FILE__}"
     end
 
     def test_lists_specific_range_when_requested_in_hyphen_format
       enter 'list 7-9'
       debug_proc(@example)
-      check_output_includes("[7, 9] in #{__FILE__}",
-                            *lines_between(7, 9, false))
+      check_output_includes "[7, 9] in #{__FILE__}"
     end
 
     def test_lists_specific_range_when_requested_in_comma_format
       enter 'list 7,9'
       debug_proc(@example)
-      check_output_includes("[7, 9] in #{__FILE__}",
-                            *lines_between(7, 9, false))
+      check_output_includes "[7, 9] in #{__FILE__}"
     end
 
     def test_lists_nothing_if_unexistent_range_is_specified
@@ -135,15 +130,13 @@ module Byebug
     def test_list_proper_lines_when_range_around_specific_line_with_hyphen
       enter 'list 17-'
       debug_proc(@example)
-      check_output_includes("[12, 21] in #{__FILE__}",
-                            *lines_between(12, 21, false))
+      check_output_includes "[12, 21] in #{__FILE__}"
     end
 
     def test_list_proper_lines_when_range_around_specific_line_with_comma
       enter 'list 17,'
       debug_proc(@example)
-      check_output_includes("[12, 21] in #{__FILE__}",
-                            *lines_between(12, 21, false))
+      check_output_includes "[12, 21] in #{__FILE__}"
     end
 
     def test_shows_an_error_when_the_file_to_list_does_not_exist

data/test/commands/restart_test.rb

@@ -15,15 +15,9 @@ module Byebug
         RestartExample.new.concat_args(a, b, c)
       end
 
-      @old_prog_script = Byebug::PROG_SCRIPT if defined?(Byebug::PROG_SCRIPT)
-
       super
     end
 
-    def after
-      force_set_const(Byebug, 'PROG_SCRIPT', @old_prog_script)
-    end
-
     def must_restart(cmd = nil)
       expectation = RestartCommand.any_instance.expects(:exec)
       expectation = expectation.with(cmd) if cmd
@@ -32,23 +26,26 @@ module Byebug
 
     def test_restarts_with_manual_arguments
       force_set_const(Byebug, 'BYEBUG_SCRIPT', 'byebug_script')
-      cmd = "#{BYEBUG_SCRIPT} #{PROG_SCRIPT} 1 2 3"
+      cmd = "#{BYEBUG_SCRIPT} #{Byebug.debugged_program} 1 2 3"
       must_restart(cmd)
+
       enter 'restart 1 2 3'
       debug_proc(@example)
       check_output_includes "Re exec'ing:\n\t#{cmd}"
     end
 
-    def test_does_not_restart_when_no_script_specified
-      force_unset_const(Byebug, 'PROG_SCRIPT')
-      must_restart.never
+    def test_restart_with_a_default_script_if_nil_script_specified
+      force_set_const(Byebug, 'BYEBUG_SCRIPT', 'byebug_script')
+      Byebug.debugged_program = nil
+      must_restart
+
       enter 'restart'
       debug_proc(@example)
-      check_error_includes "Don't know name of debugged program"
+      check_output_includes(/Re exec'ing:\s*#{BYEBUG_SCRIPT} #{$PROGRAM_NAME}/)
     end
 
     def test_does_not_restart_when_script_specified_does_not_exist
-      force_set_const(Byebug, 'PROG_SCRIPT', 'blabla')
+      Byebug.debugged_program = 'blabla'
       must_restart.never
       enter 'restart'
       debug_proc(@example)
@@ -61,8 +58,9 @@ module Byebug
       enter 'restart'
       debug_proc(@example)
       check_output_includes 'Byebug was not called from the outset...'
-      check_output_includes "Ruby program #{PROG_SCRIPT} not executable... " \
-                            "We'll wrap it in a ruby call"
+      check_output_includes \
+        "Ruby program #{Byebug.debugged_program} not executable... " \
+        "We'll wrap it in a ruby call"
     end
   end
 end

data/test/commands/variables_test.rb

@@ -5,7 +5,7 @@ module Byebug
     def initialize
       @inst_a = 1
       @inst_b = 2
-      @inst_c = "1" * 40
+      @inst_c = '1' * 40
       @inst_d = BasicObject.new
     end
 

data/test/runner_test.rb

@@ -63,6 +63,13 @@ module Byebug
       Byebug::Runner.new.run
     end
 
+    def test_saved_debugged_program
+      ARGV.replace(%w(my_script -opt value))
+
+      Byebug::Runner.new.save_debugged_program
+      assert_match 'my_script', Byebug.debugged_program
+    end
+
     def test_run_with_no_rc_option
       ARGV.replace(%w(--no-rc my_script))
       Byebug.expects(:start)

data/test/test_helper.rb

@@ -33,22 +33,18 @@ module Byebug
 
       byebug_bin = File.expand_path('../../../bin/byebug', __FILE__)
       force_set_const(Byebug, 'BYEBUG_SCRIPT', byebug_bin)
+      Byebug.debugged_program = $PROGRAM_NAME
 
       # include test files as ignored files
       glob_exp = File.expand_path('../../{lib,test/support}/**/*.rb', __FILE__)
       ignored_files = Dir.glob(glob_exp) + ['test/test_helper.rb']
       force_set_const(Byebug, 'IGNORED_FILES', ignored_files)
-
-      force_set_const(Byebug, 'PROG_SCRIPT', $PROGRAM_NAME)
     end
 
     include Byebug::TestUtils
   end
 end
 
-# Init globals to avoid warnings
-$binding = binding # this is from irb...
-
 # Load the test files from the command line.
 argv = ARGV.select do |argument|
   case argument

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: debugger-linecache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 description: |-
@@ -70,9 +70,9 @@ extra_rdoc_files:
 - README.md
 - GUIDE.md
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - GUIDE.md
@@ -207,12 +207,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []