vagrant-dnsmasq 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b75455201bfb6befe1e758adbc39e12fc285499
-  data.tar.gz: 533a9dba6753b9f00fed10706b995f983e87c57a
+  metadata.gz: 32fa6a951824651c68fc45260332a031c5cac985
+  data.tar.gz: 1dc26c7cf06d98bd76d5a56713a2abac4242be2e
 SHA512:
-  metadata.gz: 7453f930a999bba5635ba38e20175ba4668cbd9bd1e765f229b38678b7741a81ca5b1acebf72d717af931edf525b2d200e614470a6be1ef2d0401150e81f3644
-  data.tar.gz: ba5e5c725f7f2c3ea2b67602c390c30ac66ca280a2a72d4dd306485f57ce852987302167ee415a4edd045308e04327bb01d03aee684ddd6cc8d1809f0964e999
+  metadata.gz: d9abe56b4521cd162621b34c409daa324406bb1619322a050aa1fd5a76a3607fdb417374c11513512bec0edbdaf884dc056c0939c3493718e2ee982eca9c474a
+  data.tar.gz: b45905b0a184b75100758da736c46d0e8a220bac5c9e379f9918a1f173e59698da9a104070a481bf48e34b72c1e4e7f65a310c8fb03bdc7a8d4ae4e4adc5640e

data/.ruby-version

@@ -0,0 +1 @@
+2.1.3

data/.travis.yml

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

data/Gemfile.lock

@@ -15,31 +15,35 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-dnsmasq (0.0.9)
+    vagrant-dnsmasq (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.0)
-    i18n (0.6.4)
+    ffi (1.9.3)
+    i18n (0.6.11)
     json (1.7.7)
     log4r (1.1.10)
-    net-scp (1.1.1)
+    net-scp (1.1.2)
       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)
+    net-ssh (2.6.8)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -48,6 +48,9 @@ config.dnsmasq.domain = '.dev'
 brew_prefix = `brew --prefix`.strip
 config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
 
+# command for reloading dnsmasq after config changes
+config.dnsmasq.reload_command = 'sudo launchctl unload /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist; sudo launchctl load /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist'
+
 # disable dnsmasq handling
 # config.dnsmasq.disable = true
 ```

data/lib/vagrant-dnsmasq/actions.rb

@@ -48,7 +48,7 @@ module Vagrant
             # use ip to update dnsmasq.conf and /etc/resolver
 
             # update dnsmasq.conf
-            dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf)
+            dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf, @machine.config.dnsmasq.reload_command)
             dnsmasq.insert(@machine.config.dnsmasq.domain, use_ip)
             
             # update /etc/resolver
@@ -79,7 +79,7 @@ module Vagrant
           # remove records from dnsmasq.conf and /etc/resolver
 
           # update dnsmasq.conf
-          dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf)
+          dnsmasq = DnsmasqConf.new(@machine.config.dnsmasq.dnsmasqconf, @machine.config.dnsmasq.reload_command)
           dnsmasq.delete(@machine.config.dnsmasq.domain)
 
           # update /etc/resolver

data/lib/vagrant-dnsmasq/config.rb

@@ -7,6 +7,7 @@ module Vagrant
       attr_accessor :resolver
       attr_accessor :keep_resolver_on_destroy
       attr_accessor :dnsmasqconf
+      attr_accessor :reload_command
       attr_accessor :disable
 
       def initialize
@@ -15,14 +16,22 @@ module Vagrant
         @resolver = UNSET_VALUE
         @keep_resolver_on_destroy = UNSET_VALUE
         @dnsmasqconf = UNSET_VALUE
+        @reload_command = UNSET_VALUE
         @disable = UNSET_VALUE
       end
 
       def finalize!
-        @domain = nil if @domain == UNSET_VALUE
+
+        if @domain == UNSET_VALUE 
+          @domain = nil
+        elsif !@domain.is_a?(Domain)
+          @domain = Domain.new @domain;
+        end
+        
         @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
+        @reload_command = nil if @reload_command == UNSET_VALUE
         @disable = false if @disable == UNSET_VALUE
 
         # default way to obtain ip address

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

@@ -1,28 +1,24 @@
 class DnsmasqConf
 
   attr_reader :filename
+  attr_reader :reload_command
 
-  def initialize(filename)
+  def initialize(filename, reload_command)
     raise ArgumentError, 'wrong filename' if filename.blank?
     raise IOError unless File.exists? filename
     @filename = filename
+    @reload_command = reload_command
   end
 
-  def self.flush_cache!
-    begin
-      # restart dnsmasq (if installed with homebrew)
-
-
-      # hmm ... this seems to be useless?!
-      # puts "You might be asked for your password to restart the dnsmasq daemon."
-      # system "sudo launchctl unload /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist"
-      # system "sudo 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
+  def reload
+    if @reload_command
+      begin
+        # reload dnsmasq config if command specified
+        puts "You might be asked for your password to restart the dnsmasq daemon."
+        system @reload_command
+      rescue => e
+        # hmm ... i dont care
+      end
     end
   end
 
@@ -34,7 +30,7 @@ class DnsmasqConf
       File.open(@filename, 'a') { |file|
         file.write "\naddress=/#{domain.dotted}/#{ip.v4}"
       }
-      DnsmasqConf::flush_cache!
+      reload
     end
   end
 
@@ -51,7 +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!
+    reload
   end
 
 

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

@@ -1,6 +1,6 @@
 class Domain
 
-  MATCH = /^\.?[a-z]*$/
+  MATCH = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*$/
 
   def initialize(name)
     @name = nil

data/lib/vagrant-dnsmasq/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dnsmasq
-    VERSION = "0.0.9"
+    VERSION = "0.1.1"
   end
 end

data/test/Dnsmasq.class.spec.rb

@@ -7,7 +7,7 @@ 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")
+    DnsmasqConf.new("/tmp/some-non-existing-file-#{random}-h25hch345b3k5", nil)
   }.to raise_error IOError
   end
 end
@@ -16,7 +16,7 @@ end
 describe DnsmasqConf do
   before(:each) do
     system "touch /tmp/dnsmasq-conf-#{random}" 
-    @dnsm = DnsmasqConf.new("/tmp/dnsmasq-conf-#{random}")
+    @dnsm = DnsmasqConf.new("/tmp/dnsmasq-conf-#{random}", nil)
     @domain = Domain.new('.foobar')
     @ip = Ip.new('10.10.10.10')
   end

data/test/Domain.class.spec.rb

@@ -5,11 +5,25 @@ describe Domain do
   it "should return normal domain" do
     Domain.new('foobar').name.should eq('foobar')
     Domain.new('.foobar').name.should eq('foobar')
+    Domain.new('foo.bar').name.should eq('foo.bar')
+    Domain.new('.foo.bar').name.should eq('foo.bar')
+    Domain.new('foo8ar').name.should eq('foo8ar')
+    Domain.new('.foo8ar').name.should eq('foo8ar')
+    Domain.new('foo.8ar').name.should eq('foo.8ar')
+    Domain.new('.foo.8ar').name.should eq('foo.8ar')
+    Domain.new('foo-bar').name.should eq('foo-bar')
   end
 
   it "should return dotted domain" do
     Domain.new('foobar').dotted.should eq('.foobar')
     Domain.new('.foobar').dotted.should eq('.foobar')
+    Domain.new('foo.bar').dotted.should eq('.foo.bar')
+    Domain.new('.foo.bar').dotted.should eq('.foo.bar')
+    Domain.new('foo8ar').dotted.should eq('.foo8ar')
+    Domain.new('.foo8ar').dotted.should eq('.foo8ar')
+    Domain.new('foo.8ar').dotted.should eq('.foo.8ar')
+    Domain.new('.foo.8ar').dotted.should eq('.foo.8ar')
+    Domain.new('foo-bar').dotted.should eq('.foo-bar')
   end
 
   it "should return valid domain if domain is passed" do
@@ -17,6 +31,19 @@ describe Domain do
     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')
+    Domain.new(Domain.new('foo.bar')).name.should eq('foo.bar')
+    Domain.new(Domain.new('.foo.bar')).name.should eq('foo.bar')
+    Domain.new(Domain.new('foo.bar')).dotted.should eq('.foo.bar')
+    Domain.new(Domain.new('.foo.bar')).dotted.should eq('.foo.bar')
+    Domain.new(Domain.new('foo8ar')).name.should eq('foo8ar')
+    Domain.new(Domain.new('.foo8ar')).name.should eq('foo8ar')
+    Domain.new(Domain.new('foo8ar')).dotted.should eq('.foo8ar')
+    Domain.new(Domain.new('.foo8ar')).dotted.should eq('.foo8ar')
+    Domain.new(Domain.new('foo.8ar')).name.should eq('foo.8ar')
+    Domain.new(Domain.new('.foo.8ar')).name.should eq('foo.8ar')
+    Domain.new(Domain.new('foo.8ar')).dotted.should eq('.foo.8ar')
+    Domain.new(Domain.new('.foo.8ar')).dotted.should eq('.foo.8ar')
+    Domain.new(Domain.new('foo-bar')).name.should eq('foo-bar')
   end
 
   it "should make the domain lowercase" do
@@ -25,7 +52,15 @@ describe Domain do
 
   it "should fail for invalid domains" do
     expect {
-      Domain.new('foo1')
+      Domain.new('foo*')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('.')
+    }.to raise_error ArgumentError
+
+    expect {
+      Domain.new('foo..bar')
     }.to raise_error ArgumentError
 
     expect {
@@ -36,6 +71,10 @@ describe Domain do
       Domain.new('foo.')
     }.to raise_error ArgumentError
 
+    expect {
+      Domain.new('-foo')
+    }.to raise_error ArgumentError
+
     expect {
       Domain.new('foo-')
     }.to raise_error ArgumentError
@@ -50,9 +89,12 @@ describe Domain do
   end
 
   it "#valid? should fail for invalid domains" do
-    Domain::valid?('foo1').should eq(false)
+    Domain::valid?('foo*').should eq(false)
+    Domain::valid?('.').should eq(false)
+    Domain::valid?('foo..bar').should eq(false)
     Domain::valid?('foo_').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)

data/test/Vagrantfile

@@ -41,6 +41,9 @@ Vagrant.configure('2') do |config|
   brew_prefix = `brew --prefix`.strip
   config.dnsmasq.dnsmasqconf = brew_prefix + '/etc/dnsmasq.conf'
 
+  # specify command to reload dnsmasq
+  config.dnsmasq.reload_command = 'sudo launchctl unload /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist; sudo launchctl load /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist'
+
   # disable dnsmasq handling
   # config.dnsmasq.disable = true
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsmasq
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - mattes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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
@@ -60,8 +60,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -94,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Dnsmasq Vagrant plugin that manages the dnsmasq.conf file and /etc/resolver