byebug 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b0070dd4542ad3a4b03b56cb55d340f6fff374
-  data.tar.gz: 012595cd2ab1bbceb49884f387b58775c8c8b181
+  metadata.gz: 6d343499b9880b10f470260db66d852711470e61
+  data.tar.gz: c9003db4d4426203f8feadce35967527141e79e3
 SHA512:
-  metadata.gz: 83b18f103aed1d6242b30f39d8b22c852a971b6892ae81d7660a8df51502d101c887211f13c5f74c1cc9bd25ba4a04c678e22de7ed463e205470acbeea3af0a3
-  data.tar.gz: 4da42772a75c913e4c9270be8e9c24a663fbaac53f38542c6be93917e5995652a85811ba28175657ecb7edad59a4f3f659f8569ca00577eb4685dd1d7d5af9dd
+  metadata.gz: 0fdafc0ae02185a12ca220d091816ac7e99e9e54721d7f4a1132583025b68ebc4c5f69dcf71fa4510f3248a9c2e2944d1ad7d7b0d35126ff6cb0dbf01b5842f5
+  data.tar.gz: 54917e0fa06f438bd27f9bcb89a952ba04199460ec61120c86051c7338eaef0d64a8ff39436a75488769c046da7852b6e4c7be21d99bd9620bf9a46867806f6c

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Master (Unreleased)
 
+## 9.0.3 - 2016-05-16
+
+### Fixed
+
+* Unfriendly output in byebug's executable when no script specified (#256).
+* Unfriendly output in byebug's executable when script doesn't exist.
+* Unfriendly output in byebug's executable when script has invalid code.
+
 ## 9.0.2 - 2016-05-15
 
 ### Fixed
@@ -12,6 +20,8 @@
 
 ## 9.0.1 - 2016-05-14
 
+### Fixed
+
 * `quit` never exiting when remote debugging (#201).
 
 ## 9.0.0 - 2016-05-11

data/lib/byebug/runner.rb

@@ -13,21 +13,6 @@ module Byebug
   class Runner
     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
-
     #
     # Special working modes that don't actually start the debugger.
     #
@@ -63,7 +48,7 @@ module Byebug
     def help=(text)
       @help ||= text
 
-      interface.puts("\n#{text}\n")
+      interface.puts("#{text}\n")
     end
 
     def version=(number)
@@ -74,6 +59,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
@@ -97,18 +84,11 @@ module Byebug
     # Starts byebug to debug a program.
     #
     def run
-      prepare_options.order!($ARGV)
-      return if version || help
-
-      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
 
-      setup_cmd_line_args
-
       loop do
         debug_program
 
@@ -127,36 +107,70 @@ 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
 
+    #
+    # 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
+    def non_existing_script?
       Byebug.mode = :standalone
 
-      raise(NoScript, 'You must specify a program to debug...') if $ARGV.empty?
-
       program = which($ARGV.shift)
       program = which($ARGV.shift) if program == which('ruby')
-      raise(NonExistentScript, "The script doesn't exist") unless program
 
-      $PROGRAM_NAME = program
+      if program
+        $PROGRAM_NAME = program
+        false
+      else
+        print_error("The script doesn't exist")
+        true
+      end
+    end
+
+    #
+    # Checks the debugged script has correct syntax
+    #
+    def invalid_script?
+      return false if syntax_valid?(File.read($PROGRAM_NAME))
+
+      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)
       puts "#{error}\n#{error.backtrace}" if error
     end
@@ -178,5 +192,13 @@ module Byebug
 
       nil
     end
+
+    #
+    # Prints an error message and a help string
+    #
+    def print_error(msg)
+      interface.errmsg(msg)
+      interface.puts(option_parser.help)
+    end
   end
 end

data/lib/byebug/version.rb

@@ -3,5 +3,5 @@
 # Reopen main module to define the library version
 #
 module Byebug
-  VERSION = '9.0.2'.freeze
+  VERSION = '9.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.3
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler