devdnsd 3.0.8 → 3.1.0

data/doc/DevDNSd/ApplicationMethods/System/ClassMethods.html

@@ -529,7 +529,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/DevDNSd/Configuration.html

@@ -421,7 +421,7 @@ config.add_rule("match.dev", "10.0.0.1")
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:57 2014 by
+  Generated on Sun Mar  9 19:54:08 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/DevDNSd/Errors.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/DevDNSd/Errors/InvalidRule.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:57 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/DevDNSd/Rule.html

@@ -2927,7 +2927,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:57 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/DevDNSd/Version.html

@@ -134,7 +134,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>0</span></pre></dd>
+        <dd><pre class="code"><span class='int'>1</span></pre></dd>
       
         <dt id="PATCH-constant" class="">PATCH =
           <div class="docstring">
@@ -149,7 +149,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>8</span></pre></dd>
+        <dd><pre class="code"><span class='int'>0</span></pre></dd>
       
         <dt id="STRING-constant" class="">STRING =
           <div class="docstring">
@@ -180,7 +180,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/_index.html

@@ -237,7 +237,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:06 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/file.README.html

@@ -99,6 +99,15 @@
 
 <p><strong>You’re done!</strong></p>
 
+<h2 id="dual-stack-ipv4ipv6-usage">Dual stack (IPv4/IPv6) usage</h2>
+
+<p>If you experience slowness in resolving host from clients (Chrome, curl etc.) when you don’t specify the address type, make sure you have both a <code>A</code> and <code>AAAA</code> rules set for the same host, like this:</p>
+
+<p><code>ruby
+config.add_rule(/\.dev$/, "127.0.0.1")
+config.add_rule(/\.dev$/, "::1", :AAAA)
+</code></p>
+
 <h2 id="advanced-usage">Advanced usage</h2>
 
 <p>Just type <code>devdnsd help</code> and you’ll see all available options.</p>
@@ -166,7 +175,7 @@ This argument is ignored if you pass the block, as it assumes that the second ar
 </div></div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/index.html

@@ -99,6 +99,15 @@
 
 <p><strong>You’re done!</strong></p>
 
+<h2 id="dual-stack-ipv4ipv6-usage">Dual stack (IPv4/IPv6) usage</h2>
+
+<p>If you experience slowness in resolving host from clients (Chrome, curl etc.) when you don’t specify the address type, make sure you have both a <code>A</code> and <code>AAAA</code> rules set for the same host, like this:</p>
+
+<p><code>ruby
+config.add_rule(/\.dev$/, "127.0.0.1")
+config.add_rule(/\.dev$/, "::1", :AAAA)
+</code></p>
+
 <h2 id="advanced-usage">Advanced usage</h2>
 
 <p>Just type <code>devdnsd help</code> and you’ll see all available options.</p>
@@ -166,7 +175,7 @@ This argument is ignored if you pass the block, as it assumes that the second ar
 </div></div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/method_list.html

@@ -66,11 +66,23 @@
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="DevDNSd/ApplicationMethods/System.html#action_restart-instance_method" title="DevDNSd::ApplicationMethods::System#action_restart (method)">#action_restart</a></span>
+    <small>DevDNSd::ApplicationMethods::System</small>
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="DevDNSd/ApplicationMethods/System.html#action_start-instance_method" title="DevDNSd::ApplicationMethods::System#action_start (method)">#action_start</a></span>
     <small>DevDNSd::ApplicationMethods::System</small>
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="DevDNSd/ApplicationMethods/System.html#action_status-instance_method" title="DevDNSd::ApplicationMethods::System#action_status (method)">#action_status</a></span>
+    <small>DevDNSd::ApplicationMethods::System</small>
+  </li>
+  
+
   <li class="r1 ">
     <span class='object_link'><a href="DevDNSd/ApplicationMethods/System.html#action_stop-instance_method" title="DevDNSd::ApplicationMethods::System#action_stop (method)">#action_stop</a></span>
     <small>DevDNSd::ApplicationMethods::System</small>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 15:25:56 2014 by
+  Generated on Sun Mar  9 19:54:07 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/lib/devdnsd/application.rb

@@ -126,6 +126,31 @@ module DevDNSd
         true
       end
 
+      # Restarts the server in background.
+      #
+      # @return [Boolean] `true` if action succeeded, `false` otherwise.
+      def action_restart
+        action_stop
+        action_start
+        true
+      end
+
+      # Shows the status of the server
+      #
+      # @return [Boolean] `true` if action succeeded, `false` otherwise.
+      def action_status
+        daemon = self.class
+        status = RExec::Daemon::ProcessFile.status(daemon)
+        pid = RExec::Daemon::ProcessFile.recall(daemon).to_s
+        status = :crashed if status == :unknown && daemon.crashed?
+
+        if status == :running then
+          logger.info(replace_markers(i18n.status_running(pid)))
+        elsif
+          logger.info(replace_markers(i18n.send("status_#{status}")))
+        end
+      end
+
       # Adds aliases to an interface.
       #
       # @param options [Hash] The options provided by the user.
@@ -216,8 +241,7 @@ module DevDNSd
             logger.info(replace_markers(i18n.resolver_creating(resolver_path)))
 
             script = Tempfile.new("devdnsd-install-script")
-            script.write("mkdir -p '#{File.dirname(resolver_path)}'\n")
-            script.write("rm -rf '#{resolver_path}'\n")
+            script.write("mkdir -p '#{File.dirname(resolver_path)}'\nrm -rf '#{resolver_path}'\n")
             script.write("echo 'nameserver 127.0.0.1\\nport #{@config.port}' >> '#{resolver_path}'")
             script.close
 
@@ -512,7 +536,8 @@ module DevDNSd
       # @return [Object] The result of stop callbacks.
       def perform_server
         application = self
-        RubyDNS::run_server(listen: [[:udp, @config.address, @config.port.to_integer]]) do
+
+        RubyDNS::run_server(listen: build_listen_interfaces) do
           self.logger = application.logger
 
           match(/.+/, DevDNSd::Application::ANY_CLASSES) do |transaction, match_data|
@@ -564,6 +589,14 @@ module DevDNSd
       end
 
       private
+        # Builds the list of listening interfaces.
+        #
+        # @return [Array] Array of addresses.
+        def build_listen_interfaces
+          port = @config.port.to_integer
+          @config.bind_addresses.ensure_array {|address| [:udp, address, port] }
+        end
+
         # Performs the processing of a rule.
         #
         # @param rule [Rule] The rule to process.
@@ -746,16 +779,14 @@ module DevDNSd
           @logger = nil
           @logger = get_logger
         rescue Bovem::Errors::InvalidConfiguration => e
-          logger = Bovem::Logger.create($stderr)
-          logger.fatal(e.message)
-          logger.warn(replace_markers(i18n.application_create_config(path)))
+          log_failed_configuration(path, e)
           raise ::SystemExit
         end
       end
 
       # Creates a folder for a file.
       #
-      # @param [String] The path of the file.
+      # @param path [String] The path of the file.
       def ensure_directory_for(path)
         begin
           FileUtils.mkdir_p(File.dirname(path))
@@ -764,5 +795,15 @@ module DevDNSd
           raise ::SystemExit
         end
       end
+
+      # Logs a failed configuration
+      #
+      # @param path [String] The path of the invalid file.
+      # @param exception [Exception] The occurred exception.
+      def log_failed_configuration(path, exception)
+        logger = Bovem::Logger.create($stderr)
+        logger.fatal(exception.message)
+        logger.warn(replace_markers(i18n.application_create_config(path)))
+      end
   end
 end

data/lib/devdnsd/configuration.rb

@@ -10,8 +10,8 @@ module DevDNSd
     # If to run the server in foreground. Default: `false`.
     property :foreground, default: false
 
-    # The address to listen to. Default: `0.0.0.0`.
-    property :address, default: "0.0.0.0"
+    # The addresses to listen to. Default: `["0.0.0.0"]`.
+    property :bind_addresses, default: ["0.0.0.0"]
 
     # The port to listen to. Default: `7771`.
     property :port, default: 7771

data/lib/devdnsd/version.rb

@@ -13,10 +13,10 @@ module DevDNSd
     MAJOR = 3
 
     # The minor version.
-    MINOR = 0
+    MINOR = 1
 
     # The patch version.
-    PATCH = 8
+    PATCH = 0
 
     # The current version number of DevDNSd.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/locales/en.yml

@@ -58,12 +58,19 @@
     application_meta_command: "COMMAND"
     application_create_config: "To execute devdnsd, please create the file {mark=bright}%1{/mark}. An empty file is sufficient."
     command_start: "Starts the server."
+    command_stop: "Stops the server."
+    command_restart: "Restarts the server."
+    command_status: "Shows the status of the server."
+    command_clean: "Cleans the system's DNS."
     command_install: "Installs the server."
     command_uninstall: "Uninstalls the server."
-    command_stop: "Stops the server."
     command_aliases: "Adds or removes aliases to network interfaces."
     command_add: "Adds aliases."
     command_remove: "Removes aliases."
+    status_running: "The server is running with process ID {mark=bright}%1{/mark}."
+    status_stopped: "The server is stopped."
+    status_crashed: "The server crashed. See the log for more information."
+    status_unknown: "The server status is unknown."
     removing: "Removing"
     adding: "Adding"
     remove: "remove"

data/locales/it.yml

@@ -59,12 +59,19 @@
     application_meta_command: "COMANDO"
     application_create_config: "Per eseguire devdnsd, per favore crea il file {mark=bright}%1{/mark}. Un file vuoto è sufficiente."
     command_start: "Avvia server."
+    command_stop: "Ferma il server."
+    command_restart: "Riavvia server."
+    command_status: "Mostra lo status del server."
+    command_clean: "Pulisce la cache DNS del sistema."
     command_install: "Installa il server."
     command_uninstall: "Disinstalla il server."
-    command_stop: "Ferma il server."
     command_aliases: "Aggiunge or rimuove indirizzi dalle interfacce di rete."
     command_add: "Aggiungi indirizzi"
     command_remove: "Rimuovi indirizzi."
+    status_running: "Il server è in esecuzione con ID processo {mark=bright}%1{/mark}."
+    status_stopped: "Il server è stato fermato."
+    status_crashed: "Il server è terminato con errori. Guarda il log per maggiori informazioni."
+    status_unknown: "Lo status del server è sconosciuto."
     removing: "Rimuovo"
     adding: "Aggiungo"
     remove: "rimuovere"

data/spec/devdnsd/application_spec.rb

@@ -192,9 +192,9 @@ describe DevDNSd::Application do
   end
 
   describe "#perform_server" do
-    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
+    let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config, "port" => 60771}) }
 
-    def test_resolve(host = "match_1.dev", type = "ANY", nameserver = "127.0.0.1", port = 7771, logger = nil)
+    def test_resolve(host = "match_1.dev", type = "ANY", nameserver = "127.0.0.1", port = 60771, logger = nil)
       result = nil
 
       EM.run do
@@ -567,6 +567,48 @@ describe DevDNSd::Application do
     end
   end
 
+  describe "#action_restart" do
+    it "should stop and restart the server" do
+      expect(application).to receive(:action_stop)
+      expect(application).to receive(:action_start)
+      application.action_restart
+    end
+  end
+
+  describe "#action_status" do
+    it "should get the status of the daemon when running" do
+      expect(RExec::Daemon::ProcessFile).to receive(:status).and_return(:running)
+      expect(RExec::Daemon::ProcessFile).to receive(:recall).and_return(123)
+
+      expect(application.logger).to receive(:info).with("The server is running with process ID 123.")
+      application.action_status
+    end
+
+    it "should get the status of the daemon when stopped" do
+      expect(RExec::Daemon::ProcessFile).to receive(:status).and_return(:stopped)
+      expect(RExec::Daemon::ProcessFile).to receive(:recall).and_return(123)
+
+      expect(application.logger).to receive(:info).with("The server is stopped.")
+      application.action_status
+    end
+
+    it "should get the status of the daemon when crashed" do
+      expect(RExec::Daemon::ProcessFile).to receive(:status).and_return(:unknown)
+      expect(application.class).to receive(:crashed?).and_return(true)
+
+      expect(application.logger).to receive(:info).with("The server crashed. See the log for more information.")
+      application.action_status
+    end
+
+    it "should get the status of the daemon when unknown" do
+      expect(RExec::Daemon::ProcessFile).to receive(:status).and_return(:unknown)
+      expect(application.class).to receive(:crashed?).and_return(false)
+
+      expect(application.logger).to receive(:info).with("The server status is unknown.")
+      application.action_status
+    end
+  end
+
   describe "#action_install" do
     before(:each) do
       allow(application).to receive(:is_osx?).and_return(true)

data/spec/devdnsd/configuration_spec.rb

@@ -11,7 +11,7 @@ describe DevDNSd::Configuration do
   describe "#initialize" do
     it "sets default arguments and rules" do
       config = DevDNSd::Configuration.new
-      expect(config.address).to eq("0.0.0.0")
+      expect(config.bind_addresses).to eq(["0.0.0.0"])
       expect(config.port).to eq(7771)
       expect(config.tld).to eq("dev")
       expect(config.log_file).to eq(File.absolute_path(File.expand_path("~/.devdnsd/daemon.log")))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devdnsd
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.1.0
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bovem