landrush 1.1.0.beta.1 → 1.1.0.beta.2

data/test/landrush/cap/{all → guest/all}/read_host_visible_ip_address_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
 module Landrush
   module Cap

data/test/landrush/cap/{linux → guest/linux}/configured_dns_servers_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
 describe Landrush::Cap::Linux::ConfiguredDnsServers do
   let(:machine) { fake_machine }

data/test/landrush/cap/{linux → guest/linux}/redirect_dns_test.rb

@@ -1,14 +1,11 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
 describe Landrush::Cap::Linux::RedirectDns do
   let(:machine) { fake_machine }
 
   describe 'redirect_dns' do
     it 'fetches the dns servers from the machine, and adds one iptables rule per server' do
-      machine.guest.stubs(:capability).with(:configured_dns_servers).returns([
-        '1.2.3.4',
-        '4.5.6.7'
-      ])
+      machine.guest.stubs(:capability).with(:configured_dns_servers).returns(%w(1.2.3.4 4.5.6.7))
 
       machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p tcp -d 1.2.3.4 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once
       machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p udp -d 1.2.3.4 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once

data/test/landrush/cap/host/darwin/configure_visibility_on_host_test.rb

@@ -0,0 +1,56 @@
+require_relative '../../../../test_helper'
+
+module Landrush
+  module Cap
+    module Darwin
+      describe ConfigureVisibilityOnHost do
+        let(:env) { Vagrant::Environment.new }
+
+        CONFIG = <<-EOF.gsub(/^ +/, '')
+        # Generated by landrush, a vagrant plugin
+        nameserver 127.0.0.1
+        port #{Server.port}
+        EOF
+
+        describe 'configure_visibility_on_host' do
+          it 'writes a resolver config on the host' do
+            Dir.mktmpdir('landrush-test-dir-') do |dir|
+              # puts "Using #{dir} for testing"
+              Dir["#{dir}/*"].empty?.must_equal true
+
+              # stub some internal methods to make sure config gets written into tmp directory
+              ConfigureVisibilityOnHost.stubs(:config_dir).returns(Pathname(dir))
+              # also disable 'sudo'
+              ConfigureVisibilityOnHost.stubs(:sudo).returns('')
+
+              ConfigureVisibilityOnHost.configure_visibility_on_host(env)
+
+              Dir["#{dir}/*"].empty?.must_equal false
+              File.exist?(File.join(dir, 'vagrant.test')).must_equal true
+              Pathname(File.join(dir, 'vagrant.test')).read.must_equal CONFIG
+            end
+          end
+
+          it 'the config file is named after the configured tld' do
+            Dir.mktmpdir('landrush-test-dir-') do |dir|
+              # puts "Using #{dir} for testing"
+              Dir["#{dir}/*"].empty?.must_equal true
+
+              # stub some internal methods to make sure config gets written into tmp directory
+              ConfigureVisibilityOnHost.stubs(:config_dir).returns(Pathname(dir))
+              # also disable 'sudo'
+              ConfigureVisibilityOnHost.stubs(:sudo).returns('')
+
+              env.vagrantfile.config.landrush.tld = 'foo.bar'
+              ConfigureVisibilityOnHost.configure_visibility_on_host(env)
+
+              Dir["#{dir}/*"].empty?.must_equal false
+              File.exist?(File.join(dir, 'foo.bar')).must_equal true
+              Pathname(File.join(dir, 'foo.bar')).read.must_equal CONFIG
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/landrush/cap/host/linux/configure_visibility_on_host_test.rb

@@ -0,0 +1,34 @@
+require_relative '../../../../test_helper'
+
+module Landrush
+  module Cap
+    module Linux
+      describe ConfigureVisibilityOnHost do
+        TEST_IP = '10.42.42.42'.freeze
+        TEST_TLD = 'landrush.test'.freeze
+        TEST_CONFIG = "/etc/dnsmasq.d/vagrant-landrush-#{TEST_TLD}".freeze
+
+        CONFIG = <<-EOF.gsub(/^ +/, '')
+        # Generated by landrush, a vagrant plugin
+        server=/landrush.test/127.0.0.1#10053
+        EOF
+
+        after do
+          system("sudo rm #{TEST_CONFIG}") if Pathname(TEST_CONFIG).exist?
+        end
+
+        describe 'dnsmasq' do
+          it 'creates dnsmasq config' do
+            skip('Only supported on Linux') unless Vagrant::Util::Platform.linux?
+            File.exist?(TEST_CONFIG).must_equal false
+
+            Landrush::Cap::Linux::ConfigureVisibilityOnHost.configure_visibility_on_host(fake_environment, TEST_IP, TEST_TLD)
+
+            File.exist?(TEST_CONFIG).must_equal true
+            Pathname(TEST_CONFIG).read.must_equal CONFIG
+          end
+        end
+      end
+    end
+  end
+end

data/test/landrush/cap/host/windows/configure_visibility_on_host_test.rb

@@ -0,0 +1,70 @@
+require_relative '../../../../test_helper'
+
+module Landrush
+  module Cap
+    module Windows
+      describe ConfigureVisibilityOnHost do
+        TEST_IP = '10.42.42.42'.freeze
+
+        before do
+          @vboxmanage_found = !Vagrant::Util::Which.which('VBoxManage').nil?
+          @has_admin_privileges = Landrush::Cap::Windows::ConfigureVisibilityOnHost.admin_mode?
+        end
+
+        describe 'modify DNS settings of network adapter' do
+          it 'sets 127.0.0.1 as DNS server on the interface' do
+            skip('Only supported on Windows') unless Vagrant::Util::Platform.windows? && @vboxmanage_found && @has_admin_privileges
+
+            # VBoxManage uses the network description for its commands whereas netsh uses the name
+            # We need to get both
+            begin
+              old_network_state = network_state
+              network_description = create_test_interface
+              new_network_state = network_state
+              network_name = get_network_name(old_network_state, new_network_state)
+
+              get_dns_for_name(network_name).must_be_nil
+              Landrush::Cap::Windows::ConfigureVisibilityOnHost.configure_visibility_on_host(fake_environment, TEST_IP, 'landrush.test')
+              get_dns_for_name(network_name).must_equal '127.0.0.1'
+            rescue
+              delete_test_interface network_description
+            end
+          end
+        end
+
+        def network_state
+          `netsh interface ip show config`.split(/\n/).reject(&:empty?)
+        end
+
+        def get_network_name(old_network_state, new_network_state)
+          new_network_state.reject! { |line| old_network_state.include? line }
+          new_network_state[0].match(/.*\"(.*)\"$/).captures[0]
+        end
+
+        # Creates a test interface using VBoxMange and sets a known test IP
+        def create_test_interface
+          cmd_out = `VBoxManage hostonlyif create`
+          network_description = cmd_out.match(/.*'(.*)'.*/).captures[0]
+          `VBoxManage.exe hostonlyif ipconfig \"#{network_description}\" --ip #{TEST_IP}`
+          sleep 3
+          network_description
+        end
+
+        def delete_test_interface(name)
+          `VBoxManage hostonlyif remove \"#{name}\"`
+        end
+
+        def get_dns_for_name(name)
+          cmd_out = `netsh interface ip show config name=\"#{name}\"`
+          dns = cmd_out.split(/\n/).select { |settings| settings.match(/Statically Configured DNS Servers/m) }
+          # TODO: better error handling
+          begin
+            dns[0].match(/.* (\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}).*/).captures[0]
+          rescue
+            return nil
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -4,10 +4,12 @@ require 'bundler/setup'
 require 'minitest/spec'
 
 require 'landrush'
-require 'landrush/cap/linux/configured_dns_servers'
-require 'landrush/cap/linux/redirect_dns'
-require 'landrush/cap/all/read_host_visible_ip_address'
-require 'landrush/win_network_config'
+require 'landrush/cap/guest/linux/configured_dns_servers'
+require 'landrush/cap/guest/linux/redirect_dns'
+require 'landrush/cap/guest/all/read_host_visible_ip_address'
+require 'landrush/cap/host/darwin/configure_visibility_on_host'
+require 'landrush/cap/host/windows/configure_visibility_on_host'
+require 'landrush/cap/host/linux/configure_visibility_on_host'
 require 'landrush/util/retry'
 
 require 'minitest/autorun'
@@ -17,19 +19,33 @@ require 'mocha/mini_test'
 # Putting include/exclude out of order is kind of the point though ;)
 def fake_addresses
   [
-    { 'name' => 'exclude1', 'ipv4' => '172.28.128.1', 'ipv6' => '::1' },
-    { 'name' => 'include1', 'ipv4' => '172.28.128.2', 'ipv6' => '::2' },
-    { 'name' => 'include2', 'ipv4' => '172.28.128.3', 'ipv6' => '::3' },
-    { 'name' => 'include3', 'ipv4' => '172.28.128.4', 'ipv6' => '::4' },
-    { 'name' => 'exclude2', 'ipv4' => '172.28.128.5', 'ipv6' => '::5' },
-    { 'name' => 'exclude3', 'ipv4' => '172.28.128.6', 'ipv6' => '::6' }
+    {'name' => 'exclude1', 'ipv4' => '172.28.128.1', 'ipv6' => '::1'},
+    {'name' => 'include1', 'ipv4' => '172.28.128.2', 'ipv6' => '::2'},
+    {'name' => 'include2', 'ipv4' => '172.28.128.3', 'ipv6' => '::3'},
+    {'name' => 'include3', 'ipv4' => '172.28.128.4', 'ipv6' => '::4'},
+    {'name' => 'exclude2', 'ipv4' => '172.28.128.5', 'ipv6' => '::5'},
+    {'name' => 'exclude3', 'ipv4' => '172.28.128.6', 'ipv6' => '::6'}
   ]
 end
 
-def fake_environment(options = { enabled: true })
+def fake_environment(options = {enabled: true})
   # For the home_path we want the base Vagrant directory
   vagrant_test_home = Pathname(Landrush::Server.working_dir).parent.parent
-  { machine: fake_machine(options), ui: FakeUI, home_path: vagrant_test_home }
+  env = Vagrant::Environment.new
+  {machine: fake_machine(options), host: env.host, ui: FakeUI.new, home_path: vagrant_test_home}
+end
+
+class FakeUI
+  attr_reader :received_info_messages
+
+  def initialize
+    @received_info_messages = []
+  end
+
+  def info(*args)
+    # puts "#{args}"
+    @received_info_messages << args[0]
+  end
 end
 
 class RecordingCommunicator
@@ -136,11 +152,6 @@ end
 
 # order is important on these
 require_relative 'support/create_fake_working_dir'
-
 require_relative 'support/clear_dependent_vms'
-
-require_relative 'support/fake_ui'
 require_relative 'support/test_server_daemon'
-require_relative 'support/fake_resolver_config'
-
 require_relative 'support/delete_fake_working_dir'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.1
+  version: 1.1.0.beta.2
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -101,41 +101,50 @@ files:
 - lib/landrush/action/redirect_dns.rb
 - lib/landrush/action/setup.rb
 - lib/landrush/action/teardown.rb
-- lib/landrush/cap/all/read_host_visible_ip_address.rb
-- lib/landrush/cap/debian/install_iptables.rb
-- lib/landrush/cap/debian/iptables_installed.rb
-- lib/landrush/cap/linux/add_iptables_rule.rb
-- lib/landrush/cap/linux/configured_dns_servers.rb
-- lib/landrush/cap/linux/redirect_dns.rb
-- lib/landrush/cap/redhat/install_iptables.rb
-- lib/landrush/cap/redhat/iptables_installed.rb
+- lib/landrush/cap/guest/all/read_host_visible_ip_address.rb
+- lib/landrush/cap/guest/debian/install_iptables.rb
+- lib/landrush/cap/guest/debian/iptables_installed.rb
+- lib/landrush/cap/guest/linux/add_iptables_rule.rb
+- lib/landrush/cap/guest/linux/configured_dns_servers.rb
+- lib/landrush/cap/guest/linux/redirect_dns.rb
+- lib/landrush/cap/guest/redhat/install_iptables.rb
+- lib/landrush/cap/guest/redhat/iptables_installed.rb
+- lib/landrush/cap/host/darwin/configure_visibility_on_host.rb
+- lib/landrush/cap/host/debian/dnsmasq_installed.rb
+- lib/landrush/cap/host/debian/host.rb
+- lib/landrush/cap/host/debian/install_dnsmasq.rb
+- lib/landrush/cap/host/debian/restart_dnsmasq.rb
+- lib/landrush/cap/host/linux/configure_visibility_on_host.rb
+- lib/landrush/cap/host/linux/create_dnsmasq_config.rb
+- lib/landrush/cap/host/redhat/dnsmasq_installed.rb
+- lib/landrush/cap/host/redhat/install_dnsmasq.rb
+- lib/landrush/cap/host/redhat/restart_dnsmasq.rb
+- lib/landrush/cap/host/ubuntu/host.rb
+- lib/landrush/cap/host/windows/configure_visibility_on_host.rb
 - lib/landrush/command.rb
 - lib/landrush/config.rb
 - lib/landrush/dependent_vms.rb
 - lib/landrush/plugin.rb
-- lib/landrush/resolver_config.rb
 - lib/landrush/server.rb
 - lib/landrush/store.rb
 - lib/landrush/util/retry.rb
 - lib/landrush/version.rb
-- lib/landrush/win_network_config.rb
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
-- test/landrush/cap/all/read_host_visible_ip_address_test.rb
-- test/landrush/cap/linux/configured_dns_servers_test.rb
-- test/landrush/cap/linux/redirect_dns_test.rb
+- test/landrush/cap/guest/all/read_host_visible_ip_address_test.rb
+- test/landrush/cap/guest/linux/configured_dns_servers_test.rb
+- test/landrush/cap/guest/linux/redirect_dns_test.rb
+- test/landrush/cap/host/darwin/configure_visibility_on_host_test.rb
+- test/landrush/cap/host/linux/configure_visibility_on_host_test.rb
+- test/landrush/cap/host/windows/configure_visibility_on_host_test.rb
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
-- test/landrush/resolver_config_test.rb
 - test/landrush/server_test.rb
 - test/landrush/store_test.rb
 - test/landrush/util/rety_test.rb
-- test/landrush/win_network_config_test.rb
 - test/support/clear_dependent_vms.rb
 - test/support/create_fake_working_dir.rb
 - test/support/delete_fake_working_dir.rb
-- test/support/fake_resolver_config.rb
-- test/support/fake_ui.rb
 - test/support/test_server_daemon.rb
 - test/test_helper.rb
 homepage: https://github.com/vagrant-landrush/landrush
@@ -170,20 +179,19 @@ test_files:
 - features/support/env.rb
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
-- test/landrush/cap/all/read_host_visible_ip_address_test.rb
-- test/landrush/cap/linux/configured_dns_servers_test.rb
-- test/landrush/cap/linux/redirect_dns_test.rb
+- test/landrush/cap/guest/all/read_host_visible_ip_address_test.rb
+- test/landrush/cap/guest/linux/configured_dns_servers_test.rb
+- test/landrush/cap/guest/linux/redirect_dns_test.rb
+- test/landrush/cap/host/darwin/configure_visibility_on_host_test.rb
+- test/landrush/cap/host/linux/configure_visibility_on_host_test.rb
+- test/landrush/cap/host/windows/configure_visibility_on_host_test.rb
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
-- test/landrush/resolver_config_test.rb
 - test/landrush/server_test.rb
 - test/landrush/store_test.rb
 - test/landrush/util/rety_test.rb
-- test/landrush/win_network_config_test.rb
 - test/support/clear_dependent_vms.rb
 - test/support/create_fake_working_dir.rb
 - test/support/delete_fake_working_dir.rb
-- test/support/fake_resolver_config.rb
-- test/support/fake_ui.rb
 - test/support/test_server_daemon.rb
 - test/test_helper.rb

data/lib/landrush/resolver_config.rb

@@ -1,68 +0,0 @@
-require 'tempfile'
-
-module Landrush
-  class ResolverConfig
-    class << self
-      attr_writer :sudo, :config_dir
-    end
-
-    def self.sudo
-      @sudo ||= 'sudo'
-    end
-
-    def self.config_dir
-      @config_dir ||= Pathname('/etc/resolver')
-    end
-
-    def initialize(env={})
-      @env = env
-    end
-
-    def info(msg)
-      @env[:ui].info("[landrush] #{msg}")
-    end
-
-    def desired_contents; <<-EOS.gsub(/^      /, '')
-      # Generated by landrush, a vagrant plugin
-      nameserver 127.0.0.1
-      port #{Server.port}
-      EOS
-    end
-
-    def config_dir
-      self.class.config_dir
-    end
-
-    def config_file
-      config_dir.join(@env[:machine].config.landrush.tld)
-    end
-
-    def contents_match?
-      config_file.exist? && File.read(config_file) == desired_contents
-    end
-
-    def write_config!
-      info 'Momentarily using sudo to put the host config in place...'
-      system "#{self.class.sudo} mkdir #{config_dir}" unless config_dir.directory?
-      Tempfile.open('vagrant_landrush_host_config') do |f|
-        f.write(desired_contents)
-        f.close
-        system "#{sudo} cp #{f.path} #{config_file}"
-        system "#{sudo} chmod 644 #{config_file}"
-      end
-    end
-
-    def ensure_config_exists!
-      if contents_match?
-        info 'Host DNS resolver config looks good.'
-      else
-        info 'Need to configure the host.'
-        write_config!
-      end
-    end
-
-    def sudo
-      self.class.sudo
-    end
-  end
-end