findme 0.0.3 → 0.0.4

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+.idea
+*~
+

data/README.md

@@ -9,6 +9,10 @@ Install
     sudo apt-get install avahi-utils avahi-daemon libnss-mdns
     gem install findme
     
+Enable normal user to use this gem (first time):
+
+    sudo chmod a+w /etc/avahi/services/
+    
 Example
 -------
 
@@ -24,10 +28,10 @@ More advanced Example
 on server:
 
     require 'findme'
-
+    Findme.cleanup
     Findme.register "findme", 1337
 
-on client:
+on client -> client.rb:
     
     require 'findme'
 
@@ -35,9 +39,27 @@ on client:
     services = Findme.discover
     services.select{|s| s.service == "_#{SERVICE}._tcp"}.each{|s| puts "#{s.ip}:#{s.port}"}
 
+on client discover latest and earliest -> client_earliest_latest.rb:
+    
+    require 'findme'
+    require 'pp'
+
+    SERVICE = "findme"
+    h = Findme.discover_only_earliest
+    h.select{|k,s| s.service == "_#{SERVICE}._tcp"}.each{|k,s| puts "#{k}|#{s.ip}:#{s.port}:#{s.txt}"}
+
+     
+    h = Findme.discover_only_latest
+    h.select{|k,s| s.service == "_#{SERVICE}._tcp"}.each{|k,s| puts "#{k}|#{s.ip}:#{s.port}:#{s.txt}"}
+ 
+
 results on client.rb:
 
     ~ > ruby client.rb
     fe80::a00:27ff:feeb:xxxx:1337
     192.168.xx.xx:1337
 
+
+     ~ > ruby client_earliest_latest.rb
+     _findme._tcp|192.168.10.xxx:1337:"findme_startup_time=1346228166"
+     _findme._tcp|192.168.10.yyy:1337:"findme_startup_time=1346229066"

data/lib/findme.rb

@@ -1,4 +1,4 @@
-class Findme
+module Findme
  
   AVAHI_SERVICE_DIR = "/etc/avahi/services/"
   AVAHI_BROWSE      = "/usr/bin/avahi-browse"
@@ -96,6 +96,15 @@ class Findme
     h_out
   end
 
+  def self.discover_service(service, ip=nil)
+    services = discover
+
+    result = services.detect {|x| x.service == "_#{service}._tcp" && x.ip == ip}
+    return result if result #here we choose best match if previous is this ip
+    #todo, using other factor to determine rank algorithm
+    return services.detect {|x| x.service == "_#{service}._tcp"}[0]
+  end
+
 
   def self.discover 
     res = `avahi-browse -arpt`
@@ -165,4 +174,8 @@ end
 class AvahiService
   attr_accessor :eth, :ipv4, :ip, :hosttxt, :hostname, :port, :txt, :service
 
+  def ip_and_port
+    [ip, port]
+  end
+
 end

data/lib/findme/version.rb

@@ -1,3 +1,3 @@
 module Findme
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findme
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies: []
 description: find neighborhood host and services with avahi / avahi-daemon. run this
   for the first time to allow normal user to register services `sudo chmod a+w /etc/avahi/services/`