pry-remote-em 0.4.3 → 0.5.0

data/README.md

@@ -301,6 +301,17 @@ The standard Pry pager is supported through the included client.
 :
 ```
 
+## Messaging
+It is possible for each pry-remote-em service to host multiple
+simultaneous connections. You can send messages to other connections
+with the '!' and '!!' prefix.
+
+The '!' prefix will send the message to connections on the same object.
+the '!!' prefix will send the message to all connections in the current
+process.
+
+Message will not be displayed by the clients until the presses enter.
+
 # Missing Features
 
   - AutoDiscovery/Broker [ticket](https://github.com/simulacre/pry-remote-em/issues/11)

data/lib/pry-remote-em/client.rb

@@ -58,16 +58,17 @@ module PryRemoteEm
 
     def receive_json(j)
       if j['p'] # prompt
-        if @negotiated && !@unbound
-          Fiber.new {
-            true while (l = Readline.readline(j['p'], true)).empty?
-            send_data(l)
-          }.resume
-        end
+        readline(j['p'])
 
       elsif j['d'] # printable data
         stagger_output j['d'], $stdout # Pry::Helpers::BaseHelpers
 
+      elsif j['m']
+        Kernel.puts "\033[1m! msg: " + j['m'] + "\033[0m"
+
+      elsif j['mb']
+        Kernel.puts "\033[1m!! msg: " + j['mb'] + "\033[0m"
+
       elsif j['g'] # server banner
         Kernel.puts "[pry-remote-em] remote is #{j['g']}"
         name, version, scheme = j['g'].split(" ", 3)
@@ -123,6 +124,22 @@ module PryRemoteEm
       return succeed if Gem.loaded_specs["eventmachine"].version < Gem::Version.new("1.0.0.beta4")
       error? ? fail : succeed
     end
+
+    def readline(prompt)
+      if @negotiated && !@unbound
+        Fiber.new {
+          l = Readline.readline(prompt, !prompt.nil?)
+          if '!!' == l[0..1]
+            send_data({:b => l[2..-1]})
+          elsif '!' == l[0]
+            send_data({:m => l[1..-1]})
+          else
+            send_data(l)
+          end # "!!" == l[0..1]
+        }.resume
+      end
+    end # readline(prompt = @last_prompt)
+
   end # module::Client
 end # module::PryRemoteEm
 

data/lib/pry-remote-em/json-proto.rb

@@ -13,7 +13,8 @@ module PryRemoteEm
         j = JSON.load(@buffer)
         @buffer.clear
         receive_json(j)
-        receive_data(d[(six + DELIM.length)..-1])
+        (rem = d[(six + DELIM.length)..-1]).empty? ||
+          receive_data(rem)
       else
         @buffer << d
       end

data/lib/pry-remote-em/server.rb

@@ -39,7 +39,7 @@ module PryRemoteEm
         # TODO raise a useful exception not RuntimeError
         raise "root permission required for port below 1024 (#{port})" if port < 1024 && Process.euid != 0
         begin
-          EM.start_server(host, port, PryRemoteEm::Server, opts) do |pre|
+          EM.start_server(host, port, PryRemoteEm::Server, obj, opts) do |pre|
             Fiber.new {
               begin
                 Pry.start(obj, :input => pre, :output => pre)
@@ -60,9 +60,28 @@ module PryRemoteEm
         scheme = opts[:tls] ? 'pryems' : 'pryem'
         Kernel.puts "[pry-remote-em] listening for connections on #{scheme}://#{host}:#{port}/"
       end # run(obj, host = DEFHOST, port = DEFPORT)
+
+      # The list of pry-remote-em connections for a given object, or the list of all pry-remote-em
+      # connections for this process.
+      # The peer list is used when broadcasting messages between connections.
+      def peers(obj = nil)
+        @peers ||= {}
+        obj.nil? ? @peers.values.flatten : (@peers[obj] ||= [])
+      end
+
+      # Record the association between a given object and a given pry-remote-em connection.
+      def register(obj, peer)
+        peers(obj).tap { |plist| plist.include?(peer) || plist.push(peer) }
+      end
+
+      # Remove the association between a given object and a given pry-remote-em connection.
+      def unregister(obj, peer)
+        peers(obj).tap {|plist| true while plist.delete(peer) }
+      end
     end # class << self
 
-    def initialize(opts = {:tls => false})
+    def initialize(obj, opts = {:tls => false})
+      @obj        = obj
       @after_auth = []
       @opts       = opts
       return unless (a = opts[:auth])
@@ -88,6 +107,7 @@ module PryRemoteEm
       Kernel.puts "[pry-remote-em] received client connection from #{ip}:#{port}"
       send_data({:g => "PryRemoteEm #{VERSION} #{@opts[:tls] ? 'pryems' : 'pryem'}"})
       @opts[:tls] ? start_tls : (@auth_required && send_data({:a => false}))
+      PryRemoteEm::Server.register(@obj, self)
     end
 
     def start_tls
@@ -118,6 +138,7 @@ module PryRemoteEm
       return send_data({:a => false}) if @auth_required && !j['a']
 
       if j['d'] # just normal data
+        return send_last_prompt if j['d'].empty?
         @lines.push(*j['d'].split("\n"))
         if @waiting
           f, @waiting = @waiting, nil
@@ -142,6 +163,14 @@ module PryRemoteEm
         end
         return send_data({:a => !@auth_required})
 
+      elsif j['m'] # message all peer connections
+        peers.each { |peer| peer.send_message(j['m']) }
+        send_last_prompt
+
+      elsif j['b'] # broadcast message
+        peers(:all).each { |peer| peer.send_bmessage(j['b']) }
+        send_last_prompt
+
       else
         warn "received unexpected data: #{j.inspect}"
       end # j['d']
@@ -157,12 +186,34 @@ module PryRemoteEm
     def unbind
       Pry.config.pager  = @old_pager
       Pry.config.system = @old_system
+      PryRemoteEm::Server.unregister(@obj, self)
       Kernel.puts "[pry-remote-em] remote session terminated (#{peer_ip}:#{peer_port})"
     end
 
+    def peers(all = false)
+      plist = (all ? PryRemoteEm::Server.peers : PryRemoteEm::Server.peers(@obj)).clone
+      plist.delete(self)
+      plist
+    end
+
+    def send_last_prompt
+      @auth_required ? @after_auth.push({:p => @last_prompt}) :  send_data({:p => @last_prompt})
+    end
+
+    # Sends a chat message to the client.
+    def send_message(msg)
+      @auth_required ?  @after_auth.push({:m => msg}) : send_data({:m => msg})
+    end
+    #
+    # Sends a chat message to the client.
+    def send_bmessage(msg)
+      @auth_required ?  @after_auth.push({:mb => msg}) : send_data({:mb => msg})
+    end
+
     # Methods that make Server compatible with Pry
 
     def readline(prompt)
+      @last_prompt = prompt
       @auth_required ? @after_auth.push({:p => prompt}) : send_data({:p => prompt})
       return @lines.shift unless @lines.empty?
       @waiting = Fiber.current

data/lib/pry-remote-em/version.rb

@@ -1,3 +1,3 @@
 module PryRemoteEm
-  VERSION   = '0.4.3'
+  VERSION   = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote-em
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70346942721200 !ruby/object:Gem::Requirement
+  requirement: &70256102479660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346942721200
+  version_requirements: *70256102479660
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70346942720300 !ruby/object:Gem::Requirement
+  requirement: &70256102473680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70346942720300
+  version_requirements: *70256102473680
 - !ruby/object:Gem::Dependency
   name: rb-readline
-  requirement: &70346942719100 !ruby/object:Gem::Requirement
+  requirement: &70256102473100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346942719100
+  version_requirements: *70256102473100
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70346942716820 !ruby/object:Gem::Requirement
+  requirement: &70256102471840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,9 +54,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346942716820
+  version_requirements: *70256102471840
 description: Connect to Pry remotely using EventMachine with tab-completion, paging,
-  user authentication and SSL support.
+  user auth and SSL
 email: pry-remote-em@simulacre.org
 executables:
 - pry-remote-em