dnssd 0.7.1 → 1.0

data/ext/dnssd/extconf.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+# :nodoc: all
+#
+# Extension configuration script for DNS_SD C Extension.
+
+def check_for_funcs(*funcs)
+  funcs.flatten!
+  funcs.each do |f|
+    abort("need function #{f}") unless have_func(f)
+  end
+end
+
+require "mkmf"
+
+$CFLAGS << " -Wall"
+$CFLAGS << " -DDEBUG" if $DEBUG
+
+unless RUBY_PLATFORM.include? "darwin"
+  have_library( "mdns", "DNSServiceRefSockFD" ) or
+  have_library( "dns_sd", "DNSServiceRefSockFD" ) or
+  abort( "can't find rendezvous library" )
+end
+
+#have_library( "dns-sd", "DNSServiceRefSockFD" ) or
+# abort( "Can't find rendezvous client library" )
+
+have_header("dns_sd.h") or abort("can't find the rendezvous client headers")
+
+have_header "unistd.h"
+have_header "sys/types.h"
+have_header "sys/socket.h"
+have_header "sys/param.h"
+have_header "sys/if.h"
+have_header "net/if.h"
+have_header "arpa/inet.h"
+
+abort "need function #{f}" unless have_macro("htons") || have_func("htons")
+abort "need function #{f}" unless have_macro("ntohs") || have_func("ntohs")
+
+check_for_funcs "if_indextoname", "if_nametoindex"
+have_func "gethostname"
+
+s1 = check_sizeof "void*"
+s2 = check_sizeof("DNSServiceFlags", "dns_sd.h") or
+  abort("can't determine sizeof(DNSServiceFlags)")
+
+# need to make sure storing unsigned integer in void * is OK.
+s1 >= s2 or abort("sizeof(void*) < sizeof(DNSServiceFlags) please contact the authors!")
+
+create_makefile "dnssd"
+

data/lib/dnssd.rb

@@ -1,17 +1,29 @@
-require 'rdnssd'
+require 'dnssd/dnssd'
+
+##
+# DNSSD is a wrapper for Apple's DNS Service Discovery library.  The methods
+# DNSSD.enumerate_domains, DNSSD.browse(), DNSSD.register(), and
+# DNSSD.resolve() provide the basic API for making your applications DNS
+# Service Discovery aware.
+
+module DNSSD
+  VERSION = '1.0'
+end
+
+require 'dnssd/flags'
 
 =begin
 
 module DNSSD
-  class MalformedDomainException < Exception; end
-  class MalformedPortException < Exception; end
-  
+  class MalformedDomain < Error; end
+  class MalformedPort < Error; end
+
   def self.new_text_record(hash={})
     TextRecord.new(hash)
   end
 
   class ServiceDescription
-  
+
     class Location
       attr_accessor :name, :port, :iface
       def initialize(port, name=nil, iface=0)
@@ -27,8 +39,8 @@ module DNSSD
       @domain = validate_domain(domain)
       @location = validate_location(location)
     end
-    
-    def self.for_browse_notification(name, domain, 
+
+    def self.for_browse_notification(name, domain,
 
     def stop
       @registrar.stop
@@ -36,14 +48,14 @@ module DNSSD
 
     def validate_location(location)
       unless(location.port.respond_to?(:to_int))
-        raise MalformedPortException.new("#{location.port} is not a valid port number")
+        raise MalformedPort.new("#{location.port} is not a valid port number")
       end
       location
     end
 
     def validate_domain(domain)
       unless(domain.empty? || domain =~ /^[a-z_]+$/)
-	      raise MalformedDomainException.new("#{domain} is not a valid domain name")
+	      raise MalformedDomain.new("#{domain} is not a valid domain name")
       end
       domain
     end
@@ -62,64 +74,65 @@ module DNSSD
     def self.advertise_http(name, port=80, domain="", iface=0, &block)
       self.advertise("_http._tcp", name, port, domain, iface, &block)
     end
-    
+
     ##
-    # iface: Numerical interface (0 = all interfaces, This should be used for most applications)
-    #
+    # iface: Numerical interface (0 = all interfaces, This should be used for
+    # most applications)
+
     def self.advertise(type, name, port, domain="", iface=0, &block)
       service_description = ServiceDescription.new(type, name, domain, Location.new(port,nil,iface))
-      service_description.advertise_and_confirm 
+      service_description.advertise_and_confirm
       yield service_description if block_given?
       service_description
     end
   end
 
   class Browser
-  
+
     Context = Struct.new(:service, :name, :type, :domain, :operation, :interface)
-    
+
     class Context
       def ==(other)
         self.to_s == other.to_s
       end
-      
+
       def to_s
         "#{name}.#{type}.#{domain}"
       end
-      
+
       def eql?(other)
         self == other
       end
-      
+
       def hash
         to_s.hash
       end
     end
-  
+
     def on_change(&block)
       @change_listener ||= []
       @change_listeners << block
     end
-    
+
     def on_add(&block)
       @add_listeners || = []
       @add_listeners << block
     end
-    
+
     def on_remove(&block)
       @remove_listeners || = []
       @remove_listeners << block
     end
-    
+
     def initialize(type, domain="")
       @list = []
-      @browse_service = DNSSD::Protocol.browse(type, domain) do 
+      @browse_service = DNSSD::Protocol.browse(type, domain) do
          |service, name, type, domain, operation, interface|
          context = Context.new(service, name, type, domain, operation, interface)
          puts "Name: #{name} Type: #{type} Domain: #{domain} Operation: #{operation} Interface: #{interface}"
       end
     end
-    
+
     def service_descriptions
       @list.clone
     end
@@ -134,4 +147,4 @@ module DNSSD
   end
 end
 
-=end
+=end

data/test/test_dnssd_flags.rb

@@ -0,0 +1,152 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDFlags < MiniTest::Unit::TestCase
+
+  def setup
+    @flags = DNSSD::Flags.new
+  end
+
+  def test_accessors
+    DNSSD::Flags.constants.each do |name|
+      next unless name =~ /[a-z]/
+      attr = name.to_s.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+
+      assert_respond_to @flags, "#{attr}="
+      assert_respond_to @flags, "#{attr}?"
+    end
+  end
+
+  def test_add_eh
+    refute @flags.add?
+
+    @flags.add = true
+
+    assert @flags.add?
+  end
+
+  def test_add_equals
+    @flags.add = true
+
+    assert_equal DNSSD::Flags::Add, @flags
+
+    @flags.add = false
+
+    assert_equal 0, @flags
+  end
+
+  def test_default_eh
+    refute @flags.default?
+
+    @flags.default = true
+
+    assert @flags.default?
+  end
+
+  def test_default_equals
+    @flags.default = true
+
+    assert_equal DNSSD::Flags::Default, @flags
+
+    @flags.default = false
+
+    assert_equal 0, @flags
+  end
+
+  def test_clear_flag
+    @flags.set_flag DNSSD::Flags::Add
+    @flags.set_flag DNSSD::Flags::Default
+
+    @flags.clear_flag DNSSD::Flags::Add
+
+    assert_equal DNSSD::Flags::Default, @flags
+  end
+
+  def test_complement
+    new_flags = ~@flags
+
+    expected = DNSSD::Flags.new(DNSSD::Flags::Add,
+                                DNSSD::Flags::BrowseDomains,
+                                DNSSD::Flags::Default,
+                                DNSSD::Flags::LongLivedQuery,
+                                DNSSD::Flags::MoreComing,
+                                DNSSD::Flags::NoAutoRename,
+                                DNSSD::Flags::RegistrationDomains,
+                                DNSSD::Flags::Shared, DNSSD::Flags::Unique)
+
+    assert_equal expected, new_flags
+  end
+
+  def test_equals
+    assert_equal @flags, DNSSD::Flags.new
+    refute_equal @flags, DNSSD::Flags.new(DNSSD::Flags::Add)
+
+    @flags.add = true
+    @flags.default = true
+
+    assert_equal @flags, (DNSSD::Flags::Add | DNSSD::Flags::Default)
+    assert_equal @flags, (DNSSD::Flags::Add | DNSSD::Flags::Default)
+  end
+
+  def test_inspect
+    assert_equal '#<DNSSD::Flags>', @flags.inspect
+
+    @flags.add = true
+    @flags.default = true
+
+    assert_equal '#<DNSSD::Flags add, default>', @flags.inspect
+  end
+
+  def test_intersection
+    new_flags = @flags & DNSSD::Flags::Add
+
+    assert_equal @flags, new_flags
+
+    @flags.default = true
+
+    new_flags = @flags & DNSSD::Flags::Default
+
+    assert_equal @flags, new_flags
+
+    assert_equal new_flags, (new_flags & new_flags)
+  end
+
+  def test_set_flag
+    @flags.set_flag DNSSD::Flags::Add
+
+    assert_equal DNSSD::Flags::Add, @flags
+  end
+
+  def test_to_a
+    assert_equal [], @flags.to_a
+
+    @flags.add = true
+    @flags.default = true
+
+    assert_equal %w[add default], @flags.to_a.sort
+  end
+
+  def test_to_i
+    assert_equal 0, @flags.to_i
+
+    @flags.add = true
+    @flags.default = true
+
+    assert_equal 6, @flags.to_i
+  end
+
+  def test_union
+    new_flags = @flags | DNSSD::Flags::Add
+
+    assert_equal DNSSD::Flags.new(DNSSD::Flags::Add), new_flags
+
+    new_flags = new_flags | DNSSD::Flags::Default
+
+    assert_equal DNSSD::Flags.new(DNSSD::Flags::Add, DNSSD::Flags::Default),
+                 new_flags
+
+    assert_equal new_flags, (new_flags | new_flags)
+  end
+
+end
+

metadata

@@ -1,44 +1,122 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: "1.0"
 platform: ruby
 authors: 
-- Charlie Mills
-autorequire: dnssd
+- Chad Fowler
+- Charles Mills
+- Rich Kilmer
+- Phil Hagelberg
+- Aaron Patterson
+- Eric Hodel
+autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
+  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
+  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
+  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
+  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
+  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
+  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
+  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
+  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
+  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
+  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
+  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
+  x52qPcexcYZR7w==
+  -----END CERTIFICATE-----
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-08-05 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: 
-email: cmills@freeshell.org
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe-seattlerb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake-complier
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.2
+    version: 
+description: |-
+  DNS Service Discovery (aka Bonjour, MDNS) API for Ruby.  Implements browsing,
+  resolving, registration and domain enumeration.
+email: 
+- chad@chadfowler.com
+- ""
+- ""
+- phil@hagelb.org
+- aaronp@rubyforge.org
+- drbrain@segment.net
 executables: []
 
 extensions: 
-- ext/extconf.rb
-extra_rdoc_files: []
-
+- ext/dnssd/extconf.rb
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- ext/dnssd/dns_sd.h
+- ext/dnssd/dnssd.c
+- ext/dnssd/dnssd.h
+- ext/dnssd/dnssd_service.c
+- ext/dnssd/dnssd_structs.c
+- ext/dnssd/dnssd_tr.c
+- ext/dnssd/extconf.rb
 - lib/dnssd.rb
-- ext/extconf.rb
-- ext/dns_sd.h
-- ext/rdnssd.c
-- ext/rdnssd_tr.c
-- ext/rdnssd_structs.c
-- ext/run_rdoc
-- ext/rdnssd_service.c
-- ext/MANIFEST
-- ext/rdnssd.h
-has_rdoc: false
+has_rdoc: true
 homepage: http://rubyforge.org/projects/dnssd
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 - ext
@@ -56,10 +134,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.1.2403
+rubyforge_project: dnssd
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: DNS Service Discovery (aka Bonjour) API for Ruby
-test_files: []
-
+summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby
+test_files: 
+- test/test_dnssd_flags.rb