bind9mgr 0.3.10 → 0.3.11

data/History.txt

@@ -68,3 +68,13 @@
 * MX validations
 * A validations
 * spec update
+
+=== 0.3.10
+
+* bug fixes
+
+=== 0.3.11
+
+* Zone db file generation fix (bad new lines)
+* NamedConf#add_zone adds default records wthen called with string
+* Tests update

data/README.txt

@@ -25,6 +25,7 @@ TODO: more configuration features
 TODO: more conventions(feedback welcomed!)
 TODO: true domain names validations
 TODO: RFC records validations
+TODO: ignore bad zone db files
 
 == SYNOPSIS:
 

data/lib/bind9mgr.rb

@@ -6,7 +6,7 @@ require File.join( File.dirname(__FILE__), 'resource_record' )
 require File.join( File.dirname(__FILE__), 'parser' )
 
 module Bind9mgr
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 
   ZONES_BIND_SUBDIR = 'primary'
 
@@ -14,7 +14,7 @@ module Bind9mgr
   ALLOWED_TYPES = %w{A CNAME MX TXT PTR NS SRV SOA}
 
   class Bind9mgrError           < RuntimeError; end
-
+  class InvalidZoneError        < RuntimeError; end
   class ParserError             < Bind9mgrError; end
   class MalformedResourceRecord < Bind9mgrError; end
 end

data/lib/named_conf.rb

@@ -30,6 +30,7 @@ module Bind9mgr
     def load
       init_zones
       parse File.read( @file ) if File.exists?(@file)
+      zones
     end
 
     # Load just one zone and return it
@@ -99,9 +100,9 @@ module Bind9mgr
       if zone_or_name.kind_of?( Zone )
         raise ArgumentError, "file_name should be nil if instance of Zone supplied" unless file_name.nil?
         zone = zone_or_name
-      elsif zone_or_name.kind_of?( String ) && ( zone_or_name.length > 4 ) # at last 'a.a.'
+      elsif zone_or_name.kind_of?( String )
         raise ArgumentError, "Main ns not secified" unless @main_ns
-        # raise ArgumentError, "Secondary ns not secified" unless @secondary_ns
+        # TODO what to do with sec. ns? # raise ArgumentError, "Secondary ns not secified" unless @secondary_ns
         raise ArgumentError, "Support email not secified" unless @support_email
         raise ArgumentError, "Main server ip not secified" unless @main_server_ip
         
@@ -112,10 +113,13 @@ module Bind9mgr
                          :support_email => @support_email,
                          :main_server_ip => @main_server_ip,
                          :mail_server_ip => @mail_server_ip)
+        zone.add_default_rrs
       else
         raise( RuntimeError, "BindZone or String instance expected, but #{zone_or_name.inspect} got")
       end
 
+      raise InvalidZoneError, zone.inspect unless zone.valid?
+
       del_zone! zone.origin
       @zones.push zone
 

data/lib/resource_record.rb

@@ -68,9 +68,9 @@ module Bind9mgr
         cont << "\t#{rdata[4]} ; retry\n"
         cont << "\t#{rdata[5]} ; expire\n"
         cont << "\t#{rdata[6]} ; minimum\n"
-        cont << ")"
+        cont << ")\n"
       else
-        "#{@owner}\t#{@ttl}\t#{@klass}\t#{@type}\t#{[@rdata].flatten.join(' ')}"
+        "#{@owner}\t#{@ttl}\t#{@klass}\t#{@type}\t#{[@rdata].flatten.join(' ')}\n"
       end
     end
   end

data/lib/zone.rb

@@ -84,7 +84,8 @@ module Bind9mgr
 
       rrhash.keys.each do |rr_type|
         cont << ";;; #{rr_type} ;;;\n"
-        cont << rrhash[rr_type].map{ |r| r.gen_rr_string }.join("\n")
+        cont << rrhash[rr_type].map{ |r| r.gen_rr_string }.join
+        cont << "\n"
       end
 
       cont

data/spec/named_conf_spec.rb

@@ -172,8 +172,6 @@ alias1  	IN	CNAME	ns
     @nc.zones.last.add_rr( 'cname', nil, nil, 'CNAME', '@' )
     @nc.zones.count.should == 3 # we specified 2 zones in "before"
     @nc.add_zone( 'example.com' )
-    @nc.zones.last.records.count.should == 0
-    @nc.zones.last.add_default_rrs
     @nc.zones.last.records.count.should == 5 # new zone should have SOA, A, CNAME(www) and 2*NS records
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &11719380 !ruby/object:Gem::Requirement
+  requirement: &15371660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *11719380
+  version_requirements: *15371660
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru