devdnsd 3.1.2 → 4.0.0

data/spec/devdnsd/configuration_spec.rb

@@ -29,13 +29,13 @@ describe DevDNSd::Configuration do
   describe "#add_rule" do
     it "should add a good rule" do
       config = DevDNSd::Configuration.new
-      config.add_rule("RULE", "127.0.0.1")
+      config.add_rule(match: "RULE", reply: "127.0.0.1")
       expect(config.rules.count).to eq(2)
     end
 
     it "should reject a bad rule" do
       config = DevDNSd::Configuration.new
-      expect { config.add_rule("RULE") }.to raise_error(DevDNSd::Errors::InvalidRule)
+      expect { config.add_rule(match: "RULE", options: "ARG") }.to raise_error(DevDNSd::Errors::InvalidRule)
     end
   end
 end

data/spec/devdnsd/rule_spec.rb

@@ -18,7 +18,7 @@ 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: "MATCH", reply: "REPLY", type: "TYPE", options: {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
       expect(rule.type).to eq("TYPE")
@@ -27,7 +27,7 @@ describe DevDNSd::Rule do
     end
 
     it "should create a rule with arguments and a block" do
-      rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE") do end
+      rule = DevDNSd::Rule.new(match: "MATCH", reply: "REPLY", type: "TYPE") do end
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to be_nil
       expect(rule.type).to eq("TYPE")
@@ -36,56 +36,69 @@ describe DevDNSd::Rule do
     end
   end
 
-  describe "#is_regexp?" do
+  describe "#regexp?" do
     it "should return true for a regexp pattern" do
-      expect(DevDNSd::Rule.create(/.+/, "127.0.0.1").is_regexp?).to be_true
+      expect(DevDNSd::Rule.create(match: /.+/, reply: "127.0.0.1").regexp?).to be_truthy
     end
 
     it "should return false otherwise" do
-      expect(DevDNSd::Rule.create("RULE", "127.0.0.1").is_regexp?).to be_false
+      expect(DevDNSd::Rule.create(match: "RULE", reply: "127.0.0.1").regexp?).to be_falsey
     end
   end
 
-  describe "#has_block?" do
+  describe "#block?" do
     it "should return true when a block is present" do
-      expect(DevDNSd::Rule.create("RULE"){}.has_block?).to be_true
+      expect(DevDNSd::Rule.create(match: "RULE"){}.block?).to be_truthy
     end
 
     it "should return false otherwise" do
-      expect(DevDNSd::Rule.create("RULE", "127.0.0.1").has_block?).to be_false
+      expect(DevDNSd::Rule.create(match: "RULE", reply: "127.0.0.1").block?).to be_falsey
     end
   end
 
   describe "#match_host" do
     describe "with a string pattern" do
       it "should return true when hostname matches" do
-        expect(DevDNSd::Rule.create("match.dev", "127.0.0.1").match_host("match.dev")).to be_true
+        expect(DevDNSd::Rule.create(match: "match.dev", reply: "127.0.0.1").match_host("match.dev")).to be_truthy
       end
 
       it "should return false when hostname doesn't match" do
-        expect(DevDNSd::Rule.create("match.dev", "127.0.0.1").match_host("unmatch.dev")).to be_false
+        expect(DevDNSd::Rule.create(match: "match.dev", reply: "127.0.0.1").match_host("unmatch.dev")).to be_falsey
       end
     end
 
     describe "with a regexp pattern" do
       it "should return a MatchData when hostname matches" do
-        expect(DevDNSd::Rule.create(/^match/, "127.0.0.1").match_host("match.dev")).to be_a(MatchData)
+        expect(DevDNSd::Rule.create(match: /^match/, reply: "127.0.0.1").match_host("match.dev")).to be_a(MatchData)
       end
 
       it "should return nil when hostname doesn't match" do
-        expect(DevDNSd::Rule.create(/^match/, "127.0.0.1").match_host("unmatch.dev")).to be_nil
+        expect(DevDNSd::Rule.create(match: /^match/, reply: "127.0.0.1").match_host("unmatch.dev")).to be_nil
       end
     end
   end
 
-  describe "::create" do
+  describe "#resource_class" do
+    it "should return a single class" do
+      expect(DevDNSd::Rule.create(match: "MATCH", reply: "REPLY", type: :A).resource_class).to eq(Resolv::DNS::Resource::IN::A)
+    end
+
+    it "should return an array of classes" do
+      expect(DevDNSd::Rule.create(match: "MATCH", reply: "REPLY", type: [:A, :MX]).resource_class).to eq([Resolv::DNS::Resource::IN::A, Resolv::DNS::Resource::IN::MX])
+    end
+
+    it "should fail for a invalid class" do
+      expect { DevDNSd::Rule.create(match: "MATCH", reply: "REPLY", type: :INVALID).resource_class }.to raise_error(DevDNSd::Errors::InvalidRule)
+    end
+  end
+
+  describe ".create" do
     it "should not allow rules without sufficient arguments" do
-      expect{ DevDNSd::Rule.create("RULE") }.to raise_error(DevDNSd::Errors::InvalidRule)
-      expect{ DevDNSd::Rule.create("RULE", "REPLY", "TYPE", "ARG") }.to raise_error(DevDNSd::Errors::InvalidRule)
+      expect{ DevDNSd::Rule.create(match: "RULE", reply: "REPLY", type: "TYPE", options: "ARG") }.to raise_error(DevDNSd::Errors::InvalidRule)
     end
 
     it "should create a rule with host and reply" do
-      rule = DevDNSd::Rule.create("MATCH", "REPLY")
+      rule = DevDNSd::Rule.create(match: "MATCH", reply: "REPLY")
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
       expect(rule.type).to eq(:A)
@@ -93,7 +106,7 @@ 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: "MATCH", reply: "REPLY", type: "TYPE", options: {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
       expect(rule.type).to eq("TYPE")
@@ -102,7 +115,7 @@ describe DevDNSd::Rule do
     end
 
     it "should create a rule with host, type and a reply block" do
-      rule = DevDNSd::Rule.create("MATCH", "TYPE", "UNUSED") do end
+      rule = DevDNSd::Rule.create(match: "MATCH", reply: "UNUSED", type: "TYPE") do end
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to be_nil
       expect(rule.type).to eq("TYPE")
@@ -111,28 +124,14 @@ describe DevDNSd::Rule do
     end
   end
 
-  describe "#resource_class" do
-    it "should return a single class" do
-      expect(DevDNSd::Rule.create("MATCH", "REPLY", :A).resource_class).to eq(Resolv::DNS::Resource::IN::A)
-    end
-
-    it "should return an array of classes" do
-      expect(DevDNSd::Rule.create("MATCH", "REPLY", [:A, :MX]).resource_class).to eq([Resolv::DNS::Resource::IN::A, Resolv::DNS::Resource::IN::MX])
-    end
-
-    it "should fail for a invalid class" do
-      expect { DevDNSd::Rule.create("MATCH", "REPLY", :INVALID).resource_class }.to raise_error(DevDNSd::Errors::InvalidRule)
-    end
-  end
-
-  describe "::resource_class_to_symbol" do
+  describe ".resource_class_to_symbol" do
     it "should convert a class a symbol" do
       expect(DevDNSd::Rule.resource_class_to_symbol(Resolv::DNS::Resource::IN::A)).to eq(:A)
       expect(DevDNSd::Rule.resource_class_to_symbol(Resolv)).to eq(:Resolv)
     end
   end
 
-  describe "::symbol_to_resource_class" 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, :en)).to eq(Resolv::DNS::Resource::IN::A)
     end

data/spec/resolver_helper.rb

@@ -4,14 +4,6 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-# Resolvs an hostname to a nameserver.
-#
-# @param [String] The hostname to resolv.
-# @param [String] The type of query to issue.
-# @param [String] The nameserver to connect to.
-# @param [Fixnum] The port to connect to.
-# @param [Logger] A logger for the resolver.
-# @return [Array|NilClass] Return an array of pair of addresses and types. `nil` is returned if nothing is found.
 def devdnsd_resolv(address = "match.dev", type = "ANY", nameserver = "127.0.0.1", port = 7771, logger = nil)
   resolver = Fiber.current
   rv = []
@@ -20,31 +12,22 @@ def devdnsd_resolv(address = "match.dev", type = "ANY", nameserver = "127.0.0.1"
   logger = Bovem::Logger.new("/dev/null", Bovem::Logger::DEBUG) if !logger
   logger.info(::Bovem::Console.replace_markers("Resolving address {mark=bright}#{address}{/mark} with type {mark=bright}#{type}{/mark} at nameserver {mark=bright}#{nameserver}{/mark}:{mark=bright}#{port.to_s}{/mark} ..."))
 
-  RubyDNS::Resolver.new([[:udp, nameserver, port], [:tcp, nameserver, port]]).query(address, "Resolv::DNS::Resource::IN::#{type}".constantize) do |response|
-    begin
-      if response.is_a?(RubyDNS::Message) then
-        response.answer.each do |answer|
-          type = answer[2].class.to_s.split("::")[-1].to_sym
+  answers = RubyDNS::Resolver.new([[:udp, nameserver, port], [:tcp, nameserver, port]]).query(address, "Resolv::DNS::Resource::IN::#{type}".constantize).answer
 
-          name = case type
-            when :MX then answer[2].exchange.to_s.gsub(/\.$/, "")
-            when :CNAME then answer[2].name.to_s.gsub(/\.$/, "")
-            when :NS then answer[2].name.to_s.gsub(/\.$/, "")
-            when :PTR then answer[2].name.to_s.gsub(/\.$/, "")
-            else answer[2].address.to_s
-          end
+  answers.each do |answer|
+    type = answer[2].class.to_s.split("::")[-1].to_sym
 
-          rv << [name, type]
-        end
-      end
-    rescue => e
-      logger.error("[#{e.class}] #{e.to_s}")
+    name = case type
+      when :MX then answer[2].exchange.to_s.gsub(/\.$/, "")
+      when :CNAME then answer[2].name.to_s.gsub(/\.$/, "")
+      when :NS then answer[2].name.to_s.gsub(/\.$/, "")
+      when :PTR then answer[2].name.to_s.gsub(/\.$/, "")
+      else answer[2].address.to_s
     end
 
-    resolver.resume
+    rv << [name, type]
   end
 
-  Fiber.yield
   rv.uniq!
   logger.info("Resolving ended with result: #{rv.inspect}")
   rv.length == 1 ? rv[0] : rv

data/spec/spec_helper.rb

@@ -4,13 +4,27 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require "rubygems"
 require "bundler/setup"
-require "devdnsd"
-require "resolver_helper"
 
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
+if ENV["COVERAGE"]
+  require "simplecov"
+  require "coveralls"
+
+  Coveralls.wear! if ENV["CI"]
+
+  SimpleCov.start do
+    root = Pathname.new(File.dirname(__FILE__)) + ".."
+
+    add_filter do |src_file|
+      path = Pathname.new(src_file.filename).relative_path_from(root).to_s
+      path !~ /^lib/
+    end
   end
-end
+end
+
+require "i18n"
+::I18n.enforce_available_locales = false
+require File.dirname(__FILE__) + "/../lib/devdnsd"
+Lazier::I18n.default_locale = :en
+
+require "resolver_helper"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devdnsd
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bovem
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: process-daemon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.2'
 description: A small DNS server to enable local domain resolution.
 email:
 - shogun@cowtech.it
@@ -78,6 +92,7 @@ files:
 - ".gitignore"
 - ".rbx/8b/8b2d1928657c1eeac610d1207ff1bee6e918287c"
 - ".rbx/db/dbd6130694811dcd0359863bd5380c673db0fe71"
+- ".rubocop.yml"
 - ".travis-gemfile"
 - ".travis.yml"
 - ".yardopts"
@@ -89,16 +104,15 @@ files:
 - config/devdnsd_config.sample
 - devdnsd.gemspec
 - doc/DevDNSd.html
+- doc/DevDNSd/Aliases.html
 - doc/DevDNSd/Application.html
-- doc/DevDNSd/ApplicationMethods.html
-- doc/DevDNSd/ApplicationMethods/Aliases.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
+- doc/DevDNSd/OSX.html
 - doc/DevDNSd/Rule.html
+- doc/DevDNSd/Server.html
+- doc/DevDNSd/System.html
 - doc/DevDNSd/Version.html
 - doc/_index.html
 - doc/class_list.html
@@ -115,21 +129,23 @@ files:
 - doc/method_list.html
 - doc/top-level-namespace.html
 - lib/devdnsd.rb
+- lib/devdnsd/aliases.rb
 - lib/devdnsd/application.rb
 - lib/devdnsd/configuration.rb
 - lib/devdnsd/errors.rb
+- lib/devdnsd/osx.rb
 - lib/devdnsd/rule.rb
+- lib/devdnsd/server.rb
+- lib/devdnsd/system.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/resolver_helper.rb
 - spec/spec_helper.rb
-- utils/tester.rb
-homepage: http://sw.cow.tc/devdnsd
+homepage: http://sw.cowtech.it/devdnsd
 licenses:
 - MIT
 metadata: {}
@@ -141,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,12 +165,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: devdnsd
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A small DNS server to enable local domain resolution.
 test_files:
-- spec/coverage_helper.rb
 - spec/devdnsd/application_spec.rb
 - spec/devdnsd/configuration_spec.rb
 - spec/devdnsd/rule_spec.rb

data/doc/DevDNSd/ApplicationMethods.html

@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>
-  Module: DevDNSd::ApplicationMethods
-  
-    &mdash; Documentation by YARD 0.8.7.4
-  
-</title>
-
-  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
-
-  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
-
-<script type="text/javascript" charset="utf-8">
-  hasFrames = window.top.frames.main ? true : false;
-  relpath = '../';
-  framesUrl = "../frames.html#!DevDNSd/ApplicationMethods.html";
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div id="header">
-      <div id="menu">
-  
-    <a href="../_index.html">Index (A)</a> &raquo;
-    <span class='title'><span class='object_link'><a href="../DevDNSd.html" title="DevDNSd (module)">DevDNSd</a></span></span>
-     &raquo; 
-    <span class="title">ApplicationMethods</span>
-  
-
-  <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
-</div>
-
-      <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="../class_list.html">
-      Class List
-    </a>
-  
-    <a class="full_list_link" id="method_list_link"
-        href="../method_list.html">
-      Method List
-    </a>
-  
-    <a class="full_list_link" id="file_list_link"
-        href="../file_list.html">
-      File List
-    </a>
-  
-</div>
-      <div class="clear"></div>
-    </div>
-
-    <iframe id="search_frame"></iframe>
-
-    <div id="content"><h1>Module: DevDNSd::ApplicationMethods
-  
-  
-  
-</h1>
-
-<dl class="box">
-  
-  
-    
-  
-    
-  
-  
-  
-    <dt class="r1 last">Defined in:</dt>
-    <dd class="r1 last">lib/devdnsd/application.rb</dd>
-  
-</dl>
-<div class="clear"></div>
-
-<h2>Overview</h2><div class="docstring">
-  <div class="discussion">
-    <p>Methods for the <span class='object_link'><a href="Application.html" title="DevDNSd::Application (class)">Application</a></span> class.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><h2>Defined Under Namespace</h2>
-<p class="children">
-  
-    
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="ApplicationMethods/Aliases.html" title="DevDNSd::ApplicationMethods::Aliases (module)">Aliases</a></span>, <span class='object_link'><a href="ApplicationMethods/Server.html" title="DevDNSd::ApplicationMethods::Server (module)">Server</a></span>, <span class='object_link'><a href="ApplicationMethods/System.html" title="DevDNSd::ApplicationMethods::System (module)">System</a></span>
-    
-  
-    
-  
-</p>
-
-
-
-
-
-
-
-
-
-</div>
-
-    <div id="footer">
-  Generated on Sat Mar 29 11:53:13 2014 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.4 (ruby-2.1.0).
-</div>
-
-  </body>
-</html>