byebug 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c3c3868ab03af89e252040738d248a93ee7fd5
-  data.tar.gz: 86c48afc3df76c6ad06f71e4f187cf7ebfb4d753
+  metadata.gz: cbe8d8d298e3c0b99567a1f38024883979f90910
+  data.tar.gz: 2b39f4c8cd9d970ae1e2d2c29ed4462cf35d322b
 SHA512:
-  metadata.gz: f1afe8ff550a182da17c136b3a49030f8370974e3c9b5e818da6f8c5d3c6e4fbe78731ee1840d848e7fbac0baa0b87ea031df44f4c316f69c6ac162bcd523187
-  data.tar.gz: 4c1abe7a5407b9483ebdc7f7c14ac2f142434b699566a06127759593917b466b8986e4cff3b583206a5bd72ac56d9fc38c1dff6ff4b9421ca246885b251f7d74
+  metadata.gz: e8450631530abd699cf86afdfe4787676aa3e4c405c20fadb1acc455dff420b3afbfda3d2e4cab6d0f6a2ae6306e01d8f76b48330efcb69fe8f4182a9bbb5d82
+  data.tar.gz: b992d11ab40ad0641be835e4ecc3b2643fc24d88a19fba43d5f7aa95f2b234011506d9328e6d7e0cad68dbb9e9f906e78a646aa252251ff73b7a1a2c30e94d9a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 6.0.1 - 2015-08-19
+### Fixed
+* Bug in evaluation where the user would lose the command prompt when entering
+an expression with a syntax error.
+
 ## 6.0.0 - 2015-08-17
 ### Removed
 * `autoeval` setting. I haven't heard of anyone setting it to false.

data/README.md

@@ -53,9 +53,8 @@ Windows [![Vey][vey]][vey_url]
 [debugger][].
 
 * Recommended:
-  - MRI 2.0.0-p576 or higher.
-  - MRI 2.1.3 or higher.
-  - MRI 2.2.1 or higher.
+  - MRI 2.1.7 or higher.
+  - MRI 2.2.3 or higher.
 
 
 ## Install

data/lib/byebug/commands/break.rb

@@ -45,6 +45,8 @@ module Byebug
 
       errmsg(pr('break.errors.expression', expr: @match[2]))
       b.enabled = false
+    rescue => e
+      errmsg(e.message)
     end
 
     private
@@ -70,7 +72,7 @@ module Byebug
     end
 
     def target_object(str)
-      k = warning_eval(str)
+      k = error_eval(str)
 
       k && k.is_a?(Module) ? k.name : str
     rescue

data/lib/byebug/commands/display.rb

@@ -56,7 +56,7 @@ module Byebug
     end
 
     def eval_expr(expression)
-      thread_safe_eval(expression).inspect
+      error_eval(expression).inspect
     rescue
       '(undefined)'
     end

data/lib/byebug/commands/help.rb

@@ -35,6 +35,8 @@ module Byebug
       return help_for(@match[1], command) unless @match[2]
 
       help_for(@match[2], subcommand)
+    rescue => e
+      errmsg(e.message)
     end
 
     private

data/lib/byebug/commands/up.rb

@@ -14,7 +14,7 @@ module Byebug
     self.allow_in_post_mortem = true
 
     def self.regexp
-      /^\s* u(?:p)? (?:\s+(\S+))? \s*$/x
+      /^\s* up (?:\s+(\S+))? \s*$/x
     end
 
     def self.description

data/lib/byebug/helpers/eval.rb

@@ -19,8 +19,6 @@ module Byebug
       # @param expression [String] Expression to evaluate
       #
       def single_thread_eval(expression)
-        return error_eval(expression) if Setting[:stack_on_error]
-
         warning_eval(expression)
       end
 
@@ -29,9 +27,7 @@ module Byebug
       # returning nil in an error happens.
       #
       def silent_eval(str, binding = frame._binding)
-        binding.eval(str)
-      rescue StandardError, ScriptError
-        nil
+        safe_eval(str, binding) { |_e| nil }
       end
 
       #
@@ -39,7 +35,7 @@ module Byebug
       # handling the errors at an error level.
       #
       def error_eval(str, binding = frame._binding)
-        safe_eval(str, binding) { |e| error_msg(e) }
+        safe_eval(str, binding) { |e| fail(e, msg(e)) }
       end
 
       #
@@ -47,7 +43,7 @@ module Byebug
       # handling the errors at a warning level.
       #
       def warning_eval(str, binding = frame._binding)
-        safe_eval(str, binding) { |e| warning_msg(e) }
+        safe_eval(str, binding) { |e| errmsg(msg(e)) }
       end
 
       private
@@ -55,19 +51,25 @@ module Byebug
       def safe_eval(str, binding)
         binding.eval(str)
       rescue StandardError, ScriptError => e
-        raise(e, yield(e))
+        yield(e)
+      end
+
+      def msg(e)
+        msg = Setting[:stack_on_error] ? error_msg(e) : warning_msg(e)
+
+        pr('eval.exception', text_message: msg)
       end
 
       def error_msg(e)
         at = e.backtrace
-        locations = ["#{at.shift}: #{e.class} Exception(#{e.message})"]
-        locations += at.map { |path| "\tfrom #{path}" }
 
-        pr('eval.exception', text_message: locations.join("\n"))
+        locations = ["#{at.shift}: #{warning_msg(e)}"]
+        locations += at.map { |path| "\tfrom #{path}" }
+        locations.join("\n")
       end
 
       def warning_msg(e)
-        pr('eval.exception', text_message: "#{e.class} Exception: #{e.message}")
+        "#{e.class} Exception: #{e.message}"
       end
 
       #

data/lib/byebug/processors/command_processor.rb

@@ -156,8 +156,6 @@ module Byebug
       return command.new(self, input).execute if command
 
       puts thread_safe_eval(input)
-    rescue => e
-      errmsg(e)
     end
   end
 end

data/lib/byebug/subcommands.rb

@@ -25,6 +25,8 @@ module Byebug
       fail CommandNotFound.new(@match[1], self.class) unless subcmd
 
       subcmd.new(processor, arguments).execute
+    rescue => e
+      errmsg(e.message)
     end
 
     #

data/lib/byebug/version.rb

@@ -2,5 +2,5 @@
 # Reopen main module to define the library version
 #
 module Byebug
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,6 @@ files:
 - lib/byebug/remote.rb
 - lib/byebug/runner.rb
 - lib/byebug/setting.rb
-- lib/byebug/settings/autoeval.rb
 - lib/byebug/settings/autoirb.rb
 - lib/byebug/settings/autolist.rb
 - lib/byebug/settings/autosave.rb
@@ -189,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby 2.0 fast debugger - base + CLI

data/lib/byebug/settings/autoeval.rb

@@ -1,14 +0,0 @@
-require 'byebug/setting'
-
-module Byebug
-  #
-  # Setting for automatic evaluation of unknown commands.
-  #
-  class AutoevalSetting < Setting
-    DEFAULT = true
-
-    def banner
-      'Automatically evaluate unrecognized commands'
-    end
-  end
-end