dnssd 1.4 → 2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0 / 2011-03-02
+
+* Major enhancment
+  * DNSSD::Service#process now automatically stops the DNSSD::Service.
+
 === 1.4 / 2010-09-07
 
 * Minor enhancements

data/Rakefile

@@ -6,6 +6,7 @@ require 'hoe'
 Hoe.plugin :minitest
 Hoe.plugin :email
 Hoe.plugin :git
+Hoe.plugin :compiler
 
 HOE = Hoe.spec 'dnssd' do
   self.rubyforge_name = 'dnssd'
@@ -17,22 +18,7 @@ HOE = Hoe.spec 'dnssd' do
   developer 'Charles Mills',   ''
   developer 'Rich Kilmer',     ''
 
-  spec_extras[:extensions] = 'ext/dnssd/extconf.rb'
-
   clean_globs << 'lib/dnssd/*.{so,bundle,dll}'
-
-  extra_dev_deps << ['hoe-seattlerb', '~> 1.2']
-  extra_dev_deps << ['minitest', '~> 1.4']
-  extra_dev_deps << ['rake-compiler', '~> 0.6']
-end
-
-require 'rake/extensiontask'
-
-Rake::ExtensionTask.new 'dnssd', HOE.spec do |ext|
-  ext.lib_dir = File.join 'lib', 'dnssd'
-  ext.config_options << '--with-warnings'
 end
 
-task :test => :compile
-
 # vim: syntax=Ruby

data/lib/dnssd.rb

@@ -13,7 +13,7 @@ module DNSSD
   ##
   # The version of DNSSD you're using.
 
-  VERSION = '1.4'
+  VERSION = '2.0'
 
   ##
   # Registers +socket+ with DNSSD as +name+.  If +service+ is omitted it is

data/lib/dnssd/reply/resolve.rb

@@ -65,30 +65,26 @@ class DNSSD::Reply::Resolve < DNSSD::Reply
 
     service = DNSSD::Service.new
 
-    begin
-      service.getaddrinfo target, addrinfo_protocol, addrinfo_flags,
-                          @interface do |addrinfo|
-        address = addrinfo.address
-
-        begin
-          socket = nil
-
-          case protocol
-          when 'tcp' then
-            socket = TCPSocket.new address, port
-          when 'udp' then
-            socket = UDPSocket.new
-            socket.connect address, port
-          end
-
-          return socket
-        rescue
-          next if addrinfo.flags.more_coming?
-          raise
+    service.getaddrinfo target, addrinfo_protocol, addrinfo_flags,
+                        @interface do |addrinfo|
+      address = addrinfo.address
+
+      begin
+        socket = nil
+
+        case protocol
+        when 'tcp' then
+          socket = TCPSocket.new address, port
+        when 'udp' then
+          socket = UDPSocket.new
+          socket.connect address, port
         end
+
+        return socket
+      rescue
+        next if addrinfo.flags.more_coming?
+        raise
       end
-    ensure
-      service.stop
     end
   end
 

data/lib/dnssd/service.rb

@@ -1,10 +1,11 @@
 require 'thread'
 
 ##
-# A DNSSD::Service may be used for one DNS-SD call at a time.  Between calls
-# the service must be stopped.  A single service can be reused multiple times.
+# A DNSSD::Service may be used for one DNS-SD call at a time.  The service is
+# automatically stopped after calling.  A single service can not be reused
+# multiple times.
 #
-# DNSSD::Service provides the raw DNS-SD functions via the _ variants.
+# DNSSD::Service provides the raw DNS-SD functions via the +_+ variants.
 
 class DNSSD::Service
 
@@ -151,6 +152,9 @@ class DNSSD::Service
 
   ##
   # Yields results from the mDNS daemon, blocking until data is available.
+  # Use break or return when you wish to stop receiving results.
+  #
+  # The service is automatically stopped after calling this method.
 
   def process # :yields: DNSSD::Result
     @thread = Thread.current
@@ -167,6 +171,8 @@ class DNSSD::Service
     # raised when we jump out of DNSServiceProcess() while it's waiting for a
     # response
     self
+  ensure
+    stop unless stopped?
   end
 
   ##
@@ -232,9 +238,6 @@ class DNSSD::Service
   # record, all contained in the DNSSD::Reply object passed to the required
   # block.
   #
-  # The returned service can be used to control when to stop resolving the
-  # service (see DNSSD::Service#stop).
-  #
   #   service.resolve "foo bar", "_http._tcp", "local" do |r|
   #     p r
   #   end

data/sample/getaddrinfo.rb

@@ -8,13 +8,10 @@ resolver = DNSSD.resolve ARGV.shift, '_http._tcp', 'local' do |reply|
   addresses = []
 
   service = DNSSD::Service.new
-  begin
-    service.getaddrinfo reply.target do |addrinfo|
-      addresses << addrinfo.address
-      break unless addrinfo.flags.more_coming?
-    end
-  ensure
-    service.stop
+
+  service.getaddrinfo reply.target do |addrinfo|
+    addresses << addrinfo.address
+    break unless addrinfo.flags.more_coming?
   end
 
   puts "Addresses for #{reply.target}:\n#{addresses.join "\n"}"

data/sample/growl.rb

@@ -5,7 +5,7 @@ Thread.abort_on_exception = true
 browser = DNSSD.browse '_growl._tcp' do |b|
   DNSSD.resolve b.name, b.type, b.domain do |r|
     puts "#{b.name} of #{b.type} in #{b.domain} => #{r.target}:#{r.port} on #{b.interface} txt #{r.text_record.inspect}"
-    r.service.stop
+    break
   end
 end
 

data/sample/resolve.rb

@@ -20,14 +20,11 @@ browser.browse '_blackjack._tcp' do |reply|
   end.each do |_, service|
     next unless service.flags.add?
 
-    resolver = DNSSD::Service.new
-    resolver.resolve service do |r|
+    DNSSD::Service.new.resolve service do |r|
       puts "#{r.name} on #{r.target}:#{r.port}"
       puts "\t#{r.text_record.inspect}" unless r.text_record.empty?
       break unless r.flags.more_coming?
     end
-
-    resolver.stop
   end
 
   services.clear

data/sample/resolve_ichat.rb

@@ -9,7 +9,7 @@ class ChatNameResolver
     Thread.new reply do |reply|
       DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
         puts "Adding: #{resolve_reply.inspect}"
-        resolve_reply.service.stop
+        break
       end
     end
   end
@@ -17,7 +17,7 @@ class ChatNameResolver
     Thread.new reply do |reply|
       DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
         puts "Removing: #{resolve_reply.inspect}"
-        resolve_reply.service.stop
+        break
       end
     end
   end

data/test/test_dnssd_service.rb

@@ -4,22 +4,23 @@ require 'dnssd'
 class TestDNSSDService < MiniTest::Unit::TestCase
 
   def test_class_get_property
+    skip 'DNSSD::Service::get_property not defined' unless
+      DNSSD::Service.respond_to? :get_property
+
     assert_kind_of Numeric,
                    DNSSD::Service.get_property(DNSSD::Service::DaemonVersion)
-  end if DNSSD::Service.respond_to? :get_property
+  end
 
   def test_class_getaddrinfo
     service = DNSSD::Service.new
 
     addresses = []
-    begin
-      service.getaddrinfo 'localhost' do |addrinfo|
-        addresses << addrinfo.address
-        break unless addrinfo.flags.more_coming?
-      end
-    ensure
-      service.stop
+
+    service.getaddrinfo 'localhost' do |addrinfo|
+      addresses << addrinfo.address
+      break unless addrinfo.flags.more_coming?
     end
+
     assert addresses.index('127.0.0.1')
   end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
-  - 1
-  - 4
-  version: "1.4"
+  - 2
+  - 0
+  version: "2.0"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -40,102 +40,56 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 2
         - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
         - 2
-        version: "1.2"
+        version: 2.0.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :development
-  version_requirements: *id004
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 7
+        version: "0.7"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 43
         segments: 
         - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 9
+        - 0
+        version: 2.9.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id003
 description: |-
   DNS Service Discovery (aka Bonjour, MDNS) API for Ruby.  Implements browsing,
   resolving, registration and domain enumeration.  Supports avahi's DNSSD
@@ -199,6 +153,7 @@ files:
 - test/test_dnssd_reply_resolve.rb
 - test/test_dnssd_service.rb
 - test/test_dnssd_text_record.rb
+- .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/dnssd
 licenses: []
@@ -230,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dnssd
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby