byebug 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd8920a83d1fedf0cbd9d0be440d9f91787a7d2
-  data.tar.gz: 314f0f812d551b821dd2e359395913f892b658c9
+  metadata.gz: 6e50f515a828a79ec3a73e802a9b480b44d4aedb
+  data.tar.gz: 3a613a22f8a9a5e6805899f646efbd8e5f29c5eb
 SHA512:
-  metadata.gz: 5d876b60bd98e99b26d56f4eab6a755e128d898e21495fe0a3068f28b69cd3650813033ece544e8ed3f3cba5f01d40e9bc359f16437c44f891a0f294dc10287d
-  data.tar.gz: 94a65649be23ce095d340a6cbb358c217fb4151649183df73c652efd8e5efddf9d40d58a3f5deaa45eb7963e88b008879408a129f444a39bc74fbec0aa285d24
+  metadata.gz: b1dea64be0bf3f4aa95986f80e4d468c810ce5ed6a3322a5a672d8db772548109a3c390d5a442bf0b91b6f934c2d6b18797b5782730b2b6f9a544f47ddb337f1
+  data.tar.gz: 7962816e1385499dce322487b27be5ec25e71f8134f65c8d6b2970ab19257ee998c9f34c2f3208fa64e8349a20ea3b0b050406be1806222b24b8ce6f9af95f1b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.8.2
+
+* More user friendly regexps for commands
+* Better help for some commands
+* `save` command now saves the list of "displays"
+* Fixes bug in calculating stacksize
+
+
 ## 1.8.1
 
 * Bugfix release

data/CONTRIBUTING.md

@@ -1 +1,9 @@
-Thanks for trying out this project! [See here for contribution guidelines.](http://tagaholic.me/contributing.html)
+Thanks for your interest in contributing to ByeBug!
+
+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`
+* Insert awesome code
+* 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/README.md

@@ -37,6 +37,7 @@ directly affecting byebug and a fix for it has been released with this
 patchlevel (see [#5](https://github.com/deivid-rodriguez/byebug/issues/5) for
 more information)
 
+
 ## Usage
 
 Simply drop
@@ -47,23 +48,17 @@ wherever you want to start debugging and the execution will stop there. If you
 are debugging rails, start the server and once the execution get to your
 `byebug` command you will get a debugging prompt.
 
-_If you are coming from debugger, notice that stopping execution using the word
- `debugger` doesn't work anymore unless you explicitly alias it._
-
-### Configuration
-
-You can automatically load some configurations at startup by dropping them in
-the startup file `.byebugrc`. For example, you can change the number of lines
-listed whenever byebug stops like this:
-
-    set listsize 20
-
-If you are coming from [debugger](https://github.com/cldwalker/debugger), notice
-however that you no longer need
-
-    set autoreload
+Former [debugger](https://github.com/cldwalker/debugger) or
+[ruby-debug](https://github.com/mark-moseley/ruby-debug) users, notice:
 
-because it is a default option in byebug.
+* Some gems (rails, rspec) implement debugging flags (-d, --debugger) that early
+require and start the debugger. This flags are a performance penalty and Byebug
+doesn't need them anymore so my recommendation is not to use them.
+* Stopping execution using the word `debugger` doesn't work anymore unless you
+explicitly alias it. Similarly, the startup configuration file is now called
+`.byebugrc` instead of `.rdebugrc`.
+* `autoreload`, `autoeval` and `autolist` are default options in Byebug so you
+no longer need to set them in the startup file.
 
 
 ## What's different from debugger
@@ -75,14 +70,14 @@ because it is a default option in byebug.
   - Line number wrongly shown as zero in backtrace.
   - Line tracing.
   - Colon delimited include paths.
-  - Nice markdow guide.
+  - Nice markdown guide.
   - Ruby 2.0 support.
   - where/bt does not in fact give a backtrace.
   - `byebug` can now be placed at the end of a block or method call.
 * Very actively mantained.
 * Editor agnostic: no external editor built-in support.
-* No thread support as not supported by the new API yet (I hope it will come
-  soon!).
+* No thread support. Haven't had time to look at it and I don't know whether
+the new debugging API supports it yet.
 * Pry command is built-in. No need of external gem like debugger-pry.
 
 
@@ -244,6 +239,8 @@ quit without being prompted, suffix the command with an exclamation mark, e.g.,
 
 * [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.
 
 
 ## Credits

data/lib/byebug/commands/breakpoints.rb

@@ -5,12 +5,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      / ^\s*
-        b(?:reak)?
-        (?: \s+ #{Position_regexp})? \s*
-        (?: \s+ (.*))? \s*
-        $
-      /x
+      /^\s* b(?:reak)? (?:\s+#{Position_regexp})? (?:\s+(.+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/catchpoint.rb

@@ -4,9 +4,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^\s* cat(?:ch)?
-           (?:\s+ (\S+))?
-           (?:\s+ (off))? \s* $/ix
+      /^\s* cat(?:ch)? (?:\s+(\S+))? (?:\s+(off))? \s*$/ix
     end
 
     def execute
@@ -39,11 +37,9 @@ module Byebug
       end
 
       def description
-        %{cat[ch]\t\tsame as "info catch"
-          cat[ch] <exception-name> [on|off]
-          \tIntercept <exception-name> when there would otherwise be no handler.
-          \tWith an "on" or "off", turn handling the exception on or off.
-          cat[ch] off\tdelete all catchpoints}
+        %{cat[ch]\t\t\t\tLists catchpoints
+          cat[ch] off\t\t\tDeletes all catchpoints
+          cat[ch] <exception> [off]\tEnable/disable handling <exception>.}
       end
     end
   end

data/lib/byebug/commands/condition.rb

@@ -3,12 +3,11 @@ module Byebug
   class ConditionCommand < Command
 
     def regexp
-      /^\s* cond(?:ition)? (?:\s+(\d+)\s*(.*))?$/ix
+      /^\s* cond(?:ition)? (?:\s+(\d+)(?:\s+(.*))?)? \s*$/ix
     end
 
     def execute
-      return errmsg "\"condition\" must be followed by " \
-                    "breakpoint number and expression\n" unless @match[1]
+      return print ConditionCommand.help(nil) unless @match[1]
 
       breakpoints = Byebug.breakpoints.sort_by{|b| b.id }
       largest = breakpoints.inject(0) do |tally, b|
@@ -17,12 +16,9 @@ module Byebug
 
       return print "No breakpoints have been set.\n" if 0 == largest
       return unless pos = get_int(@match[1], "Condition", 1, largest)
-      breakpoints.each do |b|
-        if b.id == pos
-          b.expr = @match[2].empty? ? nil : @match[2]
-          break
-        end
-      end
+
+      b = breakpoints.select{ |b| b.id == pos }.first
+      b.expr = @match[2] if b
     end
 
     class << self

data/lib/byebug/commands/continue.rb

@@ -6,7 +6,7 @@ module Byebug
     self.need_context         = false
 
     def regexp
-      /^\s* c(?:ont(?:inue)?)? (?:\s+(.*))? $/x
+      /^\s* c(?:ont(?:inue)?)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/control.rb

@@ -4,11 +4,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      / ^\s*
-      (?:restart|R)
-      (?:\s+ (\S?.*\S))? \s*
-      $
-      /ix
+      /^\s* (?:restart|R) (?:\s+(.+))? \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/display.rb

@@ -23,7 +23,7 @@ module Byebug
 
   class AddDisplayCommand < Command
     def regexp
-      /^\s*disp(?:lay)?\s+(.+)$/
+      /^\s* disp(?:lay)? \s+ (.+) \s*$/x
     end
 
     def execute
@@ -55,7 +55,7 @@ module Byebug
     end
 
     def regexp
-      /^\s*disp(?:lay)?$/
+      /^\s* disp(?:lay)? \s*$/x
     end
 
     def execute
@@ -75,7 +75,7 @@ module Byebug
 
   class DeleteDisplayCommand < Command
     def regexp
-      /^\s* undisp(?:lay)? \s* (?:(\S+))?$/x
+      /^\s* undisp(?:lay)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/edit.rb

@@ -4,7 +4,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^\s* ed(?:it)? (?:\s+(.*))?$/ix
+      /^\s* ed(?:it)? (?:\s+(\S+))? \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/enable.rb

@@ -60,7 +60,7 @@ module Byebug
     end unless defined?(Subcommands)
 
     def regexp
-      /^\s* en(?:able)? (?:\s+(.*))?$/ix
+      /^\s* en(?:able)? (?:\s+(.+))? \s*$/ix
     end
 
     def execute
@@ -91,8 +91,10 @@ module Byebug
       end
 
       def description
-        %{Enable some things.
-          This is used to cancel the effect of the "disable" command.}
+        %{Enable breakpoints or displays.
+
+          This is used to cancel the effect of the "disable" command.
+         }
       end
     end
   end
@@ -112,7 +114,7 @@ module Byebug
     end unless defined?(Subcommands)
 
     def regexp
-      /^\s* dis(?:able)? (?:\s+(.*))?$/ix
+      /^\s* dis(?:able)? (?:\s+(.+))? \s*$/ix
     end
 
     def execute
@@ -143,10 +145,11 @@ module Byebug
       end
 
       def description
-        %{Disable some things.
+        %{Disable breakpoints or displays.
 
           A disabled item is not forgotten, but has no effect until reenabled.
-          Use the "enable" command to have it take effect again.}
+          Use the "enable" command to have it take effect again.
+         }
       end
     end
   end

data/lib/byebug/commands/eval.rb

@@ -43,7 +43,7 @@ module Byebug
     end
 
     def regexp
-      /^\s*(p|e(?:val)?)\s+/
+      /^\s*(p|e(?:val)?)\s+/x
     end
 
     def execute

data/lib/byebug/commands/finish.rb

@@ -6,7 +6,7 @@ module Byebug
     self.need_context         = true
 
     def regexp
-      /^\s*fin(?:ish)? (?:\s+(.*))?$/x
+      /^\s* fin(?:ish)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/frame.rb

@@ -2,7 +2,6 @@ module Byebug
 
   # Mix-in module to assist in command parsing.
   module FrameFunctions
-
     def c_frame?(frame_no)
       @state.context.frame_binding(frame_no).nil?
     end
@@ -104,7 +103,9 @@ module Byebug
     end
 
     def print_backtrace
-      realsize = caller.drop_while {|e| e[/\(eval\)|byebug/] }.size
+      realsize = caller_locations.
+        drop_while{ |l| IGNORED_FILES.include?(l.path) || l.path == '(eval)' }.
+        take_while{ |l| !IGNORED_FILES.include?(l.path) }.size
       if @state.context.stack_size != realsize
         errmsg "Warning, Byebug's stacksize (#{@state.context.stack_size}) is" \
                " incorrect (must be #{realsize}). This might be a bug in " \
@@ -150,7 +151,7 @@ module Byebug
   # Implements byebug "where" or "backtrace" command.
   class WhereCommand < Command
     def regexp
-      /^\s*(?:w(?:here)?|bt|backtrace)$/
+      /^\s* (?:w(?:here)?|bt|backtrace) \s*$/x
     end
 
     def execute
@@ -177,7 +178,7 @@ module Byebug
 
   class UpCommand < Command
     def regexp
-      /^\s* u(?:p)? (?:\s+(.*))?$/x
+      /^\s* u(?:p)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute
@@ -199,7 +200,7 @@ module Byebug
 
   class DownCommand < Command
     def regexp
-      /^\s* down (?:\s+(.*))? .*$/x
+      /^\s* down (?:\s+(\S+))? \s*$/x
     end
 
     def execute
@@ -221,10 +222,7 @@ module Byebug
 
   class FrameCommand < Command
     def regexp
-      / ^\s*
-        f(?:rame)?
-        (?: \s+ (\S+))? \s*
-        $/x
+      /^\s* f(?:rame)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/help.rb

@@ -7,7 +7,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^\s* h(?:elp)? (?:\s+(.+))? $/x
+      /^\s* h(?:elp)? (?:\s+(.+))? \s*$/x
     end
 
     def execute
@@ -15,7 +15,7 @@ module Byebug
         args = @match[1].split
         cmds = @state.commands.select { |cmd| cmd.names.include?(args[0]) }
         unless cmds.empty?
-          help = cmds.map{ |cmd| cmd.help(args) }.join
+          help = cmds.map{ |cmd| cmd.help(args) }.join("\n")
           help = help.split("\n").map{|l| l.gsub(/^ +/, '')}
           help.shift if help.first && help.first.empty?
           help.pop if help.last && help.last.empty?

data/lib/byebug/commands/info.rb

@@ -63,7 +63,7 @@ module Byebug
     end unless defined?(InfoFileSubcommands)
 
     def regexp
-      /^\s* i(?:nfo)? (?:\s+(.*))?$/ix
+      /^\s* i(?:nfo)? (?:\s+(.+))? \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/jump.rb

@@ -9,12 +9,7 @@ module Byebug
     end
 
     def regexp
-      / ^\s*
-         j(?:ump)? \s*
-         (?:\s+(\S+))?\s*
-         (?:\s+(\S+))?\s*
-         $
-      /ix
+      /^\s* j(?:ump)? (?:\s+(\S+))? \s* (?:\s+(\S+))? \s*$/ix
     end
 
     def execute
@@ -23,10 +18,8 @@ module Byebug
 
       line = @match[1].to_i
       line = @state.context.frame_line(0) + line if @match[1][0] == '+' or @match[1][0] == '-'
-      if line == @state.context.frame_line(0)
-        CommandProcessor.print_location_and_text(@state.context.frame_file(0), line)
-        return
-      end
+      return aprint @state.location if line == @state.context.frame_line(0)
+
       file = @match[2]
       file = @state.context.frame_file(file.to_i) if numeric?(file)
       file = @state.context.frame_file(0) if !file

data/lib/byebug/commands/list.rb

@@ -14,7 +14,7 @@ module Byebug
     Command.settings[:autolist] = 1
 
     def regexp
-      /^\s* l(?:ist)? (?:\s*([-=])|\s+(.+))? $/x
+      /^\s* l(?:ist)? (?:\s*([-=])|\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/method.rb

@@ -10,7 +10,7 @@ module Byebug
   # Implements byebug's 'method sig' command.
   class MethodSigCommand < Command
     def regexp
-      /^\s*m(?:ethod)?\s+sig(?:nature)?\s+(\S+)\s*$/
+      /^\s* m(?:ethod)? \s+ sig(?:nature)? \s+ (\S+) \s*$/x
     end
 
     def execute
@@ -42,7 +42,7 @@ module Byebug
     include Columnize
 
     def regexp
-      /^\s*m(?:ethod)?\s+((iv)|(i(:?nstance)?)\s+)?/
+      /^\s* m(?:ethod)? \s+ ((iv)|(i(:?nstance)?)\s+)?/x
     end
 
     def execute

data/lib/byebug/commands/quit.rb

@@ -5,11 +5,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      / ^\s*
-         (?:q(?:uit)?|exit) \s*
-         (!|\s+unconditionally)? \s*
-         $
-      /ix
+      /^\s* (?:q(?:uit)?|exit) \s* (!|\s+unconditionally)? \s*$/ix
     end
 
     def execute
@@ -25,8 +21,7 @@ module Byebug
       end
 
       def description
-        %{q[uit][ !| unconditionally]\texit from byebug.
-          exit[!]\talias to quit
+        %{q[uit]|exit [!|unconditionally]\tExits from byebug.
 
           Normally we prompt before exiting. However if the parameter
           "unconditionally" is given or command is suffixed with !, we exit

data/lib/byebug/commands/reload.rb

@@ -14,7 +14,7 @@ module Byebug
     Command.settings[:autoreload] = true
 
     def regexp
-      /^\s*r(?:eload)?$/
+      /^\s* r(?:eload)? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/repl.rb

@@ -84,7 +84,7 @@ module Byebug
       else
         file = @state.context.frame_file(0)
         line = @state.context.frame_line(0)
-        CommandProcessor.print_location_and_text(file, line)
+        print @state.location
         @state.previous_line = nil
       end
     end

data/lib/byebug/commands/save.rb

@@ -49,9 +49,7 @@ module Byebug
     end
 
     def regexp
-      /^\s* sa(?:ve)?
-        (?:\s+(.+))?
-        \s*$/ix
+      /^\s* sa(?:ve)? (?:\s+(\S+))? \s*$/ix
     end
 
     def execute
@@ -62,7 +60,7 @@ module Byebug
       end
       save_breakpoints(file)
       save_catchpoints(file)
-      # save_displays(file)
+      save_displays(file)
       save_settings(file)
       print "Saved to '#{file.path}'\n"
       if @state and @state.interface

data/lib/byebug/commands/set.rb

@@ -46,7 +46,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^set (?: \s+ (.*) )?$/ix
+      /^\s* set (?:\s+(.*))? \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/show.rb

@@ -193,7 +193,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^show (?: \s+ (.+) )?$/xi
+      /^\s* show (?:\s+(.+))? \s*$/xi
     end
 
     def execute

data/lib/byebug/commands/skip.rb

@@ -5,10 +5,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      / ^\s*
-         sk(?:ip)? \s*
-         $
-      /ix
+      /^\s* sk(?:ip)? \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/source.rb

@@ -5,7 +5,7 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^\s* so(?:urce)? (?:\s+ (.+))? $/x
+      /^\s* so(?:urce)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/stepping.rb

@@ -21,9 +21,7 @@ module Byebug
     self.need_context         = true
 
     def regexp
-      /^\s* n(?:ext)?
-        ([+-])?(?:\s+(\S+))?
-        \s*$/x
+      /^\s* n(?:ext)?([+-])? (?:\s+(\S+))? \s*$/x
     end
 
     def execute
@@ -52,9 +50,7 @@ module Byebug
     self.need_context         = true
 
     def regexp
-      /^\s* s(?:tep)?
-        ([+-])?(?:\s+(\S+))?
-        \s*$/x
+      /^\s* s(?:tep)?([+-]) ?(?:\s+(\S+))? \s*$/x
     end
 
     def execute

data/lib/byebug/commands/trace.rb

@@ -2,10 +2,10 @@ module Byebug
 
   class TraceCommand < Command
     def regexp
-      /^\s* tr(?:ace)? (?: \s+ (\S+))      # on | off | var(iable)
-                       (?: \s+ (\S+))?     # (variable-name)?
-                       (?: \s+ (\S+))? \s* # (stop | nostop)?
-       $/ix
+      /^\s* tr(?:ace)? (?: \s+ (\S+))   # on | off | var(iable)
+                       (?: \s+ (\S+))?  # (variable-name)?
+                       (?: \s+ (\S+))?  # (stop | nostop)?
+       \s*$/ix
     end
 
     def execute

data/lib/byebug/commands/variables.rb

@@ -29,7 +29,7 @@ module Byebug
   # Implements byebug's 'var class' command
   class VarClassVarCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+cl(?:ass)?/
+      /^\s* v(?:ar)? \s+ cl(?:ass)? \s*/x
     end
 
     def execute
@@ -53,7 +53,7 @@ module Byebug
 
   class VarConstantCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+co(?:nst(?:ant)?)?\s+/
+      /^\s* v(?:ar)? \s+ co(?:nst(?:ant)?)? \s+/x
     end
 
     def execute
@@ -84,7 +84,7 @@ module Byebug
 
   class VarGlobalCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+g(?:lobal)?\s*$/
+      /^\s* v(?:ar)? \s+ g(?:lobal)? \s*$/x
     end
 
     def execute
@@ -104,7 +104,7 @@ module Byebug
 
   class VarInstanceCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+ins(?:tance)?\s*/
+      /^\s* v(?:ar)? \s+ ins(?:tance)? \s*/x
     end
 
     def execute
@@ -126,7 +126,7 @@ module Byebug
   # Implements byebug's 'var local' command
   class VarLocalCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+l(?:ocal)?\s*$/
+      /^\s* v(?:ar)? \s+ l(?:ocal)? \s*$/x
     end
 
     def execute
@@ -158,7 +158,7 @@ module Byebug
   # Implements byebug's 'var inherit' command
   class VarInheritCommand < Command
     def regexp
-      /^\s*v(?:ar)?\s+ct\s*/
+      /^\s* v(?:ar)? \s+ ct \s*$/x
     end
 
     def execute

data/lib/byebug/interface.rb

@@ -26,19 +26,22 @@ module Byebug
     end
 
     def aprint(msg)
-      print afmt(msg)
+      print afmt(msg) if Byebug.annotate.to_i > 2
     end
 
-    protected
-      def format(*args)
-        if args.is_a?(Array)
-          new_args = args.first
-          new_args = new_args % args[1..-1] unless args[1..-1].empty?
-        else
-          new_args = args
-        end
-        new_args.gsub('%', '%%')
+    def format(*args)
+      if args.is_a?(Array)
+        new_args = args.first
+        new_args = new_args % args[1..-1] unless args[1..-1].empty?
+      else
+        new_args = args
       end
+      new_args
+    end
+
+    def escape(msg)
+      msg.gsub('%', '%%')
+    end
   end
 
   class LocalInterface < Interface
@@ -72,7 +75,7 @@ module Byebug
     end
 
     def print(*args)
-      STDOUT.printf(format(*args))
+      STDOUT.printf(escape(format(*args)))
     end
 
     def close

data/lib/byebug/processor.rb

@@ -9,17 +9,11 @@ module Byebug
     attr_accessor :interface
 
     extend Forwardable
-    def_delegators :@interface, :errmsg, :print
+    def_delegators :@interface, :errmsg, :print, :aprint, :afmt
 
-    # Format msg with gdb-style annotation header
-    def afmt(msg, newline="\n")
-      "\032\032#{msg}#{newline}"
-    end
-
-    def aprint(msg)
-      print afmt(msg) if Byebug.annotate.to_i > 2
+    def initialize(interface)
+      @interface = interface
     end
-
   end
 
   class CommandProcessor < Processor
@@ -42,16 +36,16 @@ module Byebug
                                  ]
 
     def initialize(interface = LocalInterface.new)
-      @interface = interface
-      @display = []
+      super(interface)
 
+      @display = []
       @mutex = Mutex.new
       @last_cmd               = nil   # To allow empty (just <RET>) commands
       @last_file              = nil   # Filename the last time we stopped
-      @last_line              = nil   # line number the last time we stopped
+      @last_line              = nil   # Line number the last time we stopped
       @breakpoints_were_empty = false # Show breakpoints 1st time
       @displays_were_empty    = true  # No display 1st time
-      @context_was_dead       = true  # Assume we haven't started.
+      @context_was_dead       = false  # Assume we haven't started.
     end
 
     def interface=(interface)
@@ -81,21 +75,6 @@ module Byebug
       end
     end
 
-    def self.print_location_and_text(file, line)
-      if file == '(irb)' || file == '-e'
-        file_line = "#{canonic_file(file)} @ #{line}\n"
-      else
-        file_line = "#{canonic_file(file)} @ #{line}\n" \
-                    "#{Byebug.line_at(file, line)}\n"
-      end
-
-      # FIXME: use annotations routines
-      if Byebug.annotate.to_i > 2
-        file_line = "\032\032source #{file_line}"
-      end
-      print file_line
-    end
-
     def self.protect(mname)
       alias_method "__#{mname}", mname
       module_eval %{
@@ -116,19 +95,17 @@ module Byebug
     end
 
     def at_breakpoint(context, breakpoint)
-      aprint 'stopped' if Byebug.annotate.to_i > 2
+      aprint 'stopped'
       n = Byebug.breakpoints.index(breakpoint) + 1
       file = CommandProcessor.canonic_file(breakpoint.source)
       line = breakpoint.pos
-      if Byebug.annotate.to_i > 2
-        print afmt("source #{file}:#{line}")
-      end
+      aprint "source #{file}:#{line}"
       print "Stopped by breakpoint #{n} at #{file}:#{line}\n"
     end
     protect :at_breakpoint
 
     def at_catchpoint(context, excpt)
-      aprint 'stopped' if Byebug.annotate.to_i > 2
+      aprint 'stopped'
       file = CommandProcessor.canonic_file(context.frame_file(0))
       line = context.frame_line(0)
       print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
@@ -190,7 +167,7 @@ module Byebug
           cmd.allow_in_post_mortem
         end if context.dead?
 
-        state = State.new(event_cmds, context, display, file, interface, line)
+        state = State.new(event_cmds, context, @display, file, @interface, line)
 
         # Change default when in irb or code included in command line
         Command.settings[:autolist] = 0 if file == '(irb)' or file == '-e'
@@ -232,9 +209,7 @@ module Byebug
         $state = Command.settings[:testing] ? state : nil
 
         preloop(commands, context)
-        if Command.settings[:autolist] == 0
-          CommandProcessor.print_location_and_text(file, line)
-        end
+        aprint state.location if Command.settings[:autolist] == 0
 
         while !state.proceed?
           input = @interface.command_queue.empty? ?
@@ -280,12 +255,14 @@ module Byebug
       def preloop(commands, context)
         @context_was_dead = true if context.dead? and not @context_was_dead
 
+        aprint 'stopped'
+        if @context_was_dead
+          aprint 'exited'
+          print "The program finished.\n"
+          @context_was_dead = false
+        end
+
         if Byebug.annotate.to_i > 2
-          aprint('stopped')
-          if @context_was_dead
-            aprint('exited')
-            print "The program finished.\n"
-          end
           breakpoint_annotations(commands, context)
           display_annotations(commands, context)
           annotation('stack', commands, context, "where")
@@ -307,7 +284,7 @@ module Byebug
               context.dead?
           end
           if not context.dead? and @@Show_annotations_run.find{|pat| cmd =~ pat}
-            aprint 'starting'
+            afmt 'starting'
             @context_was_dead = false
           end
         end
@@ -347,7 +324,7 @@ module Byebug
         end
 
         extend Forwardable
-        def_delegators :@interface, :errmsg, :print, :confirm
+        def_delegators :@interface, :aprint, :errmsg, :print, :confirm
 
         def proceed?
           @proceed
@@ -356,6 +333,12 @@ module Byebug
         def proceed
           @proceed = true
         end
+
+        def location
+          loc = "#{CommandProcessor.canonic_file(@file)} @ #{@line}\n"
+          loc += "#{Byebug.line_at(@file, @line)}\n" unless
+            ['(irb)', '-e'].include? @file
+        end
       end
 
   end # class CommandProcessor
@@ -364,9 +347,8 @@ module Byebug
   class ControlCommandProcessor < Processor
 
     def initialize(interface)
-      super()
-      @interface = interface
-      @context_was_dead = true # Assume we haven't started.
+      super(interface)
+      @context_was_dead = false # Assume we haven't started.
     end
 
     def process_commands(verbose=false)
@@ -376,12 +358,10 @@ module Byebug
       state = State.new(@interface, control_cmds)
       commands = control_cmds.map{|cmd| cmd.new(state) }
 
-      unless @context_was_dead
-        if Byebug.annotate.to_i > 2
-          aprint 'exited'
-          print "The program finished.\n"
-        end
-        @context_was_dead = true
+      if @context_was_dead
+        aprint 'exited'
+        print "The program finished.\n"
+        @context_was_dead = false
       end
 
       while input = @interface.read_command(prompt(nil))
@@ -406,8 +386,7 @@ module Byebug
     # Note: have an unused 'context' parameter to match the local interface.
     def prompt(context)
       p = '(byebug:ctrl) '
-      p = afmt("pre-prompt") + p + "\n" + afmt("prompt") if
-        Byebug.annotate.to_i > 2
+      p = afmt("pre-prompt") +p+"\n"+ afmt("prompt") if Byebug.annotate.to_i > 2
       return p
     end
 

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

data/test/save_test.rb

@@ -1,14 +1,12 @@
 require_relative 'test_helper'
 
 class TestSave < TestDsl::TestCase
-
   describe 'successful saving' do
     let(:file_name) { 'save_output.txt' }
     let(:file_contents) { File.read(file_name) }
     before do
       enter 'break 2', 'break 3 if true', 'catch NoMethodError',
-            'display 2 + 3', 'display 5 + 6', 'set autoeval', 'set autolist',
-            "save #{file_name}"
+            'display 2 + 3', 'display 5 + 6', "save #{file_name}"
       debug_file 'save'
     end
     after do
@@ -27,9 +25,8 @@ class TestSave < TestDsl::TestCase
       file_contents.must_include 'catch NoMethodError'
     end
 
-    # Not sure why it is suppressed, but this is like it is now.
-    it 'must not save displays' do
-      file_contents.wont_include 'display 2 + 3'
+    it 'must save displays' do
+      file_contents.must_include 'display 2 + 3'
     end
 
     describe 'saving settings' do

data/test/support/test_interface.rb

@@ -2,7 +2,7 @@ class TestInterface < Byebug::Interface
   attr_reader :input_queue, :output_queue, :error_queue, :confirm_queue
 
   attr_accessor :command_queue, :histfile, :history_length, :history_save
-  attr_accessor :print_queue, :readline_support, :restart_file, :test_block
+  attr_accessor :readline_support, :restart_file, :test_block
 
   def initialize
     @input_queue = []
@@ -10,12 +10,11 @@ class TestInterface < Byebug::Interface
     @error_queue = []
     @confirm_queue = []
     @command_queue = []
-    @print_queue = []
     @readline_support = false
   end
 
   def errmsg(*args)
-    @error_queue << format(args)
+    @error_queue << format(*args)
   end
 
   def read_command(*args)
@@ -31,7 +30,7 @@ class TestInterface < Byebug::Interface
   end
 
   def print(*args)
-    @output_queue << format(args)
+    @output_queue << format(*args)
   end
 
   def confirm(message)
@@ -54,18 +53,7 @@ class TestInterface < Byebug::Interface
       "input_queue: #{input_queue.inspect}",
       "output_queue: #{output_queue.inspect}",
       "error_queue: #{error_queue.inspect}",
-      "confirm_queue: #{confirm_queue.inspect}",
-      "print_queue: #{print_queue.inspect}"
+      "confirm_queue: #{confirm_queue.inspect}"
     ].join("\n")
   end
-
-  private
-
-    def format(args)
-      if args.size > 1
-        args.first % args[1..-1]
-      else
-        args.first
-      end
-    end
 end

data/test/variables_test.rb

@@ -29,7 +29,7 @@ class TestVariables < TestDsl::TestCase
       check_output_includes 'SOMECONST => "foo"'
     end
 
-    it 'must show error message if given object is not a Class or a Module' do
+    it 'must show error message if given object is not a class or a module' do
       enter 'break 25', 'cont', 'var const v'
       debug_file 'variables'
       check_output_includes 'Should be Class/Module: v'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -218,7 +218,6 @@ files:
 - test/support/breakpoint.rb
 - test/support/context.rb
 - test/support/matchers.rb
-- test/support/processor.rb
 - test/support/test_dsl.rb
 - test/support/test_interface.rb
 - test/test_helper.rb
@@ -309,7 +308,6 @@ test_files:
 - test/support/breakpoint.rb
 - test/support/context.rb
 - test/support/matchers.rb
-- test/support/processor.rb
 - test/support/test_dsl.rb
 - test/support/test_interface.rb
 - test/test_helper.rb

data/test/support/processor.rb

@@ -1,13 +0,0 @@
-module Byebug
-
-  class Processor
-
-    class << self
-      def print(message)
-        Byebug.handler.interface.print_queue << message
-      end
-    end
-
-  end
-
-end