pry-remote 0.1.6 → 0.1.7

data/lib/pry-remote.rb

@@ -5,7 +5,7 @@ require 'readline'
 require 'open3'
 
 module PryRemote
-  DefaultHost = "localhost"
+  DefaultHost = "127.0.0.1"
   DefaultPort = 9876
 
   # A class to represent an input object created from DRb. This is used because
@@ -15,7 +15,74 @@ module PryRemote
   InputProxy = Struct.new :input do
     # Reads a line from the input
     def readline(prompt)
-      input.readline(prompt)
+      case readline_arity
+      when 1 then input.readline(prompt)
+      else        input.readline
+      end
+    end
+
+    def completion_proc=(val)
+      input.completion_proc = val
+    end
+
+    def readline_arity
+      input.method_missing(:method, :readline).arity
+    rescue NameError
+      0
+    end
+  end
+
+  # Class used to wrap inputs so that they can be sent through DRb.
+  #
+  # This is to ensure the input is used locally and not reconstructed on the
+  # server by DRb.
+  class IOUndumpedProxy
+    include DRb::DRbUndumped
+
+    def initialize(obj)
+      @obj = obj
+    end
+
+    def completion_proc=(val)
+      if @obj.respond_to? :completion_proc=
+        @obj.completion_proc = val
+      end
+    end
+
+    def completion_proc
+      @obj.completion_proc if @obj.respond_to? :completion_proc
+    end
+
+    def readline(prompt)
+      if @obj.method(:readline).arity == 1
+        @obj.readline(prompt)
+      else
+        $stdout.print prompt
+        @obj.readline
+      end
+    end
+
+    def puts(*lines)
+      @obj.puts(*lines)
+    end
+
+    def print(*objs)
+      @obj.print(*objs)
+    end
+
+    def write(data)
+      @obj.write data
+    end
+
+    def <<(data)
+      @obj << data
+      self
+    end
+
+    # Some versions of Pry expect $stdout or its output objects to respond to
+    # this message.
+    def tty?
+      false
     end
   end
 
@@ -65,7 +132,7 @@ module PryRemote
       new(object, host, port).run
     end
 
-    def initialize(object, host = "loclahost", port = DefaultPort)
+    def initialize(object, host = DefaultHost, port = DefaultPort)
       @uri    = "druby://#{host}:#{port}"
       @object = object
 
@@ -115,9 +182,15 @@ module PryRemote
       Pry.config.system = @old_system
 
       puts "[pry-remote] Remote session terminated"
-      @client.kill
 
-      DRb.stop_service
+      begin
+        @client.kill
+      rescue DRb::DRbConnError
+        puts "[pry-remote] Continuing to stop service"
+      ensure
+        puts "[pry-remote] Ensure stop service"
+        DRb.stop_service
+      end
     end
 
     # Actually runs pry-remote
@@ -141,18 +214,23 @@ module PryRemote
       params = Slop.parse args, :help => true do
         banner "#$PROGRAM_NAME [OPTIONS]"
 
-        on :h, :host, "Host of the server (#{DefaultHost})", true,
+        on :s, :server=, "Host of the server (#{DefaultHost})", :argument => :optional,
            :default => DefaultHost
-        on :p, :port, "Port of the server (#{DefaultPort})", true,
+        on :p, :port=, "Port of the server (#{DefaultPort})", :argument => :optional,
            :as => Integer, :default => DefaultPort
         on :c, :capture, "Captures $stdout and $stderr from the server (true)",
            :default => true
+        on :f, "Disables loading of .pryrc and its plugins, requires, and command history "
       end
 
-      @host = params[:host]
+      exit if params.help?
+
+      @host = params[:server]
       @port = params[:port]
 
       @capture = params[:capture]
+
+      Pry.initial_session_setup unless params[:f]
     end
 
     # @return [String] Host of the server
@@ -170,21 +248,19 @@ module PryRemote
     alias capture? capture
 
     # Connects to the server
-    def run
+    #
+    # @param [IO] input  Object holding input for pry-remote
+    # @param [IO] output Object pry-debug will send its output to
+    def run(input = Pry.config.input, output = Pry.config.output)
       DRb.start_service
       client = DRbObject.new(nil, uri)
 
-      # Passing Readline to DRb won't actually make it use our readline
-      # object. Instead, it will use the server-side readilne. Therefore, we
-      # create a simple proxy here.
-
-      input = Object.new
-      def input.readline(prompt)
-        Readline.readline(prompt, true)
-      end
+      input  = IOUndumpedProxy.new(input)
+      output = IOUndumpedProxy.new(output)
 
       client.input  = input
-      client.output = $stdout
+
+      client.output = output
 
       if capture?
         client.stdout = $stdout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop