byebug 8.2.5 → 9.1.0

data/lib/byebug/runner.rb

@@ -2,7 +2,9 @@ require 'optparse'
 require 'English'
 require 'byebug/core'
 require 'byebug/version'
+require 'byebug/helpers/bin'
 require 'byebug/helpers/parse'
+require 'byebug/helpers/string'
 require 'byebug/option_setter'
 require 'byebug/processors/control_processor'
 
@@ -11,22 +13,9 @@ module Byebug
   # Responsible for starting the debugger when started from the command line.
   #
   class Runner
+    include Helpers::BinHelper
     include Helpers::ParseHelper
-
-    #
-    # Error class signaling absence of a script to debug.
-    #
-    class NoScript < StandardError; end
-
-    #
-    # Error class signaling a non existent script to debug.
-    #
-    class NonExistentScript < StandardError; end
-
-    #
-    # Error class signaling a script with invalid Ruby syntax.
-    #
-    class InvalidScript < StandardError; end
+    include Helpers::StringHelper
 
     #
     # Special working modes that don't actually start the debugger.
@@ -63,7 +52,7 @@ module Byebug
     def help=(text)
       @help ||= text
 
-      interface.puts("\n#{text}\n")
+      interface.puts("#{text}\n")
     end
 
     def version=(number)
@@ -74,6 +63,8 @@ module Byebug
 
     def remote=(host_and_port)
       @remote ||= Byebug.parse_host_and_port(host_and_port)
+
+      Byebug.start_client(*@remote)
     end
 
     def init_script
@@ -84,12 +75,10 @@ module Byebug
     # Usage banner.
     #
     def banner
-      <<-EOB.gsub(/^ {8}/, '')
-
-          byebug #{Byebug::VERSION}
-
-          Usage: byebug [options] <script.rb> -- <script.rb parameters>
+      prettify <<-EOB
+        byebug #{Byebug::VERSION}
 
+        Usage: byebug [options] <script.rb> -- <script.rb parameters>
       EOB
     end
 
@@ -97,17 +86,14 @@ module Byebug
     # Starts byebug to debug a program.
     #
     def run
-      prepare_options.order!($ARGV)
-      return if version || help
+      Byebug.mode = :standalone
 
-      if remote
-        Byebug.start_client(*remote)
-        return
-      end
+      option_parser.order!($ARGV)
+      return if non_script_option? || error_in_script?
 
-      Byebug.run_init_script if init_script
+      $PROGRAM_NAME = program
 
-      setup_cmd_line_args
+      Byebug.run_init_script if init_script
 
       loop do
         debug_program
@@ -127,56 +113,79 @@ module Byebug
     #
     # Processes options passed from the command line.
     #
-    def prepare_options
-      OptionParser.new(banner, 25) do |opts|
+    def option_parser
+      @option_parser ||= OptionParser.new(banner, 25) do |opts|
         opts.banner = banner
 
         OptionSetter.new(self, opts).setup
       end
     end
 
+    def program
+      @program ||= begin
+                     candidate = which($ARGV.shift)
+                     candidate == which('ruby') ? which($ARGV.shift) : candidate
+                   end
+    end
+
+    #
+    # An option that doesn't need a script specified was given
+    #
+    def non_script_option?
+      version || help || remote
+    end
+
+    #
+    # There is an error with the specified script
+    #
+    def error_in_script?
+      no_script? || non_existing_script? || invalid_script?
+    end
+
+    #
+    # No script to debug specified
+    #
+    def no_script?
+      return false unless $ARGV.empty?
+
+      print_error('You must specify a program to debug')
+      true
+    end
+
     #
     # Extracts debugged program from command line args.
     #
-    def setup_cmd_line_args
-      Byebug.mode = :standalone
+    def non_existing_script?
+      return false if program
 
-      raise(NoScript, 'You must specify a program to debug...') if $ARGV.empty?
+      print_error("The script doesn't exist")
+      true
+    end
 
-      program = which($ARGV.shift)
-      program = which($ARGV.shift) if program == which('ruby')
-      raise(NonExistentScript, "The script doesn't exist") unless program
+    #
+    # Checks the debugged script has correct syntax
+    #
+    def invalid_script?
+      return false if syntax_valid?(File.read(program))
 
-      $PROGRAM_NAME = program
+      print_error('The script has incorrect syntax')
+      true
     end
 
     #
     # Debugs a script only if syntax checks okay.
     #
     def debug_program
-      ok = syntax_valid?(File.read($PROGRAM_NAME))
-      raise(InvalidScript, 'The script has incorrect syntax') unless ok
-
-      error = Byebug.debug_load($PROGRAM_NAME, stop)
+      error = Byebug.debug_load(program, stop)
       puts "#{error}\n#{error.backtrace}" if error
     end
 
     #
-    # Cross-platform way of finding an executable in the $PATH.
-    # Borrowed from: http://stackoverflow.com/questions/2108727
+    # Prints an error message and a help string
     #
-    def which(cmd)
-      return File.expand_path(cmd) if File.exist?(cmd)
-
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          return exe if File.executable?(exe) && !File.directory?(exe)
-        end
-      end
-
-      nil
+    def print_error(msg)
+      interface.errmsg(msg)
+      interface.puts(option_parser.help)
     end
   end
 end

data/lib/byebug/setting.rb

@@ -58,7 +58,7 @@ module Byebug
       end
 
       #
-      # TODO: DRY this up. Very similar code exists in the CommandList class
+      # @todo DRY this up. Very similar code exists in the CommandList class
       #
       def help_all
         output = "  List of supported settings:\n\n"

data/lib/byebug/settings/callstyle.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'byebug/setting'
 
 module Byebug

data/lib/byebug/version.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 #
 # Reopen main module to define the library version
 #
 module Byebug
-  VERSION = '8.2.5'.freeze
+  VERSION = '9.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 8.2.5
+  version: 9.1.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,12 +27,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 description: |-
-  Byebug is a Ruby 2 debugger. It's implemented using the
-      Ruby 2 TracePoint C API for execution control and the Debug Inspector C API
-      for call stack navigation.  The core component provides support that
-      front-ends can build on. It provides breakpoint handling and bindings for
-      stack frames among other things and it comes with an easy to use command
-      line interface.
+  Byebug is a Ruby debugger. It's implemented using the
+      TracePoint C API for execution control and the Debug Inspector C API for
+      call stack navigation.  The core component provides support that front-ends
+      can build on. It provides breakpoint handling and bindings for stack frames
+      among other things and it comes with an easy to use command line interface.
 email: deivid.rodriguez@mail.com
 executables:
 - byebug
@@ -124,6 +123,7 @@ files:
 - lib/byebug/core.rb
 - lib/byebug/errors.rb
 - lib/byebug/frame.rb
+- lib/byebug/helpers/bin.rb
 - lib/byebug/helpers/eval.rb
 - lib/byebug/helpers/file.rb
 - lib/byebug/helpers/frame.rb
@@ -171,7 +171,7 @@ files:
 - lib/byebug/version.rb
 homepage: http://github.com/deivid-rodriguez/byebug
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,9 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Ruby 2.0 fast debugger - base + CLI
+summary: Ruby fast debugger - base + CLI
 test_files: []
-has_rdoc: