rspec-dns 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZlNDcxN2JiNWZiMmY4OWVmZDdjZDJmMmNiMGQwYmQ2OTI5OTAwMA==
+    YWZhYzZhZTc5ZjFiZWY2MzRhMjIwMWMyYzhhNjQ2N2M3YWQxYWEyZg==
   data.tar.gz: !binary |-
-    YWUyZWRmMTQwOWU4ZDVhYjM3YTIzMTQ5ZWY2NGQwMTU0ODYzNDMzZg==
+    YTNiNTQyZWU5ZTBmM2ZhYTMzMmI4MjFhMjAyNGFmMWFhYWE3ZGQ0MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODk0NGEwYThiMThmNGQyY2ZiYWE4NmY5MWViMWU1NzM4ZDM5YThjM2JlM2U0
-    MzU3MjcyYThjODNkNGQxNDgxMGQyZDc2YTA5ZWQ3NGMzYmNmZGEzOGQ0YjQ2
-    ZDJlNjdiNjc4NmJmNWQ4ODhiZjllMjE4MjU0MDMxYmE4NGFjNmU=
+    ZTAyZWQ5NGM5YWRhNmI3YzIxOWNiZGUxMzcxNWE5ZTI1ZjY1YjVkYjY5YjI2
+    YjBhMTEzMWQ2OGEzYWYxYTE4MGJjOTFlYzRiNWQ0ZjJkODcyZmUzZmNhZjgw
+    YWFiZWE1MzQzMTk0Mzk0OTMyZDk3ZjcyOTI4YmZlNjJkNjYwN2I=
   data.tar.gz: !binary |-
-    ZDRjNTFhNTY1ZTRkNWNkYzViMWU1YjY5NGJmZDIwNjdkODgxMjQ1OWJjNGM2
-    NjliZmI0MzAzYTc0NDgwMGRhMjE0OTU1Y2M1NzlkYThmYWE3OGE0ZDkxY2I4
-    ZjQyMjc3OTAyMzJkMTUyYjk1Y2MwNjNmYTVjMjIyZDY4Mzk2OWY=
+    NmEzYmE0ZjdiYmJhODJlZjllYjhjMjVkZGQ3MjMxZDc0Njc1NDE5ZjAxZjZj
+    YTdiNDE3ZjQzMTQxZjc1ODhlMjZlZTgzMTQyNTZjNTY1Y2M1M2NmYTE4ZTJm
+    MDIwZTIzOTRmZWUxNzE0ZmYyNzY0YjA5ZDg2ZGJkZjA1Y2YyZDE=

data/README.md

@@ -35,7 +35,7 @@ Then, create a spec like this:
 require 'spec_helper'
 
 describe 'www.example.com' do
-  it { should have_dns.with_type('TXT').and_ttl(300).and_data('a=b') }
+  it { is_expected.to have_dns.with_type('TXT').and_ttl(300).and_data('a=b') }
 end
 ```
 
@@ -46,8 +46,9 @@ require 'spec_helper'
 
 describe 'DNS tests' do
   it 'passes some tests' do
-    'www.example.com'.should have_dns.with_type('TXT').and_ttl(300).and_data('a=b')
-    'www.example.com'.should have_dns.with_type('A').and_ttl(300).and_address('1.2.3.4')
+    expect('www.example.com').to have_dns.with_type('TXT').and_ttl(300).and_data('a=b')
+    expect('www.example.com').to have_dns.with_type('A').and_ttl(300).and_address('192.0.2.4')
+    expect('192.0.2.4').to have_dns.with_type('PTR').and_domainname('www.example.com')
   end
 end
 ```
@@ -59,20 +60,25 @@ Currently the following chaining methods are supported:
 - at\_least
 - in\_authority
 - refuse\_request
+- config
 
 Here's some usage examples:
 
 ```ruby
   it 'checks if recursion is disabled' do
-    'google.com'.should have_dns.refuse_request
+    expect('google.com').to have_dns.refuse_request
   end
 
   it 'checks if gslb subdomain is delegated to dynect' do
-    'gslb.example.com'.should have_dns.in_authority.with_type('NS').and_name(/dynect/).at_least(3)
+    expect('gslb.example.com').to have_dns.in_authority.with_type('NS').and_name(/dynect/).at_least(3)
   end
 
   it 'checks number of hosts in round robin' do
-    'example.com'.should have_dns.with_type('A').at_least(3)
+    expect('example.com').to have_dns.with_type('A').at_least(3)
+  end
+
+  it 'check with configuration' do
+    expect('example.com').to have_dns.with_type('A').config(nameserver: '192.0.2.4')
   end
 ```
 
@@ -109,7 +115,7 @@ Depending on the type of record, the following attributes may be available:
 If you try checking an attribute on a record that is non-existent (like checking the `rmailbx` on an `A` record), you'll get an error like this:
 
 ```text
-Failure/Error: it { should have_dns.with_type('TXT').and_ftl(300).and_data('a=b') }
+Failure/Error: it { is_expected.to have_dns.with_type('TXT').and_ftl(300).and_data('a=b') }
   got 1 exception(s): undefined method `rmailbx' for #<Dnsruby::RR::IN::A:0x007f66a0339b00>
 ```
 
@@ -117,7 +123,7 @@ For this reason, you should always check the `type` attribute first in your chai
 
 Configuring
 -----------
-All configurations must be in your project root at `config/dns.yml`. This YAML file directly corresponds to the Resolv DNS initializer.
+All configurations can be in your project root at `config/dns.yml`. This YAML file directly corresponds to the Resolv DNS initializer.
 
 For example, to directly query your DNS servers (necessary for correct TTL tests), create a `config/dns.yml` file like this:
 
@@ -128,8 +134,9 @@ nameserver:
 ```
 
 If this file is missing Resolv will use the settings in /etc/resolv.conf.
+You can also configure with `config` chain.
 
-The full list of configuration options can be found on the [Dnsruby docs](http://dnsruby.rubyforge.org/classes/Dnsruby/Config.html).
+The full list of configuration options can be found on the [Dnsruby docs](http://www.ruby-doc.org/gems/docs/d/Dnsruby-1.0/Dnsruby/Config.html).
 
 ### Configuring connection timeout
 
@@ -161,11 +168,13 @@ License & Authors
 - Seth Vargo (sethvargo@gmail.com)
 - Johannes Russek (jrussek@spotify.com)
 - Alexey Lapitsky (lex@realisticgroup.com)
+- Hiroshi OTA (otahi.pub@gmail.com)
 
 ```text
 Copyright 2012-2013 Seth Vargo
 Copyright 2012-2013 CustomInk, LLC
 Copyright 2013-2014 Spotify AB
+Copyright 2013-2014 Hiroshi OTA
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/rspec-dns.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'dnsruby'
+require 'ipaddr'
 require 'rspec/expectations'
 
 require 'rspec-dns/have_dns'

data/lib/rspec-dns/have_dns.rb

@@ -80,6 +80,10 @@ RSpec::Matchers.define :have_dns do
     @refuse_request = true
   end
 
+  chain :config do |c|
+    @config = c
+  end
+
   def method_missing(m, *args, &block)
     if m.to_s =~ /(and\_with|and|with)?\_(.*)$/
       _options[$2.to_sym] = args.first
@@ -129,7 +133,11 @@ RSpec::Matchers.define :have_dns do
       Timeout::timeout(query_timeout + 0.2) do
         resolver =  Dnsruby::Resolver.new(config)
         resolver.query_timeout = query_timeout
-        resolver.query(@dns, Dnsruby::Types.ANY)
+        if (IPAddr.new(@dns) rescue nil) # Check if IPAddr(v4,v6)
+          resolver.query(@dns, Dnsruby::Types.PTR)
+        else
+          resolver.query(@dns, Dnsruby::Types.ANY)
+        end
       end
     rescue Exception => e
       if Dnsruby::NXDomain === e

data/rspec-dns.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
-  s.version       = '0.1.2'
+  s.version       = '0.1.3'
   s.name          = 'rspec-dns'
-  s.authors       = ['Seth Vargo', 'Alexey Lapitsky', 'Johannes Russek']
+  s.authors       = ['Seth Vargo', 'Alexey Lapitsky', 'Johannes Russek', 'Hiroshi OTA']
   s.email         = 'alexey@spotify.com'
   s.description   = 'Easily test your DNS entries with RSpec'
   s.summary       = 'rspec-dns provides an easy-to-use DSL for testing your DNS records are responding as they should.'

data/spec/rspec-dns/have_dns_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 def stub_records(strings)
   records = strings.map { |s| Dnsruby::RR.new_from_string(s) }
   resolver = Dnsruby::Resolver.new
-  Dnsruby::Resolver.stub(:new) do
+  allow(Dnsruby::Resolver).to receive(:new) do
     yield if block_given?
     resolver
   end
-  resolver.stub_chain(:query, :answer).and_return(records)
+  allow(resolver).to receive_message_chain(:query, :answer).and_return(records)
 end
 
 describe 'rspec-dns matchers' do
@@ -15,68 +15,68 @@ describe 'rspec-dns matchers' do
   describe '#have_dns' do
     context 'with a sigle record' do
       it 'can evalutate an A record' do
-        stub_records(['example.com 86400 A 192.168.100.100'])
+        stub_records(['example.com 86400 A 192.0.2.4'])
 
-        'example.com'.should have_dns.with_type('A')
-        'example.com'.should_not have_dns.with_type('TXT')
-        'example.com'.should have_dns.with_type('A').and_address('192.168.100.100')
+        expect('example.com').to have_dns.with_type('A')
+        expect('example.com').to_not have_dns.with_type('TXT')
+        expect('example.com').to have_dns.with_type('A').and_address('192.0.2.4')
       end
 
       it 'can evalutate a AAAA record' do
-        stub_records(['example.com 86400 AAAA 2001:0002:6c::430'])
+        stub_records(['example.com 86400 AAAA 2001:DB8:6c::430'])
 
-        'example.com'.should have_dns.with_type('AAAA')
-        'example.com'.should_not have_dns.with_type('A')
-        'example.com'.should have_dns.with_type('AAAA')
-          .and_address('2001:2:6C::430')
+        expect('example.com').to have_dns.with_type('AAAA')
+        expect('example.com').to_not have_dns.with_type('A')
+        expect('example.com').to have_dns.with_type('AAAA')
+          .and_address('2001:DB8:6C::430')
       end
 
       it 'can evalutate a CNAME record' do
         stub_records(['www.example.com 300 IN CNAME example.com'])
 
-        'example.com'.should have_dns.with_type('CNAME')
-        'example.com'.should_not have_dns.with_type('AAAA')
-        'example.com'.should have_dns.with_type('CNAME').and_name('www.example.com')
+        expect('example.com').to have_dns.with_type('CNAME')
+        expect('example.com').to_not have_dns.with_type('AAAA')
+        expect('example.com').to have_dns.with_type('CNAME').and_name('www.example.com')
       end
 
       it 'can evalutate an MX record' do
         stub_records(['example.com. 7200 MX 40 mail.example.com.'])
 
-        'example.com'.should have_dns.with_type('MX')
-        'example.com'.should_not have_dns.with_type('CNAME')
-        'example.com'.should have_dns.with_type('MX').and_preference(40)
-        'example.com'.should have_dns.with_type('MX')
+        expect('example.com').to have_dns.with_type('MX')
+        expect('example.com').to_not have_dns.with_type('CNAME')
+        expect('example.com').to have_dns.with_type('MX').and_preference(40)
+        expect('example.com').to have_dns.with_type('MX')
           .and_preference(40).and_exchange('mail.example.com')
-        'example.com'.should_not have_dns.with_type('MX')
+        expect('example.com').to_not have_dns.with_type('MX')
           .and_preference(30).and_exchange('mail.example.com')
-        'example.com'.should_not have_dns.with_type('MX')
+        expect('example.com').to_not have_dns.with_type('MX')
           .and_preference(40).and_exchange('example.com')
       end
 
       it 'can evalutate an NS record' do
         stub_records(['sub.example.com. 300 IN NS ns.sub.example.com.'])
 
-        'example.com'.should have_dns.with_type('NS')
-        'example.com'.should_not have_dns.with_type('MX')
-        'example.com'.should have_dns.with_type('NS').and_domainname('ns.sub.example.com')
-        'example.com'.should_not have_dns.with_type('NS').and_domainname('sub.example.com')
+        expect('example.com').to have_dns.with_type('NS')
+        expect('example.com').to_not have_dns.with_type('MX')
+        expect('example.com').to have_dns.with_type('NS').and_domainname('ns.sub.example.com')
+        expect('example.com').to_not have_dns.with_type('NS').and_domainname('sub.example.com')
       end
 
       it 'can evalutate a PTR record' do
         stub_records(['ptrs.example.com. 300 IN PTR ptr.example.com.'])
 
-        '192.168.100.100'.should have_dns.with_type('PTR')
-        '192.168.100.100'.should_not have_dns.with_type('MX')
-        '192.168.100.100'.should have_dns.with_type('PTR').and_domainname('ptr.example.com')
-        '192.168.100.100'.should_not have_dns.with_type('PTR').and_domainname('ptrs.example.com')
+        expect('192.168.100.100').to have_dns.with_type('PTR')
+        expect('192.168.100.100').to_not have_dns.with_type('MX')
+        expect('192.168.100.100').to have_dns.with_type('PTR').and_domainname('ptr.example.com')
+        expect('192.168.100.100').to_not have_dns.with_type('PTR').and_domainname('ptrs.example.com')
       end
 
       it 'can evalutate an SOA record' do
         stub_records(['example.com 210 IN SOA ns.example.com a.example.com. 2014030712 60 25 3628800 900'])
 
-        'example.com'.should have_dns.with_type('SOA')
-        'example.com'.should_not have_dns.with_type('PTR')
-        'example.com'.should have_dns.with_type('SOA')
+        expect('example.com').to have_dns.with_type('SOA')
+        expect('example.com').to_not have_dns.with_type('PTR')
+        expect('example.com').to have_dns.with_type('SOA')
           .and_mname('ns.example.com')
           .and_rname('a.example.com')
           .and_serial('2014030712')
@@ -84,34 +84,42 @@ describe 'rspec-dns matchers' do
           .and_retry(25)
           .and_expire(3628800)
           .and_minimum(900)
-        'example.com'.should_not have_dns.with_type('SOA')
+        expect('example.com').to_not have_dns.with_type('SOA')
           .and_mname('nstest.example.com')
       end
 
       it 'can evalutate a TXT record' do
         stub_records(['example.com. 300 IN TXT "v=spf1 a:example.com ~all"'])
 
-        'example.com'.should have_dns.with_type('TXT')
-        'example.com'.should_not have_dns.with_type('SOA')
-        'example.com'.should have_dns.with_type('TXT').and_data('v=spf1 a:example.com ~all')
-        'example.com'.should_not have_dns.with_type('TXT').and_data('v=spf2 a:example.com ~all')
+        expect('example.com').to have_dns.with_type('TXT')
+        expect('example.com').to_not have_dns.with_type('SOA')
+        expect('example.com').to have_dns.with_type('TXT').and_data('v=spf1 a:example.com ~all')
+        expect('example.com').to_not have_dns.with_type('TXT').and_data('v=spf2 a:example.com ~all')
+      end
+    end
+
+    context 'with config chain' do
+      it 'should accept config chain' do
+        stub_records(['example.com 86400 A 192.0.2.1'])
+        expect('example.com').to have_dns.with_type('A')
+          .config(nameserver: '192.0.2.4')
       end
     end
 
     context 'with changable connection timeout' do
-      it 'should timeout within 3 seconds in default' do
+      it 'is_expected.to timeout within 3 seconds in default' do
         stub_records(['example.com 86400 A 192.168.100.100']) do
           sleep 3
         end
-        'example.com'.should_not have_dns.with_type('A')
+        expect('example.com').to_not have_dns.with_type('A')
       end
 
-      it 'should not timeout within 3 seconds when timeout is 5' do
+      it 'is_expected.to not timeout within 3 seconds when timeout is 5' do
         RSpec.configuration.rspec_dns_connection_timeout = 5
         stub_records(['example.com 86400 A 192.168.100.100']) do
           sleep 3
         end
-        'example.com'.should have_dns.with_type('A')
+        expect('example.com').to have_dns.with_type('A')
       end
     end
   end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rspec-dns
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Seth Vargo
 - Alexey Lapitsky
 - Johannes Russek
+- Hiroshi OTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: rspec-dns provides an easy-to-use DSL for testing your DNS records are responding