pry-remote 0.1.7 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 169f55f956d914a4ca611f12b2b41c221166c1da
+  data.tar.gz: a0dfdb736a3c3772e1d9542fb96f3a2fd57446ef
+SHA512:
+  metadata.gz: b58db7ae0a89f8b6c4b6ce1e2e341d18bf679d3b703f6948a7e200b3efa6d5bd71fc523b47a16f3669e3665d355b8378eb1267339740ce499bcf0d4a2bf3e7cd
+  data.tar.gz: f970dbe41d24079a2910cb03bba7b61d898065bf625f8cd446dc1dc424d701596ffbb0bb6d0e1e04dbe2bfc8a7c8f9bf86f3268ca9fc051ffd8462743a93f904

data/lib/pry-remote.rb

@@ -54,7 +54,9 @@ module PryRemote
     end
 
     def readline(prompt)
-      if @obj.method(:readline).arity == 1
+      if Readline == @obj
+        @obj.readline(prompt, true)
+      elsif @obj.method(:readline).arity == 1
         @obj.readline(prompt)
       else
         $stdout.print prompt
@@ -70,6 +72,10 @@ module PryRemote
       @obj.print(*objs)
     end
 
+    def printf(*args)
+      @obj.printf(*args)
+    end
+
     def write(data)
       @obj.write data
     end
@@ -128,18 +134,21 @@ module PryRemote
   end
 
   class Server
-    def self.run(object, host = DefaultHost, port = DefaultPort)
-      new(object, host, port).run
+    def self.run(object, host = DefaultHost, port = DefaultPort, options = {})
+      new(object, host, port, options).run
     end
 
-    def initialize(object, host = DefaultHost, port = DefaultPort)
-      @uri    = "druby://#{host}:#{port}"
-      @object = object
+    def initialize(object, host = DefaultHost, port = DefaultPort, options = {})
+      @host    = host
+      @port    = port
+
+      @object  = object
+      @options = options
 
       @client = PryRemote::Client.new
-      DRb.start_service @uri, @client
+      DRb.start_service uri, @client
 
-      puts "[pry-remote] Waiting for client on #@uri"
+      puts "[pry-remote] Waiting for client on #{uri}"
       @client.wait
 
       puts "[pry-remote] Client received, starting remote session"
@@ -196,7 +205,8 @@ module PryRemote
     # Actually runs pry-remote
     def run
       setup
-      Pry.start(@object, :input => client.input_proxy, :output => client.output)
+
+      Pry.start(@object, @options.merge(:input => client.input_proxy, :output => client.output))
     ensure
       teardown
     end
@@ -206,6 +216,17 @@ module PryRemote
 
     # @return [PryServer::Client] Client connecting to the pry-remote server
     attr_reader :client
+
+    # @return [String] Host of the server
+    attr_reader :host
+
+    # @return [Integer] Port of the server
+    attr_reader :port
+
+    # @return [String] URI for DRb
+    def uri
+      "druby://#{host}:#{port}"
+    end
   end
 
   # Parses arguments and allows to start the client.
@@ -218,6 +239,8 @@ module PryRemote
            :default => DefaultHost
         on :p, :port=, "Port of the server (#{DefaultPort})", :argument => :optional,
            :as => Integer, :default => DefaultPort
+        on :w, :wait, "Wait for the pry server to come up",
+           :default => false
         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 "
@@ -228,6 +251,7 @@ module PryRemote
       @host = params[:server]
       @port = params[:port]
 
+      @wait = params[:wait]
       @capture = params[:capture]
 
       Pry.initial_session_setup unless params[:f]
@@ -244,7 +268,9 @@ module PryRemote
       "druby://#{host}:#{port}"
     end
 
+    attr_reader :wait
     attr_reader :capture
+    alias wait? wait
     alias capture? capture
 
     # Connects to the server
@@ -252,15 +278,24 @@ module PryRemote
     # @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
+      local_ip = UDPSocket.open {|s| s.connect(@host, 1); s.addr.last}
+      DRb.start_service "druby://#{local_ip}:0"
       client = DRbObject.new(nil, uri)
 
       input  = IOUndumpedProxy.new(input)
       output = IOUndumpedProxy.new(output)
 
-      client.input  = input
-
-      client.output = output
+      begin
+        client.input  = input
+        client.output = output
+      rescue DRb::DRbConnError => ex
+        if wait?
+          sleep 1
+          retry
+        else
+          raise ex
+        end
+      end
 
       if capture?
         client.stdout = $stdout
@@ -280,8 +315,9 @@ class Object
   #
   # @param [String]  host Host of the server
   # @param [Integer] port Port of the server
-  def remote_pry(host = PryRemote::DefaultHost, port = PryRemote::DefaultPort)
-    PryRemote::Server.new(self, host, port).run
+  # @param [Hash] options Options to be passed to Pry.start
+  def remote_pry(host = PryRemote::DefaultHost, port = PryRemote::DefaultPort, options = {})
+    PryRemote::Server.new(self, host, port, options).run
   end
 
   # a handy alias as many people may think the method is named after the gem

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Mon ouie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Connect to Pry remotely using DRb
@@ -56,27 +51,26 @@ files:
 - bin/pry-remote
 homepage: http://github.com/Mon-Ouie/pry-remote
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Connect to Pry remotely
 test_files: []
 has_rdoc: