pry-remote 0.0.1 → 0.1.0

data/lib/pry-remote.rb

@@ -2,6 +2,7 @@ require 'pry'
 require 'slop'
 require 'drb'
 require 'readline'
+require 'open3'
 
 module PryRemote
   # A class to represent an input object created from DRb. This is used because
@@ -15,8 +16,33 @@ module PryRemote
     end
   end
 
+  # Ensure that system (shell command) output is redirected for remote session.
+  System = proc do |output, cmd, _|
+    status = nil
+    Open3.popen3 cmd do |stdin, stdout, stderr, wait_thr|
+      stdin.close # Send EOF to the process
+
+      until stdout.eof? and stderr.eof?
+        ios = [stdout, stderr]
+
+        if res = IO.select([stdout, stderr])
+          res[0].each do |io|
+            next if io.eof?
+            output.write io.read_nonblock(1024)
+          end
+        end
+      end
+
+      status = wait_thr.value
+    end
+
+    unless status.success?
+      output.puts "Error while executing command: #{cmd}"
+    end
+  end
+
   # A client is used to retrieve information from the client program.
-  Client = Struct.new :input, :output, :thread do
+  Client = Struct.new :input, :output, :thread, :stdout, :stderr do
     # Waits until both an input and output are set
     def wait
       sleep 0.01 until input and output and thread
@@ -37,16 +63,20 @@ module PryRemote
   class CLI
     def initialize(args = ARGV)
       params = Slop.parse args, :help => true do
-        banner "#$PROGRAM_NAME [-h HOST] [-p PORT]"
+        banner "#$PROGRAM_NAME [OPTIONS]"
 
         on :h, :host, "Host of the server (localhost)", true,
            :default => "localhost"
         on :p, :port, "Port of the server (9876)", true, :as => Integer,
            :default => 9876
+        on :c, :capture, "Captures $stdout and $stderr from the server (true)",
+           :default => true
       end
 
       @host = params[:host]
       @port = params[:port]
+
+      @capture = params[:capture]
     end
 
     # @return [String] Host of the server
@@ -60,6 +90,9 @@ module PryRemote
       "druby://#{host}:#{port}"
     end
 
+    attr_reader :capture
+    alias capture? capture
+
     # Connects to the server
     def run
       DRb.start_service
@@ -76,6 +109,12 @@ module PryRemote
 
       client.input  = input
       client.output = $stdout
+
+      if capture?
+        client.stdout = $stdout
+        client.stderr = $stderr
+      end
+
       client.thread = Thread.current
 
       sleep
@@ -98,12 +137,49 @@ class Object
     puts "[pry-remote] Waiting for client on #{uri}"
     client.wait
 
-    puts "[pry-remote] Client received, starting remote sesion"
-    Pry.start(self, :input => client.input_proxy, :output => client.output)
+    begin
+      # 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
+
+      puts "[pry-remote] Client received, starting remote sesion"
+      Pry.start(self, :input => client.input_proxy, :output => client.output)
+    ensure
+      # Reset output streams
+      $stdout = old_stdout
+      $stderr = old_stderr
 
-    puts "[pry-remote] Remote sesion terminated"
-    client.kill
+      # Reset config
+      Pry.config.pager = old_pager
 
-    DRb.stop_service
+      # Reset sysem
+      Pry.config.system = old_system
+
+      puts "[pry-remote] Remote sesion terminated"
+      client.kill
+
+      DRb.stop_service
+    end
   end
+
+  # a handy alias as many people may think the method is named after the gem
+  # (pry-remote)
+  alias pry_remote remote_pry
 end

metadata

@@ -2,7 +2,7 @@
 name: pry-remote
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mon ouie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slop
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.9"
+        version: 0.9.6
   type: :runtime
   version_requirements: *id002
 description: Connect to Pry remotely using DRb
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Connect to Pry remotely