devdnsd 2.2.0 → 2.3.0

data/lib/devdnsd/rule.rb

@@ -35,7 +35,7 @@ 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)
-      self.i18n_setup(:devdnsd, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"))
+      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
@@ -45,7 +45,7 @@ module DevDNSd
     #
     # @return [Array|Class] The class(es) for the current rule.
     def resource_class
-      classes = @type.ensure_array.collect {|cls| self.class.symbol_to_resource_class(cls, options[:locale]) }.compact.uniq
+      classes = @type.ensure_array(nil, true, true) {|cls| self.class.symbol_to_resource_class(cls, options[:locale]) }
       classes.length == 1 ? classes.first : classes
     end
 
@@ -68,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? ? @match.match(hostname) : (@match == hostname)
+      is_regexp? ? @match.match(hostname) : (@match == hostname)
     end
 
     # Creates a new rule.
@@ -81,7 +81,7 @@ module DevDNSd
     # @return [Rule] The new rule.
     def self.create(match, reply_or_type = nil, type = nil, options = {}, &block)
       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)
+      setup(new(match), reply_or_type, type, options, block)
     end
 
     # Converts a class to the correspondent symbol.
@@ -125,8 +125,8 @@ module DevDNSd
 
       # 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)
+        raise(DevDNSd::Errors::InvalidRule.new(i18n.rule_invalid_call)) if @reply.blank? && @block.nil?
+        raise(DevDNSd::Errors::InvalidRule.new(i18n.rule_invalid_options)) if !@options.is_a?(::Hash)
       end
 
       # Setups a new rule.

data/lib/devdnsd/version.rb

@@ -13,7 +13,7 @@ module DevDNSd
     MAJOR = 2
 
     # The minor version.
-    MINOR = 2
+    MINOR = 3
 
     # The patch version.
     PATCH = 0

data/spec/coverage_helper.rb

@@ -6,6 +6,9 @@
 
 require "pathname"
 require "simplecov"
+require "coveralls"
+
+Coveralls.wear!
 
 SimpleCov.start do
   root = Pathname.new(File.dirname(__FILE__)) + ".."

data/spec/devdnsd/application_spec.rb

@@ -88,7 +88,7 @@ describe DevDNSd::Application do
     end
 
     let(:mamertes) {
-      mamertes_app = Mamertes::App(run: false) do
+      Mamertes::App(run: false) do
         option :configuration, [], {default: "/dev/null"}
         option :tld, [], {default: "dev"}
         option :port, [], {type: Integer, default: 7771}
@@ -257,7 +257,7 @@ describe DevDNSd::Application do
         @resource_class = cls
       end
 
-      def respond!(*args)
+      def respond!(*_)
         true
       end
     end
@@ -328,6 +328,15 @@ describe DevDNSd::Application do
     end
   end
 
+  describe "#is_osx?" do
+    it "should return the correct information" do
+      stub_const("RbConfig::CONFIG", {"host_os" => "darwin foo"})
+      expect(application.is_osx?).to be_true
+      stub_const("RbConfig::CONFIG", {"host_os" => "another"})
+      expect(application.is_osx?).to be_false
+    end
+  end
+
   describe "#resolver_path" do
     it "should return the resolver file basing on the configuration" do
       expect(application.resolver_path).to eq("/etc/resolver/#{application.config.tld}")
@@ -382,89 +391,92 @@ describe DevDNSd::Application do
   end
 
   describe "#action_install" do
-    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)
-        ::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
-        expect(::File.exists?(resolver_path)).to be_true
-
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+    before(:each) do
+      application.stub(:is_osx?).and_return(true)
+      application.stub(:execute_command)
+    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)
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should create the resolver" do
+      application.stub(:resolver_path).and_return(resolver_path)
+      application.stub(: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)
-        application.action_install
-        expect(::File.exists?(application.launch_agent_path)).to be_true
+      application.action_install
+      expect(::File.exists?(resolver_path)).to be_true
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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)
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should create the agent" do
+      application.stub(:resolver_path).and_return(resolver_path)
+      application.stub(: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)
-        application.action_install
+      application.stub(:resolver_path).and_return(resolver_path)
+      application.action_install
+      expect(::File.exists?(application.launch_agent_path)).to be_true
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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)
+      ::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.")
-        application.action_install
+      application.should_receive(:dns_update)
+      application.action_install
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
+      ::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.")
-        application.action_install
+      application.logger.should_receive(:error).with("Cannot create the resolver file.")
+      application.action_install
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
 
-      it "should not load an invalid agent" do
-        application.stub(:execute_command) do |command|
-          command =~ /^launchctl/ ? raise(StandardError) : system(command)
-        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")
+      ::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)
-        application.stub(: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 create the launch agent.")
+      application.action_install
 
-        application.logger.should_receive(:error).with("Cannot load the launch agent.")
-        application.action_install
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should not load an invalid agent" do
+      application.stub(: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)
+      ::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.")
+      application.action_install
+
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
     end
 
     it "should raise an exception if not running on OSX" do
@@ -475,87 +487,90 @@ describe DevDNSd::Application do
   end
 
   describe "#action_uninstall" do
-    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)
-        ::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.action_uninstall
-        expect(::File.exists?(resolver_path)).to be_false
-
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+    before(:each) do
+      application.stub(:is_osx?).and_return(true)
+      application.stub(:execute_command)
+    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)
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should remove the resolver" do
+      application.stub(:resolver_path).and_return(resolver_path)
+      application.stub(: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)
-        application.action_install
-        application.action_uninstall
-        expect(::File.exists?(application.launch_agent_path)).to be_false
+      application.action_install
+      application.action_uninstall
+      expect(::File.exists?(resolver_path)).to be_false
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
+    it "should remove the agent" do
+      application.stub(:resolver_path).and_return(resolver_path)
+      application.stub(: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.logger.should_receive(:warn).at_least(1)
-        application.action_uninstall
+      Bovem::Logger.stub(:default_file).and_return($stdout)
+      application.action_install
+      application.action_uninstall
+      expect(::File.exists?(application.launch_agent_path)).to be_false
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
+    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")
 
-        application.action_install
-        application.logger.should_receive(:warn).at_least(1)
-        application.action_uninstall
+      application.action_install
+      application.logger.should_receive(:warn).at_least(1)
+      application.action_uninstall
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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")
+    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")
 
-        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
+      application.action_install
+      application.logger.should_receive(:warn).at_least(1)
+      application.action_uninstall
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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)
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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.should_receive(:dns_update)
-        application.action_uninstall
+      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
 
-        ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    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)
+      ::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)
+      application.action_uninstall
+
+      ::File.unlink(application.resolver_path) if ::File.exists?(application.resolver_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
     end
 
     it "should raise an exception if not running on OSX" do

metadata

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