bind9mgr 0.2.4 → 0.2.6

data/History.txt

@@ -1,6 +1,10 @@
-=== 1.0.0 / 2011-09-09
+=== 0.0.0 / 2011-09-09
 
 * 1 major enhancement
 
   * Birthday!
 
+=== 0.2.6 / 2011-09-14
+
+* don't fail if there is missing zone db files
+* specs update

data/README.txt

@@ -1,12 +1,28 @@
 = bind9mgr
 
+https://github.com/madbox/bind9mgr
+https://rubygems.org/gems/bind9mgr
+
 == DESCRIPTION:
 
 This gem contains some classes to manage bind9 zone files
 
 == FEATURES/PROBLEMS:
 
-Please look into specs
+Features:
+* zone db file parseing
+* named.conf simple parser
+* OO data organization
+* Simple verifications
+* add zone intaeface
+* delete zone interface
+* automatic zone options management (origin, default NS, default A, "www" CNAME etc)
+
+Please look into specs for more detailed info.
+
+TODO: more configuration features
+TODO: more conventions(feedback welcomed!)
+TODO: xml mappings for restful APIs
 
 == SYNOPSIS:
 
@@ -20,6 +36,9 @@ Please look into specs
   bc.zones # => [ existing zones ... Bind9mgr::Zone ]
   bc.zones.first.records # => [ records ... Bind9mgr::ResourceRecord ]
   
+  bc.add_zone('y_a_zone.org') # adds zone entry with default params
+  bc.write_all # rewrites named.conf.local and zone db files (in /etc/bind/zones_db.)
+  bc.del_zone!('y_a_zone.org') # immidiately removes db file and zone entry in named.conf.local 
 
 == REQUIREMENTS:
 

data/lib/bind9mgr.rb

@@ -6,9 +6,9 @@ require File.join( File.dirname(__FILE__), 'resource_record' )
 require File.join( File.dirname(__FILE__), 'parser' )
 
 module Bind9mgr
-  VERSION = '0.2.4'
+  VERSION = '0.2.6'
 
-  ZONES_BIND_SUBDIR = 'zones_db'
+  ZONES_BIND_SUBDIR = 'primary'
 
   KLASSES = %w{IN CH}
   ALLOWED_TYPES = %w{A CNAME MX TXT PTR NS SRV SOA}

data/lib/named_conf.rb

@@ -1,6 +1,7 @@
 module Bind9mgr
   # You can specify bind_location. If you do so then .add_zone method
   # will generate zones with right filenames.
+  # If .file
   class NamedConf
     #    BIND_PATH = '/etc/bind'
     #    BIND_DB_PATH = BIND_PATH + '/master'
@@ -13,15 +14,26 @@ module Bind9mgr
       @bind_location = File.dirname(file) if file.length > 1
       load
     end
-    
+
+    def file= str
+      raise ArgumentError, "String expected" unless str.kind_of? String
+      @file = str
+    end
+
+    # Tries to load data from named conf. Raises exception if file missing.
+    def load!
+      init_zones
+      parse File.read( @file ) if file.length > 0
+    end
+
+    # Tries to load data from named conf. Do nothing if file missing.
     def load
       init_zones
-      parse File.read( File.join( @file )) if File.exists? file
+      parse File.read( @file ) if File.exists?(@file)
     end
 
     def load_with_zones
-      init_zones
-      parse File.read( File.join( @file )) if File.exists? file
+      load
       zones.each{ |z| z.load}
     end
 

data/lib/zone.rb

@@ -49,42 +49,18 @@ module Bind9mgr
 
     def load
       raise ArgumentError, "file not specified" unless @file
+     
+      
+      # TODO what should we do if there is no db file?
+      # raise ArgumentError, "File: #{file} not found." unless File.exists?( @file )
+      # just emulate parsing of empty file
+      return 0 unless File.exists?( @file )
       
       p = Parser.new
       p.result = self
-      raise ArgumentError, "File: #{file} not found." unless File.exists?( @file )
       p.parse File.read( @file )
     end
 
-    # def parse content
-    #   clear_records
-    #   content.gsub!(/^\s+\n/, '')
-
-    #   # find and remove SOA record with its comments
-    #   soa = /([^\s]*?)\s+?(\d+?)?\s*?(#{RRClasses.join('|')})\s*?(SOA)\s+(.*?\).*?)\n/m
-    #   arr = content.match(soa).to_a
-    #   arr.shift
-    #   @records['SOA'].push arr
-    #   content.sub! soa, ''
-
-    #   # remove comments and blank lines
-    #   content.gsub!(/;.*$/, '')
-    #   content.gsub!(/^\s+\n/, '')
-      
-    #   # other @Records
-    #   rr = /^([^\s]+)\s+?(\d+?)?\s*?(#{RRClasses.join('|')})?\s*?(#{RRTypes.join('|')})\s+(.*?)$/
-    #   content.lines.each do |l|
-    #     if md = l.match(/\$TTL\s+(\d+)/)
-    #       ( @default_ttl = md[1].to_i ) if md[1].to_i > 0
-    #     elsif md = l.match(rr)
-    #       tmp_a = md.to_a
-    #       tmp_a.shift
-    #       @records[tmp_a[3]].push tmp_a
-    #     end
-    #   end
-    #   @records
-    # end
-
     def gen_db_content
       initialized?
       raise ArgumentError, "default_ttl not secified" unless @default_ttl

data/spec/named_conf_spec.rb

@@ -23,6 +23,18 @@ zone "cloud.ru" {
 	file "testdomain.com.db";
 };
 
+zone "1.168.192.in-addr.arpa" {
+	type master;
+	file "testdomain.com.db";
+};
+}
+
+    @test_wrong_conf_content = %q{// test file
+zone "cloud.ru" {
+	type master;
+	file "there_is_no_such_file.com.db";
+};
+
 zone "1.168.192.in-addr.arpa" {
 	type master;
 	file "testdomain.com.db";
@@ -49,6 +61,7 @@ alias1  	IN	CNAME	ns
     File.stub(:exists?).with("testfile.conf").and_return(true)
     File.stub(:exists?).with("testdomain.com.db").and_return(true)
 
+    File.stub(:read).with(anything()).and_raise(Errno::ENOENT.new("File.read stubbed. You trying to read unexpected file."))
     File.stub(:read).with("testfile.conf").and_return(@test_conf_content)
     File.stub(:read).with("testdomain.com.db").and_return(@test_db_content)
 
@@ -117,6 +130,14 @@ alias1  	IN	CNAME	ns
     @nc.zones.should be_empty()
   end
 
+  it "should raise error if you try to assign non-String object to file" do
+    expect{ @nc.file = nil }.to raise_error(ArgumentError)
+    expect{ @nc.file = 1 }.to raise_error(ArgumentError)
+    expect{ @nc.file = '' }.not_to raise_error(ArgumentError)
+    expect{ @nc.file = 'qwe' }.not_to raise_error(ArgumentError)
+  end
+
+
   it "should have an empty array of zones on instantiation without conf file" do
     nc = Bind9mgr::NamedConf.new
     nc.zones.should be_empty()
@@ -144,4 +165,24 @@ alias1  	IN	CNAME	ns
   pending "should automatically generate file name for zone db if not supplied"
   pending "should automatically make dir for zone db files"
   pending "should have methods to edit SOA values"
+
+  it "'load!' should raise error if named conf file is missing" do
+    @nc.file = "missing.file"
+    expect{ @nc.load! }.to raise_error
+  end
+
+  it "'load' should not raise error if named conf file is missing" do
+    @nc.file = "missing.file"
+    expect{ @nc.load }.not_to raise_error
+  end
+
+  it "should not fail to load configuration when there is no zone db file" do
+    # named conf file with not existing zone db file
+    File.stub(:exists?).with("testwrongfile.conf").and_return(true)
+    File.stub(:read).with("testwrongfile.conf").and_return(@test_wrong_conf_content) 
+    @nc.file = "testwrongfile.conf"
+
+    expect{ @nc.load }.not_to raise_error
+    expect{ @nc.load_with_zones }.not_to raise_error
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 +04:00
+date: 2011-09-15 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9505680 !ruby/object:Gem::Requirement
+  requirement: &21035760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *9505680
+  version_requirements: *21035760
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru
@@ -52,7 +52,7 @@ files:
 - spec/resource_record_spec.rb
 - .gemtest
 has_rdoc: true
-homepage: 
+homepage: https://github.com/madbox/bind9mgr
 licenses: []
 post_install_message: 
 rdoc_options: