bind9mgr 0.2.6 → 0.2.7

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.2.6'
+  VERSION = '0.2.7'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/named_conf.rb

@@ -66,9 +66,16 @@ module Bind9mgr
 
     def write_zones
       @zones.uniq.each do |z| 
-        z.file ||= gen_zone_file_name;
-        zones_subdir = File.dirname(z.file)
+        z.file ||= gen_zone_file_name( z.origin );
+        zones_subdir = File.dirname( z.file )
         Dir.mkdir( zones_subdir ) unless File.exists?( zones_subdir )
+
+        # OPTIMIZE this
+        z.options[:main_ns]        ||= @main_ns
+        z.options[:secondary_ns]   ||= @secondary_ns
+        z.options[:support_email]  ||= @support_email
+        z.options[:main_server_ip] ||= @main_server_ip
+
         z.write_db_file
       end if @zones.size > 0
     end

data/spec/named_conf_spec.rb

@@ -65,6 +65,9 @@ alias1  	IN	CNAME	ns
     File.stub(:read).with("testfile.conf").and_return(@test_conf_content)
     File.stub(:read).with("testdomain.com.db").and_return(@test_db_content)
 
+    File.stub(:open).with(anything(),anything()).and_return(true)
+    Dir.stub(:mkdir).with(anything()).and_return(true)
+
     @nc = Bind9mgr::NamedConf.new
     @nc.file = 'testfile.conf'
     @nc.bind_location = ''
@@ -79,6 +82,18 @@ alias1  	IN	CNAME	ns
     expect { Bind9mgr::NamedConf.new }.to_not raise_error
   end
 
+  it "should fill zone parametrs after add" do
+    @nc.add_zone "example.com"
+    @nc.zones.last.options[:main_ns].should eql("ns1.example.com")
+  end
+
+  it "should update undefined zone options on write" do
+    Bind9mgr::Zone.any_instance.stub(:write_db_file)
+    @nc.zones << Bind9mgr::Zone.new("emptyzone.com")
+    @nc.write_zones
+    @nc.zones.last.options[:main_ns].should eql("ns1.example.com")
+  end
+
   it "should fail to add_zone(some_string) unless bind_location filled" do
     @nc.bind_location = nil
     expect { @nc.add_zone('example.com') }.to raise_error(ArgumentError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000 +04:00
+date: 2011-09-16 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21035760 !ruby/object:Gem::Requirement
+  requirement: &13259340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *21035760
+  version_requirements: *13259340
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru