byebug 1.1.1 → 1.2.0

data/bin/byebug

@@ -199,8 +199,7 @@ end
 opts = process_options(options)
 begin
   Byebug::ARGV = ARGV.clone if not defined? Byebug::ARGV
-  byebug_path = File.expand_path($0)
-  Byebug::BYEBUG_SCRIPT = byebug_path
+  Byebug::BYEBUG_SCRIPT = File.expand_path(__FILE__)
   Byebug::INITIAL_DIR = Dir.pwd
   opts.parse! ARGV
 rescue StandardError => e
@@ -223,9 +222,6 @@ prog_script = ARGV.shift
 prog_script = whence_file(prog_script) unless File.exist?(prog_script)
 Byebug::PROG_SCRIPT = File.expand_path prog_script
 
-# install interruption handler
-trap('INT') { Byebug.interrupt_last }
-
 # Set up trace hook for byebug
 Byebug.start
 

data/byebug.gemspec

@@ -1,35 +1,34 @@
-# -*- encoding: utf-8 -*-
-require 'rubygems'
-require File.dirname(__FILE__) + "/lib/byebug/version"
-
-Gem::Specification.new do |s|
-  s.name = %q{byebug}
-  s.version = Byebug::VERSION
-
-  s.authors = ["David Rodríguez", "Kent Sibilev", "Mark Moseley"]
-  s.email = "deivid.rodriguez@mail.com"
-  s.homepage = "http://github.com/deivid-rodriguez/byebug"
-  s.summary = %q{Ruby 2.0 fast debugger - base + cli}
-  s.description = %q{Byebug is a Ruby 2.0 debugger. It's implemented using the
-    Ruby 2.0 TracePoint C API. The C extension was forked from debase whereas
-    the rest of the gem was forked from debugger. The core component provides
-    support that front-ends can build on. It provides breakpoint handling,
-    bindings for stack frames among other things.}
-
-  s.required_ruby_version = '>= 2.0.0'
-  s.required_rubygems_version = ">= 2.0.3"
-
-  s.extra_rdoc_files = [ "README.md" ]
-  s.files = `git ls-files`.split("\n")
-  s.extensions << "ext/byebug/extconf.rb"
-  s.executables = ["byebug"]
-
-  s.add_dependency "columnize", "~> 0.3.6"
-  s.add_dependency "debugger-linecache", '~> 1.2.0'
-  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.4'
-
-  s.license = "BSD"
-end
+require 'rubygems'
+require File.dirname(__FILE__) + "/lib/byebug/version"
+
+Gem::Specification.new do |s|
+  s.name = %q{byebug}
+  s.version = Byebug::VERSION
+
+  s.authors = ["David Rodríguez", "Kent Sibilev", "Mark Moseley"]
+  s.email = "deivid.rodriguez@mail.com"
+  s.homepage = "http://github.com/deivid-rodriguez/byebug"
+  s.summary = %q{Ruby 2.0 fast debugger - base + cli}
+  s.description = %q{Byebug is a Ruby 2.0 debugger. It's implemented using the
+    Ruby 2.0 TracePoint C API. The C extension was forked from debase whereas
+    the rest of the gem was forked from debugger. The core component provides
+    support that front-ends can build on. It provides breakpoint handling,
+    bindings for stack frames among other things.}
+
+  s.required_ruby_version = '>= 2.0.0'
+  s.required_rubygems_version = ">= 2.0.3"
+
+  s.extra_rdoc_files = [ "README.md" ]
+  s.files = `git ls-files`.split("\n")
+  s.extensions << "ext/byebug/extconf.rb"
+  s.executables = ["byebug"]
+
+  s.add_dependency "columnize", "~> 0.3.6"
+  s.add_dependency "debugger-linecache", '~> 1.2.0'
+  s.add_development_dependency 'rake', '~> 10.0.4'
+  s.add_development_dependency 'rake-compiler', '~> 0.8.3'
+  s.add_development_dependency 'mocha', '~> 0.14.0'
+  s.add_development_dependency 'minitest', '~> 5.0.1'
+
+  s.license = "BSD"
+end

data/lib/byebug.rb

@@ -18,9 +18,6 @@ module Byebug
     tracing:     nil    # Byebug.tracing? value. true/false resets
   } unless defined?(DEFAULT_START_SETTINGS)
 
-  # Port number used for remote debugging
-  PORT = 8989 unless defined?(PORT)
-
   # Configuration file used for startup commands. Default value is .byebugrc
   INITFILE = '.byebugrc' unless defined?(INITFILE)
 
@@ -48,8 +45,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_source_on_change = nil unless defined?(@@reload_source_on_change)
-      line = LineCache::getline(filename, line_number, @@reload_source_on_change)
+      @@autoreload = nil unless defined?(@@autoreload)
+      line = LineCache::getline filename, line_number, @@autoreload
       return "\n" unless line
       return "#{line.gsub(/^\s+/, '').chomp}"
     end

data/lib/byebug/command.rb

@@ -151,7 +151,7 @@ module Byebug
     register_setting_var(:callstyle, :last)
     register_setting_var(:testing, false)
     register_setting_var(:force_stepping, false)
-    register_setting_var(:full_path, true)
+    register_setting_var(:frame_fullpath, true)
     register_setting_var(:listsize, 10)
     register_setting_var(:stack_trace_on_error, false)
     register_setting_var(:tracing_plus, false)
@@ -223,18 +223,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_fullpath       - displays full paths when showing frame stack
+  #  :frame_class_names    - displays method's class name when showing frame
+  #                          stack
+  #  :autoreload           - 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

data/lib/byebug/commands/breakpoints.rb

@@ -59,7 +59,7 @@ module Byebug
 
       if line =~ /^\d+$/
         line = line.to_i
-        if LineCache.cache(brkpt_filename, Command.settings[:reload_source_on_change])
+        if LineCache.cache(brkpt_filename, Command.settings[:autoreload])
           last_line = LineCache.size(brkpt_filename)
           if line > last_line
             errmsg \

data/lib/byebug/commands/control.rb

@@ -29,7 +29,7 @@ module Byebug
           cmd = Byebug::PROG_SCRIPT
         end
       else
-        cmd = Byebug::BYEBUG_SCRIPT
+        cmd = "#{Byebug::BYEBUG_SCRIPT} #{Byebug::PROG_SCRIPT}"
       end
 
       begin

data/lib/byebug/commands/frame.rb

@@ -89,7 +89,7 @@ module Byebug
       line = context.frame_line(pos)
       klass = context.frame_class(pos)
 
-      unless Command.settings[:full_path]
+      unless Command.settings[:frame_fullpath]
         path_components = file.split(/[\\\/]/)
         if path_components.size > 3
           path_components[0...-3] = '...'

data/lib/byebug/commands/info.rb

@@ -189,7 +189,7 @@ module Byebug
         unless LineCache::cached_script?(file)
           return print "File #{file} is not cached\n"
         end
-        LineCache::cache(file, Command.settings[:reload_source_on_change])
+        LineCache::cache(file, Command.settings[:autoreload])
       end
 
       print "File #{file}"

data/lib/byebug/commands/list.rb

@@ -18,9 +18,8 @@ module Byebug
     end
 
     def execute
-      Byebug.source_reload if Command.settings[:reload_source_on_change]
-      lines = LineCache::getlines(@state.file,
-                                  Command.settings[:reload_source_on_change])
+      Byebug.source_reload if Command.settings[:autoreload]
+      lines = LineCache::getlines @state.file, Command.settings[:autoreload]
       if !lines
         errmsg "No sourcefile available for #{@state.file}\n"
         return @state.previous_line
@@ -107,12 +106,13 @@ module Byebug
       # 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|
           if n > 0 && lines[n-1]
             if n == current
-              print "=> %d  %s\n", n, lines[n-1].chomp
+              print "=> %#{width}d: %s\n", n, lines[n-1].chomp
             else
-              print "   %d  %s\n", n, lines[n-1].chomp
+              print "   %#{width}d: %s\n", n, lines[n-1].chomp
             end
           end
         end

data/lib/byebug/commands/reload.rb

@@ -4,14 +4,14 @@ module Byebug
   class ReloadCommand < Command
     self.allow_in_control = true
 
-    register_setting_get(:reload_source_on_change) do
-      Byebug.class_variable_get(:@@reload_source_on_change)
+    register_setting_get(:autoreload) do
+      Byebug.class_variable_get(:@@autoreload)
     end
 
-    register_setting_set(:reload_source_on_change) do |value|
-      Byebug.class_variable_set(:@@reload_source_on_change, value)
+    register_setting_set(:autoreload) do |value|
+      Byebug.class_variable_set(:@@autoreload, value)
     end
-    Command.settings[:reload_source_on_change] = true
+    Command.settings[:autoreload] = true
 
     def regexp
       /^\s*r(?:eload)?$/
@@ -19,15 +19,12 @@ module Byebug
 
     def execute
       Byebug.source_reload
-      print "Source code is reloaded. Automatic reloading is #{source_reloading}.\n"
+      print "Source code is reloaded. Automatic reloading is "   \
+            "#{Command.settings[:autoreload] ? 'on' : 'off'}.\n"
     end
 
     private
 
-    def source_reloading
-      Command.settings[:reload_source_on_change] ? 'on' : 'off'
-    end
-
     class << self
       def names
         %w(reload)

data/lib/byebug/commands/{irb.rb → repl.rb}

@@ -1,7 +1,6 @@
 require 'irb'
 
 module IRB
-
   module ExtendCommand
     class Continue
       def self.execute(conf)
@@ -33,19 +32,21 @@ module IRB
     end
 
     workspace = WorkSpace.new(binding)
-
     irb = Irb.new(workspace)
 
     @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
     @CONF[:MAIN_CONTEXT] = irb.context
 
+    trap("SIGINT") do
+      irb.signal_handle
+    end
+
     catch(:IRB_EXIT) do
       irb.eval_input
     end
   end
 end
 
-
 module Byebug
 
   # Implements byebug's "irb" command.
@@ -70,13 +71,9 @@ module Byebug
         throw :debug_error
       end
 
-      save_trap = trap("SIGINT") do
-        throw :IRB_EXIT, :cont if $byebug_in_irb
-      end
-
       add_debugging = @match.is_a?(MatchData) && '-d' == @match[1]
       $byebug_state = @state if add_debugging
-      $byebug_in_irb = true
+
       cont = IRB.start_session(get_binding)
       case cont
       when :cont
@@ -95,13 +92,10 @@ module Byebug
         CommandProcessor.print_location_and_text(file, line)
         @state.previous_line = nil
       end
-
-    ensure
-      $byebug_in_irb = nil
       $byebug_state = nil if add_debugging
-      trap("SIGINT", save_trap) if save_trap
     end
 
+
     class << self
       def names
         %w(irb)
@@ -119,5 +113,47 @@ module Byebug
       end
     end
   end
-end
 
+  begin
+    require 'pry'
+    has_pry = true
+  rescue LoadError
+    has_pry = false
+  end
+
+  # Implements byebug's "pry" command
+  class PryCommand < Command
+    def regexp
+      /^\s* pry
+        (?:\s+(-d))?
+        \s*$/x
+    end
+
+    def execute
+      unless @state.interface.kind_of?(LocalInterface)
+        print "Command is available only in local mode.\n"
+        throw :debug_error
+      end
+
+      add_debugging = @match.is_a?(MatchData) && '-d' == @match[1]
+      $byebug_state = @state if add_debugging
+
+      get_binding.pry
+
+      $byebug_state = nil if add_debugging
+    end
+
+    class << self
+      def names
+        %w(pry)
+      end
+
+      def description
+        %{
+          pry[ -d]\tstarts a Pry session.
+        }
+      end
+    end
+  end if has_pry
+
+end

data/lib/byebug/commands/set.rb

@@ -20,7 +20,7 @@ module Byebug
        ['autolist', 4, true, 'Execute "list" command on every breakpoint'],
        ['autoirb', 4, true, 'Invoke IRB on every stop'],
        ['autoreload', 4, true, 'Reload source code when changed'],
-       ['basename', 1, true, 'Report file basename only showing file names'],
+       ['basename', 1, true, 'Set filename display style.'],
        ['callstyle', 2, false, 'Set how you want call parameters displayed'],
        ['testing', 2, false, 'Used when testing byebug'],
        ['forcestep', 2, true,
@@ -67,7 +67,11 @@ module Byebug
       # Subcommand not found...
       return print "Unknown set command \"#{try_subcmd}\"\n" unless subcmd
 
-      set_on = get_onoff(args[0]) if subcmd.is_bool and args.size > 0
+      begin
+        set_on = get_onoff(args[0]) if subcmd.is_bool and args.size > 0
+      rescue RuntimeError
+        return
+      end
 
       case subcmd.name
       when /^annotate$/
@@ -103,14 +107,14 @@ module Byebug
       when /^trace$/
         Command.settings[:stack_trace_on_error] = set_on
       when /^fullpath$/
-        Command.settings[:full_path] = set_on
+        Command.settings[:frame_fullpath] = set_on
       when /^autoreload$/
-        Command.settings[:reload_source_on_change] = set_on
+        Command.settings[:autoreload] = set_on
       when /^autoirb$/
         Command.settings[:autoirb] = (set_on ? 1 : 0)
       when /^testing$/
         Command.settings[:testing] = set_on
-        Command.settings[:basename] = true if set_on
+        Command.settings[:basename] = set_on
       when /^forcestep$/
         self.class.settings[:force_stepping] = set_on
       when /^history$/
@@ -137,7 +141,7 @@ module Byebug
       when /^linetrace\+$/
         self.class.settings[:tracing_plus] = set_on
       when /^linetrace$/
-        Command.settings[:tracing] = set_on
+        Byebug.tracing = set_on
       when /^listsize$/
         listsize = get_int(args[0], "Set listsize", 1, nil, 10)
         return unless listsize

data/lib/byebug/commands/show.rb

@@ -28,7 +28,7 @@ module Byebug
         on_off = Command.settings[:autoeval]
         return "autoeval is #{show_onoff(on_off)}."
       when /^autoreload$/
-        on_off = Command.settings[:reload_source_on_change]
+        on_off = Command.settings[:autoreload]
         return "autoreload is #{show_onoff(on_off)}."
       when /^autoirb$/
         on_off = Command.settings[:autoirb] > 0
@@ -80,7 +80,7 @@ module Byebug
         on_off = self.class.settings[:force_stepping]
         return "force-stepping is #{show_onoff(on_off)}."
       when /^fullpath$/
-        on_off = Command.settings[:full_path]
+        on_off = Command.settings[:frame_fullpath]
         return "Displaying frame's full file names is #{show_onoff(on_off)}."
       when /^history(:?\s+(filename|save|size))?$/
         args = @match[1].split
@@ -101,9 +101,8 @@ module Byebug
         end
         s = []
         if show_filename
-          msg = (prefix ? "filename: " : "") +
-            "The filename in which to record the command history is " +
-                      "#{interface.histfile.inspect}"
+          msg = "#{prefix ? 'filename:' : ''} The command history file is " \
+                "#{interface.histfile.inspect}"
           s << msg
         end
         if show_save
@@ -130,8 +129,6 @@ module Byebug
       when /^listsize$/
         listlines = Command.settings[:listsize]
         return "Number of source lines to list is #{listlines}."
-      when /^port$/
-        return "server port is #{Byebug::PORT}."
       when /^trace$/
         on_off = Command.settings[:stack_trace_on_error]
         return "Displaying stack trace is #{show_onoff(on_off)}."