landrush 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d8b8d3d76cf287d4cd432d2d702842b5efb3b672cd6c25fec249b76d989eb34
-  data.tar.gz: '09b16732791cb9d9d1112f1695dff95fb317ad35c07c2878c1011fb8918c5c4d'
+  metadata.gz: d31f07ae3a474d9a5e399e15ce9bffa3cce616651a999437094d1aece8c617d2
+  data.tar.gz: 6e91547880229bdd51b4df747d8dde2fc9d48b167ff0a7acf3e83a56a0df1ce3
 SHA512:
-  metadata.gz: f28250855875dff56af42a8a6c0470f94b9d1cc01661ecca63cba5f2ce4f2bb1f2df7895d48ac5df67cf46357b6bdaf06527eb8fe2abd94c86c79b2d9b0a5045
-  data.tar.gz: 51a1f6a0cc73405ba8913d72fa29ed98180e70eef38b456c8c7d28c025079eb22937984be94ed105e8442f8c355dc8a51fdebbb3272d2b1adb8d2f687f77727e
+  metadata.gz: c6c01e67c9d8f55d8f0f4d9a42e959e4005840fce1d6f2d86f6060973a0313158beaa1bdfadec68ba7ef8da18da56824ebee27482a2498688f2f6b21f4bf00c3
+  data.tar.gz: dbf7d7cbc7ba989a89408468c567b1036ebaefa634422f93aeba540783fcf0b9851d450300de2dcbcf3b5e8366cbfac4f10a6c7e657363469af23bde19f6a1f8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.3.1] - 2018-12-04
+
+- Issue [#11](https://github.com/vagrant-landrush/landrush/issues/11)   - Landrush prevents the machine from reaching internet
+- Issue [#165](https://github.com/vagrant-landrush/landrush/issues/165) - Unable to use with CentOS v5 boxes on vmware_fusion
+- Issue [#314](https://github.com/vagrant-landrush/landrush/issues/314) - get_network_name fails on windows 10
+- Issue [#319](https://github.com/vagrant-landrush/landrush/issues/319) - Installation error because can't build eventmachine gem
+- Issue [#321](https://github.com/vagrant-landrush/landrush/issues/321) - iptables rule - move from OUTPUT => PREROUTING
+
 ## [1.3.0] - 2018-09-19
 
 - Issue [#177](https://github.com/vagrant-landrush/landrush/issues/177) - Allow multiple TLD kind/feature priority/major

data/CONTRIBUTING.adoc

@@ -81,26 +81,6 @@ $ git merge fix-123
 $ git push origin master
 -------------------------------------------------------------------------
 
-== Releasing
-
-* Make sure the HEAD of development builds and passes all tests:
-  `bundle exec rake clean rubocop test features install`.
-* Review https://github.com/vagrant-landrush/landrush/milestones[milestone] for the current release
-** Make sure all issues are resolved
-** Move unresolved issues into an upcoming release
-** Close milestone
-* Update the link:CHANGELOG.md[CHANGELOG]
-* Update link:lib/landrush/version.rb[version.rb] with the correct
-  release version. Consider http://semver.org/:[Semantic Versioning] guidelines
-  when deciding on the release version
-* Commit _CHANGELOG_ and _version.rb_ using commit message of the form:
-  `cut v<version>`
-* Push commit to upstream
-* Release the gem: `bundle exec rake release`
-* Update link:lib/landrush/version.rb[version.rb] with the next anticipated release version, eg _1.4.0.dev_
-* Commit with message: `setting dev version <version>.dev`
-* Push upstream
-
 == Maintainers
 
 * Brian Exelbierd (@bexelbie)

data/Gemfile

@@ -16,7 +16,7 @@ group :development do
   gem 'minitest'
   gem 'mocha'
   gem 'rake', '~> 10'
-  gem 'rubocop'
+  gem 'rubocop', '~> 0.59.0'
   gem 'vagrant',
       git: 'https://github.com/mitchellh/vagrant.git',
       ref: 'v2.1.2'

data/README.adoc

@@ -4,6 +4,7 @@
 
 https://travis-ci.org/vagrant-landrush/landrush[image:https://travis-ci.org/vagrant-landrush/landrush.png[Build Status]]
 https://ci.appveyor.com/project/hferentschik/landrush-3agrx/branch/master[image:https://ci.appveyor.com/api/projects/status/3iv8sv5v73s15mt6/branch/master?svg=true[Build Status]]
+image:https://badge.fury.io/rb/landrush.svg["Gem Version", link="https://badge.fury.io/rb/landrush"]
 
 Landrush is a simple cross-platform DNS for Vagrant VMs that is visible
 on both, the guest and the host.

data/doc/Development.adoc

@@ -21,41 +21,47 @@ The following sections list the most important commands you will need for develo
 
 * Install http://bundler.io/[Bundler]:
 +
-....
+[source,bash]
+----
 $ gem install bundler
-....
+----
 
 * Install dependencies:
 +
-....
+[source,bash]
+----
 $ bundle install
-....
+----
 
 * Get a list of all available build tasks:
 +
-....
+[source,bash]
+----
 $ bundle exec rake -T
-....
+----
 
 * Build the Landrush gem:
 +
-....
+[source,bash]
+----
 $ bundle exec rake build
-....
+----
 
 * Clean all generated files:
 +
-....
+[source,bash]
+----
 $ bundle exec rake clean clobber
-....
+----
 
 == Tests
 
 * Run the test suite:
 +
-....
+[source,bash]
+----
 $ bundle exec rake test
-....
+----
 
 TIP: The unit tests utilize https://github.com/seattlerb/minitest[minitest] as test harness.
 Tests are mainly written in Spec style.
@@ -64,15 +70,17 @@ Refer to https://github.com/vagrant-landrush/landrush/blob/master/test/test_help
 
 * Run a single test file:
 +
-....
+[source,bash]
+----
 $ bundle exec rake test TEST=<path to test file>
-....
+----
 
 * Run cucumber/aruba acceptance tests:
 +
-....
+[source,bash]
+----
 $ bundle exec rake features
-....
+----
 
 NOTE: The acceptance tests currently work only for OS X, out of the box.
 On Linux, one has to manually configure the host visibility for the TLD _landrush-acceptance-test_.
@@ -81,9 +89,10 @@ On Windows, the acceptance tests won't work due to a bug in https://github.com/c
 
 * Run a single cucumber/aruba acceptance tests:
 +
-....
+[source,bash]
+----
 $ bundle exec rake features FEATURE=features/<feature-filename>.feature
-....
+----
 
 == Documentation
 
@@ -92,6 +101,7 @@ refer to the http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiD
 
 To build the documentation you can execute:
 
+[source,bash]
 ----
 $ bundle exec rake html
 ----
@@ -101,12 +111,44 @@ which will build the HTML documentation into the folder _build/html_.
 The source code also contains a link:../Guardfile[Guardfile] for the https://github.com/guard/guard[Guard] library.
 You can execute:
 
+[source,bash]
 ----
 $ bundle exec guard
 ----
 
 and your HTML documentation will be automatically updated on each change to an Asciidoc source file.
 
+== Releasing
+
+[NOTE]
+====
+In order to publish to RubyGems you need to have an account and you need to have an API key configured on your machine.
+If you have an account you can setup the API key using:
+
+[source,bash]
+----
+curl -u carlos https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+----
+====
+
+* Make sure the HEAD of development builds and passes all tests:
+  `bundle exec rake clean rubocop test features install`.
+* Review https://github.com/vagrant-landrush/landrush/milestones[milestone] for the current release
+** Make sure all issues are resolved
+** Move unresolved issues into an upcoming release
+** Close milestone
+* Update the link:CHANGELOG.md[CHANGELOG] (you can use _scripts/changelog.sh to generate the content)
+* Update link:lib/landrush/version.rb[version.rb] with the correct
+  release version. Consider http://semver.org/:[Semantic Versioning] guidelines
+  when deciding on the release version
+* Commit _CHANGELOG_ and _version.rb_ using commit message of the form:
+  `cut v<version>`
+* Push commit to upstream
+* Release the gem: `bundle exec rake release`
+* Update link:lib/landrush/version.rb[version.rb] with the next anticipated release version, eg _1.4.0.dev_
+* Commit with message: `setting dev version <version>.dev`
+* Push upstream
+
 == Misc
 
 * Run the vagrant binary with the Landrush plugin loaded from your local

data/doc/Troubleshooting.adoc

@@ -10,33 +10,41 @@ toc::[]
 
 == How to avoid providing sudo password on OS X
 
-When using Landrush on OS X, Landrush will try to create a file in
-`/etc/resolver` to make the guest VM visible via DNS on the host. See *OS X* in the *Visibility on the Host* section of the link:Usage.adoc[Usage guide]. To create this file, sudo permissions are needed and Landrush
-will ask you for your sudo password. +
+When using Landrush on OS X, Landrush will try to create a file in `/etc/resolver` to make the guest VM visible via DNS on the host.
+See *OS X* in the *Visibility on the Host* section of the link:Usage.adoc[Usage guide].
+To create this file, sudo permissions are needed and Landrush will ask you for your sudo password. +
  +
-This can be avoided by adding the
-following entries to the bottom of the sudoer configuration. Make sure
-to edit your `/etc/sudoers` configuration via `sudo visudo`:
+This can be avoided by adding the following entries to the bottom of the sudoer configuration.
+Make sure to edit your `/etc/sudoers` configuration via `sudo visudo`:
 
-....
+[source,bash]
+----
 # Begin Landrush config
 Cmnd_Alias VAGRANT_LANDRUSH_HOST_MKDIR = /bin/mkdir /etc/resolver/*
 Cmnd_Alias VAGRANT_LANDRUSH_HOST_CP = /bin/cp /*/vagrant_landrush_host_config* /etc/resolver/*
 Cmnd_Alias VAGRANT_LANDRUSH_HOST_CHMOD = /bin/chmod 644 /etc/resolver/*
 %admin ALL=(ALL) NOPASSWD: VAGRANT_LANDRUSH_HOST_MKDIR, VAGRANT_LANDRUSH_HOST_CP, VAGRANT_LANDRUSH_HOST_CHMOD
 # End Landrush config
-....
+----
 
 == Guest is unable to access the Internet
 
-In some network configurations the access to outside DNS servers is
-restricted (firewalls, VPN, etc). Since unmatched DNS queries are per
-default passed through to Google's DNS servers, this can lead to the
-fact that the guest cannot access anything in the outside world. +
- +
-If you face problem with the guest's DNS, verify that you can access
-Google's DNS server under __8.8.8.8__. If it does not work, you will
-need to set a custom upstream DNS server. Check your network
-configuration on the host or ask your network administrator about the
-right DNS server address to use. You can set the custom DNS server via
-the `config.landrush.upstream` option, see section on *Unmatched Queries* in the link:Usage.adoc[Usage guide].
+In some network configurations the access to outside DNS servers is restricted (firewalls, VPN, etc).
+Since unmatched DNS queries are per default passed through to Google's DNS servers, this can lead to the fact that the guest cannot access anything in the outside world.
+
+If you face problem with the guest's DNS, verify that you can access Google's DNS server under __8.8.8.8__.
+If it does not work, you will need to set a custom upstream DNS server.
+Check your network configuration on the host or ask your network administrator about the right DNS server address to use.
+You can set the custom DNS server via the `config.landrush.upstream` option, see section on _Unmatched Queries_ in the link:Usage.adoc[Usage guide].
+
+== ERROR: Failed to build gem native extension
+
+Some of the Landrush dependencies use native extensions which get built during the plugin installation.
+For that the required libraries and/or headers for the compilation must be installed on your machine.
+How these required libraries need to be installed depends on the OS.
+On link:https://en.wikipedia.org/wiki/APT_(Debian)[APT] based Linux distributions, it can for example be achieved via:
+
+[source,bash]
+----
+$ sudo apt install build-essential
+----

data/features/commands.feature

@@ -1,5 +1,5 @@
-Feature: Landrush reload
-  Landrush DNS server should restart on a 'vagrant reload'
+Feature: Basic commands
+  Basic Landrush commands including reload.
 
   Scenario Outline: booting a box and restarting it
     Given a file named "Vagrantfile" with:

data/features/dns_resolution.feature

@@ -1,4 +1,4 @@
-Feature: dns_resolution
+Feature: DNS resolution
   Landrush should make a virtual machine's IP address DNS-resolvable.
 
   Scenario Outline: booting a box
@@ -33,7 +33,7 @@ Feature: dns_resolution
     Then Landrush is not running
 
     Examples:
-      | box                           | provider   |
-      | debian/jessie64               | virtualbox |
-      #| opensuse/openSUSE-42.1-x86_64 | virtualbox |
-      #| ubuntu/wily64                 | virtualbox |
+      | box              | provider   |
+      | debian/jessie64  | virtualbox |
+      | ubuntu/xenial64  | virtualbox |
+      | ubuntu/bionic64  | virtualbox |

data/features/docker_provider.feature

@@ -1,4 +1,4 @@
-Feature: Landrush with Docker provider
+Feature: Docker provider
   Landrush should work with Docker provider
 
   Scenario: Booting box with Docker provider

data/features/landrush_ip.feature

@@ -25,6 +25,9 @@ Feature: landrush-ip
     When I successfully run `bundle exec vagrant up --provider <provider>`
     Then the host visible IP address of the guest is the IP of interface "eth3"
 
+    When I successfully run `bundle exec vagrant landrush stop`
+    Then Landrush is not running
+
     Examples:
       | box             | provider   |
       | debian/jessie64 | virtualbox |
@@ -52,6 +55,10 @@ Feature: landrush-ip
     When I successfully run `bundle exec vagrant up --provider <provider>`
     Then the host visible IP address of the guest is the IP of interface "eth4"
 
+    When I successfully run `bundle exec vagrant landrush stop`
+    Then Landrush is not running
+
     Examples:
       | box             | provider   |
       | debian/jessie64 | virtualbox |
+

data/lib/landrush/action/redirect_dns.rb

@@ -13,9 +13,7 @@ module Landrush
       end
 
       def redirect_dns
-        info "setting up machine's DNS to point to our server"
         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}"
         end

data/lib/landrush/action/setup.rb

@@ -50,7 +50,7 @@ module Landrush
       def add_prerequisite_network_interface
         return unless virtualbox? && !private_network_exists?
 
-        info 'virtualbox requires an additional private network; adding it'
+        info 'Virtualbox requires an additional private network; adding it'
         machine.config.vm.network :private_network, type: :dhcp
       end
 
@@ -93,7 +93,7 @@ module Landrush
         end
 
         unless Store.hosts.has?(machine_hostname, ip_address)
-          info "adding machine entry: #{machine_hostname} => #{ip_address}"
+          info "Adding '#{machine_hostname} => #{ip_address}' to #{Store.hosts.backing_file}"
           Store.hosts.set(machine_hostname, ip_address)
           Store.hosts.set(IPAddr.new(ip_address).reverse, machine_hostname)
         end

data/lib/landrush/action/teardown.rb

@@ -25,7 +25,7 @@ module Landrush
       def teardown_machine_dns
         return unless Store.hosts.has? machine_hostname
 
-        info "removing machine entry: #{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

@@ -42,8 +42,7 @@ module Landrush
           # This allows us to be more accurate, especially with logging what's going on.
           unless machine.config.landrush.host_interface.nil?
             addr = addresses.detect { |a| a['name'] == machine.config.landrush.host_interface }
-
-            machine.env.ui.warn "[landrush] Unable to find interface #{machine.config.landrush.host_interface}" if addr.nil?
+            log_with_prefix(:warn, "Unable to find interface #{machine.config.landrush.host_interface}", machine) if addr.nil?
           end
 
           if addr.nil?
@@ -64,11 +63,14 @@ module Landrush
                 end
 
           ip = IPAddr.new(addr[key])
-
-          machine.env.ui.info "[landrush] Using #{addr['name']} (#{addr[key]})"
-
+          log_with_prefix(:info, "Using #{addr['name']} (#{addr[key]})", machine)
           ip.to_s
         end
+
+        def self.log_with_prefix(level, msg, machine)
+          @prefix_ui = Vagrant::UI::Prefixed.new(machine.env.ui, machine.name) if @prefix_ui.nil?
+          @prefix_ui.send level, "[landrush] #{msg}"
+        end
       end
     end
   end

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

@@ -2,20 +2,34 @@ module Landrush
   module Cap
     module Linux
       module RedirectDns
-        def self.redirect_dns(machine, target = {})
-          dns_servers = machine.guest.capability(:configured_dns_servers)
-          %w[tcp udp].each do |proto|
+        class << self
+          def redirect_dns(machine, target = {})
+            prefix_ui = Vagrant::UI::Prefixed.new(machine.env.ui, machine.name)
+            dns_servers = machine.guest.capability(:configured_dns_servers)
             dns_servers.each do |dns_server|
-              machine.guest.capability(
-                :add_iptables_rule,
-                _redirect_dns_rule(proto, dns_server, target.fetch(:host), target.fetch(:port))
-              )
+              prefix_ui.info("[landrush] Setting up iptables rule on guest for DNS server #{dns_server}")
+              enable_route_localnet(machine) if dns_server =~ /127\.0\.0\.\d+/
+              %w[tcp udp].each do |proto|
+                machine.guest.capability(:add_iptables_rule, redirect_dns_rule(proto, dns_server, target.fetch(:host), target.fetch(:port)))
+              end
             end
           end
-        end
 
-        def self._redirect_dns_rule(protocol, original_server, target_server, target_port)
-          "OUTPUT -t nat -p #{protocol} -d #{original_server} --dport 53 -j DNAT --to-destination #{target_server}:#{target_port}"
+          private
+
+          def redirect_dns_rule(protocol, original_server, target_server, target_port)
+            "OUTPUT -t nat -p #{protocol} -d #{original_server} --dport 53 -j DNAT --to-destination #{target_server}:#{target_port}"
+          end
+
+          def enable_route_localnet(machine)
+            command = "sh -c 'echo 1 > /proc/sys/net/ipv4/conf/all/route_localnet'"
+            machine.communicate.sudo(command) do |data, type|
+              if %i[stderr stdout].include?(type)
+                color = type == :stdout ? :green : :red
+                machine.env.ui.info(data.chomp, color: color, prefix: false)
+              end
+            end
+          end
         end
       end
     end

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

@@ -23,6 +23,41 @@ module Landrush
             (`reg query HKU\\S-1-5-19 2>&1` =~ /ERROR/).nil?
           end
 
+          # Given an IP determines the network name, if any. Uses netsh which generates output like this:
+          #
+          # ...
+          # \n\n
+          # Configuration for interface "Ethernet 2"
+          #    DHCP enabled:                         Yes
+          #    IP Address:                           10.10.10.1
+          #    Subnet Prefix:                        10.10.10.0/24 (mask 255.255.255.0)
+          #    InterfaceMetric:                      10
+          #    DNS servers configured through DHCP:  None
+          #    Register with which suffix:           Primary only
+          #    WINS servers configured through DHCP: None
+          # \n\n
+          # ...
+          def get_network_name(ip)
+            cmd_out = `netsh interface ip show config`
+            network_details = cmd_out.split(/^$/).reject(&:empty?).select do |settings|
+              begin
+                lines = settings.split(/\n/).reject(&:empty?)
+                subnet = lines[3]
+                next false unless subnet =~ /Subnet Prefix/
+
+                mask = IPAddr.new(subnet.match(%r{.* (\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}/\d{1,3}).*}).captures[0])
+                address = IPAddr.new(ip)
+
+                mask.include?(address)
+              rescue StandardError
+                false
+              end
+            end
+            return nil if network_details[0].nil? || network_details[0].empty?
+
+            network_details[0].split(/\n/).reject(&:empty?)[0].match(/Configuration for interface "(.*)"/).captures[0].strip
+          end
+
           private
 
           # Checks that all required tools are on the PATH and that the Wired AutoConfig service is started
@@ -102,41 +137,6 @@ module Landrush
             interface_details[0].split(/\n/)[2].match(/.*:(.*)/).captures[0].strip
           end
 
-          # Given an IP determines the network name, if any. Uses netsh which generates output like this:
-          #
-          # ...
-          # \n\n
-          # Configuration for interface "Ethernet 2"
-          #    DHCP enabled:                         Yes
-          #    IP Address:                           10.10.10.1
-          #    Subnet Prefix:                        10.10.10.0/24 (mask 255.255.255.0)
-          #    InterfaceMetric:                      10
-          #    DNS servers configured through DHCP:  None
-          #    Register with which suffix:           Primary only
-          #    WINS servers configured through DHCP: None
-          # \n\n
-          # ...
-          def get_network_name(ip)
-            cmd_out = `netsh interface ip show config`
-            network_details = cmd_out.split(/\n\n/).select do |settings|
-              begin
-                lines = settings.split(/\n/).reject(&:empty?)
-                subnet = lines[3]
-                next false unless subnet =~ /Subnet Prefix/
-
-                mask = IPAddr.new(subnet.match(%r{.* (\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}/\d{1,3}).*}).captures[0])
-                address = IPAddr.new(ip)
-
-                mask.include?(address)
-              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
-
           # Makes sure that we have admin privileges and if nor starts a new shell with the required
           # privileges
           def run_with_admin_privileges(file, *args)

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/scripts/changelog.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+programname=$0
+function usage()
+{
+    echo "usage: $programname -m milestone"
+    echo "  -m  milestone id"
+    exit 1
+}
+
+
+
+# Given a milestone id, generates a sorted list of issues for this milestone.
+# Can be used to generate content for CHANGELOG.md
+function milestone_issues()
+{
+  # get the raw data
+  milestone_data="`curl -s https://api.github.com/repos/vagrant-landrush/landrush/issues?per_page=100\&milestone=$milestone\&state=closed`"
+
+  issue_list=`echo $milestone_data | jq '.[] | "- Issue [#" + (.number|tostring) + "](" + .url + ") - " + .title'`
+
+  # sort first on issue type, then issue id
+  issue_list=`echo "$issue_list" | sort  -k4,4 -k2n`
+
+  # Remove enclosing quotes on each line
+  issue_list=`echo "$issue_list" | tr -d \"`
+
+  # Replace \ which is left over from above command with "(double quote) and suppress warning
+  issue_list=`echo "$issue_list" | tr '\' '"' 2> /dev/null`
+
+  # Adjust the issue links
+  issue_list=`echo "$issue_list" | sed -e s/api.github.com.repos/github.com/g`
+
+  echo "$issue_list"
+}
+
+while getopts ":r:m:" opt; do
+  case $opt in
+    r)
+      repository=$OPTARG
+      ;;
+    m)
+      milestone=$OPTARG
+      ;;
+    *)
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+shift $((OPTIND-1))
+
+if [ -z "${milestone}" ]; then
+    usage
+    exit 1
+fi
+
+milestone_issues

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

@@ -1,12 +1,8 @@
 require_relative '../../../../test_helper'
 
-module Landrush
-  module Cap
-    module Windows
-      describe ConfigureVisibilityOnHost do
-        TEST_IP = '10.42.42.42'.freeze
+TEST_IP = '10.42.42.42'.freeze
 
-        DOT_3_SVC_RUNNING = 'SERVICE_NAME: dot3svc
+DOT_3_SVC_RUNNING = 'SERVICE_NAME: dot3svc
         TYPE               : 30  WIN32
         STATE              : 4  RUNNING
                                 (STOPPABLE, NOT_PAUSABLE, ACCEPTS_SHUTDOWN)
@@ -16,7 +12,7 @@ module Landrush
         WAIT_HINT          : 0x0
 '.freeze
 
-        DOT_3_SVC_STOPPED = 'SERVICE_NAME: dot3svc
+DOT_3_SVC_STOPPED = 'SERVICE_NAME: dot3svc
         TYPE               : 30  WIN32
         STATE              : 1  STOPPED
         WIN32_EXIT_CODE    : 0  (0x0)
@@ -25,6 +21,54 @@ module Landrush
         WAIT_HINT          : 0x0
 '.freeze
 
+NETSH_EXAMPLE = '
+Configuration for interface "VirtualBox Host-Only Network #1"
+    DHCP enabled:                         No
+    IP Address:                           192.168.99.1
+    Subnet Prefix:                        192.168.99.0/24 (mask 255.255.255.0)
+    InterfaceMetric:                      25
+    Statically Configured DNS Servers:    None
+    Register with which suffix:           Primary only
+    Statically Configured WINS Servers:   None
+
+Configuration for interface "Ethernet"
+    DHCP enabled:                         Yes
+    IP Address:                           192.168.1.193
+    Subnet Prefix:                        192.168.1.0/24 (mask 255.255.255.0)
+    Default Gateway:                      192.168.1.1
+    Gateway Metric:                       0
+    InterfaceMetric:                      35
+    DNS servers configured through DHCP:  192.168.1.1
+    Register with which suffix:           Primary only
+    WINS servers configured through DHCP: None
+
+Configuration for interface "Loopback Pseudo-Interface 1"
+    DHCP enabled:                         No
+    IP Address:                           127.0.0.1
+    Subnet Prefix:                        127.0.0.0/8 (mask 255.0.0.0)
+    InterfaceMetric:                      75
+    Statically Configured DNS Servers:    None
+    Register with which suffix:           Primary only
+    Statically Configured WINS Servers:   None
+'.freeze
+
+NETSH_EXAMPLE_SINGLE_INTERFACE = '
+Configuration for interface "Ethernet"
+    DHCP enabled:                         Yes
+    IP Address:                           192.168.1.193
+    Subnet Prefix:                        192.168.1.0/24 (mask 255.255.255.0)
+    Default Gateway:                      192.168.1.1
+    Gateway Metric:                       0
+    InterfaceMetric:                      35
+    DNS servers configured through DHCP:  192.168.1.1
+    Register with which suffix:           Primary only
+    WINS servers configured through DHCP: None
+'.freeze
+
+module Landrush
+  module Cap
+    module Windows
+      describe ConfigureVisibilityOnHost do
         before do
           @vboxmanage_found = !Vagrant::Util::Which.which('VBoxManage').nil?
           @has_admin_privileges = Landrush::Cap::Windows::ConfigureVisibilityOnHost.admin_mode?
@@ -63,6 +107,35 @@ module Landrush
           end
         end
 
+        describe '#get_network_name' do
+          it 'returns network name for matching IP' do
+            ConfigureVisibilityOnHost.expects(:`).with('netsh interface ip show config').returns(NETSH_EXAMPLE)
+            expect(ConfigureVisibilityOnHost.get_network_name('192.168.1.193')).must_equal('Ethernet')
+          end
+
+          it 'returns nil for non matching IP' do
+            ConfigureVisibilityOnHost.expects(:`).with('netsh interface ip show config').returns(NETSH_EXAMPLE)
+            expect(ConfigureVisibilityOnHost.get_network_name('42.42.42.42')).must_be_nil
+          end
+
+          it 'returns nil for nil input' do
+            ConfigureVisibilityOnHost.expects(:`).with('netsh interface ip show config').returns(NETSH_EXAMPLE)
+            expect(ConfigureVisibilityOnHost.get_network_name(nil)).must_be_nil
+          end
+
+          it 'returns nil for empty input' do
+            ConfigureVisibilityOnHost.expects(:`).with('netsh interface ip show config').returns(NETSH_EXAMPLE)
+            expect(ConfigureVisibilityOnHost.get_network_name('')).must_be_nil
+          end
+
+          describe '#get_network_name' do
+            it 'returns network name for single interface' do
+              ConfigureVisibilityOnHost.expects(:`).with('netsh interface ip show config').returns(NETSH_EXAMPLE_SINGLE_INTERFACE)
+              expect(ConfigureVisibilityOnHost.get_network_name('192.168.1.193')).must_equal('Ethernet')
+            end
+          end
+        end
+
         def network_state
           `netsh interface ip show config`.split(/\n/).reject(&:empty?)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filelock
@@ -162,6 +162,7 @@ files:
 - lib/landrush/util/process_helper.rb
 - lib/landrush/util/retry.rb
 - lib/landrush/version.rb
+- scripts/changelog.sh
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
 - test/landrush/cap/guest/all/read_host_visible_ip_address_test.rb