byebug 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe8d8d298e3c0b99567a1f38024883979f90910
-  data.tar.gz: 2b39f4c8cd9d970ae1e2d2c29ed4462cf35d322b
+  metadata.gz: 9bd941f093c6a49a371dfefe4cb06d9285eb5154
+  data.tar.gz: cc056395c95ece29b62647a4875d759ac18708c6
 SHA512:
-  metadata.gz: e8450631530abd699cf86afdfe4787676aa3e4c405c20fadb1acc455dff420b3afbfda3d2e4cab6d0f6a2ae6306e01d8f76b48330efcb69fe8f4182a9bbb5d82
-  data.tar.gz: b992d11ab40ad0641be835e4ecc3b2643fc24d88a19fba43d5f7aa95f2b234011506d9328e6d7e0cad68dbb9e9f906e78a646aa252251ff73b7a1a2c30e94d9a
+  metadata.gz: 092d68626a8dc9190494a66d84405c5e36b709e1ca2548eb4b76e7b949aa1605548e3cc7a19aeb5988cc1480adfc21619f5603dce31471020ef2c04c83c287e7
+  data.tar.gz: e6d15db6847705de02000c299a1ca7be98d63e4f15ac306348a82d19d9667f90451c01dbee66c12744d4166f558bffbb1cf9f3ac7f46861b3cbde8257cda2576

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 6.0.2 - 2015-08-20
+### Fixed
+* The user should always be given back a prompt unless (s)he explicitly states
+the opposite. This provides a more general fix to the bug resolved in 6.0.1.
+
 ## 6.0.1 - 2015-08-19
 ### Fixed
 * Bug in evaluation where the user would lose the command prompt when entering

data/lib/byebug/commands/break.rb

@@ -45,8 +45,6 @@ module Byebug
 
       errmsg(pr('break.errors.expression', expr: @match[2]))
       b.enabled = false
-    rescue => e
-      errmsg(e.message)
     end
 
     private

data/lib/byebug/commands/help.rb

@@ -35,8 +35,6 @@ 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/history.rb

@@ -30,7 +30,7 @@ module Byebug
       history = processor.interface.history
 
       if @match[:num_cmds]
-        size, = get_int(@match[:num_cmds], 'history', 1, history.size)
+        size, err = get_int(@match[:num_cmds], 'history', 1, history.size)
         return errmsg(err) unless size
       end
 

data/lib/byebug/commands/list.rb

@@ -36,11 +36,11 @@ module Byebug
 
     def execute
       msg = "No sourcefile available for #{frame.file}"
-      return errmsg(msg) unless File.exist?(frame.file)
+      fail(msg) unless File.exist?(frame.file)
 
       max_lines = n_lines(frame.file)
       b, e = range(@match[2], max_lines)
-      return errmsg('Invalid line range') unless valid_range?(b, e, max_lines)
+      fail('Invalid line range') unless valid_range?(b, e, max_lines)
 
       display_lines(b, e)
 
@@ -85,11 +85,11 @@ module Byebug
 
     def parse_range(input, size, max_line)
       first, err = get_int(lower_bound(input), 'List', 1, max_line)
-      return [-1, -1] if err
+      fail(err) unless first
 
       if upper_bound(input)
-        last, = get_int(upper_bound(input), 'List', 1, max_line)
-        return [-1, -1] unless last
+        last, err = get_int(upper_bound(input), 'List', 1, max_line)
+        fail(err) unless last
 
         last = amend(last, max_line)
       else

data/lib/byebug/helpers/parse.rb

@@ -14,17 +14,16 @@ module Byebug
       #
       def get_int(str, cmd, min = nil, max = nil)
         if str !~ /\A-?[0-9]+\z/
-          err = pr('parse.errors.int.not_number', cmd: cmd, str: str)
-          return nil, errmsg(err)
+          return nil, pr('parse.errors.int.not_number', cmd: cmd, str: str)
         end
 
         int = str.to_i
         if min && int < min
           err = pr('parse.errors.int.too_low', cmd: cmd, str: str, min: min)
-          return min, errmsg(err)
+          return nil, err
         elsif max && int > max
           err = pr('parse.errors.int.too_high', cmd: cmd, str: str, max: max)
-          return max, errmsg(err)
+          return nil, err
         end
 
         int

data/lib/byebug/helpers/thread.rb

@@ -9,30 +9,12 @@ module Byebug
       end
 
       def thread_arguments(ctx)
-        status_flag = if ctx.suspended?
-                        '$'
-                      else
-                        current_thread?(ctx) ? '+' : ' '
-                      end
-
-        debug_flag = ctx.ignored? ? '!' : ' '
-
-        # Check whether it is Byebug.current_context or context
-        if ctx == Byebug.current_context
-          file_line = context.location
-        else
-          backtrace = ctx.thread.backtrace_locations
-          if backtrace && backtrace[0]
-            file_line = "#{backtrace[0].path}:#{backtrace[0].lineno}"
-          end
-        end
-
         {
-          status_flag: status_flag,
-          debug_flag: debug_flag,
+          status_flag: status_flag(ctx),
+          debug_flag: debug_flag(ctx),
           id: ctx.thnum,
           thread: ctx.thread.inspect,
-          file_line: file_line || '',
+          file_line: location(ctx),
           pid: Process.pid,
           status: ctx.thread.status,
           current: current_thread?(ctx)
@@ -54,6 +36,28 @@ module Byebug
 
         [ctx, err]
       end
+
+      private
+
+      # TODO: Check whether it is Byebug.current_context or context
+      def location(ctx)
+        return context.location if ctx == Byebug.current_context
+
+        backtrace = ctx.thread.backtrace_locations
+        return '' unless backtrace && backtrace[0]
+
+        "#{backtrace[0].path}:#{backtrace[0].lineno}"
+      end
+
+      def status_flag(ctx)
+        return '$' if ctx.suspended?
+
+        current_thread?(ctx) ? '+' : ' '
+      end
+
+      def debug_flag(ctx)
+        ctx.ignored? ? '!' : ' '
+      end
     end
   end
 end

data/lib/byebug/processors/command_processor.rb

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

data/lib/byebug/subcommands.rb

@@ -19,14 +19,13 @@ module Byebug
     # Delegates to subcommands or prints help if no subcommand specified.
     #
     def execute
-      return puts(help) unless @match[1]
+      subcmd_name = @match[1]
+      return puts(help) unless subcmd_name
 
-      subcmd = subcommand_list.match(@match[1])
-      fail CommandNotFound.new(@match[1], self.class) unless subcmd
+      subcmd = subcommand_list.match(subcmd_name)
+      fail CommandNotFound.new(subcmd_name, 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.1'
+  VERSION = '6.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler