landrush 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9367fe3e35d41516cf4a30aaf8ac35b629c166d1
-  data.tar.gz: 910fb953178c60bf1f51300c6ac97ed33a99b779
+  metadata.gz: ec605e64f20e01e018e99697a30959d6e853e08c
+  data.tar.gz: 9f277d17166bf5519773ef74a504a54599624ddf
 SHA512:
-  metadata.gz: 1defc8f7a0e566f3532bf6c15d890e0c7eaeae1bcff90eb8af335645f9dbad8c6d1e4c2b6fb901880e1bb534a516b48acb41d6ddb368d8c19e3dc208b7a5e256
-  data.tar.gz: 4874259e55c38e3949afcbb59b6fe46e74759876bd9fefa9dcba85d30635af1267893138bb88f44b3bc0d9fd72a819bf6cdcfa7f906ca3d4755c8ba10c1e315d
+  metadata.gz: 8b0f812b769d51e99b15402c0a8caf65e901f1b6055b1dbe4e1e788cfd1f1a4125a2337a9b67b667ab312186dc4b41da51b61261fcb5b4f9893881745bdde15f
+  data.tar.gz: 045f68ee5fd1ab4aea77c88a8ef53f16be68c415f97bf9763a406cd2ba3b1384cc0a0f7d21948a3feab29575e87e5bef68a5b25f0fed80d06ac80a2202050e5a

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
 
 before_install:
   - sudo apt-get install dnsutils
+  - rvm @global do gem uninstall bundler -x && gem install bundler -v '~> 1.5.2'  # For Vagrant 1.5

data/Gemfile

@@ -14,7 +14,7 @@ end
 group :development do
   gem 'vagrant',
     :git => 'git://github.com/mitchellh/vagrant.git',
-    :ref => 'v1.5.1'
+    :ref => 'v1.6.1'
 
   gem 'byebug'
 end

data/README.md

@@ -18,7 +18,7 @@ Install under Vagrant (1.1 or later):
 
 Enable the plugin in your `Vagrantfile`:
 
-    config.landrush.enable
+    config.landrush.enabled = true
 
 Bring up a machine that has a hostname set (see the `Vagrantfile` for an example)
 

data/examples/Vagrantfile

@@ -9,9 +9,9 @@
 #
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
+  config.vm.box = "hashicorp/precise64"
 
-  config.landrush.enable
+  config.landrush.enabled = true
 
   config.vm.hostname = "myhost.vagrant.dev"
 

data/lib/landrush.rb

@@ -15,6 +15,7 @@ module Landrush
 end
 
 require 'rubydns'
+require 'ipaddr'
 
 require 'landrush/dependent_vms'
 require 'landrush/plugin'

data/lib/landrush/action/setup.rb

@@ -52,8 +52,10 @@ module Landrush
       def setup_static_dns
         config.hosts.each do |hostname, dns_value|
           dns_value ||= machine.guest.capability(:read_host_visible_ip_address)
-          info "adding static entry: #{hostname} => #{dns_value}"
-          Store.hosts.set hostname, dns_value
+          if !Store.hosts.has?(hostname, dns_value)
+            info "adding static entry: #{hostname} => #{dns_value}"
+            Store.hosts.set hostname, dns_value
+          end
         end
       end
 
@@ -61,14 +63,15 @@ module Landrush
         ip_address = machine.config.landrush.host_ip_address ||
                      machine.guest.capability(:read_host_visible_ip_address)
 
-        info "adding machine entry: #{machine_hostname} => #{ip_address}"
-
         if not machine_hostname.match(config.tld)
           log :error, "hostname #{machine_hostname} does not match the configured TLD: #{config.tld}"
           log :error, "You will not be able to access #{machine_hostname} from the host"
         end
 
-        Store.hosts.set(machine_hostname, ip_address)
+        if !Store.hosts.has?(machine_hostname, ip_address)
+          info "adding machine entry: #{machine_hostname} => #{ip_address}"
+          Store.hosts.set(machine_hostname, ip_address)
+        end
       end
 
       def private_network_exists?

data/lib/landrush/action/teardown.rb

@@ -16,21 +16,22 @@ module Landrush
         if DependentVMs.none?
           teardown_static_dns
           teardown_server
-        else
-          info "there are #{DependentVMs.count} VMs left, leaving DNS server and static entries"
-          info DependentVMs.list.map { |dvm| " - #{dvm}" }.join("\n")
         end
       end
 
       def teardown_machine_dns
-        info "removing machine entry: #{machine_hostname}"
-        Store.hosts.delete(machine_hostname)
+        if Store.hosts.has? machine_hostname
+          info "removing machine entry: #{machine_hostname}"
+          Store.hosts.delete(machine_hostname)
+        end
       end
 
       def teardown_static_dns
         config.hosts.each do |static_hostname, _|
-          info "removing static entry: #{static_hostname}"
-          Store.hosts.delete static_hostname
+          if Store.hosts.has? static_hostname
+            info "removing static entry: #{static_hostname}"
+            Store.hosts.delete static_hostname
+          end
         end
       end
 

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

@@ -22,16 +22,24 @@ module Landrush
         # TODO: Find a better heuristic for this implementation.
         #
         def self.read_host_visible_ip_address(machine)
-          result  = ""
+          result = ""
           machine.communicate.execute(command) do |type, data|
             result << data if type == :stdout
           end
 
-          result.chomp.split("\n").last
+          last_line = result.chomp.split("\n").last || ''
+          addresses = last_line.split(/\s+/).map { |address| IPAddr.new(address) }
+          addresses = addresses.reject { |address| address.ipv6? }
+
+          if addresses.empty?
+            raise "Cannot detect IP address, command `#{command}` returned `#{result}`"
+          end
+
+          addresses.last.to_s
         end
 
         def self.command
-          %Q(hostname -I | awk -F' ' '{print $NF}')
+          %Q(hostname -I)
         end
       end
     end

data/lib/landrush/config.rb

@@ -1,19 +1,30 @@
 module Landrush
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :hosts
+    attr_accessor :enabled
+    attr_accessor :tld
     attr_accessor :upstream_servers
     attr_accessor :host_ip_address
+    attr_accessor :guest_redirect_dns
+
+    DEFAULTS = {
+      :enabled => false,
+      :tld => 'vagrant.dev',
+      :upstream_servers => [[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]],
+      :host_ip_address => nil,
+      :guest_redirect_dns => true
+    }
 
     def initialize
       @hosts = {}
-      @enabled = false
-      @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
+      @enabled = UNSET_VALUE
+      @tld = UNSET_VALUE
+      @upstream_servers = UNSET_VALUE
+      @host_ip_address = UNSET_VALUE
+      @guest_redirect_dns = UNSET_VALUE
     end
 
-    def enable(enabled=true)
+    def enable
       @enabled = true
     end
 
@@ -22,11 +33,7 @@ module Landrush
     end
 
     def enabled?
-      @enabled
-    end
-
-    def guest_redirect_dns=(guest_redirect_dns=true)
-      @guest_redirect_dns=guest_redirect_dns
+      !!@enabled
     end
 
     def guest_redirect_dns?
@@ -37,16 +44,8 @@ module Landrush
       @hosts[hostname] = ip_address
     end
 
-    def tld
-      @tld ||= @default_tld
-    end
-
-    def tld=(tld)
-      @tld = tld
-    end
-
     def upstream(ip, port=53, protocol=nil)
-      if @upstream_servers == @default_upstream
+      if @upstream_servers == UNSET_VALUE
         @upstream_servers = []
       end
 
@@ -64,13 +63,24 @@ module Landrush
       end
     end
 
+    def finalize!
+      DEFAULTS.each do |name, value|
+        if instance_variable_get('@' + name.to_s) == UNSET_VALUE
+          instance_variable_set '@' + name.to_s, value
+        end
+      end
+    end
+
     def validate(machine)
+      errors = _detected_errors
+
       if enabled?
         unless machine.config.vm.hostname.to_s.length > 0
-          return { 'landrush' => ['you must specify a hostname so we can make a DNS entry for it'] }
+          errors << 'you must specify a hostname so we can make a DNS entry for it'
         end
       end
-      {}
+
+      { 'landrush' => errors }
     end
   end
 end

data/lib/landrush/resolver_config.rb

@@ -23,7 +23,7 @@ module Landrush
     end
 
     def info(msg)
-      @env[:ui].info(msg)
+      @env[:ui].info("[landrush] #{msg}")
     end
 
     def desired_contents; <<-EOS.gsub(/^      /, '')
@@ -61,11 +61,6 @@ module Landrush
     end
 
     def ensure_config_exists!
-      unless osx?
-        puts "Not an OSX machine, so skipping host DNS resolver config."
-        return
-      end
-
       if contents_match?
         info "Host DNS resolver config looks good."
       else

data/lib/landrush/store.rb

@@ -26,6 +26,14 @@ module Landrush
       write(current_config.reject { |k, _| k == key })
     end
 
+    def has?(key, value = nil)
+      if value.nil?
+        current_config.has_key? key
+      else
+        current_config[key] == value
+      end
+    end
+
     def find(search)
       current_config.keys.detect do |key|
         key.casecmp(search) == 0   ||

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/test/landrush/action/setup_test.rb

@@ -77,9 +77,8 @@ module Landrush
         it "does nothing if it is not enabled via config" do
           app = Proc.new {}
           setup = Setup.new(app, nil)
-          env = fake_environment
+          env = fake_environment(enabled: false)
 
-          env[:machine].config.landrush.disable
           setup.call(env)
 
           Store.hosts.get('somehost.vagrant.dev').must_equal nil

data/test/landrush/cap/linux/read_host_visible_ip_address_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Landrush
+  module Cap
+    module Linux
+
+      describe ReadHostVisibleIpAddress do
+        describe 'read_host_visible_ip_address' do
+          let (:machine) { fake_machine }
+
+          it 'should read the last address' do
+            machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "1.2.3.4 5.6.7.8\n")
+            machine.guest.capability(:read_host_visible_ip_address).must_equal '5.6.7.8'
+          end
+
+          it 'should ignore IPv6 addresses' do
+            machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "1.2.3.4 5.6.7.8 fdb2:2c26:f4e4:0:21c:42ff:febc:ea4f\n")
+            machine.guest.capability(:read_host_visible_ip_address).must_equal '5.6.7.8'
+          end
+
+          it 'should fail on invalid address' do
+            machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "hello world\n")
+            lambda {
+              machine.guest.capability(:read_host_visible_ip_address)
+            }.must_raise(IPAddr::InvalidAddressError)
+          end
+
+          it 'should fail without address' do
+            machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "\n")
+            lambda {
+              machine.guest.capability(:read_host_visible_ip_address)
+            }.must_raise(RuntimeError, 'Cannot detect IP address, command `hostname -I` returned ``')
+          end
+        end
+      end
+
+    end
+  end
+end

data/test/landrush/config_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+describe 'Landrush::Config' do
+  it "supports enabling via accessor style" do
+    machine = fake_machine
+    config = machine.config.landrush
+
+    machine.config.landrush.enabled = true
+    config.enabled?.must_equal true
+    machine.config.landrush.enabled = false
+    config.enabled?.must_equal false
+  end
+
+  it "is backwards-compatible with the old method call style" do
+    machine = fake_machine
+    config = machine.config.landrush
+
+    machine.config.landrush.enable
+    config.enabled?.must_equal true
+    machine.config.landrush.disable
+    config.enabled?.must_equal false
+  end
+end

data/test/test_helper.rb

@@ -8,7 +8,7 @@ require 'landrush/cap/linux/read_host_visible_ip_address'
 
 require 'minitest/autorun'
 
-def fake_environment(options={})
+def fake_environment(options = { enabled: true })
   { machine: fake_machine(options), ui: FakeUI }
 end
 
@@ -89,7 +89,7 @@ def fake_machine(options={})
     "#{options.fetch(:ip, '1.2.3.4')}\n"
   )
 
-  machine.config.landrush.enable
+  machine.config.landrush.enabled = options.fetch(:enabled, false)
   machine.config.vm.hostname = options.fetch(:hostname, 'somehost.vagrant.dev')
 
   machine

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -80,6 +80,8 @@ files:
 - lib/landrush/version.rb
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
+- test/landrush/cap/linux/read_host_visible_ip_address_test.rb
+- test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/resolver_config_test.rb
 - test/landrush/server_test.rb
@@ -110,13 +112,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: a vagrant plugin providing consistent DNS visible on host and guests
 test_files:
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
+- test/landrush/cap/linux/read_host_visible_ip_address_test.rb
+- test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/resolver_config_test.rb
 - test/landrush/server_test.rb