devdnsd 2.3.0 → 2.3.1

data/.travis-gemfile

@@ -8,7 +8,7 @@ source "http://rubygems.org"
 
 gemspec
 
-# Testing gems
+# Testing
 gem "rspec", "~> 2.14.1"
 gem "rake", "~> 10.1.0"
 gem "net-dns", "~> 0.8.0"

data/Rakefile

@@ -9,3 +9,21 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new("spec")
 RSpec::Core::RakeTask.new("spec:coverage") { |t| t.ruby_opts = "-r./spec/coverage_helper" }
+
+desc "Generate the documentation"
+task :docs do
+  system("yardoc") || raise("Failed Execution of: yardoc")
+end
+
+desc "Get the current release version"
+task :version, :with_name do |_, args|
+  gem = Bundler::GemHelper.instance.gemspec
+  puts [args[:with_name] == "true" ? gem.name : nil, gem.version].compact.join("-")
+end
+
+desc "Prepare the release"
+task :prerelease => ["spec:coverage", "docs"] do
+  ["git add -A", "git commit -am \"Version #{Bundler::GemHelper.instance.gemspec.version}\""].each do |cmd|
+    system(cmd) || raise("Failed Execution of: #{cmd}")
+  end
+end

data/devdnsd.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.3"
 
-  gem.add_dependency("mamertes", "~> 2.2.0")
+  gem.add_dependency("mamertes", "~> 2.2.1")
   gem.add_dependency("rubydns", "~> 0.6.3")
   gem.add_dependency("rexec", "~> 1.5.1")
 end

data/doc/DevDNSd.html

@@ -121,7 +121,7 @@ Licensed under the MIT license, which can be found at http://www.opensource.org/
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Application.html

@@ -2093,7 +2093,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:55 2013 by
+  Generated on Sat Jul 20 12:04:59 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/ApplicationMethods.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/ApplicationMethods/Server.html

@@ -508,7 +508,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:54 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/ApplicationMethods/System.html

@@ -947,7 +947,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:54 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

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

@@ -363,7 +363,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:54 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Configuration.html

@@ -411,7 +411,7 @@ config.add_rule("match.dev", "10.0.0.1")
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:55 2013 by
+  Generated on Sat Jul 20 12:04:59 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Errors.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Errors/InvalidRule.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:54 2013 by
+  Generated on Sat Jul 20 12:04:59 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Rule.html

@@ -2927,7 +2927,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:54 2013 by
+  Generated on Sat Jul 20 12:04:59 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/DevDNSd/Version.html

@@ -149,7 +149,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="STRING-constant" class="">STRING =
           <div class="docstring">
@@ -180,7 +180,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/_index.html

@@ -230,7 +230,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/file.README.html

@@ -163,7 +163,7 @@ This argument is ignored if you pass the block, as it assumes that the second ar
 </div></div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/index.html

@@ -163,7 +163,7 @@ This argument is ignored if you pass the block, as it assumes that the second ar
 </div></div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Jul 14 18:03:53 2013 by
+  Generated on Sat Jul 20 12:04:58 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.2 (ruby-1.9.3).
 </div>

data/lib/devdnsd/version.rb

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

data/spec/devdnsd/application_spec.rb

@@ -8,8 +8,8 @@ require "spec_helper"
 
 describe DevDNSd::Application do
   before(:each) do
-    Bovem::Logger.stub(:default_file).and_return("/dev/null")
-    DevDNSd::Application.stub(:instance).and_return(application)
+    allow(Bovem::Logger).to receive(:default_file).and_return("/dev/null")
+    allow(DevDNSd::Application).to receive(:instance).and_return(application)
   end
 
   def create_application(overrides = {})
@@ -33,15 +33,15 @@ describe DevDNSd::Application do
   let(:launch_agent_path) { "/tmp/devdnsd-test-agent-#{Time.now.strftime("%Y%m%d-%H%M%S")}" }
 
   describe "#initialize" do
-    it("should setup the logger") do
+    it "should setup the logger" do
       expect(application.logger).not_to be_nil
     end
 
-    it("should setup the configuration") do
+    it "should setup the configuration" do
       expect(application.config).not_to be_nil
     end
 
-    it("should abort with an invalid configuration") do
+    it "should abort with an invalid configuration" do
       path = "/tmp/devdnsd-test-#{Time.now.strftime("%Y%m%d-%H:%M:%S")}"
       file = ::File.new(path, "w")
       file.write("config.port = ")
@@ -54,14 +54,14 @@ describe DevDNSd::Application do
 
   describe ".run" do
     it "should run the server" do
-      application.should_receive(:perform_server)
+      expect(application).to receive(:perform_server)
       DevDNSd::Application.run
     end
   end
 
   describe ".quit" do
     it "should quit the application" do
-      ::EventMachine.should_receive(:stop)
+      expect(::EventMachine).to receive(:stop)
       DevDNSd::Application.quit
     end
   end
@@ -69,22 +69,22 @@ describe DevDNSd::Application do
   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)
+      expect(Kernel).to receive(:exit).with(0)
+      expect(Kernel).to 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)
+      expect(Kernel).to receive(:exit).with(0)
+      expect(Kernel).to receive(:puts)
       DevDNSd::Application.check_ruby_implementation
     end
   end
 
   describe ".instance" do
     before(:each) do
-      DevDNSd::Application.unstub(:instance)
+      allow(DevDNSd::Application).to receive(:instance).and_call_original
     end
 
     let(:mamertes) {
@@ -104,14 +104,14 @@ describe DevDNSd::Application do
 
     it "should always return the same instance" do
       other = DevDNSd::Application.instance(mamertes)
-      DevDNSd::Application.should_not_receive(:new)
+      expect(DevDNSd::Application).not_to receive(:new)
       expect(DevDNSd::Application.instance(mamertes)).to eq(other)
       expect(DevDNSd::Application.instance).to eq(other)
     end
 
     it "should recreate an instance" do
       other = DevDNSd::Application.instance(mamertes)
-      expect(DevDNSd::Application.instance(mamertes, :en, true)).not_to eq(other)
+      expect(DevDNSd::Application.instance(mamertes, :en, true)).not_to be(other)
     end
   end
 
@@ -158,7 +158,7 @@ describe DevDNSd::Application do
     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)
-      application.stub(:on_start) do Thread.main[:resolver].run if Thread.main[:resolver].try(:alive?) end
+      allow(application).to receive(:on_start) do Thread.main[:resolver].run if Thread.main[:resolver].try(:alive?) end
 
       Thread.current[:resolver] = Thread.start {
         Thread.stop
@@ -181,13 +181,13 @@ describe DevDNSd::Application do
     end
 
     it "should run the server" do
-      RubyDNS.should_receive(:run_server)
+      expect(RubyDNS).to receive(:run_server)
       application.perform_server
     end
 
     it "should setup callbacks" do
-      RubyDNS::Server.any_instance.should_receive(:on).with(:start)
-      RubyDNS::Server.any_instance.should_receive(:on).with(:stop)
+      expect_any_instance_of(RubyDNS::Server).to receive(:on).with(:start)
+      expect_any_instance_of(RubyDNS::Server).to receive(:on).with(:stop)
 
       Thread.new {
         sleep(0.1)
@@ -199,21 +199,21 @@ describe DevDNSd::Application do
 
     it "should iterate the rules" do
       test_resolve do
-        application.config.rules.should_receive(:each).at_least(1)
+        expect(application.config.rules).to receive(:each).at_least(1)
         application.perform_server
       end
     end
 
     it "should call process_rule" do
       test_resolve do
-        application.should_receive(:process_rule).at_least(1)
+        expect(application).to receive(:process_rule).at_least(1)
         application.perform_server
       end
     end
 
     it "should complain about wrong rules" do
       test_resolve do
-        application.stub(:process_rule).and_raise(::Exception)
+        allow(application).to receive(:process_rule).and_raise(::Exception)
         expect { application.perform_server }.to raise_exception
       end
     end
@@ -323,7 +323,7 @@ describe DevDNSd::Application do
 
   describe "#dns_update" do
     it "should update the DNS cache" do
-      application.stub(:execute_command).and_return("EXECUTED")
+      allow(application).to receive(:execute_command).and_return("EXECUTED")
       expect(application.dns_update).to eq("EXECUTED")
     end
   end
@@ -361,22 +361,22 @@ describe DevDNSd::Application do
     it "should call perform_server in foreground" do
       application = create_application({"log_file" => log_file})
       application.config.foreground = true
-      application.should_receive(:perform_server)
+      expect(application).to receive(:perform_server)
       application.action_start
     end
 
     it "should start the daemon" do
       application = create_application({"log_file" => log_file})
-      ::RExec::Daemon::Controller.should_receive(:start)
+      expect(::RExec::Daemon::Controller).to 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)
+      allow(Process).to receive(:respond_to?).and_return(false)
+      expect(application).to receive(:perform_server)
+      expect(application.logger).to receive(:warn)
 
       application.action_start
       expect(application.config.foreground).to be_true
@@ -385,20 +385,20 @@ describe DevDNSd::Application do
 
   describe "#action_stop" do
     it "should stop the daemon" do
-      ::RExec::Daemon::Controller.should_receive(:stop)
+      expect(::RExec::Daemon::Controller).to receive(:stop)
       application.action_stop
     end
   end
 
   describe "#action_install" do
     before(:each) do
-      application.stub(:is_osx?).and_return(true)
-      application.stub(:execute_command)
+      allow(application).to receive(:is_osx?).and_return(true)
+      allow(application).to receive(:execute_command)
     end
 
     it "should create the resolver" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
@@ -410,12 +410,12 @@ describe DevDNSd::Application do
     end
 
     it "should create the agent" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      application.stub(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
       application.action_install
       expect(::File.exists?(application.launch_agent_path)).to be_true
 
@@ -424,12 +424,12 @@ describe DevDNSd::Application do
     end
 
     it "should update the DNS cache" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      application.should_receive(:dns_update)
+      expect(application).to receive(:dns_update)
       application.action_install
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -437,12 +437,12 @@ describe DevDNSd::Application do
     end
 
     it "should not create an invalid resolver" do
-      application.stub(:resolver_path).and_return("/invalid/resolver")
-      application.stub(:launch_agent_path).and_return("/invalid/agent")
+      allow(application).to receive(:resolver_path).and_return("/invalid/resolver")
+      allow(application).to receive(:launch_agent_path).and_return("/invalid/agent")
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      application.logger.should_receive(:error).with("Cannot create the resolver file.")
+      expect(application.logger).to receive(:error).with("Cannot create the resolver file.")
       application.action_install
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -450,12 +450,12 @@ describe DevDNSd::Application do
     end
 
     it "should not create an invalid agent" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return("/invalid/agent")
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return("/invalid/agent")
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      application.logger.should_receive(:error).with("Cannot create the launch agent.")
+      expect(application.logger).to receive(:error).with("Cannot create the launch agent.")
       application.action_install
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -463,16 +463,16 @@ describe DevDNSd::Application do
     end
 
     it "should not load an invalid agent" do
-      application.stub(:execute_command) do |command|
+      allow(application).to receive(:execute_command) do |command|
         command =~ /^launchctl/ ? raise(StandardError) : true
       end
 
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      application.logger.should_receive(:error).with("Cannot load the launch agent.")
+      expect(application.logger).to receive(:error).with("Cannot load the launch agent.")
       application.action_install
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -480,21 +480,21 @@ describe DevDNSd::Application do
     end
 
     it "should raise an exception if not running on OSX" do
-      application.stub(:is_osx?).and_return(false)
-      application.logger.should_receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
+      allow(application).to receive(:is_osx?).and_return(false)
+      expect(application.logger).to receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
       expect(application.action_install).to be_false
     end
   end
 
   describe "#action_uninstall" do
     before(:each) do
-      application.stub(:is_osx?).and_return(true)
-      application.stub(:execute_command)
+      allow(application).to receive(:is_osx?).and_return(true)
+      allow(application).to receive(:execute_command)
     end
 
     it "should remove the resolver" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
@@ -507,12 +507,12 @@ describe DevDNSd::Application do
     end
 
     it "should remove the agent" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-      Bovem::Logger.stub(:default_file).and_return($stdout)
+      allow(Bovem::Logger).to receive(:default_file).and_return($stdout)
       application.action_install
       application.action_uninstall
       expect(::File.exists?(application.launch_agent_path)).to be_false
@@ -522,11 +522,11 @@ describe DevDNSd::Application do
     end
 
     it "should not delete an invalid resolver" do
-      application.stub(:resolver_path).and_return("/invalid/resolver")
-      application.stub(:launch_agent_path).and_return("/invalid/agent")
+      allow(application).to receive(:resolver_path).and_return("/invalid/resolver")
+      allow(application).to receive(:launch_agent_path).and_return("/invalid/agent")
 
       application.action_install
-      application.logger.should_receive(:warn).at_least(1)
+      expect(application.logger).to receive(:warn).at_least(1)
       application.action_uninstall
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -534,11 +534,11 @@ describe DevDNSd::Application do
     end
 
     it "should not delete an invalid agent" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return("/invalid/agent")
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return("/invalid/agent")
 
       application.action_install
-      application.logger.should_receive(:warn).at_least(1)
+      expect(application.logger).to receive(:warn).at_least(1)
       application.action_uninstall
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -546,13 +546,13 @@ describe DevDNSd::Application do
     end
 
     it "should not unload invalid agent" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return("/invalid/agent")
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(: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)
+      allow(application).to receive(:execute_command).and_raise(StandardError)
+      allow(application).to receive(:dns_update)
+      expect(application.logger).to receive(:warn).at_least(1)
       application.action_uninstall
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -560,13 +560,13 @@ describe DevDNSd::Application do
     end
 
     it "should update the DNS cache" do
-      application.stub(:resolver_path).and_return(resolver_path)
-      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      allow(application).to receive(:resolver_path).and_return(resolver_path)
+      allow(application).to receive(:launch_agent_path).and_return(launch_agent_path)
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
       ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
       application.action_install
-      application.should_receive(:dns_update)
+      expect(application).to receive(:dns_update)
       application.action_uninstall
 
       ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
@@ -574,8 +574,8 @@ describe DevDNSd::Application do
     end
 
     it "should raise an exception if not running on OSX" do
-      application.stub(:is_osx?).and_return(false)
-      application.logger.should_receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
+      allow(application).to receive(:is_osx?).and_return(false)
+      expect(application.logger).to receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
       expect(application.action_uninstall).to be_false
     end
   end

data/spec/devdnsd/rule_spec.rb

@@ -8,7 +8,7 @@ require "spec_helper"
 
 describe DevDNSd::Rule do
   describe "#new" do
-    it("should create a default rule") do
+    it "should create a default rule" do
       rule = DevDNSd::Rule.new
       expect(rule.match).to eq(/.+/)
       expect(rule.reply).to eq("127.0.0.1")
@@ -17,7 +17,7 @@ describe DevDNSd::Rule do
       expect(rule.block).to be_nil
     end
 
-    it("should create a rule with arguments and no block") do
+    it "should create a rule with arguments and no block" do
       rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE", {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
@@ -26,7 +26,7 @@ describe DevDNSd::Rule do
       expect(rule.block).to be_nil
     end
 
-    it("should create a rule with arguments and a block") do
+    it "should create a rule with arguments and a block" do
       rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE") do end
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to be_nil
@@ -37,54 +37,54 @@ describe DevDNSd::Rule do
   end
 
   describe "#is_regexp?" do
-    it("should return true for a regexp pattern") do
+    it "should return true for a regexp pattern" do
       expect(DevDNSd::Rule.create(/.+/, "127.0.0.1").is_regexp?).to be_true
     end
 
-    it("should return false otherwise") do
+    it "should return false otherwise" do
       expect(DevDNSd::Rule.create("RULE", "127.0.0.1").is_regexp?).to be_false
     end
   end
 
   describe "#has_block?" do
-    it("should return true when a block is present") do
+    it "should return true when a block is present" do
       expect(DevDNSd::Rule.create("RULE"){}.has_block?).to be_true
     end
 
-    it("should return false otherwise") do
+    it "should return false otherwise" do
       expect(DevDNSd::Rule.create("RULE", "127.0.0.1").has_block?).to be_false
     end
   end
 
   describe "#match_host" do
     describe "with a string pattern" do
-      it("should return true when hostname matches") 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
       end
 
-      it("should return false when hostname doesn't match") do
+      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
       end
     end
 
     describe "with a regexp pattern" do
-      it("should return a MatchData when hostname matches") 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)
       end
 
-      it("should return nil when hostname doesn't match") do
+      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
       end
     end
   end
 
   describe "::create" do
-    it("should not allow rules without sufficient arguments") 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)
     end
 
-    it("should create a rule with host and reply") do
+    it "should create a rule with host and reply" do
       rule = DevDNSd::Rule.create("MATCH", "REPLY")
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
@@ -92,7 +92,7 @@ describe DevDNSd::Rule do
       expect(rule.block).to be_nil
     end
 
-    it("should create a rule with host, reply and type") do
+    it "should create a rule with host, reply and type" do
       rule = DevDNSd::Rule.create("MATCH", "REPLY", "TYPE", {a: :b})
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to eq("REPLY")
@@ -101,7 +101,7 @@ describe DevDNSd::Rule do
       expect(rule.block).to be_nil
     end
 
-    it("should create a rule with host, type and a reply block") do
+    it "should create a rule with host, type and a reply block" do
       rule = DevDNSd::Rule.create("MATCH", "TYPE", "UNUSED") do end
       expect(rule.match).to eq("MATCH")
       expect(rule.reply).to be_nil
@@ -112,32 +112,32 @@ describe DevDNSd::Rule do
   end
 
   describe "#resource_class" do
-    it("should return a single 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
+    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
+    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
-    it("should convert a class a 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
-    it("should convert a symbol to a 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
 
-    it("should fail for a invalid class") do
+    it "should fail for a invalid class" do
       expect { DevDNSd::Rule.symbol_to_resource_class(:Invalid, :en) }.to raise_error(DevDNSd::Errors::InvalidRule)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devdnsd
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mamertes
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1433778156204366420
+      hash: 2120411428097888079
 requirements: []
 rubyforge_project: devdnsd
 rubygems_version: 1.8.25