landrush 1.2.0 → 1.3.0

data/features/support/env.rb

@@ -5,7 +5,7 @@ require 'find'
 
 Aruba.configure do |config|
   config.exit_timeout = 3600
-  config.activate_announcer_on_command_failure = [:stdout, :stderr]
+  config.activate_announcer_on_command_failure = %i[stdout stderr]
   config.working_directory = 'build/aruba'
 end
 
@@ -20,7 +20,7 @@ Before do |_scenario|
      .each { |file| FileUtils.rmtree(File.join(ENV['VAGRANT_HOME'], file)) }
 
   # Actual gems are in ~/vagrant.d/gems/gems
-  gems_path = File.join(vagrant_home, 'gems', 'gems')
+  gems_path = File.join(vagrant_home, 'gems', RUBY_VERSION)
   FileUtils.mkdir_p gems_path
 
   # Find the path to the Bundler gems

data/landrush.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'landrush/version'
 
@@ -28,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'filelock'
+  spec.add_dependency 'landrush-ip', '~> 0.2.5'
   spec.add_dependency 'rubydns', '0.8.5'
   spec.add_dependency 'win32-process'
-  spec.add_dependency 'landrush-ip', '~> 0.2.5'
 end

data/lib/landrush.rb

@@ -16,3 +16,4 @@ require 'landrush/server'
 require 'landrush/store'
 require 'landrush/version'
 require 'landrush-ip'
+require 'socket'

data/lib/landrush/action/common.rb

@@ -8,6 +8,7 @@ module Landrush
         'HashiCorp::VagrantVMwarefusion::Provider'     => :vmware_fusion,
         'VagrantPlugins::Parallels::Provider'          => :parallels,
         'VagrantPlugins::HyperV::Provider'             => :hyperv,
+        'VagrantPlugins::DockerProvider::Provider'     => :docker,
         'Landrush::FakeProvider'                       => :fake_provider
       }.freeze
 
@@ -20,6 +21,10 @@ module Landrush
         @env = env
       end
 
+      def docker?
+        provider == :docker
+      end
+
       def virtualbox?
         provider == :virtualbox
       end
@@ -69,7 +74,7 @@ module Landrush
       def read_machine_hostname
         return machine.config.vm.hostname if machine.config.vm.hostname
 
-        "#{Pathname.pwd.basename}.#{config.tld}"
+        "#{Pathname.pwd.basename}.#{config.tld_as_array[0]}"
       end
 
       def enabled?
@@ -86,7 +91,7 @@ module Landrush
 
       def log(level, msg)
         # Levels from github.com/mitchellh/vagrant/blob/master/lib/vagrant/ui.rb
-        valid_levels = [:ask, :detail, :warn, :error, :info, :output, :success]
+        valid_levels = %i[ask detail warn error info output success]
 
         if valid_levels.include? level
           env[:ui].send level, "[landrush] #{msg}"

data/lib/landrush/action/redirect_dns.rb

@@ -29,6 +29,9 @@ module Landrush
           _gateway_for_ip(machine.guest.capability(:configured_dns_servers).first)
         when :parallels then
           machine.provider.capability(:host_address)
+        else
+          # As a fallthrough default use the first non loopback IP. This IP should be reachable from the guest as well
+          Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
         end
       end
 

data/lib/landrush/action/setup.rb

@@ -37,9 +37,10 @@ module Landrush
         configure_server
         record_machine_dns_entry
         setup_static_dns
-        start_server
+        Server.start
         return unless machine.config.landrush.host_redirect_dns?
-        env[:host].capability(:configure_visibility_on_host, host_ip_address, config.tld)
+
+        env[:host].capability(:configure_visibility_on_host, host_ip_address, config.tld_as_array)
       end
 
       def record_dependent_vm
@@ -57,19 +58,15 @@ module Landrush
         Store.config.set('upstream', config.upstream_servers)
       end
 
-      def start_server
-        return if Server.running?
-        info 'starting dns server'
-        Server.start
-      end
-
       def setup_static_dns
         config.hosts.each do |hostname, dns_value|
           dns_value ||= host_ip_address
           next if Store.hosts.has?(hostname, dns_value)
+
           info "adding static DNS entry: #{hostname} => #{dns_value}"
           Store.hosts.set hostname, dns_value
           next unless ip_address?(dns_value)
+
           reverse_dns = IPAddr.new(dns_value).reverse
           info "adding static reverse DNS entry: #{reverse_dns} => #{dns_value}"
           Store.hosts.set(reverse_dns, hostname)
@@ -83,9 +80,16 @@ module Landrush
       def record_machine_dns_entry
         ip_address = machine.config.landrush.host_ip_address || host_ip_address
 
-        unless 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"
+        tld_match = false
+        config.tld_as_array.each do |tld|
+          if machine_hostname.match(tld)
+            tld_match = true
+            break
+          end
+        end
+        unless tld_match
+          log :error, "hostname #{machine_hostname} does not match any of the configured TLD: #{config.tld_as_array}"
+          log :error, "You will not be able to access #{machine_hostname} from your host"
         end
 
         unless Store.hosts.has?(machine_hostname, ip_address)
@@ -103,7 +107,7 @@ module Landrush
       def private_network_ips
         # machine.config.vm.networks is an array of two elements. The first containing the type as symbol, the second is a
         # hash containing other config data which varies between types
-        machine.config.vm.networks.select { |network| :private_network == network[0] && !network[1][:ip].nil? }
+        machine.config.vm.networks.select { |network| network[0] == :private_network && !network[1][:ip].nil? }
                .map { |network| network[1][:ip] }
       end
     end

data/lib/landrush/action/teardown.rb

@@ -17,12 +17,14 @@ module Landrush
         DependentVMs.remove(machine_hostname)
 
         return unless DependentVMs.none?
+
         teardown_static_dns
         teardown_server
       end
 
       def teardown_machine_dns
         return unless Store.hosts.has? machine_hostname
+
         info "removing machine entry: #{machine_hostname}"
         Store.hosts.delete(machine_hostname)
       end

data/lib/landrush/cap/guest/all/read_host_visible_ip_address.rb

@@ -6,8 +6,8 @@ module Landrush
           unless @machine.config.landrush.host_interface_excludes.nil?
             re = Regexp.union(@machine.config.landrush.host_interface_excludes)
 
-            addresses = addresses.select do |addr|
-              !addr['name'].match(re)
+            addresses = addresses.reject do |addr|
+              addr['name'].match(re)
             end
           end
 

data/lib/landrush/cap/guest/linux/add_iptables_rule.rb

@@ -8,8 +8,8 @@ module Landrush
 
         def self._run(machine, command)
           machine.communicate.sudo(command) do |data, type|
-            if [:stderr, :stdout].include?(type)
-              color = (type == :stdout) ? :green : :red
+            if %i[stderr stdout].include?(type)
+              color = type == :stdout ? :green : :red
               machine.env.ui.info(data.chomp, color: color, prefix: false)
             end
           end

data/lib/landrush/cap/guest/linux/configured_dns_servers.rb

@@ -4,6 +4,7 @@ module Landrush
       module ConfiguredDnsServers
         def self.configured_dns_servers(machine)
           return @dns_servers if @dns_servers
+
           machine.communicate.sudo('cat /etc/resolv.conf | grep ^nameserver') do |type, data|
             if type == :stdout
               @dns_servers = Array(data.scan(/\d+\.\d+\.\d+\.\d+/))

data/lib/landrush/cap/guest/linux/redirect_dns.rb

@@ -4,7 +4,7 @@ module Landrush
       module RedirectDns
         def self.redirect_dns(machine, target = {})
           dns_servers = machine.guest.capability(:configured_dns_servers)
-          %w(tcp udp).each do |proto|
+          %w[tcp udp].each do |proto|
             dns_servers.each do |dns_server|
               machine.guest.capability(
                 :add_iptables_rule,

data/lib/landrush/cap/guest/suse/add_iptables_rule.rb

@@ -8,8 +8,8 @@ module Landrush
 
         def self._run(machine, command)
           machine.communicate.sudo(command) do |data, type|
-            if [:stderr, :stdout].include?(type)
-              color = (type == :stdout) ? :green : :red
+            if %i[stderr stdout].include?(type)
+              color = type == :stdout ? :green : :red
               machine.env.ui.info(data.chomp, color: color, prefix: false)
             end
           end

data/lib/landrush/cap/host/arch/dnsmasq_installed.rb

@@ -0,0 +1,11 @@
+module Landrush
+  module Cap
+    module Arch
+      module DnsmasqInstalled
+        def self.dnsmasq_installed(_env, *_args)
+          system('pacman -Q dnsmasq > /dev/null 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/arch/install_dnsmasq.rb

@@ -0,0 +1,16 @@
+module Landrush
+  module Cap
+    module Arch
+      module InstallDnsmasq
+        class << self
+          def install_dnsmasq(_env)
+            system('pacman -Sy --noconfirm > /dev/null 2>&1')
+            system('sudo pacman -S --noconfirm dnsmasq > /dev/null 2>&1')
+
+            system('sudo sed -i "/^#conf-dir=\/etc\/dnsmasq.d$/s/^#//g" /etc/dnsmasq.conf')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/arch/restart_dnsmasq.rb

@@ -0,0 +1,21 @@
+module Landrush
+  module Cap
+    module Arch
+      module RestartDnsmasq
+        class << self
+          SED_COMMAND = <<-EOF.gsub(/^ +/, '')
+          sudo sed -i.orig '1 i\
+          # Added by landrush, a vagrant plugin \\
+          nameserver 127.0.0.1 \\
+          ' /etc/resolv.conf
+          EOF
+
+          def restart_dnsmasq(_env)
+            system(SED_COMMAND) unless system("cat /etc/resolv.conf | grep 'nameserver 127.0.0.1' > /dev/null 2>&1")
+            system('sudo systemctl restart dnsmasq')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/landrush/cap/host/darwin/configure_visibility_on_host.rb

@@ -5,14 +5,16 @@ module Landrush
         class << self
           attr_writer :sudo, :config_dir
 
-          def configure_visibility_on_host(env, _ip, tld)
+          def configure_visibility_on_host(env, _ip, tlds)
             @env = env
-            @tld = tld
-            if contents_match?
-              info 'Host DNS resolver config looks good.'
-            else
-              info 'Need to configure the host.'
-              write_config!
+
+            tlds.each do |tld|
+              if contents_match?(tld)
+                info "Host DNS resolver config for TLD '#{tld}' looks good."
+              else
+                info "Need to create /etc/resolver entry for TLD '#{tld}'"
+                write_config!(tld)
+              end
             end
           end
 
@@ -23,7 +25,11 @@ module Landrush
           end
 
           def config_dir
-            @config_dir ||= Pathname('/etc/resolver')
+            @config_dir ||= '/etc/resolver'
+          end
+
+          def config_file(tld)
+            File.join(config_dir, tld)
           end
 
           def info(msg)
@@ -38,22 +44,19 @@ module Landrush
             EOS
           end
 
-          def config_file
-            config_dir.join(@tld)
-          end
-
-          def contents_match?
-            config_file.exist? && File.read(config_file) == desired_contents
+          def contents_match?(tld)
+            config_file = config_file(tld)
+            File.exist?(config_file) && File.read(config_file) == desired_contents
           end
 
-          def write_config!
+          def write_config!(tld)
             info 'Momentarily using sudo to put the host config in place...'
-            system "#{sudo} mkdir #{config_dir}" unless config_dir.directory?
+            system "#{sudo} mkdir #{config_dir}" unless File.directory?(config_dir)
             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}"
+              system "#{sudo} cp #{f.path} #{config_file(tld)}"
+              system "#{sudo} chmod 644 #{config_file(tld)}"
             end
           end
         end

data/lib/landrush/cap/host/debian/host.rb

@@ -4,6 +4,7 @@ module Landrush
       class DebianHost < Vagrant.plugin('2', 'host')
         def detect?(_env)
           return false unless Pathname('/etc/issue').exist?
+
           system("cat /etc/issue | grep 'Debian' > /dev/null 2>&1")
         end
       end

data/lib/landrush/cap/host/linux/configure_visibility_on_host.rb

@@ -3,12 +3,14 @@ module Landrush
     module Linux
       class ConfigureVisibilityOnHost
         class << self
-          def configure_visibility_on_host(env, ip, tld)
+          def configure_visibility_on_host(env, ip, tlds)
             env.host.capability(:install_dnsmasq) unless env.host.capability(:dnsmasq_installed)
-            env.host.capability(:create_dnsmasq_config, ip, tld)
+            tlds.each do |tld|
+              env.host.capability(:create_dnsmasq_config, ip, tld)
+            end
             env.host.capability(:restart_dnsmasq)
           rescue Vagrant::Errors::CapabilityNotFound => e
-            env.ui.info("Your host was detected as '#{e.extra_data[:cap]}' for which the host capability " \
+            env.ui.info("Your host was detected as '#{e.extra_data[:host]}' for which the host capability " \
             "'#{e.extra_data[:cap]}' is not available.")
             env.ui.info('Check the documentation for the manual instructions to configure the visibility on the host.')
           end

data/lib/landrush/cap/host/linux/create_dnsmasq_config.rb

@@ -1,3 +1,5 @@
+require_relative '../../../util/dnsmasq'
+
 module Landrush
   module Cap
     module Linux
@@ -21,6 +23,7 @@ module Landrush
           end
 
           def config_dir
+            @config_dir ||= Pathname('/etc/NetworkManager/dnsmasq.d') if Landrush::Util::Dnsmasq.nm_managed?
             @config_dir ||= Pathname('/etc/dnsmasq.d')
           end
 

data/lib/landrush/cap/host/redhat/restart_dnsmasq.rb

@@ -1,3 +1,5 @@
+require_relative '../../../util/dnsmasq'
+
 module Landrush
   module Cap
     module Redhat
@@ -13,8 +15,12 @@ module Landrush
           def restart_dnsmasq(_env)
             # TODO: At some stage we might want to make create_dnsmasq_config host specific and add the resolv.conf
             # changes there which seems more natural
-            system(SED_COMMAND) unless system("cat /etc/resolv.conf | grep 'nameserver 127.0.0.1' > /dev/null 2>&1")
-            system('sudo systemctl restart dnsmasq')
+            if Landrush::Util::Dnsmasq.nm_managed?
+              system('sudo systemctl reload NetworkManager')
+            else
+              system(SED_COMMAND) unless system("cat /etc/resolv.conf | grep 'nameserver 127.0.0.1' > /dev/null 2>&1")
+              system('sudo systemctl restart dnsmasq')
+            end
           end
         end
       end

data/lib/landrush/cap/host/ubuntu/host.rb

@@ -4,6 +4,7 @@ module Landrush
       class UbuntuHost < Vagrant.plugin('2', 'host')
         def detect?(_env)
           return false unless Pathname('/usr/bin/lsb_release').exist?
+
           system("/usr/bin/lsb_release -i | grep 'Ubuntu' >/dev/null 2>&1")
         end
       end

data/lib/landrush/cap/host/windows/configure_visibility_on_host.rb

@@ -10,9 +10,11 @@ module Landrush
         INTERFACES = 'SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces'.freeze
 
         class << self
-          def configure_visibility_on_host(env, ip, tld)
+          def configure_visibility_on_host(env, ip, tlds)
             @env = env
-            update_network_adapter(ip, tld) if ensure_prerequisites
+            # tlds is an array. See also issue #177. For now we only support single TLD on windows, hence we select the
+            # first element
+            update_network_adapter(ip, tlds[0]) if ensure_prerequisites
           end
 
           # If this registry query succeeds we assume we have Admin rights
@@ -96,6 +98,7 @@ module Landrush
             cmd_out = `netsh lan show interfaces`
             interface_details = cmd_out.split(/\n\n/).select { |settings| settings.match(/#{Regexp.quote(network_name)}/m) }
             return nil if interface_details.empty?
+
             interface_details[0].split(/\n/)[2].match(/.*:(.*)/).captures[0].strip
           end
 
@@ -125,11 +128,12 @@ module Landrush
                 address = IPAddr.new(ip)
 
                 mask.include?(address)
-              rescue
+              rescue StandardError
                 false
               end
             end
             return nil if network_details[0].nil?
+
             network_details[0].split(/\n/)[0].match(/Configuration for interface "(.*)"/).captures[0].strip
           end
 
@@ -145,9 +149,13 @@ module Landrush
             @env.ui.info("[landrush] #{msg}") unless @env.nil?
           end
 
+          def wired_autoconfig_service_state
+            `sc query dot3svc`
+          end
+
           def wired_autoconfig_service_running?
-            cmd_out = `net start`
-            cmd_out =~ /Wired AutoConfig/m
+            cmd_out = wired_autoconfig_service_state
+            cmd_out =~ /\s*STATE\s+:\s+4\s+RUNNING/m
           end
 
           def command_found(cmd)
@@ -180,6 +188,6 @@ end
 
 # Only run the following code when this file is the main file being run
 # instead of having been required or loaded by another file
-if __FILE__ == $PROGRAM_NAME
+if $PROGRAM_NAME == __FILE__
   Landrush::Cap::Windows::ConfigureVisibilityOnHost.configure_visibility_on_host(nil, ARGV[0], ARGV[1])
 end