devdnsd 1.7.0 → 2.0.0

data/lib/devdnsd/configuration.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.
 #
 
@@ -8,28 +8,28 @@ module DevDNSd
   # This class holds the configuration of the applicaton.
   class Configuration < Bovem::Configuration
     # If to run the server in foreground. Default: `false`.
-    property :foreground, :default => false
+    property :foreground, default: false
 
     # The address to listen to. Default: `0.0.0.0`.
-    property :address, :default => "0.0.0.0"
+    property :address, default: "0.0.0.0"
 
     # The port to listen to. Default: `7771`.
-    property :port, :default => 7771
+    property :port, default: 7771
 
     # The TLD to manage. Default: `dev`.
-    property :tld, :default => "dev"
+    property :tld, default: "dev"
 
     # The PID file to use. Default: `/var/run/devdnsd.pid`.
-    property :pid_file, :default => "/var/log/devdnsd.pid"
+    property :pid_file, default: "/var/log/devdnsd.pid"
 
     # The file to log to. Default: `/var/log/devdnsd.log`.
-    property :log_file, :default => "/var/log/devdnsd.log"
+    property :log_file, default: "/var/log/devdnsd.log"
 
     # The minimum severity to log. Default: `Logger::INFO`.
-    property :log_level, :default => Logger::INFO
+    property :log_level, default: Logger::INFO
 
     # The rules of the server. By default, every hostname is resolved with `127.0.0.1`.
-    property :rules, :default => []
+    property :rules, default: []
 
     # Creates a new configuration.
     # A configuration file is a plain Ruby file with a top-level {Configuration config} object.

data/lib/devdnsd/errors.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/lib/devdnsd/rule.rb

@@ -1,33 +1,31 @@
 # 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.
 #
 
 module DevDNSd
   # This class encapsulate a rule for matching an hostname.
+  #
+  # @attribute match
+  #   @return [String|Regexp] The pattern to match. Default: `/.+/`.
+  # @attribute type
+  #   @return [Symbol] The type of request to match. Default: `:A`. @see .create
+  # @attribute reply
+  #   @return [String] The IP or hostname to reply back to the client. Default: `127.0.0.1`. @see .create
+  # @attribute options
+  #   @return [Hash] A list of options for the request. Default is an empty hash.
+  # @attribute block
+  #   @return [Proc] An optional block to compute the reply instead of using the `reply` parameter. @see .create
   class Rule
-    # The pattern to match. Default: `/.+/`.
     attr_accessor :match
-
-    # The type of request to match. Default: `:A`.
-    #
-    # @see .create
     attr_accessor :type
-
-    # The IP or hostname to reply back to the client. Default: `127.0.0.1`.
-    #
-    # @see .create
     attr_accessor :reply
-
-    # A list of options for the request. Default is an empty hash.
     attr_accessor :options
-
-    # An optional block to compute the reply instead of using the `reply` parameter.
-    #
-    # @see .create
     attr_accessor :block
 
+    include Lazier::I18n
+
     # Creates a new rule.
     #
     # @param match [String|Regexp] The pattern to match.
@@ -37,23 +35,17 @@ module DevDNSd
     # @param block [Proc] An optional block to compute the reply instead of using the `reply` parameter.
     # @see .create
     def initialize(match = /.+/, reply = "127.0.0.1", type = :A, options = {}, &block)
-      reply ||= "127.0.0.1"
-      type ||= :A
-      @match = match
-      @type = type
-      @reply = block.blank? ? reply : nil
-      @options = options
-      @block = block
-
-      raise(DevDNSd::Errors::InvalidRule.new("You must specify at least a rule and a host (also via a block). Optionally you can add a record type (default: A) and the options.")) if @reply.blank? && @block.nil?
-      raise(DevDNSd::Errors::InvalidRule.new("You can only use hashs for options.")) if !@options.is_a?(::Hash)
+      self.i18n_setup(:devdnsd, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"))
+      self.i18n = options[:locale]
+      setup(match, reply, type, options, block)
+      validate_rule
     end
 
     # Returns the resource class(es) for the current rule.
     #
     # @return [Array|Class] The class(es) for the current rule.
     def resource_class
-      classes = self.type.ensure_array.collect {|cls| self.class.symbol_to_resource_class(cls) }.compact.uniq
+      classes = @type.ensure_array.collect {|cls| self.class.symbol_to_resource_class(cls, options[:locale]) }.compact.uniq
       classes.length == 1 ? classes.first : classes
     end
 
@@ -61,14 +53,14 @@ module DevDNSd
     #
     # @return [Boolean] `true` if the rule is a Regexp, `false` otherwise.
     def is_regexp?
-      self.match.is_a?(::Regexp)
+      @match.is_a?(::Regexp)
     end
 
     # Checks if the rule is a regexp.
     #
     # @return [Boolean] `true` if the rule has a block, `false` otherwise.
     def has_block?
-      self.block.present?
+      @block.present?
     end
 
     # Matches a hostname to the rule.
@@ -76,7 +68,7 @@ module DevDNSd
     # @param hostname [String] The hostname to match.
     # @return [MatchData|Boolean|Nil] Return `true` or MatchData (if the pattern is a regexp) if the rule matches, `false` or `nil` otherwise.
     def match_host(hostname)
-      self.is_regexp? ? self.match.match(hostname) : (self.match == hostname)
+      self.is_regexp? ? @match.match(hostname) : (@match == hostname)
     end
 
     # Creates a new rule.
@@ -86,23 +78,10 @@ module DevDNSd
     # @param type [Symbol] The type of request to match. This is ignored if a block is provided.
     # @param options [Hash] A list of options for the request.
     # @param block [Proc] An optional block to compute the reply instead of using the `reply_or_type` parameter. In this case `reply_or_type` is used for the type of the request and `type` is ignored.
+    # @return [Rule] The new rule.
     def self.create(match, reply_or_type = nil, type = nil, options = {}, &block)
-      raise(DevDNSd::Errors::InvalidRule.new("You must specify at least a rule and a host (also via a block). Optionally you can add a record type (default: A) and the options.")) if reply_or_type.blank? && block.nil?
-      raise(DevDNSd::Errors::InvalidRule.new("You can only use hashs for options.")) if !options.is_a?(::Hash)
-
-      rv = self.new(match)
-      rv.options = options
-
-      if block.present? then # reply_or_type acts like a type, type is ignored
-        rv.type = reply_or_type || :A
-        rv.reply = nil
-        rv.block = block
-      else # reply_or_type acts like a reply
-        rv.reply = reply_or_type || "127.0.0.1"
-        rv.type = type || :A
-      end
-
-      rv
+      validate_options(reply_or_type, options, block, Lazier::Localizer.new(:devdnsd, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"), options.is_a?(Hash) ? options[:locale] : nil))
+      setup(self.new(match), reply_or_type, type, options, block)
     end
 
     # Converts a class to the correspondent symbol.
@@ -116,15 +95,72 @@ module DevDNSd
     # Converts a symbol to the correspondent DNS resource class.
     #
     # @param symbol [Symbol] The symbol to convert.
+    # @param locale [Symbol] The locale to use for the messages.
     # @return [Symbol] The class associated to the symbol.
-    def self.symbol_to_resource_class(symbol)
+    def self.symbol_to_resource_class(symbol, locale = nil)
       symbol = symbol.to_s.upcase
 
       begin
         "Resolv::DNS::Resource::IN::#{symbol}".constantize
       rescue ::NameError
-        raise(DevDNSd::Errors::InvalidRule.new("Invalid resource class #{symbol}."))
+        raise(DevDNSd::Errors::InvalidRule.new(Lazier::Localizer.new(:devdnsd, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"), locale).i18n.invalid_class(symbol)))
       end
     end
+
+    private
+      # Setups a new rule.
+      #
+      # @param match [String|Regexp] The pattern to match.
+      # @param reply [String] The IP or hostname to reply back to the client.
+      # @param type [Symbol] The type of request to match.
+      # @param options [Hash] A list of options for the request.
+      # @param block [Proc] An optional block to compute the reply instead of using the `reply` parameter.
+      def setup(match, reply, type, options, block)
+        @match = match
+        @type = type || :A
+        @reply = block.blank? ? (reply || "127.0.0.1") : nil
+        @options = options
+        @block = block
+      end
+
+      # Validates a newly created rule.
+      def validate_rule
+        raise(DevDNSd::Errors::InvalidRule.new(self.i18n.rule_invalid_call)) if @reply.blank? && @block.nil?
+        raise(DevDNSd::Errors::InvalidRule.new(self.i18n.rule_invalid_options)) if !@options.is_a?(::Hash)
+      end
+
+      # Setups a new rule.
+      #
+      # @param rv [Rule] The rule that is been created.
+      # @param reply_or_type [String|Symbol] The IP or hostname to reply back to the client (or the type of request to match, if a block is provided).
+      # @param type [Symbol] The type of request to match. This is ignored if a block is provided.
+      # @param options [Hash] A list of options for the request.
+      # @param block [Proc] An optional block to compute the reply instead of using the `reply_or_type` parameter. In this case `reply_or_type` is used for the type of the request and `type` is ignored.
+      # @return [Rule] The new rule.
+      def self.setup(rv, reply_or_type, type, options = {}, block)
+        rv.options = options
+        rv.block = block
+
+        if block.present? then # reply_or_type acts like a type, type is ignored
+          rv.type = reply_or_type || :A
+          rv.reply = nil
+        else # reply_or_type acts like a reply
+          rv.reply = reply_or_type || "127.0.0.1"
+          rv.type = type || :A
+        end
+
+        rv
+      end
+
+      # Validate options for a new rule creation.
+      #
+      # @param reply_or_type [String|Symbol] The IP or hostname to reply back to the client (or the type of request to match, if a block is provided).
+      # @param options [Hash] A list of options for the request.
+      # @param block [Proc] An optional block to compute the reply instead of using the `reply_or_type` parameter. In this case `reply_or_type` is used for the type of the request and `type` is ignored.
+      # @param localizer [Localizer] A localizer object.
+      def self.validate_options(reply_or_type, options, block, localizer)
+        raise(DevDNSd::Errors::InvalidRule.new(localizer.i18n.rule_invalid_call)) if reply_or_type.blank? && block.nil?
+        raise(DevDNSd::Errors::InvalidRule.new(localizer.i18n.rule_invalid_options)) if !options.is_a?(::Hash)
+      end
   end
 end

data/lib/devdnsd/version.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.
 #
 
@@ -10,10 +10,10 @@ module DevDNSd
   # @see http://semver.org
   module Version
     # The major version.
-    MAJOR = 1
+    MAJOR = 2
 
     # The minor version.
-    MINOR = 7
+    MINOR = 0
 
     # The patch version.
     PATCH = 0

data/lib/devdnsd.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.
 #
 
@@ -15,4 +15,7 @@ require "devdnsd/application"
 require "devdnsd/configuration"
 require "devdnsd/errors"
 require "devdnsd/rule"
-require "devdnsd/version" if !defined?(DevDNSd::Version)
+require "devdnsd/version" if !defined?(DevDNSd::Version)
+
+# DevDNSd is only supported on MRI
+DevDNSd::Application.check_ruby_implementation

data/locales/en.yml

@@ -0,0 +1,48 @@
+# encoding: utf-8
+#
+# 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.
+#
+
+---
+  devdnsd:
+    rule_invalid_call: "You must specify at least a rule and a host (also via a block). Optionally you can add a record type (default: A) and the options."
+    rule_invalid_options: "You can only use hashs for options."
+    rule_invalid_resource: "Invalid resource class %1."
+    dns_update: "Flushing DNS cache and resolvers ..."
+    no_jruby_rubinius: "DevDNSd is not available on JRuby or Rubinius."
+    no_fork: "Forking is not available for this platform. Running in foreground ..."
+    starting: "Starting DevDNSd ..."
+    match: "Found match on %1 with type %2."
+    reply: "Reply is %1 with type %2."
+    no_reply: "No reply found."
+    no_agent: "Install DevDNSd as a local resolver is only available on MacOSX."
+    resolver_creating: "Creating the resolver in {mark=bright}%1{/mark} ..."
+    resolver_creating_error: "Cannot create the resolver file."
+    resolver_deleting: "Deleting the resolver %1 ..."
+    resolver_deleting_error: "Cannot delete the resolver file."
+    agent_creating: "Creating the launch agent in {mark=bright}%1{/mark} ..."
+    agent_creating_error: "Cannot create the launch agent."
+    agent_deleting: "Deleting the launch agent %1 ..."
+    agent_deleting_error: "Cannot delete the launch agent."
+    agent_loading: "Loading the launch agent %1 ..."
+    agent_loading_error: "Cannot load the launch agent."
+    agent_unloading: "Unloading the launch agent %1 ..."
+    agent_unloading_error: "Cannot unload the launch agent."
+    logging_failed: "Cannot log to {mark=bright}%1{/mark}. Exiting..."
+    application_description: "A small DNS server to enable local domain resolution."
+    application_help_configuration: "The configuration file to use. Default is \"~/.devdnsd_config\"."
+    application_help_tld: "The TLD to handle. Default is \"dev\"."
+    application_help_port: "The port to bind. Default is 7771."
+    application_help_pid_file: "The PID file to use. Default is \"/var/run/devdnsd.pid\"."
+    application_help_log_file: "The log file to use. Not used if run in foreground. Default is \"/var/log/devdnsd.log\"."
+    application_help_log_level: "The log level to use. Valid values are from 0 to 5 where 0 means \"all messages\". Default is 1."
+    application_help_foreground: "Do not daemonize."
+    application_meta_file: "FILE"
+    application_meta_domain: "DOMAIN"
+    application_meta_level: "LEVEL"
+    application_meta_port: "PORT"
+    command_start: "Starts the server."
+    command_install: "Installs the server."
+    command_uninstall: "Uninstalls the server."
+    command_stop: "Stops the server."

data/locales/it.yml

@@ -0,0 +1,48 @@
+# encoding: utf-8
+#
+# 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.
+#
+
+---
+  devdnsd:
+    rule_invalid_call: "Devi specificare almeno una regola e un host (anche tramite un blocco). Opzionalmente puoi aggiungere un tipo di record (default: A) e le opzioni."
+    rule_invalid_options: "Puoi usare solo hash per le opzioni."
+    rule_invalid_resource: "Classe di risorsa %1 non valida."
+    no_jruby_rubinius: "DevDNSd non è disponibile per JRuby o Rubinius."
+    no_fork: "Il forking non è disponibile per questa piattaforma. Eseguo foreground ..."
+    dns_update: "Cancello la cache dei DNS e dei resolver ..."
+    starting: "Avvio DevDNSd ..."
+    match: "Trovata corrispondenza per %1 con tipo %2."
+    reply: "La risposta è %1 con tipo %2."
+    no_reply: "Nessuna risposta trovata."
+    no_agent: "Installare DevDNSd come resolver locale è disponibile solo su MacOSX."
+    resolver_creating: "Creo il resolver in {mark=bright}%1{/mark} ..."
+    resolver_creating_error: "Impossible creare il file del resolver."
+    resolver_deleting: "Cancello resolver %1 ..."
+    resolver_deleting_error: "Impossibile cancellare il file del resolver."
+    agent_creating: "Creo il launch agent in {mark=bright}%1{/mark} ..."
+    agent_creating_error: "Impossibile creare il launch agent."
+    agent_deleting: "Cancello il launch agent %1 ..."
+    agent_deleting_error: "Impossibile cancellare launch agent."
+    agent_loading: "Avvio il launch agent %1 ..."
+    agent_loading_error: "Impossibile avviare il launch agent."
+    agent_unloading: "Fermo il launch agent %1 ..."
+    agent_unloading_error: "Impossible fermare il launch agent."
+    logging_failed: "Impossibile eseguire il logging in {mark=bright}%1{/mark}. Esco..."
+    application_description: "Un piccolo server DNS per abilitare la risoluzione di domini locali."
+    application_help_configuration: "Il file di configurazione da usare. Il valore predefinito è \"~/.devdnsd_config\"."
+    application_help_tld: "Il TLD da gestiere. Il valore predefinito è \"dev\"."
+    application_help_port: "The port to bind. La porta predefinita è 7771."
+    application_help_pid_file: "Il file PID da usare. Il file predefinito è \"/var/run/devdnsd.pid\"."
+    application_help_log_file: "Il file di log da utilizzare. Non usato se eseguito in foreground. Il valore predefinito è \"/var/log/devdnsd.log\"."
+    application_help_log_level: "Il livello di log da utilizzare. I valori validi sono da 0 a 5 dove 0 significa \"tutti i messaggi\". Il valore predefinito è 1."
+    application_help_foreground: "Non eseguire in background."
+    application_meta_file: "FILE"
+    application_meta_domain: "DOMINIO"
+    application_meta_level: "LIVELLO"
+    application_meta_port: "PORTA"
+    command_start: "Avvia server."
+    command_install: "Installa il server."
+    command_uninstall: "Disinstalla il server."
+    command_stop: "Ferma il server."

data/spec/coverage_helper.rb

@@ -1,20 +1,17 @@
 # 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 "pathname"
+require "simplecov"
 
-if ENV["DEVDNSD_COVERAGE"] == "TRUE" && RUBY_VERSION >= "1.9" then
-  require "simplecov"
-
+SimpleCov.start do
   root = Pathname.new(File.dirname(__FILE__)) + ".."
 
-  SimpleCov.start do
-    add_filter do |src_file|
-      path = Pathname.new(src_file.filename).relative_path_from(root).to_s
-      path =~ /^lib\/devdnsd\/patches/ || path !~ /^(bin|lib)/
-    end
+  add_filter do |src_file|
+    path = Pathname.new(src_file.filename).relative_path_from(root).to_s
+    path =~ /^lib\/devdnsd\/patches/ || path !~ /^(bin|lib)/
   end
 end

data/spec/devdnsd/application_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.
 #
 
@@ -13,20 +13,20 @@ describe DevDNSd::Application do
   end
 
   def create_application(overrides = {})
-    mamertes_app = Mamertes::App(:run => false) do
-      option "configuration", [], {:default => overrides["configuration"] || "/dev/null"}
-      option "tld", [], {:default => overrides["tld"] || "dev"}
-      option "port", [], {:type => Integer, :default => overrides["port"] || 7771}
-      option "pid-file", [:P], {:type => String, :default => "/var/run/devdnsd.pid"}
-      option "log-file", [], {:default => overrides["log-file"] || "/dev/null"}
-      option "log-level", [:L], {:type => Integer, :default => overrides["log-level"] || 1}
+    mamertes_app = Mamertes::App(run: false) do
+      option :configuration, [], {default: overrides["configuration"] || "/dev/null"}
+      option :tld, [], {default: overrides["tld"] || "dev"}
+      option :port, [], {type: Integer, default: overrides["port"] || 7771}
+      option :pid_file, [:P, "pid-file"], {type: String, default: "/var/run/devdnsd.pid"}
+      option :log_file, [:l, "log-file"], {default: overrides["log_file"] || "/dev/null"}
+      option :log_level, [:L, "log-level"], {type: Integer, default: overrides["log_level"] || 1}
     end
 
-    DevDNSd::Application.new(mamertes_app)
+    DevDNSd::Application.new(mamertes_app, :en)
   end
 
   let(:log_file) { "/tmp/devdnsd-test-log-#{Time.now.strftime("%Y%m%d-%H%M%S")}" }
-  let(:application){ create_application({"log-file" => log_file}) }
+  let(:application){ create_application({"log_file" => log_file}) }
   let(:executable) { ::Pathname.new(::File.dirname((__FILE__))) + "../../bin/devdnsd" }
   let(:sample_config) { ::Pathname.new(::File.dirname((__FILE__))) + "../../config/devdnsd_config.sample" }
   let(:resolver_path) { "/tmp/devdnsd-test-resolver-#{Time.now.strftime("%Y%m%d-%H%M%S")}" }
@@ -47,7 +47,7 @@ describe DevDNSd::Application do
       file.write("config.port = ")
       file.close
 
-      expect { create_application({"configuration" => file.path, "log-file" => log_file}) }.to raise_error(::SystemExit)
+      expect { create_application({"configuration" => file.path, "log_file" => log_file}) }.to raise_error(::SystemExit)
       ::File.unlink(path)
     end
   end
@@ -66,19 +66,35 @@ describe DevDNSd::Application do
     end
   end
 
+  describe ".check_ruby_implementation" do
+    it "won't run on Rubinius" do
+      stub_const("Rubinius", true)
+      Kernel.should_receive(:exit).with(0)
+      Kernel.should_receive(:puts)
+      DevDNSd::Application.check_ruby_implementation
+    end
+
+    it "won't run on JRuby" do
+      stub_const("JRuby", true)
+      Kernel.should_receive(:exit).with(0)
+      Kernel.should_receive(:puts)
+      DevDNSd::Application.check_ruby_implementation
+    end
+  end
+
   describe ".instance" do
     before(:each) do
       DevDNSd::Application.unstub(:instance)
     end
 
     let(:mamertes) {
-      mamertes_app = Mamertes::App(:run => false) do
-        option "configuration", [], {:default => "/dev/null"}
-        option "tld", [], {:default => "dev"}
-        option "port", [], {:type => Integer, :default => 7771}
-        option "pid-file", [:P], {:type => String, :default => "/var/run/devdnsd.pid"}
-        option "log-file", [], {:default => "/dev/null"}
-        option "log-level", [:L], {:type => Integer, :default => 1}
+      mamertes_app = Mamertes::App(run: false) do
+        option :configuration, [], {default: "/dev/null"}
+        option :tld, [], {default: "dev"}
+        option :port, [], {type: Integer, default: 7771}
+        option :pid_file, [:P], {type: String, default: "/var/run/devdnsd.pid"}
+        option :log_file, [], {default: "/dev/null"}
+        option :log_level, [:L], {type: Integer, default: 1}
       end
     }
 
@@ -95,12 +111,12 @@ describe DevDNSd::Application do
 
     it "should recreate an instance" do
       other = DevDNSd::Application.instance(mamertes)
-      expect(DevDNSd::Application.instance(mamertes, true)).not_to eq(other)
+      expect(DevDNSd::Application.instance(mamertes, :en, true)).not_to eq(other)
     end
   end
 
   describe ".pid_fn" do
-    let(:application){ create_application({"log-file" => log_file, "configuration" => sample_config}) }
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
 
     it "returns the default file" do
       expect(DevDNSd::Application.pid_fn).to eq("/var/run/devdnsd.pid")
@@ -113,7 +129,7 @@ describe DevDNSd::Application do
   end
 
   describe ".pid_directory" do
-    let(:application){ create_application({"log-file" => log_file, "configuration" => sample_config}) }
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
 
     it "returns the default path" do
       expect(DevDNSd::Application.pid_directory).to eq("/var/run")
@@ -126,7 +142,7 @@ describe DevDNSd::Application do
   end
 
   describe ".daemon_name" do
-    let(:application){ create_application({"log-file" => log_file, "configuration" => sample_config}) }
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
 
     it "returns the default name" do
       expect(DevDNSd::Application.daemon_name).to eq("devdnsd")
@@ -139,18 +155,10 @@ describe DevDNSd::Application do
   end
 
   describe "#perform_server" do
-    let(:application){ create_application({"log-file" => log_file, "configuration" => sample_config}) }
-
-    before(:each) do
-      class DevDNSd::Application
-        def on_start
-          Thread.main[:resolver].wakeup if Thread.main[:resolver].try(:alive?)
-        end
-      end
-    end
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
 
     def test_resolve(host = "match_1.dev", type = "ANY", nameserver = "127.0.0.1", port = 7771, logger = nil)
-      host ||= "match.dev"
+      application.stub(:on_start) do Thread.main[:resolver].run if Thread.main[:resolver].try(:alive?) end
 
       Thread.current[:resolver] = Thread.start {
         Thread.stop
@@ -159,7 +167,6 @@ describe DevDNSd::Application do
 
       Thread.current[:server] = Thread.start {
         sleep(0.1)
-
         if block_given? then
           yield
         else
@@ -178,11 +185,12 @@ describe DevDNSd::Application do
       application.perform_server
     end
 
-    it "should stop the server" do
-      application.should_receive(:on_stop)
+    it "should setup callbacks" do
+      RubyDNS::Server.any_instance.should_receive(:on).with(:start)
+      RubyDNS::Server.any_instance.should_receive(:on).with(:stop)
 
       Thread.new {
-        sleep(1)
+        sleep(0.1)
         application.class.quit
       }
 
@@ -254,7 +262,7 @@ describe DevDNSd::Application do
       end
     end
 
-    let(:application){ create_application({"log-file" => log_file, "configuration" => sample_config}) }
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
     let(:transaction){ FakeTransaction.new }
 
     it "should match a valid string request" do
@@ -342,17 +350,28 @@ describe DevDNSd::Application do
 
   describe "#action_start" do
     it "should call perform_server in foreground" do
-      application = create_application({"log-file" => log_file})
+      application = create_application({"log_file" => log_file})
       application.config.foreground = true
       application.should_receive(:perform_server)
       application.action_start
     end
 
     it "should start the daemon" do
-      application = create_application({"log-file" => log_file})
+      application = create_application({"log_file" => log_file})
       ::RExec::Daemon::Controller.should_receive(:start)
       application.action_start
     end
+
+    it "should check for availability of fork" do
+      application.config.foreground = false
+
+      Process.stub(:respond_to?).and_return(false)
+      application.should_receive(:perform_server)
+      application.logger.should_receive(:warn)
+
+      application.action_start
+      expect(application.config.foreground).to be_true
+    end
   end
 
   describe "#action_stop" do
@@ -363,7 +382,7 @@ describe DevDNSd::Application do
   end
 
   describe "#action_install" do
-    if ::Config::CONFIG['host_os'] =~ /^darwin/ then
+    if ::RbConfig::CONFIG['host_os'] =~ /^darwin/ then
       it "should create the resolver" do
         application.stub(:resolver_path).and_return(resolver_path)
         application.stub(:launch_agent_path).and_return(launch_agent_path)
@@ -456,7 +475,7 @@ describe DevDNSd::Application do
   end
 
   describe "#action_uninstall" do
-    if ::Config::CONFIG['host_os'] =~ /^darwin/ then
+    if ::RbConfig::CONFIG['host_os'] =~ /^darwin/ then
       it "should remove the resolver" do
         application.stub(:resolver_path).and_return(resolver_path)
         application.stub(:launch_agent_path).and_return(launch_agent_path)
@@ -510,12 +529,13 @@ describe DevDNSd::Application do
         ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
       end
 
-      it "should not unload delete invalid agent" do
+      it "should not unload invalid agent" do
         application.stub(:resolver_path).and_return(resolver_path)
         application.stub(:launch_agent_path).and_return("/invalid/agent")
 
         application.action_install
         application.stub(:execute_command).and_raise(StandardError)
+        application.stub(:dns_update)
         application.logger.should_receive(:warn).at_least(1)
         application.action_uninstall