pry-byebug 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba2846fe4080bb11d92caad167546fad2f72fad
-  data.tar.gz: bbb99275dfe2289e74258051053715e065173810
+  metadata.gz: aaed52b59d6393f7ec0b0c0364c4ab345d4d9fbe
+  data.tar.gz: d6d0fb953ff4a59b4b2a5fb93a5c117c295a39ed
 SHA512:
-  metadata.gz: 96e581e92822c411c12219ae9b19db5d423ef262abe2aad86e3ef5bd6428bf080718ba7f4dd833c2e64fd86a0bc6d8adb758a44e166ed33196145bd99134899e
-  data.tar.gz: 6013dee785c7affd6006e905e6a46d9849e54b3f1f80d586d5908134235541d7030420ef3abc520b075f9dc7b8efe619726f7d1848d7a4b57f0eecbaa0da1ea8
+  metadata.gz: 2dd86e047aa5d2e7ebd5a502825c98adbebfe6b26824a87bfdee6c8cc109ccea2d575554e85194024c062c489f7e7297be7b31e8217b12bad7b29ea02275d9fe
+  data.tar.gz: 4987952759065ed3dd4d3891b8cafce89be3c58246a16678a2a04a70365412006f60d7d5ce1ef3dba766a09a8286ffd5d397e06f37bf22c15e05a27337223d04

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
 - 2.0.0
+- 2.1.0
 - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.0 (2014-05-02)
+
+* Add breakpoints on method names (thanks @andreychernih & @palkan)
+* Fix "undefined method `interface`" error (huge thanks to @andreychernih)
+
+
 ## 1.2.1 (2013-30-12)
 
 * Fix for "uncaught throw :breakout_nav" (thanks @lukebergen)

data/lib/pry-byebug/breakpoints.rb

@@ -7,8 +7,48 @@ module PryByebug
     extend Enumerable
     extend self
 
-    # Add a new breakpoint.
-    def add(file, line, expression = nil)
+    class FileBreakpoint < SimpleDelegator
+      def source_code
+        Pry::Code.from_file(source).around(pos, 3).with_marker(pos)
+      end
+
+      def to_s
+        "#{source} @ #{pos}"
+      end
+    end
+
+    class MethodBreakpoint < SimpleDelegator
+      def initialize(byebug_bp, method)
+        __setobj__ byebug_bp
+        @method = method
+      end
+
+      def source_code
+        Pry::Code.from_method(Pry::Method.from_str(@method))
+      end
+
+      def to_s
+        @method
+      end
+    end
+
+    def breakpoints
+      @breakpoints ||= []
+    end
+
+    # Add method breakpoint.
+    def add_method(method, expression = nil)
+      validate_expression expression
+      Pry.processor.debugging = true
+      owner, name = method.split /[\.#]/
+      byebug_bp = Byebug.add_breakpoint(owner, name.to_sym, expression)
+      bp = MethodBreakpoint.new byebug_bp, method
+      breakpoints << bp
+      bp
+    end
+
+    # Add file breakpoint.
+    def add_file(file, line, expression = nil)
       real_file = (file != Pry.eval_path)
       raise ArgumentError, 'Invalid file!' if real_file && !File.exist?(file)
       validate_expression expression
@@ -16,7 +56,9 @@ module PryByebug
       Pry.processor.debugging = true
 
       path = (real_file ? File.expand_path(file) : file)
-      Byebug.add_breakpoint(path, line, expression)
+      bp = FileBreakpoint.new Byebug.add_breakpoint(path, line, expression)
+      breakpoints << bp
+      bp
     end
 
     # Change the conditional expression for a breakpoint.
@@ -30,14 +72,16 @@ module PryByebug
 
     # Delete an existing breakpoint with the given ID.
     def delete(id)
-      unless Byebug.started? && Byebug.remove_breakpoint(id)
-        raise ArgumentError, "No breakpoint ##{id}"
-      end
+      deleted = Byebug.started? && 
+        Byebug.remove_breakpoint(id) &&
+        breakpoints.delete(find_by_id(id))
+      raise ArgumentError, "No breakpoint ##{id}" if not deleted
       Pry.processor.debugging = false if to_a.empty?
     end
 
     # Delete all breakpoints.
     def clear
+      @breakpoints = []
       Byebug.breakpoints.clear if Byebug.started?
       Pry.processor.debugging = false
     end
@@ -60,7 +104,7 @@ module PryByebug
     end
 
     def to_a
-      Byebug.started? ? Byebug.breakpoints : []
+      breakpoints
     end
 
     def size

data/lib/pry-byebug/commands.rb

@@ -152,22 +152,29 @@ module PryByebug
         place = args.shift
         condition = args.join(' ') if 'if' == args.shift
 
-        file, line =
+        bp =
           case place
           when /^(\d+)$/       # Line number only
             line = $1
             unless PryByebug.check_file_context(target)
               raise ArgumentError, 'Line number declaration valid only in a file context.'
             end
-            [target.eval('__FILE__'), line]
+            Breakpoints.add_file(target.eval('__FILE__'), line.to_i, condition)
           when /^(.+):(\d+)$/  # File and line number
-            [$1, $2]
-          else               # Method or class name
-            self.args = [place]
-            method_object.source_location
+            Breakpoints.add_file($1, $2.to_i, condition)
+          when /^(.*)[.#].+$/  # Method or class name
+            if $1.strip.empty?
+              unless PryByebug.check_file_context(target)
+                raise ArgumentError, 'Method name declaration valid only in a file context.'
+              end
+              place = target.eval('self.class.to_s') + place
+            end
+            Breakpoints.add_method(place,condition)
+          else
+            raise ArgumentError, 'Cannot identify arguments as breakpoint'
           end
 
-        print_full_breakpoint Breakpoints.add(file, line.to_i, condition)
+        print_full_breakpoint bp
       end
     end
     alias_command 'breakpoint', 'break'
@@ -201,7 +208,7 @@ module PryByebug
             Breakpoints.each do |breakpoint|
               output.printf "%#{max_width}d  ", breakpoint.id
               output.print  breakpoint.enabled? ? 'Yes      ' : 'No       '
-              output.print  "#{breakpoint.source}:#{breakpoint.pos}"
+              output.print  breakpoint.to_s
               output.print  " (if #{breakpoint.expr})" if breakpoint.expr
               output.puts
             end
@@ -236,17 +243,14 @@ module PryByebug
       def print_full_breakpoint(breakpoint)
         line = breakpoint.pos
         output.print text.bold("Breakpoint #{breakpoint.id}: ")
-        output.print "#{breakpoint.source} @ line #{line} "
+        output.print "#{breakpoint.to_s} "
         output.print breakpoint.enabled? ? '(Enabled)' : '(Disabled)'
         output.puts  ' :'
         if (expr = breakpoint.expr)
           output.puts "#{text.bold('Condition:')} #{expr}"
         end
         output.puts
-        output.puts  Pry::Code.from_file(breakpoint.source).
-                       around(line, 3).
-                       with_line_numbers.
-                       with_marker(line).to_s
+        output.puts breakpoint.source_code.with_line_numbers.to_s
         output.puts
       end
     end

data/lib/pry-byebug/processor.rb

@@ -2,10 +2,12 @@ require 'pry'
 require 'byebug'
 
 module PryByebug
-  class Processor
+  class Processor < Byebug::Processor
     attr_accessor :pry
 
-    def initialize
+    def initialize(interface = Byebug::LocalInterface.new)
+      super(interface)
+      
       Byebug.handler = self
       @always_enabled = true
       @delayed = Hash.new(0)

data/lib/pry-byebug/version.rb

@@ -1,3 +1,3 @@
 module PryByebug
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/pry-byebug.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'pry', '~> 0.9.12'
   gem.add_runtime_dependency 'byebug', '~> 2.2'
 
-  gem.add_development_dependency 'bundler', '~> 1.3.5'
-  gem.add_development_dependency 'rake', '~> 10.1.0'
-  gem.add_development_dependency 'mocha', '~> 0.14.0'
+  gem.add_development_dependency 'bundler', '~> 1.5'
+  gem.add_development_dependency 'rake', '~> 10.1'
+  gem.add_development_dependency 'mocha', '~> 1.0'
 end

data/test/breakpoints_test.rb

@@ -1,14 +1,34 @@
 require 'test_helper'
 
 class BreakpointsTest < MiniTest::Spec
-
-  def test_add_raises_argument_error
+  def test_add_file_raises_argument_error
     Pry.stubs eval_path: "something"
     File.stubs :exist?
     assert_raises(ArgumentError) do
-      PryByebug::Breakpoints.add("file", 1)
+      PryByebug::Breakpoints.add_file("file", 1)
     end
   end
 
-end
+  class Tester
+    def self.class_method; end
+    def instance_method; end
+  end
 
+  def test_add_method_adds_instance_method_breakpoint
+    Pry.stub :processor, PryByebug::Processor.new do
+      PryByebug::Breakpoints.add_method 'BreakpointsTest::Tester#instance_method'
+      bp = Byebug.breakpoints.last
+      assert_equal 'BreakpointsTest::Tester', bp.source
+      assert_equal 'instance_method', bp.pos
+    end
+  end
+
+  def test_add_method_adds_class_method_breakpoint
+    Pry.stub :processor, PryByebug::Processor.new do
+      PryByebug::Breakpoints.add_method 'BreakpointsTest::Tester.class_method'
+      bp = Byebug.breakpoints.last
+      assert_equal 'BreakpointsTest::Tester', bp.source
+      assert_equal 'class_method', bp.pos
+    end
+  end
+end

data/test/commands_test.rb

@@ -5,6 +5,14 @@ class CommandsTest < MiniTest::Spec
     (Pathname.new(__FILE__) + "../examples/stepping.rb").cleanpath.to_s
   end
 
+  let(:break_first_file) do
+    (Pathname.new(__FILE__) + "../examples/break1.rb").cleanpath.to_s
+  end
+
+  let(:break_second_file) do
+    (Pathname.new(__FILE__) + "../examples/break2.rb").cleanpath.to_s
+  end
+
   before do
     Pry.color = false
     Pry.pager = false
@@ -15,7 +23,7 @@ class CommandsTest < MiniTest::Spec
   describe 'Step Command' do
     describe 'single step' do
       before do
-        @input = InputTester.new('step')
+        @input = InputTester.new 'step'
         redirect_pry_io(@input, @output) do
           load step_file
         end
@@ -28,7 +36,7 @@ class CommandsTest < MiniTest::Spec
 
     describe 'multiple step' do
       before do
-        @input = InputTester.new('step 2')
+        @input = InputTester.new 'step 2'
         redirect_pry_io(@input, @output) do
           load step_file
         end
@@ -43,7 +51,7 @@ class CommandsTest < MiniTest::Spec
   describe 'Next Command' do
     describe 'single step' do
       before do
-        @input = InputTester.new('next')
+        @input = InputTester.new 'next'
         redirect_pry_io(@input, @output) do
           load step_file
         end
@@ -56,7 +64,7 @@ class CommandsTest < MiniTest::Spec
 
     describe 'multiple step' do
       before do
-        @input = InputTester.new('next 2')
+        @input = InputTester.new 'next 2'
         redirect_pry_io(@input, @output) do
           load step_file
         end
@@ -68,5 +76,103 @@ class CommandsTest < MiniTest::Spec
     end
   end
 
+  describe 'Set Breakpoints' do
+    before do
+      @input = InputTester.new 'break --delete-all'
+      redirect_pry_io(@input, @output) do
+        load break_first_file
+      end
+      @output = StringIO.new
+    end
+
+    describe 'set by line number' do
+      before do
+        @input = InputTester.new 'break 3'
+        redirect_pry_io(@input, @output) do
+          load break_first_file
+        end
+      end
+
+      it 'shows breakpoint enabled' do
+        @output.string.must_match /^Breakpoint [\d]+: #{break_first_file} @ 3 \(Enabled\)/
+      end
+
+      it 'shows breakpoint hit' do
+        @output.string =~ /^Breakpoint ([\d]+): #{break_first_file} @ 3 \(Enabled\)/
+        @output.string.must_match Regexp.new("^Breakpoint #{$1}\. First hit")
+      end
+
+      it 'shows breakpoint line' do
+        @output.string.must_match /\=> 3:/
+      end
+    end
+
+    describe 'set by method_id' do
+      before do
+        @input = InputTester.new 'break BreakExample#a'
+        redirect_pry_io(@input, @output) do
+          load break_first_file
+        end
+      end
+
+      it 'shows breakpoint enabled' do
+        @output.string.must_match /^Breakpoint [\d]+: BreakExample#a \(Enabled\)/
+      end
+
+      it 'shows breakpoint hit' do
+        @output.string =~ /^Breakpoint ([\d]+): BreakExample#a \(Enabled\)/
+        @output.string.must_match Regexp.new("^Breakpoint #{$1}\. First hit")
+      end
+
+      it 'shows breakpoint line' do
+        @output.string.must_match /\=> 4:/
+      end
+
+      describe 'when its a bang method' do
+        before do
+          @input = InputTester.new 'break BreakExample#c!'
+          redirect_pry_io(@input, @output) do
+            load break_first_file
+          end
+        end
+
+        it 'shows breakpoint enabled' do
+          @output.string.must_match /^Breakpoint [\d]+: BreakExample#c! \(Enabled\)/
+        end
+
+        it 'shows breakpoint hit' do
+          @output.string =~ /^Breakpoint ([\d]+): BreakExample#c! \(Enabled\)/
+          @output.string.must_match Regexp.new("^Breakpoint #{$1}\. First hit")
+        end
+
+        it 'shows breakpoint line' do
+          @output.string.must_match /\=> 14:/
+        end
+      end
+    end
+
+    describe 'set by method_id within context' do
+      before do
+        @input = InputTester.new 'break #b'
+        redirect_pry_io(@input, @output) do
+          load break_second_file
+        end
+      end
+
+      it 'shows breakpoint enabled' do
+        @output.string.must_match /^Breakpoint [\d]+: BreakExample#b \(Enabled\)/
+      end
+
+      it 'shows breakpoint hit' do
+        @output.string =~ /^Breakpoint ([\d]+): BreakExample#b \(Enabled\)/
+        @output.string.must_match Regexp.new("^Breakpoint #{$1}\. First hit")
+      end
+
+      it 'shows breakpoint line' do
+        @output.string.must_match /\=>  8:/
+      end
+    end
+
+  end
 end
 

data/test/examples/break1.rb

@@ -0,0 +1,20 @@
+binding.pry
+
+class BreakExample
+  def a
+    z = 2
+    b
+  end
+
+  def b
+    v2 = 5 if 1 == 2 ; [1,2,3].map { |a| a.to_f }
+    c!
+  end
+
+  def c!
+    z = 4
+    5
+  end
+end
+
+BreakExample.new.a

data/test/examples/break2.rb

@@ -0,0 +1,18 @@
+class BreakExample
+  def a
+    binding.pry
+    z = 2
+    b
+  end
+
+  def b
+    c
+  end
+
+  def c
+    z = 4
+    5
+  end
+end
+
+BreakExample.new.a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-byebug
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - David Rodríguez
@@ -9,78 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.0'
 description: |-
   Combine 'pry' with 'byebug'. Adds 'step', 'next', and
       'continue' commands to control execution.
@@ -89,8 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -109,6 +109,8 @@ files:
 - test/base_test.rb
 - test/breakpoints_test.rb
 - test/commands_test.rb
+- test/examples/break1.rb
+- test/examples/break2.rb
 - test/examples/stepping.rb
 - test/processor_test.rb
 - test/pry_ext_test.rb
@@ -124,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Fast debugging with Pry.
@@ -142,9 +144,10 @@ test_files:
 - test/base_test.rb
 - test/breakpoints_test.rb
 - test/commands_test.rb
+- test/examples/break1.rb
+- test/examples/break2.rb
 - test/examples/stepping.rb
 - test/processor_test.rb
 - test/pry_ext_test.rb
 - test/pry_remote_ext_test.rb
 - test/test_helper.rb
-has_rdoc: