pry-debugger 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,8 +1,18 @@
+## 0.2.1 (2012-12-26)
+
+* Support breakpoints on methods defined in the pry console. (@banister)
+* Fix support for specifying breakpoints by *file:line_number*. (@nviennot)
+* Validate breakpoint conditionals are real Ruby expressions.
+* Support for [debugger][debugger] ~> 1.2.0. (@jshou)
+* Safer `alias_method_chain`-style patching of `Pry.start` and
+  `PryRemote::Server#teardown`. (@benizi)
+
+
 ## 0.2.0 (2012-06-11)
 
-# Breakpoints.
-* **finish** command.
-* Internal cleanup and bug fixes.
+* Breakpoints
+* **finish** command
+* Internal cleanup and bug fixes
 
 
 ## 0.1.0 (2012-06-07)
@@ -12,3 +22,4 @@
 
 
 [pry-remote]:  https://github.com/Mon-Ouie/pry-remote
+[debugger]:    https://github.com/cldwalker/debugger

data/README.md

@@ -123,7 +123,14 @@ Pry.commands.alias_command 'f', 'finish'
 ```
 
 
-## Contributions
+## Contributors
+
+* Gopal Patel (@nixme)
+* John Mair (@banister)
+* Nicolas Viennot (@nviennot)
+* Benjamin R. Haskell (@benizi)
+* Joshua Hou (@jshou)
+* ...and others who helped with [pry-nav][pry-nav]
 
 Patches and bug reports are welcome. Just send a [pull request][pullrequests] or
 file an [issue][issues]. [Project changelog][changelog].

data/lib/pry-debugger/breakpoints.rb

@@ -10,13 +10,20 @@ module PryDebugger
 
     # Add a new breakpoint.
     def add(file, line, expression = nil)
-      raise ArgumentError, 'Invalid file!' unless File.exist?(file)
+      real_file = (file != Pry.eval_path)
+      raise ArgumentError, 'Invalid file!' if real_file && !File.exist?(file)
+      validate_expression expression
+
       Pry.processor.debugging = true
-      Debugger.add_breakpoint(File.expand_path(file), line, expression)
+
+      path = (real_file ? File.expand_path(file) : file)
+      Debugger.add_breakpoint(path, line, expression)
     end
 
     # Change the conditional expression for a breakpoint.
     def change(id, expression = nil)
+      validate_expression expression
+
       breakpoint = find_by_id(id)
       breakpoint.expr = expression
       breakpoint
@@ -79,5 +86,12 @@ module PryDebugger
       breakpoint.enabled = enabled
       breakpoint
     end
+
+    def validate_expression(expression)
+      if expression &&   # `nil` implies no expression given, so pass
+          (expression.empty? || !Pry::Code.complete_expression?(expression))
+        raise "Invalid breakpoint conditional: #{expression}"
+      end
+    end
   end
 end

data/lib/pry-debugger/commands.rb

@@ -142,13 +142,13 @@ module PryDebugger
 
         file, line =
           case place
-          when /(\d+)/       # Line number only
+          when /^(\d+)$/       # Line number only
             line = $1
             unless PryDebugger.check_file_context(target)
               raise ArgumentError, 'Line number declaration valid only in a file context.'
             end
             [target.eval('__FILE__'), line]
-          when /(.+):(\d+)/  # File and line number
+          when /^(.+):(\d+)$/  # File and line number
             [$1, $2]
           else               # Method or class name
             self.args = [place]

data/lib/pry-debugger/pry_ext.rb

@@ -2,21 +2,22 @@ require 'pry'
 require 'pry-debugger/processor'
 
 class << Pry
-  alias_method :start_existing, :start
+  alias_method :start_without_pry_debugger, :start
   attr_reader :processor
 
-  def start(target = TOPLEVEL_BINDING, options = {})
+  def start_with_pry_debugger(target = TOPLEVEL_BINDING, options = {})
     @processor ||= PryDebugger::Processor.new
 
     if target.is_a?(Binding) && PryDebugger.check_file_context(target)
       # Wrap the processer around the usual Pry.start to catch navigation
       # commands.
       @processor.run(true) do
-        start_existing(target, options)
+        start_without_pry_debugger(target, options)
       end
     else
       # No need for the tracer unless we have a file context to step through
-      start_existing(target, options)
+      start_without_pry_debugger(target, options)
     end
   end
+  alias_method :start, :start_with_pry_debugger
 end

data/lib/pry-debugger/pry_remote_ext.rb

@@ -19,14 +19,15 @@ module PryRemote
     end
 
     # Override to reset our saved global current server session.
-    alias_method :teardown_existing, :teardown
-    def teardown
+    alias_method :teardown_without_pry_debugger, :teardown
+    def teardown_with_pry_debugger
       return if @torn
 
-      teardown_existing
+      teardown_without_pry_debugger
       PryDebugger.current_remote_server = nil
       @torn = true
     end
+    alias_method :teardown, :teardown_with_pry_debugger
   end
 end
 

data/lib/pry-debugger/version.rb

@@ -1,3 +1,3 @@
 module PryDebugger
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/pry-debugger.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.required_ruby_version = '>= 1.9.2'
-  gem.add_runtime_dependency 'pry', '~> 0.9.9'
-  gem.add_runtime_dependency 'debugger', '~> 1.1.3'
-  gem.add_development_dependency 'pry-remote', '~> 0.1.4'
+  gem.add_runtime_dependency 'pry', '~> 0.9.10'
+  gem.add_runtime_dependency 'debugger', '~> 1.2.0'
+  gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

metadata

@@ -1,49 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: pry-debugger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
   prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Gopal Patel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70204822544220 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.10
+    none: false
+  name: pry
   type: :runtime
   prerelease: false
-  version_requirements: *70204822544220
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: &70204822543060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.10
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
+    none: false
+  name: debugger
   type: :runtime
   prerelease: false
-  version_requirements: *70204822543060
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: &70204822541940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
+    none: false
+  name: pry-remote
   type: :development
   prerelease: false
-  version_requirements: *70204822541940
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+    none: false
 description: Combine 'pry' with 'debugger'. Adds 'step', 'next', and 'continue' commands
   to control execution.
 email: nixme@stillhope.com
@@ -75,20 +90,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fast debugging with Pry.