vagrant-dnsmasq 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835c9917b38e165f4a5b04c593c11d8ad88c1b45
-  data.tar.gz: 2a0dd01d6baafd68a189d3526f4db622c839d53f
+  metadata.gz: a22f37f14051709fb9d3ff209ba8f7bbf43ddf54
+  data.tar.gz: 31dde16d265e00a553caeed1a707da3774c82a65
 SHA512:
-  metadata.gz: f5918efdad10112169ddae03bbb89b23f2cdd7805336867a196ffb0a69817e49fa8f6d12fa7fcade4bacf8a527cbe69adc35f0a4cdc9329621745e7f9c651795
-  data.tar.gz: e62960e4ec379a5302b204d3f3ab35911094d32fb85214b4810adafbb5b76ea8c810776e8fbcf31507aba21f65eaf278c237df467347d1953c04f0c4ce3effb3
+  metadata.gz: 8d31c836656532f3b975976f94f72073be3e2ca72184682375ca11371082e56d2a2b96fac114d61960b84a7e90ee8139348b85474287a5d94e11012fbffa8fe9
+  data.tar.gz: f218310e2fa580f1789b9208fe8a91a5c1cdfe54279d8d21bf08701a7c138aa5748741f2f70d6b33895e10b734088ff02cdf3fe6d1bef4a97f822497e5d8d430

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-dnsmasq (0.0.6)
+    vagrant-dnsmasq (0.0.7)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -41,9 +41,12 @@ config.dnsmasq.domain = '.dev'
 # 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'
+# 'vagrant destroy' does not delete /etc/resolver nameserver file, defaults to false
+# config.dnsmasq.keep_resolver_on_destroy = true
+
+# overwrite default location for /etc/dnsmasq.conf
+brew_prefix = `brew --prefix`.strip
+config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
 
 # disable dnsmasq handling
 # config.dnsmasq.disable = true

data/lib/vagrant-dnsmasq/actions.rb

@@ -10,7 +10,7 @@ module Vagrant
 
       def call(env)
         if @machine.config.dnsmasq.enabled?
-          # env[:ui].info "Dnsmasq handler actived"
+          env[:ui].info "Dnsmasq handler actived"
 
           @ip = @machine.config.dnsmasq.ip
 
@@ -53,7 +53,7 @@ module Vagrant
             
             # update /etc/resolver
             resolver = Resolver.new(@machine.config.dnsmasq.resolver, true) # true for sudo
-            resolver.insert(@machine.config.dnsmasq.domain, use_ip)
+            resolver.insert(@machine.config.dnsmasq.domain, Ip.new('127.0.0.1'))
 
             env[:ui].success "Dnsmasq handler set IP '#{use_ip}' for domain '#{@machine.config.dnsmasq.domain.dotted}'"
 
@@ -83,8 +83,10 @@ module Vagrant
           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)
+          unless @machine.config.dnsmasq.keep_resolver_on_destroy
+            resolver = Resolver.new(@machine.config.dnsmasq.resolver, true) # true for sudo
+            resolver.delete(@machine.config.dnsmasq.domain)
+          end
 
           env[:ui].success "Dnsmasq handler removed domain '#{@machine.config.dnsmasq.domain}'"
 

data/lib/vagrant-dnsmasq/config.rb

@@ -5,6 +5,7 @@ module Vagrant
       attr_accessor :domain
       attr_accessor :ip
       attr_accessor :resolver
+      attr_accessor :keep_resolver_on_destroy
       attr_accessor :dnsmasqconf
       attr_accessor :disable
 
@@ -12,12 +13,14 @@ module Vagrant
         @domain = UNSET_VALUE
         @ip = UNSET_VALUE
         @resolver = UNSET_VALUE
+        @keep_resolver_on_destroy = UNSET_VALUE
         @dnsmasqconf = UNSET_VALUE
         @disable = UNSET_VALUE
       end
 
       def finalize!
         @domain = nil if @domain == UNSET_VALUE
+        @keep_resolver_on_destroy = false if @keep_resolver_on_destroy == UNSET_VALUE
         @resolver = '/etc/resolver' if @resolver == UNSET_VALUE
         @dnsmasqconf = "/etc/dnsmasq.conf" if @dnsmasqconf == UNSET_VALUE
         @disable = false if @disable == UNSET_VALUE
@@ -64,8 +67,6 @@ module Vagrant
           @ip = nil
         end        
 
-
-
         # verify resolver
         if @resolver
           errors << "directory '#{@resolver}' does not exist" unless Dir.exists? @resolver

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

@@ -8,6 +8,19 @@ class DnsmasqConf
     @filename = filename
   end
 
+  def self.flush_cache!
+    begin
+      # restart dnsmasq (if installed with homebrew)
+      system "launchctl unload /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist"
+      system "launchctl load /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist"
+
+      # @todo: call proc or try other fancy things to reload dnsmasq
+
+    rescue => e
+      # hmm ... i dont care
+    end
+  end
+
   def insert(domain, ip)
     raise ArgumentError, 'invalid domain instance' unless domain.is_a? Domain
     raise ArgumentError, 'invalid ip instance' unless ip.is_a? Ip
@@ -17,6 +30,8 @@ class DnsmasqConf
     File.open(@filename, 'a') { |file|
       file.write "\naddress=/#{domain.dotted}/#{ip.v4}"
     }
+
+    DnsmasqConf::flush_cache!
   end
 
   def includes?(domain)
@@ -32,6 +47,7 @@ class DnsmasqConf
     raise ArgumentError, 'invalid domain instance' unless domain.is_a? Domain
 
     delete_line_from_file(@filename, Regexp.new("address=/\.#{domain.name}"))
+    DnsmasqConf::flush_cache!
   end
 
 

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

@@ -19,13 +19,15 @@ class Resolver
 
   def insert(domain, ip)
     raise ArgumentError, 'invalid domain instance' unless domain.is_a? Domain
+    raise ArgumentError, 'invalid ip instance' unless ip.is_a? Ip
 
-    delete(domain) if includes?(domain)
-
-    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!
+    unless includes?(domain, ip)
+      delete(domain) 
 
+      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
   end
 
   def delete(domain)
@@ -38,10 +40,15 @@ class Resolver
     end
   end
 
-  def includes?(domain)
+  def includes?(domain, with_ip = nil)
     raise ArgumentError, 'invalid domain instance' unless domain.is_a? Domain
 
-    File.exists? "#{@dirname}/#{domain.name}"
+    unless with_ip.nil?
+      raise ArgumentError, 'invalid ip instance' unless with_ip.is_a? Ip
+      File.exists?("#{@dirname}/#{domain.name}") && IO.read("#{@dirname}/#{domain.name}").strip == "nameserver #{with_ip.v4}"
+    else
+      File.exists? "#{@dirname}/#{domain.name}"
+    end
   end
 
 end

data/lib/vagrant-dnsmasq/version.rb

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

data/test/Resolver.class.spec.rb

@@ -41,6 +41,17 @@ describe Resolver do
     @res.includes?(@domain).should eq(false)
   end 
 
+  it "#includes? should verify content of domain file" do
+    @res.includes?(@domain).should eq(false)
+    @res.includes?(@domain, @ip).should eq(false)
+
+    @res.insert(@domain, @ip)
+
+    @res.includes?(@domain).should eq(true)
+    @res.includes?(@domain, @ip).should eq(true)
+    @res.includes?(@domain, Ip.new('10.10.10.11')).should eq(false)
+  end 
+
   it "#insert should raise if domain is nil" do
     expect {
       @res.insert(nil, nil)

data/test/Vagrantfile

@@ -34,7 +34,10 @@ Vagrant.configure('2') do |config|
   # overwrite default location for /etc/resolver directory
   # config.dnsmasq.resolver = '/etc/resolver'
 
-  # overwrite default location for /usr/local/etc/dnsmasq.conf
+  # 'vagrant destroy' does not delete /etc/resolver nameserver file, defaults to false
+  # config.dnsmasq.keep_resolver_on_destroy = true
+
+  # overwrite default location for /etc/dnsmasq.conf
   brew_prefix = `brew --prefix`.strip
   config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsmasq
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - mattes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler