byebug 4.0.5 → 5.0.0

data/lib/byebug/interfaces/test_interface.rb

@@ -7,7 +7,9 @@ module Byebug
 
     def initialize
       super()
-      @input, @output, @error = [], [], []
+      @input = []
+      @output = []
+      @error = []
     end
 
     def errmsg(message)
@@ -32,7 +34,9 @@ module Byebug
     end
 
     def clear
-      @input, @output, @error = [], [], []
+      @input = []
+      @output = []
+      @error = []
       history.clear
     end
 

data/lib/byebug/printers/plain.rb

@@ -24,7 +24,7 @@ module Byebug
         end
       end
 
-      def print_variables(variables)
+      def print_variables(variables, *_)
         print_collection('variable.variable', variables) do |(key, value), _|
           value = value.nil? ? 'nil' : value.to_s
           if "#{key} = #{value}".size > Setting[:width]

data/lib/byebug/processors/command_processor.rb

@@ -1,10 +1,13 @@
 require 'byebug/states/regular_state'
+require 'byebug/helpers/file'
 
 module Byebug
   #
   # Processes commands in regular mode
   #
   class CommandProcessor < Processor
+    include Helpers::FileHelper
+
     attr_reader :display, :state
 
     def initialize(interface = LocalInterface.new)
@@ -20,8 +23,6 @@ module Byebug
       @interface = interface
     end
 
-    include FileFunctions
-
     def at_breakpoint(_context, breakpoint)
       n = Byebug.breakpoints.index(breakpoint) + 1
       file = normalize(breakpoint.source)
@@ -75,9 +76,11 @@ module Byebug
       Setting[:autolist] = false if ['(irb)', '-e'].include?(file)
 
       # Bind commands to the current state.
-      Command.commands.each do |cmd|
-        cmd.new(state).execute if cmd.always_run >= run_level
-      end
+      commands.each { |cmd| cmd.execute if cmd.class.always_run >= run_level }
+    end
+
+    def commands
+      Byebug.commands.map { |cmd| cmd.new(state) }
     end
 
     #
@@ -145,12 +148,7 @@ module Byebug
     # Finds a matches the command matching the input
     #
     def match_cmd(input)
-      Command.commands.each do |c|
-        cmd = c.new(state)
-        return cmd if cmd.match(input)
-      end
-
-      nil
+      commands.find { |cmd| cmd.match(input) }
     end
 
     #

data/lib/byebug/processors/control_command_processor.rb

@@ -12,7 +12,7 @@ module Byebug
     end
 
     def commands
-      Command.commands.select(&:allow_in_control).map { |cmd| cmd.new(state) }
+      Byebug.commands.select(&:allow_in_control).map { |cmd| cmd.new(state) }
     end
 
     def process_commands

data/lib/byebug/remote.rb

@@ -37,6 +37,7 @@ module Byebug
 
       server = TCPServer.new(host, port)
       self.actual_port = server.addr[1]
+
       @thread = DebugThread.new do
         while (session = server.accept)
           handler.interface = RemoteInterface.new(session)
@@ -51,12 +52,14 @@ module Byebug
       return @actual_control_port if @control_thread
       server = TCPServer.new(host, ctrl_port)
       @actual_control_port = server.addr[1]
+
       @control_thread = DebugThread.new do
         while (session = server.accept)
           handler.interface = RemoteInterface.new(session)
           ControlCommandProcessor.new(handler.interface).process_commands
         end
       end
+
       @actual_control_port
     end
 

data/lib/byebug/runner.rb

@@ -1,13 +1,15 @@
 require 'optparse'
 require 'English'
 require 'byebug/core'
-require 'byebug/helper'
+require 'byebug/helpers/parse'
 
 module Byebug
   #
   # Responsible for starting the debugger when started from the command line.
   #
   class Runner
+    include Helpers::ParseHelper
+
     #
     # Error class signaling absence of a script to debug
     #
@@ -36,7 +38,8 @@ module Byebug
     # finishing the program.
     #
     def initialize(stop = true, quit = true)
-      @stop, @quit = stop, quit
+      @stop = stop
+      @quit = quit
     end
 
     #
@@ -155,7 +158,6 @@ module Byebug
       $PROGRAM_NAME = program
     end
 
-    include ParseFunctions
     #
     # Debugs a script only if syntax checks okay.
     #

data/lib/byebug/setting.rb

@@ -1,4 +1,4 @@
-require 'byebug/helper'
+require 'byebug/helpers/string'
 
 module Byebug
   #
@@ -24,7 +24,7 @@ module Byebug
     end
 
     def help
-      "\n  #{banner}.\n\n"
+      prettify(banner)
     end
 
     def to_sym
@@ -37,8 +37,6 @@ module Byebug
     end
 
     class << self
-      include StringFunctions
-
       def settings
         @settings ||= {}
       end
@@ -67,20 +65,6 @@ module Byebug
         end
         output + "\n"
       end
-
-      def help(cmd, subcmd)
-        unless subcmd
-          command = Byebug.const_get("#{cmd.capitalize}Command")
-          return command.description + help_all
-        end
-
-        setting = find(subcmd)
-        prettify <<-EOS
-          #{cmd} #{setting.to_sym} <value>
-
-          #{setting.banner}.
-        EOS
-      end
     end
   end
 end

data/lib/byebug/settings/savefile.rb

@@ -0,0 +1,21 @@
+require 'byebug/setting'
+
+module Byebug
+  #
+  # Setting to customize the file where byebug's history is saved.
+  #
+  class SavefileSetting < Setting
+    DEFAULT = File.expand_path("#{ENV['HOME'] || '.'}/.byebug_save")
+
+    def banner
+      <<-EOB
+        File where save commands saves current settings to. Default:
+        ~/.byebug_save
+      EOB
+    end
+
+    def to_s
+      "The command history file is #{value}\n"
+    end
+  end
+end

data/lib/byebug/states/regular_state.rb

@@ -1,10 +1,13 @@
 require 'byebug/state'
+require 'byebug/helpers/file'
 
 module Byebug
   #
   # Controls state of Byebug's REPL when in normal mode
   #
   class RegularState < State
+    include Helpers::FileHelper
+
     attr_accessor :context, :frame, :display, :file, :line, :prev_line
     attr_writer :interface
 
@@ -36,7 +39,6 @@ module Byebug
       @proceed = true
     end
 
-    include FileFunctions
     #
     # Current (formatted) location
     #
@@ -87,11 +89,7 @@ module Byebug
 
       locals = context.frame_locals(pos) unless Setting[:callstyle] == 'short'
       my_args = args.map do |arg|
-        case arg[0]
-        when :block then prefix, default = '&', 'block'
-        when :rest then prefix, default = '*', 'args'
-        else prefix, default = '', nil
-        end
+        prefix, default = prefix_and_default_from(arg[0])
 
         kls = if Setting[:callstyle] == 'short' || arg[1].nil? || locals.empty?
                 ''
@@ -174,5 +172,16 @@ module Byebug
 
       File.join('...', components[-3..-1])
     end
+
+    def prefix_and_default_from(arg_type)
+      case arg_type
+      when :block
+        return ['&', 'block']
+      when :rest
+        return ['*', 'args']
+      else
+        return ['', nil]
+      end
+    end
   end
 end

data/lib/byebug/subcommand_list.rb

@@ -0,0 +1,33 @@
+module Byebug
+  #
+  # Holds an array of subcommands for a command
+  #
+  class SubcommandList
+    def initialize(commands, parent)
+      @commands = commands
+      @parent = parent
+    end
+
+    def find(name)
+      @commands.find { |cmd| cmd.match(name) }
+    end
+
+    def help(name)
+      subcmd = find(name)
+      return errmsg("Unknown subcommand '#{name}'") unless subcmd
+
+      subcmd.help
+    end
+
+    def to_s
+      width = @commands.map(&:to_name).max_by(&:size).size
+
+      formatted_cmds = @commands.map do |subcmd|
+        format("%s %-#{width}s -- %s\n",
+               @parent, subcmd.to_name, subcmd.short_description)
+      end
+
+      formatted_cmds.join
+    end
+  end
+end

data/lib/byebug/subcommands.rb

@@ -0,0 +1,53 @@
+require 'byebug/command'
+require 'byebug/subcommand_list'
+
+module Byebug
+  #
+  # Subcommand additions.
+  #
+  module Subcommands
+    #
+    # Summarized description of a subcommand
+    #
+    def short_description
+      fail(NotImplementedError, 'Your custom subcommand needs to define this')
+    end
+
+    #
+    # Delegates to subcommands or prints help if no subcommand specified.
+    #
+    def execute
+      return puts(help) unless @match[1]
+
+      subcmd = subcommands.find(@match[1])
+      return errmsg("Unknown subcommand '#{@match[1]}'\n") unless subcmd
+
+      subcmd.execute
+    end
+
+    #
+    # Default help text for a command with subcommands
+    #
+    def help
+      prettify <<-EOH
+        #{description}
+
+        List of "#{to_name}" subcommands:
+
+        --
+        #{subcommands}
+      EOH
+    end
+
+    #
+    # Command's subcommands.
+    #
+    def subcommands
+      subcmd_klasses = self.class.subcommands
+      return nil unless subcmd_klasses.any?
+
+      subcmd_list = subcmd_klasses.map { |cmd| cmd.new(@state) }
+      SubcommandList.new(subcmd_list, self.class.name)
+    end
+  end
+end

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '4.0.5'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -80,36 +80,72 @@ files:
 - lib/byebug/commands/condition.rb
 - lib/byebug/commands/continue.rb
 - lib/byebug/commands/delete.rb
+- lib/byebug/commands/disable.rb
+- lib/byebug/commands/disable/breakpoints.rb
+- lib/byebug/commands/disable/display.rb
 - lib/byebug/commands/display.rb
+- lib/byebug/commands/down.rb
 - lib/byebug/commands/edit.rb
-- lib/byebug/commands/enable_disable.rb
+- lib/byebug/commands/enable.rb
+- lib/byebug/commands/enable/breakpoints.rb
+- lib/byebug/commands/enable/display.rb
 - lib/byebug/commands/eval.rb
 - lib/byebug/commands/finish.rb
 - lib/byebug/commands/frame.rb
 - lib/byebug/commands/help.rb
 - lib/byebug/commands/history.rb
 - lib/byebug/commands/info.rb
+- lib/byebug/commands/info/args.rb
+- lib/byebug/commands/info/breakpoints.rb
+- lib/byebug/commands/info/catch.rb
+- lib/byebug/commands/info/display.rb
+- lib/byebug/commands/info/file.rb
+- lib/byebug/commands/info/line.rb
+- lib/byebug/commands/info/program.rb
 - lib/byebug/commands/interrupt.rb
 - lib/byebug/commands/irb.rb
 - lib/byebug/commands/kill.rb
 - lib/byebug/commands/list.rb
 - lib/byebug/commands/method.rb
+- lib/byebug/commands/next.rb
+- lib/byebug/commands/pp.rb
 - lib/byebug/commands/pry.rb
+- lib/byebug/commands/ps.rb
+- lib/byebug/commands/putl.rb
 - lib/byebug/commands/quit.rb
 - lib/byebug/commands/restart.rb
 - lib/byebug/commands/save.rb
 - lib/byebug/commands/set.rb
 - lib/byebug/commands/show.rb
 - lib/byebug/commands/source.rb
-- lib/byebug/commands/stepping.rb
+- lib/byebug/commands/step.rb
 - lib/byebug/commands/thread.rb
+- lib/byebug/commands/thread/current.rb
+- lib/byebug/commands/thread/list.rb
+- lib/byebug/commands/thread/resume.rb
+- lib/byebug/commands/thread/stop.rb
+- lib/byebug/commands/thread/switch.rb
 - lib/byebug/commands/tracevar.rb
 - lib/byebug/commands/undisplay.rb
 - lib/byebug/commands/untracevar.rb
+- lib/byebug/commands/up.rb
 - lib/byebug/commands/var.rb
+- lib/byebug/commands/var/all.rb
+- lib/byebug/commands/var/const.rb
+- lib/byebug/commands/var/global.rb
+- lib/byebug/commands/var/instance.rb
+- lib/byebug/commands/var/local.rb
+- lib/byebug/commands/where.rb
 - lib/byebug/context.rb
 - lib/byebug/core.rb
-- lib/byebug/helper.rb
+- lib/byebug/helpers/eval.rb
+- lib/byebug/helpers/file.rb
+- lib/byebug/helpers/frame.rb
+- lib/byebug/helpers/parse.rb
+- lib/byebug/helpers/string.rb
+- lib/byebug/helpers/thread.rb
+- lib/byebug/helpers/toggle.rb
+- lib/byebug/helpers/var.rb
 - lib/byebug/history.rb
 - lib/byebug/interface.rb
 - lib/byebug/interfaces/local_interface.rb
@@ -138,12 +174,15 @@ files:
 - lib/byebug/settings/linetrace.rb
 - lib/byebug/settings/listsize.rb
 - lib/byebug/settings/post_mortem.rb
+- lib/byebug/settings/savefile.rb
 - lib/byebug/settings/stack_on_error.rb
 - lib/byebug/settings/verbose.rb
 - lib/byebug/settings/width.rb
 - lib/byebug/state.rb
 - lib/byebug/states/control_state.rb
 - lib/byebug/states/regular_state.rb
+- lib/byebug/subcommand_list.rb
+- lib/byebug/subcommands.rb
 - lib/byebug/version.rb
 homepage: http://github.com/deivid-rodriguez/byebug
 licenses:
@@ -165,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby 2.0 fast debugger - base + CLI