pry-remote 0.1.0 → 0.1.1

data/lib/pry-remote.rb

@@ -5,6 +5,9 @@ require 'readline'
 require 'open3'
 
 module PryRemote
+  DefaultHost = "localhost"
+  DefaultPort = 9876
+
   # A class to represent an input object created from DRb. This is used because
   # Pry checks for arity to know if a prompt should be passed to the object.
   #
@@ -23,8 +26,6 @@ module PryRemote
       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?
@@ -59,16 +60,91 @@ module PryRemote
     end
   end
 
+  class Server
+    def self.run(object, host = DefaultHost, port = DefaultPort)
+      new(object, host, port).run
+    end
+
+    def initialize(object, host = "loclahost", port = DefaultPort)
+      @uri    = "druby://#{host}:#{port}"
+      @object = object
+
+      @client = PryRemote::Client.new
+      DRb.start_service @uri, @client
+
+      puts "[pry-remote] Waiting for client on #@uri"
+      @client.wait
+
+      puts "[pry-remote] Client received, starting remote sesion"
+    end
+
+    # Code that has to be called for Pry-remote to work properly
+    def setup
+      # 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
+    end
+
+    # Code that has to be called after setup to return to the initial state
+    def teardown
+      # Reset output streams
+      $stdout = @old_stdout
+      $stderr = @old_stderr
+
+      # Reset config
+      Pry.config.pager = @old_pager
+
+      # Reset sysem
+      Pry.config.system = @old_system
+
+      puts "[pry-remote] Remote sesion terminated"
+      @client.kill
+
+      DRb.stop_service
+    end
+
+    # Actually runs pry-remote
+    def run
+      setup
+      Pry.start(@object, :input => client.input_proxy, :output => client.output)
+    ensure
+      teardown
+    end
+
+    # @return Object to enter into
+    attr_reader :object
+
+    # @return [PryServer::Client] Client connecting to the pry-remote server
+    attr_reader :client
+  end
+
   # Parses arguments and allows to start the client.
   class CLI
     def initialize(args = ARGV)
       params = Slop.parse args, :help => true do
         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 :h, :host, "Host of the server (#{DefaultHost})", true,
+           :default => DefaultHost
+        on :p, :port, "Port of the server (#{DefaultPort})", true,
+           :as => Integer, :default => DefaultPort
         on :c, :capture, "Captures $stdout and $stderr from the server (true)",
            :default => true
       end
@@ -128,55 +204,8 @@ class Object
   #
   # @param [String]  host Host of the server
   # @param [Integer] port Port of the server
-  def remote_pry(host = "localhost", port = 9876)
-    uri = "druby://#{host}:#{port}"
-
-    client = PryRemote::Client.new
-    DRb.start_service uri, client
-
-    puts "[pry-remote] Waiting for client on #{uri}"
-    client.wait
-
-    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
-
-      # Reset config
-      Pry.config.pager = old_pager
-
-      # Reset sysem
-      Pry.config.system = old_system
-
-      puts "[pry-remote] Remote sesion terminated"
-      client.kill
-
-      DRb.stop_service
-    end
+  def remote_pry(host = PryRemote::DefaultHost, port = PryRemote::DefaultPort)
+    PryRemote::Server.new(self, host, port).run
   end
 
   # a handy alias as many people may think the method is named after the gem

metadata

@@ -1,77 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry-remote
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Mon ouie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: slop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &6193840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *6193840
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &6192100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.6
+      - !ruby/object:Gem::Version
+        version: 0.9.8
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *6192100
 description: Connect to Pry remotely using DRb
 email: mon.ouie@gmail.com
-executables: 
+executables:
 - pry-remote
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/pry-remote.rb
 - README.md
 - bin/pry-remote
 homepage: http://github.com/Mon-Ouie/pry-remote
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Connect to Pry remotely
 test_files: []
-
+has_rdoc: