ruby-djbdns 0.0.1 → 0.0.2

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Christopher Boumenot
+Copyright (c) 2006-2008 Christopher Boumenot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/djb.rb

@@ -1,4 +1,4 @@
-# $Id: djb.rb 50 2006-12-21 02:41:47Z boumenot $
+# $Hg: djb.rb,v d39b62a20f42 2008/02/22 21:24:37 boumenot $
 
 class File
     def File.write(filename, string, offset=0)

data/lib/djb/tinydns.rb

@@ -1,5 +1,6 @@
-# $Id: tinydns.rb 49 2006-12-12 21:01:29Z boumenot $
+# $Hg: tinydns.rb,v d39b62a20f42 2008/02/22 21:24:37 boumenot $
 require 'djb'
+require 'ipaddr'
 
 module DJB
 
@@ -42,6 +43,7 @@ module DJB
             def add(entry)
                 @lines << entry.to_s
             end
+            alias :<< :add
 
             def add_reverse(args)
                 fqdn = args['ip'].split('.').reverse[1..3].join(".")
@@ -56,7 +58,7 @@ module DJB
                 return @lines.join("\n")
             end
 
-            def to_f
+            def to_file
                 File.write(fn(), self.to_s)
             end
         end
@@ -74,6 +76,7 @@ module DJB
             def add(res)
                 @resources << res.to_s + ":#{@name}"
             end
+            alias :<< :add
 
             def to_s
                 return @resources.join("\n")
@@ -94,8 +97,8 @@ module DJB
                 @fqdn   = args['fqdn']
             end
 
-            def encode(s)
-                s.gsub(/[^0-9a-zA-Z]/) { |m| sprintf("\\%.3o", m[0]) }
+            def encode
+                data.gsub(/[^0-9a-zA-Z]/) { |m| sprintf("\\%.3o", m[0]) }
             end
 
             def to_s
@@ -130,7 +133,7 @@ module DJB
 
                 @fields << @fqdn
                 @fields << (args.has_key?('TypeValue') ? args['TypeValue'] : self.class::TypeValue)
-                @fields << encode(@data)
+                @fields << encode
                 @fields << @ttl
                 @fields << @timestamp
             end
@@ -300,7 +303,7 @@ module DJB
                 @data = @args['data']
 
                 @fields << @fqdn
-                @fields << encode(data)
+                @fields << encode
                 @fields << @ttl
                 @fields << @timestamp
             end
@@ -320,6 +323,14 @@ module DJB
 
         class AAAA < Generic
             TypeValue = 28
+
+            def encode
+                ipv6 = IPAddr.new(@data)
+                a = ipv6.to_string.gsub(':', '').scan(/../).inject([]) do |acc,x| 
+                    acc << sprintf('\\%.3o', x.to_i(16))
+                end
+                return a.join('')
+            end
         end
 
         class LOC < Generic
@@ -388,7 +399,7 @@ module DJB
                 return s
             end
 
-            def to_f
+            def to_file
                 File.write(fn(), to_s())
             end
         end

data/sample/axfr.rb

@@ -16,7 +16,7 @@ axfr.deny('172.16.100.5', '1.16.172.in-addr.arpa')
 puts axfr
 
 # print the axfr files to the _tcp_ file
-# axfr.to_f
+# axfr.to_file
 
 
 # Local Variables:

data/sample/resolver.rb

@@ -1,40 +1,41 @@
 #!/usr/bin/env ruby
 
 require 'djb/tinydns'
+include DJB::TinyDNS
 
-tinydns = DJB::TinyDNS::Resolver.new('/etc/tinydns', '/usr/local/bin/svc')
+tinydns = Resolver.new('/etc/tinydns', '/usr/local/bin/svc')
 
-tinydns.add(DJB::TinyDNS::NS::DelegateFrom.new({'fqdn' => 'example.net',           'ip' => '172.16.1.1'}))
-tinydns.add(DJB::TinyDNS::NS::DelegateFrom.new({'fqdn' => '1.16.172.in-addr.arpa', 'ip' => '172.16.1.1'}))
+tinydns << NS::DelegateFrom.new({'fqdn' => 'example.net',           'ip' => '172.16.1.1'})
+tinydns << NS::DelegateFrom.new({'fqdn' => '1.16.172.in-addr.arpa', 'ip' => '172.16.1.1'})
 # -or-
-# tinydns.add_reverse({'ip' => '172.16.1.1'})
-
-tinydns.add(DJB::TinyDNS::Host.new( {'fqdn' => 'ace.example.net',   'ip'    => '172.16.1.1'}))
-tinydns.add(DJB::TinyDNS::Host.new( {'fqdn' => 'gary.example.net',  'ip'    => '172.16.1.2'}))
-tinydns.add(DJB::TinyDNS::A.new(    {'fqdn' => 'www.example.net',   'ip'    => '172.16.1.1'}))
-tinydns.add(DJB::TinyDNS::A.new(    {'fqdn' => 'ftp.example.net',   'ip'    => '172.16.1.1'}))
-tinydns.add(DJB::TinyDNS::A.new(    {'fqdn' => 'ssh.example.net',   'ip'    => '172.16.1.1'}))
-tinydns.add(DJB::TinyDNS::A.new(    {'fqdn' => 'tftp.example.net',  'ip'    => '172.16.1.2'}))
-tinydns.add(DJB::TinyDNS::CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'rsh.example.net'}))
-tinydns.add(DJB::TinyDNS::CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'telnet.example.net'}))
-tinydns.add(DJB::TinyDNS::CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'ntp.example.net'}))
-tinydns.add(DJB::TinyDNS::MX.new(   {'fqdn' => 'example.net',       'host'  => 'gary.example.net', 'distance' => 10}))
-
-intranet = DJB::TinyDNS::Location.new('intranet', '10.0.0')
-intranet.add(DJB::TinyDNS::Host.new({'fqdn' => 'ace.example.net',  'ip' => '10.0.0.1'}))
-intranet.add(DJB::TinyDNS::Host.new({'fqdn' => 'gary.example.net', 'ip' => '10.0.0.2'}))
-tinydns.add(intranet)
-
-vpn = DJB::TinyDNS::Location.new('vpn', '192.168')
-vpn.add(DJB::TinyDNS::Host.new({'fqdn' => 'ace.example.net',  'ip' => '192.168.1.1'}))
-vpn.add(DJB::TinyDNS::Host.new({'fqdn' => 'gary.example.net', 'ip' => '192.168.1.2'}))
-tinydns.add(vpn)
+# tinydns << _reverse({'ip' => '172.16.1.1'})
+
+tinydns << Host.new( {'fqdn' => 'ace.example.net',   'ip'    => '172.16.1.1'})
+tinydns << Host.new( {'fqdn' => 'gary.example.net',  'ip'    => '172.16.1.2'})
+tinydns << A.new(    {'fqdn' => 'www.example.net',   'ip'    => '172.16.1.1'})
+tinydns << A.new(    {'fqdn' => 'ftp.example.net',   'ip'    => '172.16.1.1'})
+tinydns << A.new(    {'fqdn' => 'ssh.example.net',   'ip'    => '172.16.1.1'})
+tinydns << A.new(    {'fqdn' => 'tftp.example.net',  'ip'    => '172.16.1.2'})
+tinydns << CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'rsh.example.net'})
+tinydns << CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'telnet.example.net'})
+tinydns << CNAME.new({'fqdn' => 'gary.example.net',  'alias' => 'ntp.example.net'})
+tinydns << MX.new(   {'fqdn' => 'example.net',       'host'  => 'gary.example.net', 'distance' => 10})
+
+intranet = Location.new('intranet', '10.0.0')
+intranet << Host.new({'fqdn' => 'ace.example.net',  'ip' => '10.0.0.1'})
+intranet << Host.new({'fqdn' => 'gary.example.net', 'ip' => '10.0.0.2'})
+tinydns  << intranet
+
+vpn = Location.new('vpn', '192.168')
+vpn << Host.new({'fqdn' => 'ace.example.net',  'ip' => '192.168.1.1'})
+vpn << Host.new({'fqdn' => 'gary.example.net', 'ip' => '192.168.1.2'})
+tinydns << vpn
 
 # print the tinydns file to the screen
 puts tinydns
 
 # print the tinydns files to the _data_ file
-# tinydns.to_f
+# tinydns.to_file
 
 
 # Local Variables:

data/test/axfr.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: axfr.rb 50 2006-12-21 02:41:47Z boumenot $
+# $Hg: axfr.rb,v d39b62a20f42 2008/02/22 21:24:37 boumenot $
 
 require 'test/unit'
 require 'djb/tinydns'

data/test/resolver.rb

@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby
-# $Id: resolver.rb 50 2006-12-21 02:41:47Z boumenot $
+# $Hg: resolver.rb,v d39b62a20f42 2008/02/22 21:24:37 boumenot $
 
 require 'test/unit'
 require 'djb/tinydns'
 
 EVERYTHING = {
-  'fqdn'  => 'ace.example.net',
-  'ip'    => '172.16.1.100',
-  'host'  => 'gary.example.net',
-  'alias' => 'agd.example.net',
-  'mname' => 'dns.example.net',
-  'rname' => 'admin.example.net',
-  'distance' => 10,
-  'data'  => 'Robert Smigel',
-  'TypeValue' => 1001,
+    'fqdn'  => 'ace.example.net',
+    'ip'    => '172.16.1.100',
+    'host'  => 'gary.example.net',
+    'alias' => 'agd.example.net',
+    'mname' => 'dns.example.net',
+    'rname' => 'admin.example.net',
+    'distance' => 10,
+    'data'  => '1234::4321',
+    'TypeValue' => 1001,
 }
 
 def module_walk(clss)
@@ -25,70 +25,81 @@ def module_walk(clss)
 end
 
 class TC_Prefix < Test::Unit::TestCase
-  def test_prefix
-    e = {
-      'Host'    => '=',
-      'Generic' => ':',
-      'A'       => '+',
-      'NS::DelegateTo'   => '&',
-      'NS::DelegateFrom' => '.',
-      'CNAME'   => 'C',
-      'SOA'     => 'Z',
-      'PTR'     => '^',
-      'MX'      => '@',
-      'TXT'     => '\'',
+    def test_prefix
+        e = {
+            'Host'    => '=',
+            'Generic' => ':',
+            'A'       => '+',
+            'NS::DelegateTo'   => '&',
+            'NS::DelegateFrom' => '.',
+            'CNAME'   => 'C',
+            'SOA'     => 'Z',
+            'PTR'     => '^',
+            'MX'      => '@',
+            'TXT'     => '\'',
 
-      'AAAA'    => ':',
-      'WKS'     => ':',
-      'SRV'     => ':',
-      'NULL'    => ':',
-      'HINFO'   => ':',
-      'MINFO'   => ':',
-    }
+            'AAAA'    => ':',
+            'WKS'     => ':',
+            'SRV'     => ':',
+            'NULL'    => ':',
+            'HINFO'   => ':',
+            'MINFO'   => ':',
+        }
 
-    e.each do |k,expected|
-      mod = module_walk("DJB::TinyDNS::#{k}")
-      actual = mod.new(EVERYTHING).to_s[0].chr
-      assert(actual == expected, "prefix: expected=#{expected}, actual=#{actual}")
+        e.each do |k,expected|
+            mod = module_walk("DJB::TinyDNS::#{k}")
+            actual = mod.new(EVERYTHING).to_s[0].chr
+            assert(actual == expected, "prefix: expected=#{expected}, actual=#{actual}")
+        end
     end
-  end
 end
 
 class TC_Accessor < Test::Unit::TestCase
-  def test_accessor
-    e = {
-      :ttl       => %w{Host Generic A NS::DelegateTo NS::DelegateFrom CNAME SOA PTR MX TXT},
-      :timestamp => %w{Host Generic A NS::DelegateTo NS::DelegateFrom CNAME SOA PTR MX TXT},
-      :alias     => %w{CNAME},
-      :mname     => %w{SOA},
-      :rname     => %w{SOA},
-      :host      => %w{NS::DelegateTo NS::DelegateFrom PTR MX},
-      :distance  => %w{MX},
-      :data      => %w{Generic TXT},
-      :ip        => %w{A NS::DelegateTo NS::DelegateFrom},
-    }
+    def test_accessor
+        e = {
+            :ttl       => %w{Host Generic A NS::DelegateTo NS::DelegateFrom CNAME SOA PTR MX TXT},
+            :timestamp => %w{Host Generic A NS::DelegateTo NS::DelegateFrom CNAME SOA PTR MX TXT},
+            :alias     => %w{CNAME},
+            :mname     => %w{SOA},
+            :rname     => %w{SOA},
+            :host      => %w{NS::DelegateTo NS::DelegateFrom PTR MX},
+            :distance  => %w{MX},
+            :data      => %w{Generic TXT},
+            :ip        => %w{A NS::DelegateTo NS::DelegateFrom},
+        }
 
-    e.each do |k,v|
-      v.each do |c|
-        mod = module_walk("DJB::TinyDNS::#{c}")
-        assert(mod.new(EVERYTHING).respond_to?(k), "DJB::TinyDNS::#{c} does not respond to #{k}")
-      end
-    end
-  end    
+        e.each do |k,v|
+            v.each do |c|
+                mod = module_walk("DJB::TinyDNS::#{c}")
+                assert(mod.new(EVERYTHING).respond_to?(k), "DJB::TinyDNS::#{c} does not respond to #{k}")
+            end
+        end
+    end    
+end
 
-  class TC_Location < Test::Unit::TestCase
+class TC_Location < Test::Unit::TestCase
     def test_location
-      loc = DJB::TinyDNS::Location.new('intranet', '192.168')
-      loc.add(DJB::TinyDNS::Host.new(EVERYTHING))
+        loc = DJB::TinyDNS::Location.new('intranet', '192.168')
+        loc.add(DJB::TinyDNS::Host.new(EVERYTHING))
 
-      first, second = loc.to_s.split("\n")
+        first, second = loc.to_s.split("\n")
 
-      assert(/^%intranet/.match(first), "location: expected /^%intranet/, actual=#{first}")
-      assert(/^\=/.match(second), "location: expected /^=.*/, actual #{second}")
+        assert(/^%intranet/.match(first), "location: expected /^%intranet/, actual=#{first}")
+        assert(/^\=/.match(second), "location: expected /^=.*/, actual #{second}")
     end
-  end
+end
 
+class TC_ExpectedResult < Test::Unit::TestCase
+    def test_aaaa
+        exp = '\\022\\064\\126\\170\\232\\274\\015\\357\\000\\000\\000\\000\\000\\000\\376\\334'
+        quad = DJB::TinyDNS::AAAA.new({'fqdn' => 'www.example.net', 'data' => '1234:5678:9abc:def::fedc'})
 
+        a = quad.to_s.split(':')
+
+        assert_equal(a[1], 'www.example.net')
+        assert_equal(a[2], DJB::TinyDNS::AAAA::TypeValue.to_s)
+        assert_equal(a[3], exp)
+    end
 end
 
 # Local Variables:

data/test/runner.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: runner.rb 50 2006-12-21 02:41:47Z boumenot $
+# $Hg: runner.rb,v d39b62a20f42 2008/02/22 21:24:37 boumenot $
 
 $: << File.dirname(__FILE__) + '/../lib'
 require 'test/unit'
@@ -8,10 +8,10 @@ if not (File.exists?('resolver.rb'))
     raise 'The test suite should only be run from the test directory.'
 end
 
-Dir.glob("#{File.dirname(__FILE__)}/*.rb").each() { |filename|
+Dir.glob("#{File.dirname(__FILE__)}/*.rb").each() do |filename|
     next if filename == 'runner.rb'
     require(filename)
-}
+end
 
 # Local Variables:
 # mode: ruby

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-djbdns
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-12-30 00:00:00 -05:00
+  version: 0.0.2
+date: 2008-02-22 00:00:00 -05:00
 summary: Ruby module to manage TinyDNS
 require_paths: 
 - lib
@@ -25,27 +25,29 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Christopher Boumenot
 files: 
-- sample
 - lib
-- VERSION
-- README
-- test
 - FILES
+- pkg
 - COPYING
-- sample/axfr.rb
-- sample/resolver.rb
+- README
+- sample
+- test
+- VERSION
 - lib/djb.rb
 - lib/djb/tinydns.rb
+- sample/resolver.rb
+- sample/axfr.rb
 - test/resolver.rb
-- test/axfr.rb
 - test/runner.rb
+- test/axfr.rb
 test_files: 
 - test/resolver.rb
-- test/axfr.rb
 - test/runner.rb
+- test/axfr.rb
 rdoc_options: []
 
 extra_rdoc_files: []