pry-nav 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## 0.0.2 (2011-11-30)
+
+* Rudimentary [pry-remote][pry-remote] support. Still a bit buggy.
+* **continue** command as an alias for **exit-all**
+
+
+## 0.0.1 (2011-11-29)
+
+* First release. Basic **step** and **next** commands.
+
+
+[pry-remote]:  https://github.com/Mon-Ouie/pry-remote

data/README.md

@@ -3,27 +3,44 @@ pry-nav
 
 _Simple execution control in Pry_
 
-Adds **step** and **next** commands to your [Pry][pry]
+Adds **step**, **next**, and **continue** commands to your [Pry][pry]
 console. Makes for a simple but ghetto debugger.
 
-Note: In order to get the correct flow control, `Pry.start` is overriden. Use at
+Rudimentary support for [pry-remote][pry-remote] is included. Ensure pry-remote
+is loaded or required before pry-nav. For example, in a Gemfile:
+
+```ruby
+gem 'pry'
+gem 'pry-remote'
+gem 'pry-nav'
+```
+
+Note: In order to get correct flow control, `Pry.start` is overriden. Use at
 your own risk.
 
 
+## Contributing
+
+Patches and bug reports are welcome. Just send a [pull request][pullrequests] or
+file an [issue][issues]. [Project changelog][changelog].
+
+
 ## Acknowledgments
 
-- Ruby stdlib [debug.rb][debug.rb]
+- Ruby stdlib's [debug.rb][debug.rb]
 - [@Mon-Ouie][Mon-Ouie]'s [pry_debug][pry_debug]
 
 
 ## TODO
 
 - Thread safety
-- Compatibility with [pry-remote][pry-remote]
 
 
-[pry]:         http://pry.github.com
-[debug.rb]:    https://github.com/ruby/ruby/blob/trunk/lib/debug.rb
-[Mon-Ouie]:    https://github.com/Mon-Ouie
-[pry_debug]:   https://github.com/Mon-Ouie/pry_debug
-[pry-remote]:  https://github.com/Mon-Ouie/pry-remote
+[pry]:          http://pry.github.com
+[pry-remote]:   https://github.com/Mon-Ouie/pry-remote
+[changelog]:    https://github.com/nixme/pry-nav/blob/master/CHANGELOG.md
+[issues]:       https://github.com/nixme/pry-nav/issues
+[pullrequests]: https://github.com/nixme/pry-nav/pulls
+[debug.rb]:     https://github.com/ruby/ruby/blob/trunk/lib/debug.rb
+[Mon-Ouie]:     https://github.com/Mon-Ouie
+[pry_debug]:    https://github.com/Mon-Ouie/pry_debug

data/lib/pry-nav.rb

@@ -2,3 +2,6 @@ require 'pry-nav/version'
 require 'pry-nav/pry_ext'
 require 'pry-nav/commands'
 require 'pry-nav/tracer'
+
+# Optionally load pry-remote monkey patches
+require 'pry-nav/pry_remote_ext' if defined? PryRemote

data/lib/pry-nav/commands.rb

@@ -10,8 +10,13 @@ module PryNav
       breakout_navigation :next, lines
     end
 
+    command 'continue', 'Continue program execution and end the Pry session.' do
+      run 'exit-all'
+    end
+
     alias_command 'n', 'next'
     alias_command 's', 'step'
+    alias_command 'c', 'continue'
 
     helpers do
       def breakout_navigation(action, times)

data/lib/pry-nav/pry_ext.rb

@@ -1,11 +1,12 @@
 require 'pry'
+require 'pry-nav/tracer'
 
 class << Pry
   alias_method :start_existing, :start
 
   def start(target = TOPLEVEL_BINDING, options = {})
     PryNav::Tracer.new(options) do
-      start_existing(target, options)
+      start_existing(target, options.reject { |k, _| k == :pry_remote })
     end
   end
 end

data/lib/pry-nav/pry_remote_ext.rb

@@ -0,0 +1,78 @@
+require 'pry-remote'
+
+module PryRemote
+
+  # Extraction of Object#remote_pry from
+  # https://github.com/Mon-Ouie/pry-remote/blob/master/lib/pry-remote.rb
+  # into separate `start` and `stop` methods so that a DRb session can last over
+  # multiple Pry.start calls.
+  module Server
+    extend self
+
+    def start(host, port)
+      uri = "druby://#{host}:#{port}"
+
+      @client = PryRemote::Client.new
+      DRb.start_service uri, @client
+
+      puts "[pry-remote] Waiting for client on #{uri}"
+      @client.wait
+
+      # If client passed stdout and stderr, redirect actual messages there.
+      @old_stdout, $stdout =
+        if @client.stdout
+          [$stdout, @client.stdout]
+        else
+          [$stdout, $stdout]
+        end
+
+      @old_stderr, $stderr =
+        if @client.stderr
+          [$stderr, @client.stderr]
+        else
+          [$stderr, $stderr]
+        end
+
+      # Before Pry starts, save the pager config.
+      # We want to disable this because the pager won't do anything useful in
+      # this case (it will run on the server).
+      Pry.config.pager, @old_pager = false, Pry.config.pager
+
+      # As above, but for system config
+      Pry.config.system, @old_system = PryRemote::System, Pry.config.system
+
+      @client
+    end
+
+    def stop
+      # Reset output streams
+      $stdout = @old_stdout
+      $stderr = @old_stderr
+
+      # Reset config
+      Pry.config.pager = @old_pager
+
+      # Reset system
+      Pry.config.system = @old_system
+
+      puts "[pry-remote] Remote sesion terminated"
+      @client.kill
+
+      DRb.stop_service
+    end
+  end
+end
+
+class Object
+  # Override pry-remote's Object#remote_pry to use the above
+  # PryRemote::Server. The PryNav::Tracer instance is responsible for
+  # terminating the DRb server by calling PryRemote::Server#stop
+  def remote_pry(host = 'localhost', port = 9876)
+    client = PryRemote::Server.start(host, port)
+    Pry.start self, {
+      :input => client.input_proxy,
+      :output => client.output,
+      :pry_remote => true
+    }
+  end
+end

data/lib/pry-nav/tracer.rb

@@ -48,6 +48,7 @@ module PryNav
         @frames_when_stepping = @frames.size
       else
         stop
+        PryRemote::Server.stop if @pry_start_options[:pry_remote]
       end
     end
 

data/lib/pry-nav/version.rb

@@ -1,3 +1,3 @@
 module PryNav
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-nav
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70106424403940 !ruby/object:Gem::Requirement
+  requirement: &70264352532260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.9.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70106424403940
+  version_requirements: *70264352532260
 description: Turn Pry into a primitive debugger. Adds 'step' and 'next' commands to
   control execution.
 email: nixme@stillhope.com
@@ -30,12 +30,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - lib/pry-nav.rb
 - lib/pry-nav/commands.rb
 - lib/pry-nav/pry_ext.rb
+- lib/pry-nav/pry_remote_ext.rb
 - lib/pry-nav/tracer.rb
 - lib/pry-nav/version.rb
 - pry-nav.gemspec