findme 0.0.5 → 0.0.6

data/lib/findme.rb

@@ -1,9 +1,9 @@
 module Findme
- 
+
   AVAHI_SERVICE_DIR = "/etc/avahi/services/"
   AVAHI_BROWSE      = "/usr/bin/avahi-browse"
 
- 
+
   #return all the services running by avahi
   def self.services
     files_with_path = Dir.glob(AVAHI_SERVICE_DIR + "*.service")
@@ -28,7 +28,7 @@ module Findme
       File.delete fs
     end
   end
-  
+
   def self._get_startup_time str
     begin
       pairs = str.strip.split(" ")
@@ -48,7 +48,7 @@ module Findme
     services = discover
     h = {}
     h_out={}
-    
+
     #construct the hash, group the services of the same name
     services.each do |s|
       if h[s.service].nil?
@@ -57,7 +57,7 @@ module Findme
         #existing hash, do nothing
       end
       h[s.service] << s
-    end  
+    end
 
     h.each do |k, v|
       if (_get_startup_time v[0].txt).nil?
@@ -112,7 +112,7 @@ module Findme
   end
 
 
-  def self.discover 
+  def self.discover
     res = `avahi-browse -arpt`
     services = []
     lines = res.split("\n")
@@ -147,7 +147,7 @@ module Findme
   <name replace-wildcards="yes">%h</name>
 
   <service protocol="' + protocol + '">
-    
+
     <type>'+ "_#{service_name}.#{type}" +'</type>
     <port>'+ port.to_s + '</port>
     <txt-record>' + txt.to_s + '</txt-record>
@@ -157,6 +157,18 @@ module Findme
     File.open(AVAHI_SERVICE_DIR  + service_name + ".service", "w" ){|f| f.write xml}
   end
 
+  # Unregister a service, just remove .service file from avahi service directory.
+  # result: BOOLEAN, In most cases we don't care it.
+  def self.unregister service_name
+    service_file = AVAHI_SERVICE_DIR + service_name + ".service"
+    if File.exist? service_file
+      File.delete service_file
+      return true
+    end
+  rescue # Errno::EACCES: Permission denied
+    false
+  end
+
   #find the mac address
   def self.mac
     return @mac_address if defined? @mac_address
@@ -170,7 +182,7 @@ module Findme
     candidates = lines.map{|l| re.match( l )[1] rescue nil }.compact
     @mac_address = candidates.first
   end
-  
+
   def self.mac_short
     self.mac.split(":").join("")
   end
@@ -184,4 +196,8 @@ class AvahiService
     [ip, port]
   end
 
+  def inspect
+    "#<eth: #{eth}, ipv4: #{ipv4}, ip: #{ip}, hosttxt: #{hosttxt}, hostname: #{hostname}, port: #{port}, txt: #{txt}, service: #{service}>"
+  end
+
 end

data/lib/findme/version.rb

@@ -1,3 +1,3 @@
 module Findme
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findme
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-09 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/`