pry-byebug 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42e1d5a58d90aa640bcd1e79be383d78286fc66
-  data.tar.gz: 32cf706c69453f75a70729fa4caf95b023642379
+  metadata.gz: 4b3ed5737036fb3e67543d8df53880500db2ea98
+  data.tar.gz: f4130936f658687b08af6ee8bed74e8554b6a77b
 SHA512:
-  metadata.gz: d4e5826a3e0d91869ff79953c45e475d0ecb5252e50171a5ad18f8a667625558690af3b00e09d0b8ccb68c55257e5bc0f285edb85334388fd7a4b8ea9c6ce826
-  data.tar.gz: e87f0c3fe28da82b42e2146c108ae73b0832b4bc10d1f1b54baaefccf639580d8874cc5c7a1149fbd46500969ce3b55bd4e13b81531f1d05913735ad389fd193
+  metadata.gz: a361fb51061ca0c6efd216623dca9754173352dcca012a82f48b80fffb767fbe1e39b649213c15b1737275f19ef6943394a9c3310dc9da7f2d9651f685d009d6
+  data.tar.gz: aeb8e5bed91c15c156cd739906791469369b55787a38a1c7212d3441f75ad6978b984877eae54d05814258205416ae17daa1da3bffe90434187bcfafc1b70f2d

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 3.0.0 (Unreleased)
+## 3.0.1 (2015-04-02)
+
+- Improvements:
+  * Fix several formatting and alignment issues.
+
+
+## 3.0.0 (2015-02-02)
 
 - Improvements:
   * Adds RuboCop to enforce a consistent code style.

data/lib/byebug/processors/pry_processor.rb

@@ -76,7 +76,7 @@ module Byebug
     def at_breakpoint(_context, breakpoint)
       @pry ||= Pry.new
 
-      brkpt_num = "\nBreakpoint #{breakpoint.id}. "
+      brkpt_num = "\n  Breakpoint #{breakpoint.id}. "
       @pry.output.print Pry::Helpers::Text.bold(brkpt_num)
 
       n_hits = breakpoint.hit_count

data/lib/pry-byebug/version.rb

@@ -2,5 +2,5 @@
 # Main container module for Pry-Byebug functionality
 #
 module PryByebug
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/pry/commands/breakpoint.rb

@@ -134,15 +134,14 @@ class Pry
       end
 
       def process
-        if breakpoints.count == 0
-          return output.puts(text.bold('No breakpoints defined.'))
-        end
+        return bold_puts('No breakpoints defined.') if breakpoints.count == 0
 
         if opts.verbose?
           breakpoints.each { |b| print_full_breakpoint(b) }
         else
           print_breakpoints_header
           breakpoints.each { |b| print_short_breakpoint(b) }
+          output.puts
         end
       end
     end
@@ -169,36 +168,41 @@ class Pry
       # Includes surrounding code at that point.
       #
       def print_full_breakpoint(br)
-        header = text.bold("Breakpoint #{br.id}:")
-        status = br.enabled? ? '(Enabled)' : '(Disabled)'
+        header = "Breakpoint #{br.id}:"
+        status = br.enabled? ? 'Enabled' : 'Disabled'
         code = br.source_code.with_line_numbers.to_s
         condition = br.expr ? "#{text.bold('Condition:')} #{br.expr}\n" : ''
 
-        output.puts("#{header} #{br} #{status} :\n#{condition}#{code}\n")
+        output.puts <<-EOP.gsub(/ {8}/, '')
+
+          #{text.bold(header)} #{br} (#{status}) #{condition}
+
+        #{code}
+
+        EOP
       end
 
       #
       # Print out concise information about a breakpoint.
       #
       def print_short_breakpoint(breakpoint)
-        id = sprintf('%*d  ', max_width, breakpoint.id)
+        id = sprintf('%*d', max_width, breakpoint.id)
         status = breakpoint.enabled? ? 'Yes' : 'No'
         expr = breakpoint.expr ? breakpoint.expr : ''
 
-        output.puts("#{id} #{status}      #{breakpoint} #{expr}")
+        output.puts("  #{id} #{status}     #{breakpoint} #{expr}")
       end
 
       #
       # Prints a header for the breakpoint list.
       #
       def print_breakpoints_header
-        header = "#{' ' * (max_width - 1)}#  Enabled  At "
+        header = "#{' ' * (max_width - 1)}# Enabled At "
 
-        output.puts <<-EOP
+        output.puts <<-EOP.gsub(/ {8}/, '')
 
           #{text.bold(header)}
           #{text.bold('-' * header.size)}
-
         EOP
       end
 
@@ -206,7 +210,7 @@ class Pry
       # Max width of breakpoints id column
       #
       def max_width
-        [Math.log10(breakpoints.count).ceil, 1].max
+        ::Byebug.breakpoints.last.id.to_s.length
       end
     end
   end

data/test/breakpoints_test.rb

@@ -53,7 +53,7 @@ module BreakpointSpecs
 
   def test_shows_breakpoint_hit
     match = @output.string.match(@regexp)
-    @output.string.must_match(/^Breakpoint #{match[:id]}\. First hit/)
+    @output.string.must_match(/^  Breakpoint #{match[:id]}\. First hit/)
   end
 
   def test_shows_breakpoint_line
@@ -84,7 +84,7 @@ class BreakpointsTestCommands < Minitest::Spec
         @input = InputTester.new('break 7')
         redirect_pry_io(@input, @output) { load break_first_file }
         @line = 7
-        @regexp = /^Breakpoint (?<id>\d+): #{break_first_file} @ 7 \(Enabled\)/
+        @regexp = /  Breakpoint (?<id>\d+): #{break_first_file} @ 7 \(Enabled\)/
       end
 
       include BreakpointSpecs
@@ -95,7 +95,7 @@ class BreakpointsTestCommands < Minitest::Spec
         @input = InputTester.new('break Break1Example#a')
         redirect_pry_io(@input, @output) { load break_first_file }
         @line = 7
-        @regexp = /Breakpoint (?<id>\d+): Break1Example#a \(Enabled\)/
+        @regexp = /  Breakpoint (?<id>\d+): Break1Example#a \(Enabled\)/
       end
 
       include BreakpointSpecs
@@ -106,7 +106,7 @@ class BreakpointsTestCommands < Minitest::Spec
         @input = InputTester.new('break Break1Example#c!')
         redirect_pry_io(@input, @output) { load break_first_file }
         @line = 17
-        @regexp = /Breakpoint (?<id>\d+): Break1Example#c! \(Enabled\)/
+        @regexp = /  Breakpoint (?<id>\d+): Break1Example#c! \(Enabled\)/
       end
 
       include BreakpointSpecs
@@ -117,7 +117,7 @@ class BreakpointsTestCommands < Minitest::Spec
         @input = InputTester.new('break #b')
         redirect_pry_io(@input, @output) { load break_second_file }
         @line = 11
-        @regexp = /Breakpoint (?<id>\d+): Break2Example#b \(Enabled\)/
+        @regexp = /  Breakpoint (?<id>\d+): Break2Example#b \(Enabled\)/
       end
 
       include BreakpointSpecs
@@ -133,5 +133,11 @@ class BreakpointsTestCommands < Minitest::Spec
     it 'shows all breakpoints' do
       @output.string.must_match(/Yes \s*Break2Example#b/)
     end
+
+    it 'properly aligns headers' do
+      width = Byebug.breakpoints.last.id.to_s.length
+      @output.string.must_match(/   {#{width - 1}}# Enabled At/)
+      @output.string.must_match(/  \d{#{width}} Yes     Break2Example#b/)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-byebug
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - David Rodríguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry