landrush 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e55caad175c97da6a1f7d178c96bda82012444
-  data.tar.gz: ada1f79f5d38f7b9ca4b28ddabb12277fc7cde2e
+  metadata.gz: c8a036c6758ecfa355d3763dd2df37cc8a699202
+  data.tar.gz: e8778c8cd9924ab4503fc2c3b4a1a8a5d4a7417f
 SHA512:
-  metadata.gz: 247f383e81f21f58cb625aa698b64ba70430330347f84725cd5eb02485929385110563f3f24a91cce708ea187cc00b1a4a8285fbd9fc47161f63ad921753e61a
-  data.tar.gz: 119d68e29a0bf5593e0c2734066f956458062faa2b0cb80d3dd66d1536ef2cc44fe01fc1981e5c7aab97e8986a8c52d6dcd319572c944460c009fa9bccc21cd1
+  metadata.gz: 5a1dd7d4800f0bced106a1792006d39d223bf57e7e22b363d6e66ca1cb3708adf65528d105963af6df7f95b03ab30c4cd20b3fe66859b3b5623d29f7b3dd95aa
+  data.tar.gz: 99f611d7fb8ac8368f643857b77b6ef283dc848d9b77a6889c4006d07076eae05c0037589b6bf0f9f9ca437797413877e50e55542995f8ca2744fb926f99bf8e

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+
+before_install:
+  - sudo apt-get install dnsutils

data/README.md

@@ -1,4 +1,4 @@
-# Landrush: DNS for Vagrant
+# Landrush: DNS for Vagrant [![Build Status](https://travis-ci.org/phinze/landrush.png)](https://travis-ci.org/phinze/landrush)
 
 Simple DNS that's visible on both the guest and the host.
 
@@ -30,6 +30,16 @@ And you should be able to get your hostname from your host:
 
 If you shut down your guest, the entries associated with it will be removed.
 
+### Dynamic entries
+
+Every time a VM is started, its IP address is automatically detected and a DNS record is created that maps the hostname to its IP.
+
+If for any reason the auto-detection detects no IP address or the wrong IP address, or you want to override it, you can do like so:
+
+    config.landrush.host_ip_address = '1.2.3.4'
+
+If you are using a multi-machine `Vagrantfile`, configure this inside each of your `config.vm.define` sections.
+
 ### Static entries
 
 You can add static host entries to the DNS server in your `Vagrantfile` like so:
@@ -64,6 +74,13 @@ If you would like to configure your own upstream servers, add upstream entries t
 
 Linux guests should automatically have their DNS traffic redirected via `iptables` rules to the Landrush DNS server. File an issue if this does not work for you.
 
+To disable this functionality:
+
+    config.landrush.guest_redirect_dns = false
+
+You may want to do this if you are already proxying all your DNS requests through your host (e.g. using VirtualBox's natdnshostresolver1 option) and you
+have DNS servers that you can easily set as upstreams in the daemon (e.g. DNS requests that go through the host's VPN connection).
+
 ### Visibility on the Host
 
 If you're on an OS X host, we use a nice trick to unobtrusively add a secondary DNS server only for specific domains.

data/examples/Vagrantfile

@@ -8,10 +8,6 @@
 #   VAGRANT_CWD=examples bundle exce vagrant halt
 #
 
-# This line is unnecessary when the plugin is installed normally; it's just
-# here for the development / testing use case.
-Vagrant.require_plugin "landrush"
-
 Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
 

data/lib/landrush/action/common.rb

@@ -31,7 +31,7 @@ module Landrush
       def vmware?
         provider == :vmware_fusion
       end
-      
+
       def parallels?
         provider == :parallels
       end
@@ -41,7 +41,7 @@ module Landrush
           raise "The landrush plugin does not support the #{key} provider yet!"
         }
 
-        if provider_name == :parallels and VagrantPlugins::Parallels::VERSION < "1.0.3"
+        if provider_name == :parallels and Gem::Version.new(VagrantPlugins::Parallels::VERSION) < Gem::Version.new("1.0.3")
           raise "The landrush plugin supports the Parallels provider v1.0.3 and later. Please, update your 'vagrant-parallels' plugin."
         end
 
@@ -70,6 +70,10 @@ module Landrush
         config.enabled?
       end
 
+      def guest_redirect_dns?
+        config.guest_redirect_dns?
+      end
+
       def info(msg)
         env[:ui].info "[landrush] #{msg}"
       end

data/lib/landrush/action/redirect_dns.rb

@@ -5,13 +5,13 @@ module Landrush
 
       def call(env)
         handle_action_stack(env) do
-          redirect_dns if enabled?
+          redirect_dns if enabled? and guest_redirect_dns?
         end
       end
 
       def redirect_dns
         info "setting up machine's DNS to point to our server"
-        machine.guest.capability(:redirect_dns, host: _target_host, port: 10053)
+        machine.guest.capability(:redirect_dns, host: _target_host, port: Server.port)
 
         machine.config.vm.networks.each do |type, options|
           info "network: #{type.inspect}, #{options.inspect}"
@@ -36,4 +36,3 @@ module Landrush
     end
   end
 end
-

data/lib/landrush/action/setup.rb

@@ -58,7 +58,8 @@ module Landrush
       end
 
       def record_machine_dns_entry
-        ip_address = machine.guest.capability(:read_host_visible_ip_address)
+        ip_address = machine.config.landrush.host_ip_address ||
+                     machine.guest.capability(:read_host_visible_ip_address)
 
         info "adding machine entry: #{machine_hostname} => #{ip_address}"
 

data/lib/landrush/cap/linux/read_host_visible_ip_address.rb

@@ -22,7 +22,6 @@ module Landrush
         # TODO: Find a better heuristic for this implementation.
         #
         def self.read_host_visible_ip_address(machine)
-          command = "ifconfig  | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1 }'"
           result  = ""
           machine.communicate.execute(command) do |type, data|
             result << data if type == :stdout
@@ -30,6 +29,10 @@ module Landrush
 
           result.chomp.split("\n").last
         end
+
+        def self.command
+          %Q(hostname -I | awk -F' ' '{print $NF}')
+        end
       end
     end
   end

data/lib/landrush/config.rb

@@ -2,6 +2,7 @@ module Landrush
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :hosts
     attr_accessor :upstream_servers
+    attr_accessor :host_ip_address
 
     def initialize
       @hosts = {}
@@ -9,6 +10,7 @@ module Landrush
       @default_upstream = [[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]]
       @default_tld = 'vagrant.dev'
       @upstream_servers = @default_upstream
+      @guest_redirect_dns = true
     end
 
     def enable(enabled=true)
@@ -23,6 +25,14 @@ module Landrush
       @enabled
     end
 
+    def guest_redirect_dns=(guest_redirect_dns=true)
+      @guest_redirect_dns=guest_redirect_dns
+    end
+
+    def guest_redirect_dns?
+      @guest_redirect_dns
+    end
+
     def host(hostname, ip_address=nil)
       @hosts[hostname] = ip_address
     end
@@ -45,7 +55,7 @@ module Landrush
         @upstream_servers.push [:tcp, ip, port]
       else
         @upstream_servers.push [protocol, ip, port]
-      end 
+      end
     end
 
     def merge(other)

data/lib/landrush/resolver_config.rb

@@ -29,7 +29,7 @@ module Landrush
     def desired_contents; <<-EOS.gsub(/^      /, '')
       # Generated by landrush, a vagrant plugin
       nameserver 127.0.0.1
-      port 10053
+      port #{Server.port}
       EOS
     end
 

data/lib/landrush/store.rb

@@ -28,15 +28,18 @@ module Landrush
 
     def find(search)
       current_config.keys.detect do |key|
-        key == search             ||
-          search =~ /#{key}$/     ||
-          key    =~ /^#{search}\./
+        key.casecmp(search) == 0   ||
+          search =~ /#{key}$/i     ||
+          key    =~ /^#{search}\./i
       end
     end
 
     def get(key)
       value = current_config[key]
-      redirect = find(value)
+      redirect = nil
+      if value.is_a? String
+        redirect = find(value)
+      end
       if value
         if redirect
           get(redirect)

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/test/landrush/resolver_config_test.rb

@@ -5,13 +5,15 @@ module Landrush
     describe 'ensure_config_exists' do
       it 'writes a resolver config on the host if one is not already there' do
         resolver_config = ResolverConfig.new(fake_environment)
+        skip("Only supported on OSX") unless resolver_config.osx?
+
         resolver_config.config_file.exist?.must_equal false
         resolver_config.ensure_config_exists!
         resolver_config.config_file.exist?.must_equal true
         resolver_config.config_file.read.must_equal <<-EOF.gsub(/^ +/, '')
           # Generated by landrush, a vagrant plugin
           nameserver 127.0.0.1
-          port 10053
+          port #{Server.port}
         EOF
       end
 

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'bundler/setup'
 require 'minitest/spec'
 
 require 'landrush'
+require 'landrush/cap/linux/read_host_visible_ip_address'
 
 require 'minitest/autorun'
 
@@ -84,7 +85,7 @@ def fake_machine(options={})
 
   machine.instance_variable_set("@communicator", RecordingCommunicator.new)
   machine.communicate.stub_command(
-    "ifconfig  | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1 }'",
+    Landrush::Cap::Linux::ReadHostVisibleIpAddress.command,
     "#{options.fetch(:ip, '1.2.3.4')}\n"
   )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md