devdnsd 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devdnsd (1.1.0)
+    devdnsd (1.1.1)
       cowtech-extensions (~> 2.7.0)
       gli (~> 1.6.0)
       rainbow (~> 1.1.0)
@@ -29,7 +29,7 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.0)
     coderay (1.0.7)
-    cowtech-extensions (2.7.0)
+    cowtech-extensions (2.7.1)
       actionpack (~> 3.0)
       json (~> 1.7.0)
       tzinfo (~> 0.3.0)

data/README.md

@@ -1,5 +1,8 @@
 # devdnsd
 
+[![Build Status](https://secure.travis-ci.org/ShogunPanda/devdnsd.png?branch=master)](http://travis-ci.org/ShogunPanda/devdnsd)
+[![Dependency Status](https://gemnasium.com/ShogunPanda/devdnsd.png?travis)](https://gemnasium.com/ShogunPanda/devdnsd)
+
 A small DNS server to enable local .dev domain resolution.
 http://github.com/ShogunPanda/devdnsd
 

data/lib/devdnsd/version.rb

@@ -16,7 +16,7 @@ module DevDNSd
     MINOR = 1
 
     # 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

@@ -19,8 +19,13 @@ 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 application.logger.should_not be_nil end
-    it("should setup the configuration") do application.config.should_not be_nil end
+    it("should setup the logger") do
+      expect(application.logger).not_to be_nil
+    end
+
+    it("should setup the configuration") do
+      expect(application.config).not_to be_nil
+    end
 
     it("should abort with an invalid configuration") do
       path = "/tmp/devdnsd-test-#{Time.now.strftime("%Y%m%d-%H:%M:%S")}"
@@ -123,31 +128,31 @@ describe DevDNSd::Application do
 
     describe "should correctly resolve hostnames" do
       it "basing on a exact pattern" do
-        test_resolve("match_1.dev").should == ["10.0.1.1", :A]
-        test_resolve("match_2.dev").should == ["10.0.2.1", :MX]
-        test_resolve("match_3.dev").should == ["10.0.3.1", :A]
-        test_resolve("match_4.dev").should == ["10.0.4.1", :CNAME]
+        expect(test_resolve("match_1.dev")).to eq(["10.0.1.1", :A])
+        expect(test_resolve("match_2.dev")).to eq(["10.0.2.1", :MX])
+        expect(test_resolve("match_3.dev")).to eq(["10.0.3.1", :A])
+        expect(test_resolve("match_4.dev")).to eq(["10.0.4.1", :CNAME])
       end
 
       it "basing on a regexp pattern" do
-        test_resolve("match_5_11.dev").should == ["10.0.5.11", :A]
-        test_resolve("match_5_22.dev").should == ["10.0.5.22", :A]
-        test_resolve("match_6_33.dev").should == ["10.0.6.33", :PTR]
-        test_resolve("match_6_44.dev").should == ["10.0.6.44", :PTR]
-        test_resolve("match_7_55.dev").should == ["10.0.7.55", :A]
-        test_resolve("match_7_66.dev").should == ["10.0.7.66", :A]
-        test_resolve("match_8_77.dev").should == ["10.0.8.77", :PTR]
-        test_resolve("match_8_88.dev").should == ["10.0.8.88", :PTR]
+        expect(test_resolve("match_5_11.dev")).to eq(["10.0.5.11", :A])
+        expect(test_resolve("match_5_22.dev")).to eq(["10.0.5.22", :A])
+        expect(test_resolve("match_6_33.dev")).to eq(["10.0.6.33", :PTR])
+        expect(test_resolve("match_6_44.dev")).to eq(["10.0.6.44", :PTR])
+        expect(test_resolve("match_7_55.dev")).to eq(["10.0.7.55", :A])
+        expect(test_resolve("match_7_66.dev")).to eq(["10.0.7.66", :A])
+        expect(test_resolve("match_8_77.dev")).to eq(["10.0.8.77", :PTR])
+        expect(test_resolve("match_8_88.dev")).to eq(["10.0.8.88", :PTR])
       end
 
       it "and return multiple or only relevant answsers" do
-        test_resolve("match_10.dev").should == [["10.0.10.1", :A], ["10.0.10.2", :MX]]
-        test_resolve("match_10.dev", "MX").should == ["10.0.10.2", :MX]
+        expect(test_resolve("match_10.dev")).to eq([["10.0.10.1", :A], ["10.0.10.2", :MX]])
+        expect(test_resolve("match_10.dev", "MX")).to eq(["10.0.10.2", :MX])
       end
 
       it "and reject invalid matches (with or without rules)" do
-        test_resolve("match_9.dev").should be_nil
-        test_resolve("invalid.dev").should be_nil
+        expect(test_resolve("match_9.dev")).to be_nil
+        expect(test_resolve("invalid.dev")).to be_nil
       end
     end
   end
@@ -170,75 +175,85 @@ describe DevDNSd::Application do
 
     it "should match a valid string request" do
       rule = application.config.rules[0]
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_true
     end
 
     it "should match a valid string request with specific type" do
       rule = application.config.rules[1]
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_true
     end
 
     it "should match a valid string request with a block" do
       rule = application.config.rules[2]
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_true
     end
 
     it "should match a valid string request with a block" do
       rule = application.config.rules[3]
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_true
     end
 
     it "should match a valid regexp request" do
       rule = application.config.rules[4]
       mo = rule.match_host("match_5_12.dev")
-      application.process_rule(rule, rule.resource_class, mo, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, mo, transaction)).to be_true
     end
 
     it "should match a valid regexp request with specific type" do
       rule = application.config.rules[5]
       mo = rule.match_host("match_6_34.dev")
-      application.process_rule(rule, rule.resource_class, mo, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, mo, transaction)).to be_true
     end
 
     it "should match a valid regexp request with a block" do
       rule = application.config.rules[6]
       mo = rule.match_host("match_7_56.dev")
-      application.process_rule(rule, rule.resource_class, mo, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, mo, transaction)).to be_true
     end
 
     it "should match a valid regexp request with a block and specific type" do
       rule = application.config.rules[7]
       mo = rule.match_host("match_8_78.dev")
-      application.process_rule(rule, rule.resource_class, mo, transaction).should be_true
+      expect(application.process_rule(rule, rule.resource_class, mo, transaction)).to be_true
     end
 
     it "should return false for a false block" do
       rule = application.config.rules[8]
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_false
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_false
     end
 
     it "should return nil for a nil reply" do
       rule = application.config.rules[0]
       rule.reply = nil
-      application.process_rule(rule, rule.resource_class, nil, transaction).should be_nil
+      expect(application.process_rule(rule, rule.resource_class, nil, transaction)).to be_nil
     end
   end
 
   describe "#dns_update" do
     it "should update the DNS cache" do
       application.stub(:execute_command).and_return("EXECUTED")
-      application.dns_update.should == "EXECUTED"
+      expect(application.dns_update).to eq("EXECUTED")
     end
   end
 
   describe "#resolver_path" do
-    it "should return the resolver file basing on the configuration" do application.resolver_path.should == "/etc/resolver/#{application.config.tld}" end
-    it "should return the resolver file basing on the argument" do application.resolver_path("foo").should == "/etc/resolver/foo" end
+    it "should return the resolver file basing on the configuration" do
+      expect(application.resolver_path).to eq("/etc/resolver/#{application.config.tld}")
+    end
+
+    it "should return the resolver file basing on the argument" do
+      expect(application.resolver_path("foo")).to eq("/etc/resolver/foo")
+    end
   end
 
   describe "#launch_agent_path" do
-    it "should return the agent file with a default name" do application.launch_agent_path.should == ENV["HOME"] + "/Library/LaunchAgents/it.cowtech.devdnsd.plist" end
-    it "should return the agent file with a specified name" do application.launch_agent_path("foo").should == ENV["HOME"] + "/Library/LaunchAgents/foo.plist" end
+    it "should return the agent file with a default name" do
+      expect(application.launch_agent_path).to eq(ENV["HOME"] + "/Library/LaunchAgents/it.cowtech.devdnsd.plist")
+    end
+
+    it "should return the agent file with a specified name" do
+      expect(application.launch_agent_path("foo")).to eq(ENV["HOME"] + "/Library/LaunchAgents/foo.plist")
+    end
   end
 
   describe "#action_start" do
@@ -271,7 +286,7 @@ describe DevDNSd::Application do
         ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
         application.action_install
-        ::File.exists?(resolver_path).should be_true
+        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)
@@ -285,7 +300,7 @@ describe DevDNSd::Application do
 
         application.stub(:resolver_path).and_return(resolver_path)
         application.action_install
-        ::File.exists?(application.launch_agent_path).should be_true
+        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)
@@ -353,7 +368,7 @@ describe DevDNSd::Application do
     it "should raise an exception if not running on OSX" do
       application.stub(:is_osx?).and_return(false)
       application.get_logger.should_receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
-      application.action_install.should be_false
+      expect(application.action_install).to be_false
     end
   end
 
@@ -367,7 +382,7 @@ describe DevDNSd::Application do
 
         application.action_install
         application.action_uninstall
-        ::File.exists?(resolver_path).should be_false
+        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)
@@ -382,7 +397,7 @@ describe DevDNSd::Application do
         DevDNSd::Logger.stub(:default_file).and_return($stdout)
         application.action_install
         application.action_uninstall
-        ::File.exists?(application.launch_agent_path).should be_false
+        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)
@@ -443,7 +458,7 @@ describe DevDNSd::Application do
     it "should raise an exception if not running on OSX" do
       application.stub(:is_osx?).and_return(false)
       application.get_logger.should_receive(:fatal).with("Install DevDNSd as a local resolver is only available on MacOSX.")
-      application.action_uninstall.should be_false
+      expect(application.action_uninstall).to be_false
     end
   end
 end

data/spec/devdnsd/configuration_spec.rb

@@ -25,13 +25,13 @@ describe DevDNSd::Configuration do
   describe "#initialize" do
     it "sets default arguments and rules" do
       config = DevDNSd::Configuration.new
-      config.address.should == "0.0.0.0"
-      config.port.should == 7771
-      config.tld.should == "dev"
-      config.log_file.should == "/var/log/devdnsd.log"
-      config.log_level.should == ::Logger::INFO
-      config.rules.count.should == 1
-      config.foreground.should == false
+      expect(config.address).to eq("0.0.0.0")
+      expect(config.port).to eq(7771)
+      expect(config.tld).to eq("dev")
+      expect(config.log_file).to eq("/var/log/devdnsd.log")
+      expect(config.log_level).to eq(::Logger::INFO)
+      expect(config.rules.count).to eq(1)
+      expect(config.foreground).to eq(false)
     end
 
     it "reads a valid configuration file" do
@@ -40,7 +40,7 @@ describe DevDNSd::Configuration do
       file.close
 
       config = DevDNSd::Configuration.new(file.path, new_application)
-      config.port.should == 7772
+      expect(config.port).to eq(7772)
       file.unlink
     end
 
@@ -59,7 +59,7 @@ describe DevDNSd::Configuration do
       file.close
 
       config = DevDNSd::Configuration.new(file.path, new_application, {:foreground => true, :port => 7773})
-      config.port.should == 7773
+      expect(config.port).to eq(7773)
       config.foreground = true
       file.unlink
     end
@@ -69,7 +69,7 @@ describe DevDNSd::Configuration do
     it "should add a good rule" do
       config = DevDNSd::Configuration.new
       config.add_rule("RULE", "127.0.0.1")
-      config.rules.count.should == 2
+      expect(config.rules.count).to eq(2)
     end
 
     it "should reject a bad rule" do

data/spec/devdnsd/logger_spec.rb

@@ -14,24 +14,24 @@ describe DevDNSd::Logger do
   describe ".create" do
     it("should create a new default logger") do
       logger = DevDNSd::Logger.create
-      logger.device.should == DevDNSd::Logger.default_file
-      logger.level.should == ::Logger::INFO
-      logger.formatter.should == DevDNSd::Logger.default_formatter
+      expect(logger.device).to eq(DevDNSd::Logger.default_file)
+      expect(logger.level).to eq(::Logger::INFO)
+      expect(logger.formatter).to eq(DevDNSd::Logger.default_formatter)
     end
 
     it("should create a logger with a custom file and level") do
       logger = DevDNSd::Logger.create("/dev/null", ::Logger::WARN)
-      logger.device.should == "/dev/null"
-      logger.level.should == ::Logger::WARN
-      logger.formatter.should == DevDNSd::Logger.default_formatter
+      expect(logger.device).to eq("/dev/null")
+      expect(logger.level).to eq(::Logger::WARN)
+      expect(logger.formatter).to eq(DevDNSd::Logger.default_formatter)
     end
 
     it("should create a logger with a custom formatter") do
       formatter = Proc.new {|severity, datetime, progname, msg| msg }
       logger = DevDNSd::Logger.create("/dev/null", ::Logger::WARN, formatter)
-      logger.device.should == "/dev/null"
-      logger.level.should == ::Logger::WARN
-      logger.formatter.should == formatter
+      expect(logger.device).to eq("/dev/null")
+      expect(logger.level).to eq(::Logger::WARN)
+      expect(logger.formatter).to eq(formatter)
     end
 
     it("should raise exceptions for invalid files") do
@@ -49,42 +49,52 @@ describe DevDNSd::Logger do
 
     it "should correctly format a DEBUG message" do
       logger.debug("Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] DEBUG: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] DEBUG: Message.")
     end
 
     it "should correctly format a INFO message" do
       logger.info("Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]  INFO: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]  INFO: Message.")
     end
 
     it "should correctly format a WARN message" do
       logger.warn("Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]  WARN: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]  WARN: Message.")
     end
 
     it "should correctly format a ERROR message" do
       logger.error("Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] ERROR: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] ERROR: Message.")
     end
 
     it "should correctly format a FATAL message" do
       logger.fatal("Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] FATAL: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}] FATAL: Message.")
     end
 
     it "should correctly format a INVALID message" do
       logger.log(::Logger::UNKNOWN, "Message.")
-      get_last_line(output).should == "[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]   ANY: Message."
+      expect(get_last_line(output)).to eq("[#{::Time.now.strftime("%Y/%b/%d %H:%M:%S")}]   ANY: Message.")
     end
   end
 
   describe ".get_real_file" do
-    it("should return the standard ouput") do DevDNSd::Logger.get_real_file("STDOUT").should == $stdout end
-    it("should return the standard error") do DevDNSd::Logger.get_real_file("STDERR").should == $stderr end
-    it("should return the file") do DevDNSd::Logger.get_real_file("/dev/null").should == "/dev/null" end
+    it("should return the standard ouput") do 
+      expect(DevDNSd::Logger.get_real_file("STDOUT")).to eq($stdout )
+    end
+    
+    it("should return the standard error") do 
+      expect(DevDNSd::Logger.get_real_file("STDERR")).to eq($stderr )
+    end
+    
+    it("should return the file") do 
+      expect(DevDNSd::Logger.get_real_file("/dev/null")).to eq("/dev/null" )
+    end
   end
 
   describe ".default_file" do
-    it("should return the standard output") do DevDNSd::Logger.default_file.should == $stdout end
+    it("should return the standard output") do
+      expect(DevDNSd::Logger.default_file).to eq($stdout)
+    end
   end
 end

data/spec/devdnsd/rule_spec.rb

@@ -10,51 +10,71 @@ describe DevDNSd::Rule do
   describe "#new" do
     it("should create a default rule") do
       rule = DevDNSd::Rule.new
-      rule.match.should == /.+/
-      rule.reply.should == "127.0.0.1"
-      rule.type.should == :A
-      rule.options.should == {}
-      rule.block.should be_nil
+      expect(rule.match).to eq(/.+/)
+      expect(rule.reply).to eq("127.0.0.1")
+      expect(rule.type).to eq(:A)
+      expect(rule.options).to eq({})
+      expect(rule.block).to be_nil
     end
 
     it("should create a rule with arguments and no block") do
       rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE", {:a => :b})
-      rule.match.should == "MATCH"
-      rule.reply.should == "REPLY"
-      rule.type.should == "TYPE"
-      rule.options.should == {:a => :b}
-      rule.block.should be_nil
+      expect(rule.match).to eq("MATCH")
+      expect(rule.reply).to eq("REPLY")
+      expect(rule.type).to eq("TYPE")
+      expect(rule.options).to eq({:a => :b})
+      expect(rule.block).to be_nil
     end
 
     it("should create a rule with arguments and a block") do
       rule = DevDNSd::Rule.new("MATCH", "REPLY", "TYPE") do end
-      rule.match.should == "MATCH"
-      rule.reply.should be_nil
-      rule.type.should == "TYPE"
-      rule.options.should == {}
-      rule.block.should_not be_nil
+      expect(rule.match).to eq("MATCH")
+      expect(rule.reply).to be_nil
+      expect(rule.type).to eq("TYPE")
+      expect(rule.options).to eq({})
+      expect(rule.block).not_to be_nil
     end
   end
 
   describe "#is_regexp?" do
-    it("should return true for a regexp pattern") do DevDNSd::Rule.create(/.+/, "127.0.0.1").is_regexp?.should be_true end
-    it("should return false otherwise") do DevDNSd::Rule.create("RULE", "127.0.0.1").is_regexp?.should be_false end
+    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
+      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 DevDNSd::Rule.create("RULE"){}.has_block?.should be_true end
-    it("should return false otherwise") do DevDNSd::Rule.create("RULE", "127.0.0.1").has_block?.should be_false end
+    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
+      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 DevDNSd::Rule.create("match.dev", "127.0.0.1").match_host("match.dev").should be_true end
-      it("should return false when hostname doesn't match") do DevDNSd::Rule.create("match.dev", "127.0.0.1").match_host("unmatch.dev").should be_false end
+      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
+        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 DevDNSd::Rule.create(/^match/, "127.0.0.1").match_host("match.dev").should be_a(MatchData) end
-      it("should return nil when hostname doesn't match") do DevDNSd::Rule.create(/^match/, "127.0.0.1").match_host("unmatch.dev").should be_nil end
+      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
+        expect(DevDNSd::Rule.create(/^match/, "127.0.0.1").match_host("unmatch.dev")).to be_nil
+      end
     end
   end
 
@@ -66,46 +86,59 @@ describe DevDNSd::Rule do
 
     it("should create a rule with host and reply") do
       rule = DevDNSd::Rule.create("MATCH", "REPLY")
-      rule.match.should == "MATCH"
-      rule.reply.should == "REPLY"
-      rule.type.should == :A
-      rule.block.should be_nil
+      expect(rule.match).to eq("MATCH")
+      expect(rule.reply).to eq("REPLY")
+      expect(rule.type).to eq(:A)
+      expect(rule.block).to be_nil
     end
 
     it("should create a rule with host, reply and type") do
       rule = DevDNSd::Rule.create("MATCH", "REPLY", "TYPE", {:a => :b})
-      rule.match.should == "MATCH"
-      rule.reply.should == "REPLY"
-      rule.type.should == "TYPE"
-      rule.options.should == {:a => :b}
-      rule.block.should be_nil
+      expect(rule.match).to eq("MATCH")
+      expect(rule.reply).to eq("REPLY")
+      expect(rule.type).to eq("TYPE")
+      expect(rule.options).to eq({:a => :b})
+      expect(rule.block).to be_nil
     end
 
     it("should create a rule with host, type and a reply block") do
       rule = DevDNSd::Rule.create("MATCH", "TYPE", "UNUSED") do end
-      rule.match.should == "MATCH"
-      rule.reply.should be_nil
-      rule.type.should == "TYPE"
-      rule.options.should == {}
-      rule.block.should_not be_nil
+      expect(rule.match).to eq("MATCH")
+      expect(rule.reply).to be_nil
+      expect(rule.type).to eq("TYPE")
+      expect(rule.options).to eq({})
+      expect(rule.block).not_to be_nil
     end
   end
 
   describe "#resource_class" do
-    it("should return a single class") do DevDNSd::Rule.create("MATCH", "REPLY", :A).resource_class.should == Resolv::DNS::Resource::IN::A end
-    it("should return an array of classes") do DevDNSd::Rule.create("MATCH", "REPLY", [:A, :MX]).resource_class.should == [Resolv::DNS::Resource::IN::A, Resolv::DNS::Resource::IN::MX] end
-    it("should fail for a invalid class") do expect { DevDNSd::Rule.create("MATCH", "REPLY", :INVALID).resource_class }.to raise_error(DevDNSd::Errors::InvalidRule) end
+    it("should return a single class") do
+      expect(DevDNSd::Rule.create("MATCH", "REPLY", :A).resource_class).to eq(Resolv::DNS::Resource::IN::A)
+    end
+
+    it("should return an array of classes") do
+      expect(DevDNSd::Rule.create("MATCH", "REPLY", [:A, :MX]).resource_class).to eq([Resolv::DNS::Resource::IN::A, Resolv::DNS::Resource::IN::MX])
+    end
+
+    it("should fail for a invalid class") do
+      expect { DevDNSd::Rule.create("MATCH", "REPLY", :INVALID).resource_class }.to raise_error(DevDNSd::Errors::InvalidRule)
+    end
   end
 
   describe "::resource_class_to_symbol" do
     it("should convert a class a symbol") do
-      DevDNSd::Rule.resource_class_to_symbol(Resolv::DNS::Resource::IN::A).should == :A
-      DevDNSd::Rule.resource_class_to_symbol(Resolv).should == :Resolv
+      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 DevDNSd::Rule.symbol_to_resource_class(:A).should == Resolv::DNS::Resource::IN::A end
-    it("should fail for a invalid class") do expect { DevDNSd::Rule.symbol_to_resource_class(:Invalid) }.to raise_error(DevDNSd::Errors::InvalidRule) end
+    it("should convert a symbol to a resource class") do
+      expect(DevDNSd::Rule.symbol_to_resource_class(:A)).to eq(Resolv::DNS::Resource::IN::A)
+    end
+
+    it("should fail for a invalid class") do
+      expect { DevDNSd::Rule.symbol_to_resource_class(:Invalid) }.to raise_error(DevDNSd::Errors::InvalidRule)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,4 +10,10 @@ require "coverage_helper"
 require "devdnsd"
 require "net/dns"
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 require File.expand_path(File.dirname(__FILE__)) + "/../utils/tester"

metadata

@@ -1,232 +1,240 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: devdnsd
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
-authors:
+authors: 
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubydns
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-07-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: cowtech-extensions
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rubydns
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: cowtech-extensions
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: rexec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: gli
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: rexec
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: rainbow
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
         version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: rspec
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: rake
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: simplecov
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
         version: 0.9.10
-- !ruby/object:Gem::Dependency
-  name: net-dns
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: pry
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: net-dns
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: yard
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: redcarpet
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
+  prerelease: false
+  type: :development
+  name: github-markup
+  requirement: *id013
 description: A small DNS server to enable local domain resolution.
-email:
+email: 
 - shogun_panda@me.com
-executables:
+executables: 
 - devdnsd
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .DS_Store
 - .gitignore
 - .travis.yml
@@ -254,35 +262,38 @@ files:
 - utils/tester.rb
 homepage: http://github.com/ShogunPanda/devdnsd
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 97728399073097527
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 97728399073097527
+      version: "0"
 requirements: []
+
 rubyforge_project: devdnsd
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A small DNS server to enable local domain resolution.
-test_files:
+test_files: 
 - spec/coverage_helper.rb
 - spec/devdnsd/application_spec.rb
 - spec/devdnsd/configuration_spec.rb