rspec-dnsruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTIyMjVlMDQ1NDE3NDgyYmM2MGNiN2FmNjY3MDQxNTI5Nzc1NDY4MA==
+    YTIxNDZhOTdjNmNiNTQ3Y2ZhNDUzODMzZTBjYjQ5NmZmNTM0ZmZjZA==
   data.tar.gz: !binary |-
-    YWEyMjhlNjhhNjZmYzgwNzRlZjZmODg2ZGMyMTQ3ZWQ1NTJiZGJjMQ==
+    YjU0YThmMDg2YzQ0Mzc1NmFhYjcwYjYyY2FlMmY5MWY0MjIxYmUzZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2Q0MDIxZTMwZDBlZWJkZTVmYjFiYmU5MzZjMzYxOGJiOTNkNDBjZmViYjA3
-    ZWRiNDkwY2QyNzRjYWNlNGY0OGE0ZTk0ZTNkMWFiM2UzNTg4NmEwMzU3MDMx
-    Yzc1NTM4OGI2NmQ2YTFjYzY5MjkwY2ZlZjdiYWRiM2ZjMzg5MWY=
+    OWVjOGJiZjg2MjIyNTBkOTMyZmFhMDBlYTg4NzU3YWUwN2EzNDI4NWIyZDI4
+    MzRiNWU1MDI0ODM2ZTlhYWJlMjdkZWY0NjkzZTQ2N2RhZDEyYTIzNDI4OGQw
+    MTE0OWJhYWJjZTM1NjIxZmE1YzdlM2FkMzA5OGE3NzI5YWI0MGQ=
   data.tar.gz: !binary |-
-    N2Q0MjZiNjc3NmMyYzY4MWRjZDcwODFjN2JlZWY3Yjg0ZjUzOTE3MDJlZmJk
-    ZjI1ODFjODIyMzVmMzM5YWMzNjgzNmZhMTQ4MmNlMmQwYTVjZjYzMWFmY2E3
-    ZmRlNDdkYTYwZjk2ZmFjNzllY2Q4NTIxOGMwMTIzMmEwMzk4MGM=
+    NWFmODY3Y2M5YWUzODc4YmM5YjdmYjdiNTFmNDE4NWJmYTllZWJmOTM2NDJm
+    OGIyNjgwMWVmMzI4YzM4ZWUxOTRmNDVlODBkNTdmOWUwOGMyNzQ2N2JlMjdm
+    OTk2MzA1NjE1YWYyMTQ1MGQ2NTM4YjJhODFjNTk3YjI2ODVkNTI=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+script: "rake travis"
+
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -1,5 +1,8 @@
 rspec-dnsruby
 =========
+
+[![Build Status](https://travis-ci.org/spotify/rspec-dnsruby.png?branch=master)](https://travis-ci.org/spotify/rspec-dnsruby)
+
 rspec-dnsruby is an rspec plugin for easy DNS testing. It is a fork of rspec-dns and uses dnsruby instead of the standard ruby library.
 
 Differences with rspec-dns
@@ -135,7 +138,19 @@ nameserver:
 
 If this file is missing Resolv will use the settings in /etc/resolv.conf.
 
-If you need to change the [timeout](http://dnsruby.rubyforge.org/classes/Dnsruby/Resolver.html) you can do so like this:
+The full list of configuration options can be found on the [Dnsruby docs](http://dnsruby.rubyforge.org/classes/Dnsruby/Config.html).
+
+### Configuring connection timeout
+
+Connection timeout is to stop waiting for resolver.
+If you want to wait over default timeout `1`,
+you can change the timeout in spec files or spec_helpers like this:
+
+```ruby
+RSpec.configuration.rspec_dns_connection_timeout = 5
+```
+
+alternatively you can specify it in the `config/dns.yml` file:
 
 ```yaml
 nameserver:
@@ -144,14 +159,14 @@ nameserver:
 timeouts: 3
 ```
 
-The full list of configuration options can be found on the [Dnsruby docs](http://dnsruby.rubyforge.org/classes/Dnsruby/Config.html).
-
 Contributing
 ------------
 1. Fork the project on github
 2. Create your feature branch
 3. Open a Pull Request
 
+
+
 License & Authors
 -----------------
 - Seth Vargo (sethvargo@gmail.com)

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :default => :travis
+task :travis => [:spec]
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end

data/lib/rspec-dnsruby/have_dns.rb

@@ -1,3 +1,7 @@
+RSpec.configure do |c|
+  c.add_setting :rspec_dns_connection_timeout, :default => 1
+end
+
 RSpec::Matchers.define :have_dns do
   match do |dns|
     @dns = dns
@@ -104,11 +108,12 @@ RSpec::Matchers.define :have_dns do
 
   def _records
     @_records ||= begin
-      Timeout::timeout(10) do
-        config = _config || {}
+      config = _config || {}
+      # Backwards compatible config option for rspec-dnsruby
+      query_timeout = config[:timeouts] || RSpec.configuration.rspec_dns_connection_timeout
+      Timeout::timeout(query_timeout + 0.2) do
         resolver =  Dnsruby::Resolver.new(config)
-        # Backwards compatible config option from the version which uses ruby stdlib
-        resolver.query_timeout = config[:timeouts] if config[:timeouts]
+        resolver.query_timeout = query_timeout
         resolver.query(@dns, Dnsruby::Types.ANY)
       end
     rescue Exception => e

data/rspec-dnsruby.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
-  s.version       = '0.1.0'
+  s.version       = '0.1.1'
   s.name          = 'rspec-dnsruby'
   s.authors       = ['Alexey Lapitsky', 'Johannes Russek']
   s.email         = 'alexey@spotify.com'
   s.description   = 'Easily test your DNS entries with RSpec'
   s.summary       = 'rspec-dnsruby provides an easy-to-use DSL for testing your DNS records are responding as they should.'
-  s.homepage      = 'https://github.com/vzctl/rspec-dnsruby'
+  s.homepage      = 'https://github.com/spotify/rspec-dnsruby'
   s.license       = 'Apache 2.0'
 
   s.files         = `git ls-files`.split($\)

data/spec/rspec-dnsruby/have_dns_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+require 'dnsruby'
+require 'resolv'
+require_relative '../../lib/rspec-dnsruby'
+
+def stub_records(strings)
+  records = strings.map { |s| Dnsruby::RR.new_from_string(s) }
+  resolver = Dnsruby::Resolver.new
+  Dnsruby::Resolver.stub(:new) do
+    yield if block_given?
+    resolver
+  end
+  resolver.stub_chain(:query, :answer).and_return(records)
+end
+
+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'])
+
+        '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(Resolv::IPv4.create('192.168.100.100'))
+      end
+
+      it 'can evalutate a AAAA record' do
+        stub_records(['example.com 86400 AAAA 2001:0002: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(Resolv::IPv6.create('2001:0002: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')
+      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')
+          .and_preference(40).and_exchange('mail.example.com')
+        'example.com'.should_not have_dns.with_type('MX')
+          .and_preference(30).and_exchange('mail.example.com')
+        'example.com'.should_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')
+      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')
+      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')
+          .and_mname('ns.example.com')
+          .and_rname('a.example.com')
+          .and_serial('2014030712')
+          .and_refresh(60)
+          .and_retry(25)
+          .and_expire(3628800)
+          .and_minimum(900)
+        'example.com'.should_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')
+      end
+    end
+
+    context 'with changable connection timeout' do
+      it 'should 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')
+      end
+
+      it 'should 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')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rspec'
+
+RSpec.configure do |config|
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-dnsruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexey Lapitsky
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -67,7 +68,9 @@ files:
 - lib/rspec-dnsruby.rb
 - lib/rspec-dnsruby/have_dns.rb
 - rspec-dnsruby.gemspec
-homepage: https://github.com/vzctl/rspec-dnsruby
+- spec/rspec-dnsruby/have_dns_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/spotify/rspec-dnsruby
 licenses:
 - Apache 2.0
 metadata: {}
@@ -92,5 +95,7 @@ signing_key:
 specification_version: 4
 summary: rspec-dnsruby provides an easy-to-use DSL for testing your DNS records are
   responding as they should.
-test_files: []
+test_files:
+- spec/rspec-dnsruby/have_dns_spec.rb
+- spec/spec_helper.rb
 has_rdoc: