vagrant-dnsmasq 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5111a30318f9e218273d6d70c080a1c554d1b12f
-  data.tar.gz: 8ebdd313a4e50a4b3841daf7977bc0eb6a1cfa21
+  metadata.gz: 835c9917b38e165f4a5b04c593c11d8ad88c1b45
+  data.tar.gz: 2a0dd01d6baafd68a189d3526f4db622c839d53f
 SHA512:
-  metadata.gz: db23f6b1a476394f7ce76ce1490a248a6b311dee0cc6b0ec908a2863b544185160f624ef5d5c72238c7fb4c1ee575b41821ec9fa963b751187402a572e5031e6
-  data.tar.gz: 1dbaf62f3975b08541220fa470dfed587ac8e72dd32e3e0033a5de6d9dbcfb15fd1b22756072cb098f8bc2ad07693210bed47c5e8b440295abb102370e7b4ef8
+  metadata.gz: f5918efdad10112169ddae03bbb89b23f2cdd7805336867a196ffb0a69817e49fa8f6d12fa7fcade4bacf8a527cbe69adc35f0a4cdc9329621745e7f9c651795
+  data.tar.gz: e62960e4ec379a5302b204d3f3ab35911094d32fb85214b4810adafbb5b76ea8c810776e8fbcf31507aba21f65eaf278c237df467347d1953c04f0c4ce3effb3

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+script: "rspec test/*.spec.rb"

data/Gemfile.lock

@@ -15,13 +15,14 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-dnsmasq (0.0.5)
+    vagrant-dnsmasq (0.0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
     ffi (1.9.0)
     i18n (0.6.4)
@@ -31,6 +32,14 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
     rake (10.1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
@@ -38,5 +47,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   rake
+  rspec
   vagrant!
   vagrant-dnsmasq!

data/README.md

@@ -1,12 +1,14 @@
-vagrant-dnsmasq
-===============
+# vagrant-dnsmasq [![Build Status](https://travis-ci.org/mattes/vagrant-dnsmasq.png?branch=master)](https://travis-ci.org/mattes/vagrant-dnsmasq)
 
 A Dnsmasq Vagrant plugin that manages the dnsmasq.conf file and /etc/resolver directory on your host system.
 
 ## Prerequisites
- * Mac OS X Mountain Lion
- * [brew](http://mxcl.github.io/homebrew/)
- * [Dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) ```brew install dnsmasq```
+ * [Vagrant](http://www.vagrantup.com)
+ * [Dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) 
+
+Easily install dnsmasq with [brew](http://mxcl.github.io/homebrew/) under Mac OS:
+ ```brew install dnsmasq```
+
 
 ## Installation
 ```
@@ -15,19 +17,36 @@ vagrant plugin install vagrant-dnsmasq
 
 ## Usage
 in your Vagrantfile
-```
-# dnsmasq ...
+```ruby
+# set domain ending (required)
+# adding this line enables dnsmasq handling
+config.dnsmasq.domain = '.dev'
 
-# enable dnsmasq?
-# set to false or delete line to disable dnsmasq handling
-config.dnsmasq.enable = true
 
-# set domain ending
-config.dnsmasq.domain = '.dev'
+# optional configuration ...
 
 # this plugin runs 'hostname -I' on the guest machine to obtain
-# the guest ip address. you could overwrite the ip here. optional.
+# the guest ip address. you can overwrite this behaviour.
 # config.dnsmasq.ip = '192.168.59.100'
+
+# config.dnsmasq.ip = proc do |guest_machine| 
+#   guest_machine.communicate.sudo("command to obtain ip somehow") do |type, data| 
+#     # return something like '192.168.59.100' or ['192.168.59.100', '192.168.59.103']
+#   end
+# end
+
+# this will prompt you during 'vagrant up' to choose an IP
+# config.dnsmasq.ip = ['192.168.59.100', '192.168.59.103']
+
+# overwrite default location for /etc/resolver directory
+# config.dnsmasq.resolver = '/etc/resolver'
+
+# overwrite default location for /usr/local/etc/dnsmasq.conf
+# brew_prefix = `brew --prefix`.strip
+# config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
+
+# disable dnsmasq handling
+# config.dnsmasq.disable = true
 ```
 
 ## Uninstall

data/Rakefile

@@ -6,6 +6,11 @@ task :default do
   system 'rake -T'
 end
 
+desc "run tests"
+task :test do
+  system 'rspec test/*.spec.rb'
+end
+
 desc "tag this version and rake release"
 task :publish do
   lib = File.expand_path('../lib', __FILE__)

data/lib/vagrant-dnsmasq/actions.rb

@@ -3,55 +3,65 @@ module Vagrant
 
     class Up
       def initialize(app, env)
-        inc_path = Pathname.new(File.expand_path("../includes", __FILE__))
-        require inc_path.join("Domain.class.rb")
-        require inc_path.join("Ip.class.rb")
-        require inc_path.join("Dnsmasq.class.rb")
-        require inc_path.join("Resolver.class.rb")
-        require inc_path.join("helper.rb")
-
         @app = app
         @machine = env[:machine]
-        @ip = []
+        @ips = nil
       end
 
       def call(env)
         if @machine.config.dnsmasq.enabled?
+          # env[:ui].info "Dnsmasq handler actived"
+
+          @ip = @machine.config.dnsmasq.ip
+
+          # is a proc?
+          if @ip.is_a? Proc
+            ips = @ip.call(@machine)
+            ips = [ips] unless ips.is_a? Array
+            ips.map!{|ip| begin Ip.new(ip) rescue nil end}.compact! # dismiss invalid ips
+            @ip = ips
+          end
           
-          # overwrite ip with value from config?
-          @ip = @machine.config.dnsmasq.ip if @machine.config.dnsmasq.ip.count > 0
-          
-          
-          # ... or try to fetch it from guest system
-          if @ip.count === 0
-            @machine.communicate.sudo("hostname -I") do |type, data| 
-              @ip = data.scan /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/
+          if @ip.is_a?(Array) && @ip.count > 0
+            # @ip is an array with domain instances ...
+
+            if @ip.count > 1
+              # prompt: choose ip
+              ask = true
+              while(ask)
+                env[:ui].info "Dnsmasq handler asks: Which IP would you like to use?"
+                i = 0
+                @ip.each do |ip|
+                  i += 1
+                  env[:ui].info "(#{i}) #{ip.v4}"
+                end
+                env[:ui].info "Please type number [1-#{i}]: "
+                answer = $stdin.gets.strip.to_i - 1
+                use_ip = @ip.at(answer)
+                ask = false unless use_ip.nil? 
+              end
+
+            else
+              use_ip = @ip[0]
             end
-            @ip.map!{|ip| begin Ip.new(ip) rescue nil end}.compact!
-          end
 
-          # is there a ip?
-          if @ip.count > 0
+            # use ip to update dnsmasq.conf and /etc/resolver
 
             # update dnsmasq.conf
-            brew_prefix = `brew --prefix`
-            brew_prefix.strip!
-            dnsmasq_conf_file = brew_prefix + "/etc/dnsmasq.conf"
-
-            dnsmasq = DnsmasqConf.new(dnsmasq_conf_file)
-            @ip.each do |ip|
-              dnsmasq.insert(@machine.config.dnsmasq.domain, ip)
-            end
+            dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf)
+            dnsmasq.insert(@machine.config.dnsmasq.domain, use_ip)
             
             # update /etc/resolver
-            resolver = Resolver.new('/etc/resolver')
-            @ip.each do |ip|
-              resolver.insert(@machine.config.dnsmasq.domain, ip)
-            end
+            resolver = Resolver.new(@machine.config.dnsmasq.resolver, true) # true for sudo
+            resolver.insert(@machine.config.dnsmasq.domain, use_ip)
 
-            env[:ui].info "Added domain #{@machine.config.dnsmasq.domain} for IP #{@ip}"
-            @app.call(env)
+            env[:ui].success "Dnsmasq handler set IP '#{use_ip}' for domain '#{@machine.config.dnsmasq.domain.dotted}'"
+
+          else
+            env[:ui].warn "Dnsmasq handler was not able to determine an IP address"
           end
+
+          @app.call(env)
         end
       end
     end
@@ -59,19 +69,27 @@ module Vagrant
 
     class Destroy
       def initialize(app, env)
-        inc_path = Pathname.new(File.expand_path("../includes", __FILE__))
-        require inc_path.join("Domain.class.rb")
-        require inc_path.join("Ip.class.rb")
-        require inc_path.join("Dnsmasq.class.rb")
-        require inc_path.join("Resolver.class.rb")
-        require inc_path.join("helper.rb")
-
         @app = app
+        @machine = env[:machine]
       end
 
       def call(env)
-        # @todo delete from dnsmasq.conf and /etc/resolver
-        @app.call(env)
+        if @machine.config.dnsmasq.enabled?
+
+          # remove records from dnsmasq.conf and /etc/resolver
+
+          # update dnsmasq.conf
+          dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf)
+          dnsmasq.delete(@machine.config.dnsmasq.domain)
+
+          # update /etc/resolver
+          resolver = Resolver.new(@machine.config.dnsmasq.resolver, true) # true for sudo
+          resolver.delete(@machine.config.dnsmasq.domain)
+
+          env[:ui].success "Dnsmasq handler removed domain '#{@machine.config.dnsmasq.domain}'"
+
+          @app.call(env)
+        end
       end
     end
 

data/lib/vagrant-dnsmasq/config.rb

@@ -2,34 +2,81 @@ module Vagrant
   module Dnsmasq
     class Config < Vagrant.plugin("2", :config)
       
-      attr_accessor :enable
       attr_accessor :domain
       attr_accessor :ip
-
-      alias_method :enabled?, :enable
+      attr_accessor :resolver
+      attr_accessor :dnsmasqconf
+      attr_accessor :disable
 
       def initialize
-        inc_path = Pathname.new(File.expand_path("../includes", __FILE__))
-        require inc_path.join("Domain.class.rb")
-        require inc_path.join("Ip.class.rb")
-
-        @enable = UNSET_VALUE
         @domain = UNSET_VALUE
         @ip = UNSET_VALUE
+        @resolver = UNSET_VALUE
+        @dnsmasqconf = UNSET_VALUE
+        @disable = UNSET_VALUE
       end
 
       def finalize!
-        @enable = false if @enable == UNSET_VALUE
         @domain = nil if @domain == UNSET_VALUE
-        @ip = nil if @ip == UNSET_VALUE
+        @resolver = '/etc/resolver' if @resolver == UNSET_VALUE
+        @dnsmasqconf = "/etc/dnsmasq.conf" if @dnsmasqconf == UNSET_VALUE
+        @disable = false if @disable == UNSET_VALUE
+
+        # default way to obtain ip address
+        if @ip == UNSET_VALUE
+          @ip = proc do |guest_machine| 
+            ips = nil
+            guest_machine.communicate.sudo("hostname -I") do |type, data| 
+              ips = data.scan /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/
+            end
+            ips
+          end
+        end
+
+      end
+
+      def enabled?
+        not @disable and not @domain.nil?
+      end
+
+      def validate(machine)
+        return unless enabled?
+
+        errors = []
+
+        # verify @disable
+        if @disable != true and @disable != false then errors << 'invalid disable setting' end
+
+        # verify domain
+        begin @domain = Domain.new @domain; rescue => e; errors << e.message end
+
+        # verify ip
+        if @ip.is_a? Array
+          @ip.map!{|ip| begin Ip.new(ip); rescue => e; errors << e.message end}
+
+        elsif @ip.is_a? String
+          begin @ip = Ip.new(@ip); rescue => e; errors << e.message end
+          @ip = [@ip]
+
+        elsif @ip.is_a? Proc
+          # okay, there is nothing to verify at the moment
+        else
+          @ip = nil
+        end        
+
+
+
+        # verify resolver
+        if @resolver
+          errors << "directory '#{@resolver}' does not exist" unless Dir.exists? @resolver
+        end
 
-        # make it a Domain instance
-        @domain = Domain.new @domain 
-        
-        # make it an Ip instance
-        @ip = [@ip] unless @ip.kind_of? Array
-        @ip.map!{|ip| begin Ip.new(ip) rescue nil end}.compact!
+        # verify dnsmasqconf
+        if @dnsmasqconf
+         errors << "file '#{@dnsmasqconf}' does not exist" unless File.exists? @dnsmasqconf
+        end 
 
+        return { 'Dnsmasq configuration' => errors }
       end
 
     end

data/lib/vagrant-dnsmasq/includes/Domain.class.rb

@@ -6,11 +6,10 @@ class Domain
     @name = nil
 
     if name.is_a? Domain
-      @name = name.dotted
-      return
+      name = name.dotted
     end
 
-    raise ArgumentError, "no domain name given" unless name
+    raise ArgumentError, "no domain name given" if name.blank?
 
     # parse domain name ...
     name = name.to_s
@@ -21,7 +20,7 @@ class Domain
   end
 
   def self.valid?(name)
-    Domain::MATCH.match(name.downcase)
+    if not name.blank? and Domain::MATCH.match(name.downcase) then true else false end
   end
 
   def dotted

data/lib/vagrant-dnsmasq/includes/Ip.class.rb

@@ -1,16 +1,20 @@
 class Ip
 
-  MATCH_IP4 = /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/
+  MATCH_IP4 = /^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[0-9]{1,2})){3}$/
 
   def initialize(ipv4)
 
+    if ipv4.is_a? Ip
+      ipv4 = ipv4.v4
+    end
+
     raise ArgumentError, "IPv4 '#{ipv4}' must match #{MATCH_IP4}" unless Ip::ipv4_valid?(ipv4)
 
     @ipv4 = ipv4
   end
 
   def self.ipv4_valid?(ipv4)
-    Ip::MATCH_IP4.match(ipv4)
+    if not ipv4.blank? and Ip::MATCH_IP4.match(ipv4) then true else false end
   end
 
   def v4

data/lib/vagrant-dnsmasq/includes/Resolver.class.rb

@@ -2,14 +2,15 @@ class Resolver
 
   attr_reader :dirname
 
-  def initialize(dirname)
+  def initialize(dirname, sudo = false)
     raise ArgumentError, 'wrong dirname' if dirname.blank?
     raise IOError unless Dir.exists? dirname
     @dirname = dirname
+    @sudo = sudo
   end
 
   def self.flush_cache!
-    system 'sudo dscacheutil -flushcache'
+    system 'sudo dscacheutil -flushcache' if @sudo
   end
 
   def list
@@ -21,8 +22,8 @@ class Resolver
 
     delete(domain) if includes?(domain)
 
-    puts "You may be asked for your password to insert #{@dirname}/#{domain.name} (ip: #{ip})"
-    system("sudo sh -c \"echo 'nameserver #{ip.v4}' >> #{@dirname}/#{domain.name}\"")
+    puts "You may be asked for your password to insert #{@dirname}/#{domain.name} (ip: #{ip})" if @sudo
+    system("#{'sudo' if @sudo} sh -c \"echo 'nameserver #{ip.v4}' >> #{@dirname}/#{domain.name}\"")
     Resolver::flush_cache!
 
   end
@@ -31,8 +32,8 @@ class Resolver
     raise ArgumentError, 'invalid domain instance' unless domain.is_a? Domain
 
     if includes? domain
-      puts "You may be asked for your password to delete #{@dirname}/#{domain.name}"
-      system("sudo rm -rf #{@dirname}/#{domain.name}")
+      puts "You may be asked for your password to delete #{@dirname}/#{domain.name}" if @sudo
+      system("#{'sudo' if @sudo} rm -rf #{@dirname}/#{domain.name}")
       Resolver::flush_cache!
     end
   end

data/lib/vagrant-dnsmasq/includes/helper.rb

@@ -1,10 +1,10 @@
-def delete_line_from_file(filename, line)
+def delete_line_from_file(filename, regex)
   # create empty file string
   tmp_file = ''
 
   # iterate over every line and skip lines that match
   File.open(filename, "r").each_line do |l|
-    tmp_file += l unless line.match(l.strip)
+    tmp_file += l unless regex.match(l.strip)
   end
 
   # write tmp file without matching lines
@@ -14,9 +14,8 @@ def delete_line_from_file(filename, line)
   tmp_file = nil
 end
 
-
 class Object
   def blank?
-    self.nil? || self.empty?
+    respond_to?(:empty?) ? empty? : !self
   end
 end

data/lib/vagrant-dnsmasq/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dnsmasq
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/vagrant-dnsmasq.rb

@@ -1,17 +1,24 @@
 module Vagrant
   module Dnsmasq
-
     class Plugin < Vagrant.plugin("2")
       name "vagrant-dnsmasq"
+      description "A Dnsmasq Vagrant plugin that manages the dnsmasq.conf file and /etc/resolver directory on your host system."
+
+      lib_path = Pathname.new(File.expand_path("../vagrant-dnsmasq", __FILE__))
+      require lib_path.join("actions")
+
+      inc_path = Pathname.new(File.expand_path("../vagrant-dnsmasq/includes", __FILE__))
+      require inc_path.join("Domain.class.rb")
+      require inc_path.join("Ip.class.rb")
+      require inc_path.join("DnsmasqConf.class.rb")
+      require inc_path.join("Resolver.class.rb")
+      require inc_path.join("helper.rb")
 
       config "dnsmasq" do
-        require "vagrant-dnsmasq/config"
+        require lib_path.join("config")
         Config
       end
 
-      lib_path = Pathname.new(File.expand_path("../vagrant-dnsmasq", __FILE__))
-      require lib_path.join("actions")
-
       action_hook(:dnsmasq, :machine_action_up) do |hook|
         hook.append(Vagrant::Action::Up)
       end
@@ -23,4 +30,4 @@ module Vagrant
     end
   end
 
-end
+end

data/test/Dnsmasq.class.spec.rb

@@ -0,0 +1,63 @@
+require './lib/vagrant-dnsmasq/includes/DnsmasqConf.class.rb'
+require './lib/vagrant-dnsmasq/includes/Domain.class.rb'
+require './lib/vagrant-dnsmasq/includes/Ip.class.rb'
+
+random = (0...50).map{ ('a'..'z').to_a[rand(26)] }.join
+
+describe "At first" do
+  it "should fail if there is no conf file" do
+  expect {
+    DnsmasqConf.new("/tmp/some-non-existing-file-#{random}-h25hch345b3k5")
+  }.to raise_error IOError
+  end
+end
+
+
+describe DnsmasqConf do
+  before(:each) do
+    system "touch /tmp/dnsmasq-conf-#{random}" 
+    @dnsm = DnsmasqConf.new("/tmp/dnsmasq-conf-#{random}")
+    @domain = Domain.new('.foobar')
+    @ip = Ip.new('10.10.10.10')
+  end
+
+  after(:each) do
+    system("rm /tmp/dnsmasq-conf-#{random}") if File.exists? "/tmp/dnsmasq-conf-#{random}"
+  end
+
+  it "should insert a domain" do
+    @dnsm.insert(@domain, @ip)
+    @dnsm.includes?(@domain).should eq(true)
+  end
+
+  it "should return false if no domain is found" do
+    @dnsm.includes?(Domain.new('.doesntexist')).should eq(false)
+  end
+
+  it "should delete a domain" do
+    @dnsm.includes?(@domain).should eq(false)
+    @dnsm.insert(@domain, @ip)
+    @dnsm.includes?(@domain).should eq(true)
+    @dnsm.delete(@domain) 
+    @dnsm.includes?(@domain).should eq(false)
+  end 
+
+  it "#insert should raise if domain is nil" do
+    expect {
+      @dnsm.insert(nil, nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#delete should raise if domain is nil" do
+    expect {
+      @dnsm.delete(nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#includes? should raise if domain is nil" do
+    expect {
+      @dnsm.includes?(nil)
+    }.to raise_error ArgumentError
+  end
+
+end

data/test/Domain.class.spec.rb

@@ -0,0 +1,61 @@
+require './lib/vagrant-dnsmasq/includes/Domain.class.rb'
+
+describe Domain do
+
+  it "should return normal domain" do
+    Domain.new('foobar').name.should eq('foobar')
+    Domain.new('.foobar').name.should eq('foobar')
+  end
+
+  it "should return dotted domain" do
+    Domain.new('foobar').dotted.should eq('.foobar')
+    Domain.new('.foobar').dotted.should eq('.foobar')
+  end
+
+  it "should return valid domain if domain is passed" do
+    Domain.new(Domain.new('foobar')).name.should eq('foobar')
+    Domain.new(Domain.new('.foobar')).name.should eq('foobar')
+    Domain.new(Domain.new('foobar')).dotted.should eq('.foobar')
+    Domain.new(Domain.new('.foobar')).dotted.should eq('.foobar')
+  end
+
+  it "should make the domain lowercase" do
+    Domain.new('FOOBAR').name.should eq('foobar')
+  end
+
+  it "should fail for invalid domains" do
+    expect {
+      Domain.new('foo1')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('foo_')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('foo.')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('foo-')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new(nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#valid? should fail for invalid domains" do
+    Domain::valid?('foo1').should eq(false)
+    Domain::valid?('foo_').should eq(false)
+    Domain::valid?('foo.').should eq(false)
+    Domain::valid?('foo-').should eq(false)
+    Domain::valid?('').should eq(false)
+    Domain::valid?(nil).should eq(false)
+  end
+
+end

data/test/Ip.class.spec.rb

@@ -0,0 +1,43 @@
+require './lib/vagrant-dnsmasq/includes/Ip.class.rb'
+
+describe Ip do
+
+  it "should return ipv4" do
+    Ip.new('10.10.10.10').v4.should eq('10.10.10.10')
+  end
+
+  it "should return ipv4 if ip is passed" do
+    Ip.new(Ip.new('10.10.10.10')).v4.should eq('10.10.10.10')
+  end
+
+  it "should fail for invalid ips" do
+    expect {
+      Ip.new('10.10.10')
+    }.to raise_error ArgumentError
+
+    expect {
+      Ip.new('300.0.0.1')
+    }.to raise_error ArgumentError
+
+    expect {
+      Ip.new('10-10-10-10')
+    }.to raise_error ArgumentError
+
+    expect {
+      Ip.new('')
+    }.to raise_error ArgumentError
+
+    expect {
+      Ip.new(nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#valid? should fail for invalid ips" do
+    Ip::ipv4_valid?('10.10.10').should eq(false)
+    Ip::ipv4_valid?('300.0.0.1').should eq(false)
+    Ip::ipv4_valid?('10-10-10-10').should eq(false)
+    Ip::ipv4_valid?('').should eq(false)
+    Ip::ipv4_valid?(nil).should eq(false)
+  end
+
+end

data/test/Resolver.class.spec.rb

@@ -0,0 +1,62 @@
+require './lib/vagrant-dnsmasq/includes/Resolver.class.rb'
+require './lib/vagrant-dnsmasq/includes/Domain.class.rb'
+require './lib/vagrant-dnsmasq/includes/Ip.class.rb'
+
+random = (0...50).map{ ('a'..'z').to_a[rand(26)] }.join
+
+describe "At first" do
+  it "should fail if there is no dir" do
+  expect {
+    Resolver.new("/tmp/some-non-existing-dir-#{random}-j2335n3kjfs3ap")
+  }.to raise_error IOError
+  end
+end
+
+describe Resolver do
+  before(:each) do
+    system("mkdir -p /tmp/resolver-dir-#{random}")
+    @res = Resolver.new("/tmp/resolver-dir-#{random}")
+    @domain = Domain.new('.foobar')
+    @ip = Ip.new('10.10.10.10')
+  end
+
+  after(:each) do
+    system("rm -R /tmp/resolver-dir-#{random}") if File.exists? "/tmp/resolver-dir-#{random}"
+  end
+
+  it "should insert a domain" do
+    @res.insert(@domain, @ip)
+    @res.includes?(@domain).should eq(true)
+  end
+
+  it "should return false if no domain is found" do
+    @res.includes?(Domain.new('.doesntexist')).should eq(false)
+  end
+
+  it "should delete a domain" do
+    @res.includes?(@domain).should eq(false)
+    @res.insert(@domain, @ip)
+    @res.includes?(@domain).should eq(true)
+    @res.delete(@domain) 
+    @res.includes?(@domain).should eq(false)
+  end 
+
+  it "#insert should raise if domain is nil" do
+    expect {
+      @res.insert(nil, nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#delete should raise if domain is nil" do
+    expect {
+      @res.delete(nil)
+    }.to raise_error ArgumentError
+  end
+
+  it "#includes? should raise if domain is nil" do
+    expect {
+      @res.includes?(nil)
+    }.to raise_error ArgumentError
+  end
+
+end

data/test/Vagrantfile

@@ -1,27 +1,44 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.require_plugin('vagrant-dnsmasq')
-
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise64'
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
+  # dnsmasq works with both, private network as well as public network
   # config.vm.network :private_network, ip: "192.168.59.100"
   config.vm.network :public_network
 
 
   # dnsmasq ...
 
-  # enable dnsmasq?
-  # set to false or delete line to disable dnsmasq handling
-  config.dnsmasq.enable = true
+  # set domain ending (required)
+  # adding this line enables dnsmasq handling
+  config.dnsmasq.domain = '.dnsmasqplugintest'
 
-  # set domain ending
-  config.dnsmasq.domain = '.dev'
+  # optional configuration ...
 
   # this plugin runs 'hostname -I' on the guest machine to obtain
-  # the guest ip address. you could overwrite the ip here. optional.
-  # config.dnsmasq.ip = '192.168.59.100'
+  # the guest ip address. you can overwrite this behaviour.
+  # config.dnsmasq.ip = '192.168.59.109'
+
+  # config.dnsmasq.ip = proc do |guest_machine| 
+  #   guest_machine.communicate.sudo("command to obtain ip somehow") do |type, data| 
+  #     # return something like '192.168.59.100' or ['192.168.59.100', '192.168.59.103']
+  #   end
+  # end
+
+  # this will prompt you during 'vagrant up' to choose an IP
+  # config.dnsmasq.ip = ['192.168.59.100', '192.168.59.103']
+
+  # overwrite default location for /etc/resolver directory
+  # config.dnsmasq.resolver = '/etc/resolver'
+
+  # overwrite default location for /usr/local/etc/dnsmasq.conf
+  brew_prefix = `brew --prefix`.strip
+  config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
+
+  # disable dnsmasq handling
+  # config.dnsmasq.disable = true
 
-end
+end

data/test/helper.spec.rb

@@ -0,0 +1,34 @@
+require './lib/vagrant-dnsmasq/includes/helper.rb'
+
+random = (0...50).map{ ('a'..'z').to_a[rand(26)] }.join
+
+
+describe "Helper" do
+
+  it "#delete_line_from_file should delete a line from a file" do
+    tmp_file = "/tmp/helper-delete-line-from-file-test-#{random}"
+    system "echo \"line 1\n another line\n\na line after an empty line  \nline5\" > #{tmp_file}" 
+    delete_line_from_file(tmp_file, Regexp.new("an"))
+    IO.read(tmp_file).should eq("line 1\n\nline5\n")
+    system("rm #{tmp_file}") if File.exists? tmp_file
+  end
+
+end
+
+describe Object do
+  it "#blank? should work" do
+    "".blank?.should eq(true)
+    nil.blank?.should eq(true)
+    [].blank?.should eq(true)
+    false.blank?.should eq(true)
+    
+    0.blank?.should eq(false)
+
+    'foo'.blank?.should eq(false)
+    [1].blank?.should eq(false)
+    true.blank?.should eq(false)
+    1.blank?.should eq(false)
+    -1.blank?.should eq(false)
+
+  end
+end

data/vagrant-dnsmasq.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsmasq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - mattes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Dnsmasq Vagrant plugin that manages the dnsmasq.conf file and /etc/resolver
   directory on your host system.
 email:
@@ -47,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -56,13 +71,18 @@ files:
 - lib/vagrant-dnsmasq.rb
 - lib/vagrant-dnsmasq/actions.rb
 - lib/vagrant-dnsmasq/config.rb
-- lib/vagrant-dnsmasq/includes/Dnsmasq.class.rb
+- lib/vagrant-dnsmasq/includes/DnsmasqConf.class.rb
 - lib/vagrant-dnsmasq/includes/Domain.class.rb
 - lib/vagrant-dnsmasq/includes/Ip.class.rb
 - lib/vagrant-dnsmasq/includes/Resolver.class.rb
 - lib/vagrant-dnsmasq/includes/helper.rb
 - lib/vagrant-dnsmasq/version.rb
+- test/Dnsmasq.class.spec.rb
+- test/Domain.class.spec.rb
+- test/Ip.class.spec.rb
+- test/Resolver.class.spec.rb
 - test/Vagrantfile
+- test/helper.spec.rb
 - vagrant-dnsmasq.gemspec
 homepage: https://github.com/mattes/vagrant-dnsmasq
 licenses:
@@ -90,4 +110,9 @@ specification_version: 4
 summary: A Dnsmasq Vagrant plugin that manages the dnsmasq.conf file and /etc/resolver
   directory on your host system.
 test_files:
+- test/Dnsmasq.class.spec.rb
+- test/Domain.class.spec.rb
+- test/Ip.class.spec.rb
+- test/Resolver.class.spec.rb
 - test/Vagrantfile
+- test/helper.spec.rb