assert_zone 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0ffd6f47f0c8ca157e80874169820de36d3aab
-  data.tar.gz: e556bf0c5d46eca4db28a64cd97fde1cb17c4902
+  metadata.gz: b9e5033994b5619de166ece33a2f701161a3d70a
+  data.tar.gz: c3b867d3d040906dc9db71252d8395092f71eee0
 SHA512:
-  metadata.gz: ce624793f4c312c70237e5eff306a32b878ef9f7d24236023e21e01e43064bf0b1b3441f63a93f2f6692e022837b5d347382637db40660c1a54384d3695d4a57
-  data.tar.gz: c51a633907b983b39d2adb97e9ae499ffcbd87ffe49504cbb6f0d822cade7e63fb4eb44ba03d56309acacea1564d2dcdb2f1dab27ac08d4e2464ca6ca810cf89
+  metadata.gz: 65355bf62bd0e6374e04183bcc251a534866063fcdc388d66850514509ecb454578b422734cc9c0a4a32e84c347c277a7487892f5265c2accdf1fdab429d55f2
+  data.tar.gz: 9b6ff8dd6342f57844333e72481d68330c5a3a25be0ad5aae1556440a4296c834027a05f026d7bc13a7cc4cafc07fa84ed4e981d341ba4c3a253216d43c1d064

data/assert_zone.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rspec', '~> 3.4.0'
   spec.add_dependency 'rspec-dns', '~> 0.1.6'
-  spec.add_dependency 'dns-zone', '~> 0.2.0'
+  spec.add_dependency 'dns-zone', '~> 0.3.1'
 end

data/exe/assert_zone

@@ -11,12 +11,25 @@ options = {
 
 OptionParser.new do |opts|
   opts.banner = "Usage: assert_zone ZONE_FILE [NAMESERVER] [options]"
-  opts.on('--color', 'Use color') do |v|
+  opts.on('-c', '--color', 'Enable color in the output.') do
     options[:rspec_flags] << '--color'
   end
+  opts.on('-f', '--format FORMATTER', 'Choose a formatter.') do |v|
+    options[:rspec_flags] << '--format'
+    options[:rspec_flags] << v
+  end
   opts.on('--use-local-resolver', 'Use local resolver settings instead of explicit nameserver') do |v|
     options[:use_local_resolver] = true
   end
+  opts.on('--skip-ns', 'Skip NS records') do |v|
+    options[:skip_ns] = true
+  end
+  opts.on('--skip-soa', 'Skip SOA record') do |v|
+    options[:skip_soa] = true
+  end
+  opts.on('--ignore-ttl', 'Ignore TTL value') do |v|
+    options[:ignore_ttl] = true
+  end
   opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit
@@ -27,4 +40,6 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-AssertZone.run(ARGV[0], nameserver: ARGV[1], rspec_flags: options[:rspec_flags], use_local_resolver: options[:use_local_resolver])
+options[:nameserver] = ARGV[1]
+
+AssertZone.run(ARGV[0], options)

data/lib/assert_zone.rb

@@ -4,7 +4,7 @@ require 'rspec'
 require 'rspec-dns'
 
 module AssertZone
-  def self.run(filename, nameserver: nil, rspec_flags: [], use_local_resolver: false)
+  def self.run(filename, nameserver: nil, rspec_flags: [], use_local_resolver: false, skip_soa: false, skip_ns: false, ignore_ttl: false)
     ns_config = {}
     ns_config[:nameserver] = nameserver if nameserver
 
@@ -18,20 +18,27 @@ module AssertZone
     end
 
     zone.records.each do |record|
-      next if ['SOA', 'NS'].include?(record.type)
+      next if record.is_a?(DNS::Zone::RR::SOA) if skip_soa
+      next if record.is_a?(DNS::Zone::RR::NS) if skip_ns
 
       fqdn = record.label == '@' ? zone.origin : "#{record.label}.#{zone.origin}".chomp('.')
 
       describe fqdn do
-        if record.is_a?(DNS::Zone::RR::A)
-          it { is_expected.to have_dns.with_type(record.type).config(ns_config).and_ttl(record.ttl).and_address(record.address) }
-        elsif record.is_a?(DNS::Zone::RR::CNAME)
-          it { is_expected.to have_dns.with_type(record.type).config(ns_config).and_ttl(record.ttl).and_domainname(record.domainname.chomp('.')) }
-        elsif record.is_a?(DNS::Zone::RR::TXT)
-          it { is_expected.to have_dns.with_type(record.type).config(ns_config).and_ttl(record.ttl).and_data(record.text) }
-        else
-          it { is_expected.to have_dns.with_type(record.type).config(ns_config).and_ttl(record.ttl) }
-          warn "WARN: Unsupported record type: #{record.type}. Value of record for #{fqdn} will not be tested."
+        it do
+          have_correct_dns = have_dns.with_type(record.type).config(ns_config)
+          have_correct_dns = have_correct_dns.and_ttl(record.ttl) unless ignore_ttl
+
+          if record.is_a?(DNS::Zone::RR::A)
+            have_correct_dns = have_correct_dns.and_address(record.address)
+          elsif record.is_a?(DNS::Zone::RR::CNAME)
+            have_correct_dns = have_correct_dns.and_domainname(record.domainname.chomp('.'))
+          elsif record.is_a?(DNS::Zone::RR::TXT)
+            have_correct_dns = have_correct_dns.and_data(record.text)
+          else
+            warn "WARN: Unsupported record type: #{record.type}. Value of #{record.type} record for #{fqdn} will not be tested."
+          end
+
+          is_expected.to have_correct_dns
         end
       end
     end

data/lib/assert_zone/version.rb

@@ -1,3 +1,3 @@
 module AssertZone
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assert_zone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 description: Assert that a DNS server returns the correct responses based on a zone
   file.
 email:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Assert DNS zone files.