bind9mgr 0.3.0 → 0.3.1

data/History.txt

@@ -25,3 +25,8 @@
 === 0.3.0 / 2011-09-20
 
 * bugfix: parser can't parse MX records without class
+
+=== 0.3.1 / 2011-09-20
+
+* light bugfixs
+* more descriptive errors when parsing 'bad' files.

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.0'
+  VERSION = '0.3.1'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/named_conf.rb

@@ -99,7 +99,7 @@ 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 )
+      elsif zone_or_name.kind_of?( String ) && ( zone_or_name.length > 3 ) # at last 'a.a'
         raise ArgumentError, "Main ns not secified" unless @main_ns
         # raise ArgumentError, "Secondary ns not secified" unless @secondary_ns
         raise ArgumentError, "Support email not secified" unless @support_email
@@ -113,7 +113,7 @@ module Bind9mgr
                          :main_server_ip => @main_server_ip,
                          :mail_server_ip => @mail_server_ip)
       else
-        raise( RuntimeError, "BindZone or String instance needed")
+        raise( RuntimeError, "BindZone or String instance expected, but #{zone_or_name.inspect} got")
       end
 
       del_zone! zone.origin

data/lib/zone.rb

@@ -57,7 +57,11 @@ module Bind9mgr
       
       p = Parser.new
       p.result = self
-      p.parse File.read( @file )
+      begin
+        p.parse File.read( @file )
+      rescue 
+        raise RuntimeError, "Parser error. File: #{@file.inspect}.\nError: #{$!.to_s}\n#{$!.backtrace.join("\n")}"
+      end
     end
 
     def gen_db_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18254240 !ruby/object:Gem::Requirement
+  requirement: &14745460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *18254240
+  version_requirements: *14745460
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru