devdnsd 1.7.0 → 2.0.0

data/spec/devdnsd/configuration_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2012 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 

data/spec/devdnsd/rule_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2012 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -18,11 +18,11 @@ describe DevDNSd::Rule do
     end
 
     it("should create a rule with arguments and no block") do
-      rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE", {:a => :b})
+      rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE", {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
       expect(rule.type).to eq("TYPE")
-      expect(rule.options).to eq({:a => :b})
+      expect(rule.options).to eq({a: :b})
       expect(rule.block).to be_nil
     end
 
@@ -93,11 +93,11 @@ describe DevDNSd::Rule do
     end
 
     it("should create a rule with host, reply and type") do
-      rule = DevDNSd::Rule.create("MATCH", "REPLY", "TYPE", {:a => :b})
+      rule = DevDNSd::Rule.create("MATCH", "REPLY", "TYPE", {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
       expect(rule.type).to eq("TYPE")
-      expect(rule.options).to eq({:a => :b})
+      expect(rule.options).to eq({a: :b})
       expect(rule.block).to be_nil
     end
 
@@ -134,11 +134,11 @@ describe DevDNSd::Rule do
 
   describe "::symbol_to_resource_class" do
     it("should convert a symbol to a resource class") do
-      expect(DevDNSd::Rule.symbol_to_resource_class(:A)).to eq(Resolv::DNS::Resource::IN::A)
+      expect(DevDNSd::Rule.symbol_to_resource_class(:A, :en)).to eq(Resolv::DNS::Resource::IN::A)
     end
 
     it("should fail for a invalid class") do
-      expect { DevDNSd::Rule.symbol_to_resource_class(:Invalid) }.to raise_error(DevDNSd::Errors::InvalidRule)
+      expect { DevDNSd::Rule.symbol_to_resource_class(:Invalid, :en) }.to raise_error(DevDNSd::Errors::InvalidRule)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2012 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
 require "rubygems"
 require "bundler/setup"
-require "coverage_helper"
 require "devdnsd"
 require "net/dns"
 

data/utils/tester.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2012 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -13,18 +13,15 @@ require "net/dns"
 # Patch to avoid resolving of hostname containing numbers.
 class Net::DNS::Resolver
   def is_ip_address?(addr)
+    ipv6_norm = [/\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/, /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/, /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/]
+    ipv6_compat = [/\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/, /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/, /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/]
+
     catch(:valid_ip) do
       if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
         throw(:valid_ip, true) if $~.captures.all? {|i| i.to_i < 256}
       else
         # IPv6 (normal)
-        throw(:valid_ip, true) if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/ =~ addr
-        throw(:valid_ip, true) if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
-        throw(:valid_ip, true) if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
-        # IPv6 (IPv4 compat)
-        throw(:valid_ip, true) if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_v4?($')
-        throw(:valid_ip, true) if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
-        throw(:valid_ip, true) if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
+        throw(:valid_ip, true) if ipv6_norm.any? {|r| r =~ addr } || (ipv6_compat.any? {|r| r =~ addr } && valid_v4?($'))
       end
 
       false
@@ -54,8 +51,6 @@ class Net::DNS::Resolver
       packet.header.recursive = @config[:recursive] ? 1 : 0
     end
 
-    # DNSSEC and TSIG stuff to be inserted here
-
     packet
   end
 end
@@ -76,24 +71,15 @@ def devdnsd_resolv(address = "match.dev", type = "ANY", nameserver = "127.0.0.1"
   tmpfile = "/tmp/devdnsd-test-tester-#{Time.now.strftime("%Y%m%d-%H:%M:%S")}"
 
   begin
-    resolver = Net::DNS::Resolver.new(:nameservers => nameserver, :port => port.to_i, :recursive => false, :udp_timeout => 1, :log_file => tmpfile)
-    response = resolver.search(address, type)
-
-    response.answer.each do |answer|
+    Net::DNS::Resolver.new(:nameservers => nameserver, :port => port.to_i, :recursive => false, :udp_timeout => 1, :log_file => tmpfile).search(address, type).answer.each do |answer|
       type = answer.type.upcase.to_sym
-      result = ""
-
-      case type
-        when :MX
-          result = answer.exchange.gsub(/\.$/, "")
-        when :CNAME
-          result = answer.cname.gsub(/\.$/, "")
-        when :NS
-          result = answer.nsdname.gsub(/\.$/, "")
-        when :PTR
-          result = answer.ptrdname.gsub(/\.$/, "")
-        else
-          result = answer.address.to_s
+
+      result = case type
+        when :MX then answer.exchange.gsub(/\.$/, "")
+        when :CNAME then answer.cname.gsub(/\.$/, "")
+        when :NS then answer.nsdname.gsub(/\.$/, "")
+        when :PTR then answer.ptrdname.gsub(/\.$/, "")
+        else answer.address.to_s
       end
 
       rv << [result, type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devdnsd
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mamertes
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement
@@ -59,134 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-dns
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 description: A small DNS server to enable local domain resolution.
 email:
 - shogun_panda@me.com
@@ -197,10 +69,10 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - .gitignore
+- .travis-gemfile
 - .travis.yml
 - .yardopts
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/devdnsd
@@ -208,6 +80,10 @@ files:
 - devdnsd.gemspec
 - doc/DevDNSd.html
 - doc/DevDNSd/Application.html
+- doc/DevDNSd/ApplicationMethods.html
+- doc/DevDNSd/ApplicationMethods/Server.html
+- doc/DevDNSd/ApplicationMethods/System.html
+- doc/DevDNSd/ApplicationMethods/System/ClassMethods.html
 - doc/DevDNSd/Configuration.html
 - doc/DevDNSd/Errors.html
 - doc/DevDNSd/Errors/InvalidRule.html
@@ -233,13 +109,15 @@ files:
 - lib/devdnsd/errors.rb
 - lib/devdnsd/rule.rb
 - lib/devdnsd/version.rb
+- locales/en.yml
+- locales/it.yml
 - spec/coverage_helper.rb
 - spec/devdnsd/application_spec.rb
 - spec/devdnsd/configuration_spec.rb
 - spec/devdnsd/rule_spec.rb
 - spec/spec_helper.rb
 - utils/tester.rb
-homepage: http://github.com/ShogunPanda/devdnsd
+homepage: http://sw.cow.tc/devdnsd
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -250,10 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 437645592278327287
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -262,10 +137,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 437645592278327287
+      hash: 4257481357820499987
 requirements: []
 rubyforge_project: devdnsd
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A small DNS server to enable local domain resolution.

data/Gemfile.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: .
-  specs:
-    devdnsd (1.7.0)
-      mamertes (~> 1.2.0)
-      rexec (~> 1.5.1)
-      rubydns (~> 0.5.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bovem (1.2.6)
-      lazier (~> 1.0)
-      open4 (~> 1.3.0)
-    builder (3.0.4)
-    coderay (1.0.7)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (1.0.0)
-    github-markup (0.7.4)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    lazier (1.0.6)
-      actionpack (~> 3.0)
-      json (~> 1.7.0)
-      tzinfo (~> 0.3.0)
-    mamertes (1.2.0)
-      bovem (~> 1.2.2)
-    method_source (0.8)
-    multi_json (1.3.6)
-    net-dns (0.7.1)
-    open4 (1.3.0)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rainbow (1.1.4)
-    rake (0.9.2.2)
-    redcarpet (2.2.2)
-    rexec (1.5.1)
-      rainbow
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rubydns (0.5.2)
-      eventmachine (~> 1.0.0)
-      rexec (~> 1.5.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.3.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-    tzinfo (0.3.33)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  devdnsd!
-  github-markup (~> 0.7.0)
-  net-dns (~> 0.7.0)
-  pry
-  rake (~> 0.9.0)
-  redcarpet (~> 2.2.2)
-  rspec (~> 2.11.0)
-  simplecov (~> 0.7.0)
-  yard (~> 0.8.0)