pry-remote-em 0.7.0 → 0.7.1

data/bin/pry-remote-em

@@ -3,12 +3,49 @@
 require 'uri'
 require 'highline'
 require 'pry-remote-em/client'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.on("-c", "--connect NAME", "connect to the first pry remote em server matching NAME") do |name|
+    options[:connect] = name
+  end 
+  opts.on("-p", "--proxy NAME", "proxy through the broker to the first pry remote em server matching NAME") do |name|
+    options[:proxy] = name
+  end 
+
+  opts.on("--fh HOST", "--filter-host HOST", "only show servers listening at the given address (regexp)") do |host|
+    if host =~ /^pryems?:\/\//
+      ARGV.push(host)
+    else  
+      options[:filter_host] = Regexp.new(host)
+    end 
+  end 
+  opts.on("--fn NAME", "--filter-name NAME", "only show servers with a matching name (regexp)") do |name|
+    if name =~ /^pryems?:\/\//
+      ARGV.push(name)
+    else  
+      options[:filter_name] = Regexp.new(name)
+    end 
+  end
+  opts.on("--[no-]fs", "--[no-]filter-ssl", "show only servers that support ssl") do |ssl|
+    options[:filter_ssl] = ssl
+  end
+
+  opts.on('--sh', '--sort-host', 'sort by host') { options[:sort] = :host }
+  opts.on('--sn', '--sort-name', 'sort by server name') { |name| options[:sort] = :name }
+  opts.on('--sp', '--sort-port', 'sort by port') { options[:sort] = :port }
+  opts.on('--ss', '--sort-ssl', 'sort by ssl support') { options[:sort] = :ssl }
+
+  opts.parse!(ARGV)
+end 
 
 uri = ARGV[0] || "pryem://localhost:#{PryRemoteEm::DEF_BROKERPORT}"
 uri = URI.parse(uri)
 unless %w(pryem pryems).include?(uri.scheme)
-  abort "only pryem URIs are currently supported\n usage: pryem(s)://127.0.0.1:#{PryRemoteEm::DEF_BROKERPORT}" 
+  abort "only pryem URIs are currently supported\n usage: pryem[s]://127.0.0.1:#{PryRemoteEm::DEF_BROKERPORT}" 
 end
+uri.port = PryRemoteEm::DEF_BROKERPORT unless uri.port
 
 tried = 0
 auth_proc = proc do
@@ -25,5 +62,5 @@ auth_proc = proc do
 end
 
 EM.run do
-  PryRemoteEm::Client.start(uri.host, uri.port, :auth=>auth_proc, :tls=>uri.scheme=='pryems') { |e| EM.stop }
+  PryRemoteEm::Client.start(uri.host, uri.port, options.merge(:auth=>auth_proc, :tls=>uri.scheme=='pryems')) { |e| EM.stop }
 end

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

@@ -1,3 +1,4 @@
+require 'socket'
 require 'pry-remote-em'
 require 'pry-remote-em/client/broker'
 require 'pry-remote-em/client/proxy'
@@ -60,11 +61,21 @@ module PryRemoteEm
       end
 
       def register(url, name = 'unknown')
-        client { |c| c.send_register_server(url, name) }
+        expand_url(url).each do |u|
+          client { |c| c.send_register_server(u, name) }
+        end
+      end
+
+      def unregister(url)
+        expand_url(url).each do |u|
+          client { |c| c.send_unregister_server(u) }
+        end
       end
 
-      def unregister(server)
-        client {|c| c.send_unregister_server(server) }
+      def expand_url(url)
+        return Array(url) if (u = URI.parse(url)).host != '0.0.0.0'
+        Socket.ip_address_list.select { |a| a.ipv4? }
+         .map(&:ip_address).map{|i| u.clone.tap{|mu| mu.host = i } }
       end
 
       def watch_heartbeats(url)

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

@@ -28,6 +28,8 @@ module PryRemoteEm
       end
     end # class << self
 
+    attr_reader :opts
+
     def initialize(opts = {})
       @opts = opts
       if (a = opts[:auth])
@@ -79,7 +81,7 @@ module PryRemoteEm
       end
       choice, proxy  = choose_server(list)
       return unless choice
-      uri, name      = URI.parse(choice[0]), choice[1]
+      uri, name      = choice[0], choice[1]
       if proxy
         @opts[:tls]  = uri.scheme == 'pryems'
         @negotiated  = false
@@ -96,10 +98,12 @@ module PryRemoteEm
       choice      = nil
       nm_col_len  = list.values.map(&:length).sort[-1] + 5
       ur_col_len  = list.keys.map(&:length).sort[-1] + 5
-      header      = sprintf("| %-3s |  %-#{nm_col_len}s |  %-#{ur_col_len}s |", "id", "name", "url")
+      header      = sprintf("| %-3s |  %-#{nm_col_len}s |  %-#{ur_col_len}s |", "", "name", "url")
       border      = ("-" * header.length)
       table       = [border, header, border]
-      list        = list.to_a
+      list        = list.to_a.map{|url, name| [URI.parse(url), name]}
+      list        = filter_server_list(list)
+      list        = sort_server_list(list)
       list.each_with_index do |(url, name), idx|
         table << sprintf("|  %-2d |  %-#{nm_col_len}s |  %-#{ur_col_len}s |", idx + 1, name, url)
       end
@@ -112,7 +116,13 @@ module PryRemoteEm
         else
           question = "(q) to quit; (r) to refresh (p) to proxy\nconnect to: "
         end
-        choice = highline.ask(question)
+        if (choice = opts.delete(:proxy))
+          proxy = true
+        else
+          choice = opts.delete(:connect) || highline.ask(question)
+          proxy = false
+        end
+
         return close_connection if ['q', 'quit', 'exit'].include?(choice.downcase)
         if ['r', 'reload', 'refresh'].include?(choice.downcase)
           send_server_list
@@ -128,13 +138,49 @@ module PryRemoteEm
           choice = nil
           next
         end
-        choice = choice.to_i.to_s == choice ?
+        choice = choice.to_i > 0 ?
           list[choice.to_i - 1] :
-          list.find{|(url, name)| url == choice || name == choice }
+          list.find{|(url, name)| url.to_s == choice || name == choice }
+        log.error("\033[31mserver not found\033[0m") unless choice
       end
       [choice, proxy]
     end
 
+    def sort_server_list(list)
+      type = opts[:sort] || :host
+      case type
+      when :name
+        list.sort { |a,b| a[1] <=> b[1] }
+      when :host
+        list.sort { |a,b| a[0].host <=> b[0].host }
+      when :ssl
+        list.sort { |a,b| b[0].scheme <=> a[0].scheme }
+      when :port
+        list.sort { |a,b| a[0].port <=> b[0].port }
+      else
+        list.sort { |a,b| a[0].host <=> b[0].host }
+      end
+    end
+
+    def filter_server_list(list)
+      if opts[:filter_host]
+        list = list.select { |url, name| url.host =~ opts[:filter_host] }
+      end
+      if opts[:filter_name]
+        list = list.select { |url, name| name =~ opts[:filter_name] }
+      end
+      if opts.include?(:filter_ssl)
+        list = opts[:filter_ssl] ?
+          list.select{|url, name| url.scheme == 'pryems' } :
+          list.select{|url, name| url.scheme == 'pryem' }
+      end
+      if list.empty?
+        log.info("\033[33m[pry-remote-em] no registered servers match the given filter\033[0m")
+        Process.exit
+      end
+      list
+    end
+
     def receive_auth(a)
       return fail a if a.is_a?(String)
       return authenticate if a == false

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

@@ -100,11 +100,7 @@ module PryRemoteEm
           raise "can't bind to #{host}:#{port} - #{e}"
         end
         url    = "#{opts[:tls] ? 'pryems' : 'pryem'}://#{host}:#{port}/"
-        begin
-          name = obj.send(:eval, 'self')
-        rescue
-          name = "#{obj}"
-        end
+        name   = obj.send(:eval, 'self') rescue "#{obj}"
         name   = Pry.view_clip(name)
         PryRemoteEm.servers[url] = [server, name]
         (opts[:logger] || ::Logger.new(STDERR)).info("[pry-remote-em] listening for connections on #{url}")

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

@@ -1,3 +1,3 @@
 module PryRemoteEm
-  VERSION   = '0.7.0'
+  VERSION   = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote-em
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ruby-termios
   requirement: !ruby/object:Gem::Requirement