bind9mgr 0.3.11 → 0.3.12

data/History.txt

@@ -73,8 +73,12 @@
 
 * bug fixes
 
-=== 0.3.11
+=== 0.3.11 / 2011-12-13
 
 * Zone db file generation fix (bad new lines)
 * NamedConf#add_zone adds default records wthen called with string
 * Tests update
+
+=== 0.3.11 / 2011-12-26
+
+* Missing newLine after rr in generated zone db files bug fix

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.11'
+  VERSION = '0.3.12'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/zone.rb

@@ -84,7 +84,7 @@ module Bind9mgr
 
       rrhash.keys.each do |rr_type|
         cont << ";;; #{rr_type} ;;;\n"
-        cont << rrhash[rr_type].map{ |r| r.gen_rr_string }.join
+        cont << rrhash[rr_type].map{ |r| r.gen_rr_string }.join("\n")
         cont << "\n"
       end
 
@@ -92,6 +92,7 @@ module Bind9mgr
     end
     
     def write_db_file
+      raise ArgumentError, "File not specified" if @file.nil? || @file.length < 1
       db_dir = File.dirname( @file )
       raise( Errno::ENOENT, "No such dir: #{db_dir}" ) unless File.exists? db_dir
       File.open( @file, 'w' ){|f| f.write( gen_db_content )}
@@ -99,6 +100,7 @@ module Bind9mgr
 
     def add_default_rrs
       raise ArgumentError, "Main ns not specified" unless @options[:main_ns]
+      # TODO main server ip should be renamed to default server ip (or what?)
       raise ArgumentError, "Main server ip not specified" unless @options[:main_server_ip]
 
       ensure_soa_rr( default_soa )
@@ -190,7 +192,8 @@ zone "#{name}" {
     end
 
     def initialized?
-      raise( ArgumentError, "zone not initialized" ) if  @origin.nil? || @file.nil?
+      raise( ArgumentError, "zone not initialized" ) if  @origin.nil?
+      puts "WARNING: @file undefined" unless @file.nil?
     end
     
   end

data/spec/zone_spec.rb

@@ -35,6 +35,16 @@ alias1  	IN	CNAME	ns
     Bind9mgr::Zone.new.should be_kind_of( Bind9mgr::Zone )
   end
 
+  it "should generate default rrs without @file association" do
+    zone = Bind9mgr::Zone.new
+    zone.name = 'test.ru'
+    zone.options[:main_ns] = 'ns.test.ru'
+    zone.options[:main_server_ip] = '123.123.123.123'
+    zone.options[:support_email] = 'adm@test.ru'
+    zone.records.count.should == 0
+    expect{ zone.add_default_rrs }.not_to raise_error
+    zone.records.count.should == 4
+  end
 
   it "should fill itself with data on load method call" do
     @zone.load
@@ -43,13 +53,19 @@ alias1  	IN	CNAME	ns
 
   pending "should fail to generate db file content unless mandatory options filled"
   pending "should raise if wrong rr type specified"
-  pending "should not write repeating rrs"
+
+  it "should not write file unless file specified" do
+    @zone.file = nil
+    expect{ @zone.write_db_file }.to raise_error
+  end
+
   it "should generate db file content" do
     @zone.load
     cont = @zone.gen_db_content
     cont.should be_kind_of( String )
     cont.match(/#{@zone.origin}/m).should be
   end
+
   pending "should generate zone entry content"
 
   describe "records creation & validation" do

metadata

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