landrush 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fc436bab040df9eb7c4b2d72c6dbed5d939e07da
-  data.tar.gz: d152964c54984aa6a4b93fe968a2dc66cb361105
+SHA256:
+  metadata.gz: 5d8b8d3d76cf287d4cd432d2d702842b5efb3b672cd6c25fec249b76d989eb34
+  data.tar.gz: '09b16732791cb9d9d1112f1695dff95fb317ad35c07c2878c1011fb8918c5c4d'
 SHA512:
-  metadata.gz: e036f50d31cbe851b787a7ca37de97550a8e2e1dc2abafb7b936bc50150675cc9419675740c13f9fbbbe409b7a29085cd1f5ca5388175cac0082ba0b270ca821
-  data.tar.gz: 048b080367798a7cf2f684b1f2fabd18b936c27bc6a80e4db3a3740c5e8056a37d4cdd8cb49acbd27ac7e385b5d3463835d21bb952036b4a92b0e052cccbf45d
+  metadata.gz: f28250855875dff56af42a8a6c0470f94b9d1cc01661ecca63cba5f2ce4f2bb1f2df7895d48ac5df67cf46357b6bdaf06527eb8fe2abd94c86c79b2d9b0a5045
+  data.tar.gz: 51a1f6a0cc73405ba8913d72fa29ed98180e70eef38b456c8c7d28c025079eb22937984be94ed105e8442f8c355dc8a51fdebbb3272d2b1adb8d2f687f77727e

data/.rubocop.yml

@@ -6,3 +6,5 @@ AllCops:
     - 'vendor/**/*'
     - 'tmp/**/*'
 
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-10-04 22:36:56 +0200 using RuboCop version 0.38.0.
+# on 2018-08-31 16:33:52 +0200 using RuboCop version 0.58.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,31 +10,65 @@
 Metrics/AbcSize:
   Max: 47
 
+# Offense count: 13
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 89
+
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 218
+  Max: 200
+  Exclude:
+  - 'lib/landrush/server.rb'
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 12
-
-# Offense count: 144
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 154
+  Max: 11
+  Exclude:
+  - 'lib/landrush/command.rb'
 
-# Offense count: 14
+# Offense count: 13
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 29
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 14
+  Max: 12
+  Exclude:
+  - 'lib/landrush/command.rb'
 
-# Offense count: 32
+# Offense count: 9
+# Configuration parameters: Blacklist.
+# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'lib/landrush/cap/host/arch/restart_dnsmasq.rb'
+    - 'lib/landrush/cap/host/darwin/configure_visibility_on_host.rb'
+    - 'lib/landrush/cap/host/linux/create_dnsmasq_config.rb'
+    - 'lib/landrush/cap/host/redhat/restart_dnsmasq.rb'
+    - 'lib/landrush/cap/host/suse/restart_dnsmasq.rb'
+    - 'lib/landrush/command.rb'
+    - 'test/landrush/cap/host/darwin/configure_visibility_on_host_test.rb'
+    - 'test/landrush/cap/host/linux/configure_visibility_on_host_test.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyleForLeadingUnderscores.
+# SupportedStylesForLeadingUnderscores: disallowed, required, optional
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'test/test_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
+  Exclude:
+    - 'lib/landrush/action/setup.rb'
+    - 'lib/landrush/dns_server.rb'
+
+# Offense count: 41
 Style/Documentation:
   Enabled: false
 
@@ -44,3 +78,57 @@ Style/DoubleNegation:
     - 'lib/landrush/config.rb'
     - 'lib/landrush/server.rb'
 
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/landrush/action/install_prerequisites.rb'
+    - 'lib/landrush/action/setup.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/landrush/cap/guest/linux/configured_dns_servers.rb'
+    - 'lib/landrush/cap/host/windows/configure_visibility_on_host.rb'
+    - 'lib/landrush/config.rb'
+    - 'lib/landrush/plugin.rb'
+    - 'lib/landrush/server.rb'
+
+# Offense count: 3
+Style/MultipleComparison:
+  Exclude:
+    - 'lib/landrush/command.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/landrush/store.rb'
+    - 'lib/landrush/util/process_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/landrush/cap/host/windows/configure_visibility_on_host.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
+# Whitelist: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/landrush/cap/host/darwin/configure_visibility_on_host.rb'
+    - 'lib/landrush/cap/host/linux/create_dnsmasq_config.rb'
+    - 'lib/landrush/cap/host/windows/configure_visibility_on_host.rb'
+    - 'lib/landrush/server.rb'
+
+# Offense count: 161
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 154

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 
 before_install:
 - rvm gemset use global
-- gem uninstall bundler -Iax --version '<1.14'
-- gem install bundler -v 1.12.5
+- gem install bundler -v 1.16.4
 
 script:
 - bundle exec rake clean rubocop test install TESTOPTS='--verbose'

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.3.0] - 2018-09-19
+
+- Issue [#177](https://github.com/vagrant-landrush/landrush/issues/177) - Allow multiple TLD kind/feature priority/major
+- Issue [#329](https://github.com/vagrant-landrush/landrush/issues/329) - Update dev docs component/documentation kind/task priority/major
+- Issue [#304](https://github.com/vagrant-landrush/landrush/issues/304) - Concurrency issue when nodes are brought up in parallel kind/bug priority/major
+- Issue [#261](https://github.com/vagrant-landrush/landrush/issues/261) - Example shown in README results in error component/documentation kind/bug priority/minor
+- Issue [#274](https://github.com/vagrant-landrush/landrush/issues/274) - Host DNS configuration should consider NetworkManager on Fedora kind/bug priority/major resolution/duplicate
+- Issue [#71](https://github.com/vagrant-landrush/landrush/issues/71)   - Support for docker provider in vagrant 1.6 kind/feature priority/major
+- Issue [#324](https://github.com/vagrant-landrush/landrush/issues/324) - Upgrade dev environment component/build kind/task priority/major
+- Issue [#297](https://github.com/vagrant-landrush/landrush/issues/297) - Support Arch Linux as host kind/feature 
+
 ## [1.2.0] - 2016-12-07
 
 - Issue [#298](https://github.com/vagrant-landrush/landrush/issues/298) - Travis CI used wrong Bundler version

data/Gemfile

@@ -6,18 +6,18 @@ group :plugins do
 end
 
 group :development do
-  gem 'vagrant',
-      git: 'https://github.com/mitchellh/vagrant.git',
-      ref: 'v1.8.6'
-  gem 'rake', '~> 10'
-  gem 'rubocop', '~> 0.38.0'
+  gem 'aruba', '~> 0.13'
+  gem 'asciidoctor'
   gem 'byebug'
-  gem 'mocha'
-  gem 'minitest'
   gem 'cucumber', '~> 2.1'
-  gem 'aruba', '~> 0.13'
-  gem 'komenda', '~> 0.1.6'
-  gem 'guard-rake'
   gem 'guard-livereload', '~> 2.5', require: false
-  gem 'asciidoctor'
+  gem 'guard-rake'
+  gem 'komenda', '~> 0.1.6'
+  gem 'minitest'
+  gem 'mocha'
+  gem 'rake', '~> 10'
+  gem 'rubocop'
+  gem 'vagrant',
+      git: 'https://github.com/mitchellh/vagrant.git',
+      ref: 'v2.1.2'
 end

data/README.adoc

@@ -12,6 +12,13 @@ It spins up a small DNS server and redirects DNS traffic from your VMs
 to use it, automatically registering/unregistering IP addresses of
 guests as they come up and go down.
 
+[NOTE]
+====
+This project is currently _unmaintained_ and looking for maintainers! Anybody interested in helping out please contact @hferentschik.
+
+I'd be happy to help coach anybody who wants to drop in and pick up the maintainer role for this plugin!
+====
+
 '''
 toc::[]
 '''
@@ -52,7 +59,7 @@ A Landrush example configuration could look like this:
 
 ....
 Vagrant.configure("2") do |config|
-  config.vm.box = "hashicorp/precise64"
+  config.vm.box = "ubuntu/xenial64"
 
   config.landrush.enabled = true
 

data/Rakefile

@@ -37,9 +37,9 @@ rule '.html' => '.adoc' do |t|
   Asciidoctor.convert_file t.source, to_dir: 'build/html'
 end
 
-task default: [
-  :rubocop,
-  :test
+task default: %i[
+  rubocop
+  test
 ]
 
 task :generate_diagrams do

data/appveyor.yml

@@ -4,12 +4,14 @@ version: "{build}"
 branches:
   only:
     - master
+init:
+  - git config --global core.autocrlf true
 install:
   - set PATH=C:\Ruby22\bin;%PATH%
   - ruby --version
   - gem --version
   - gem uninstall -x bundler
-  - gem install bundler -v 1.12.5
+  - gem install bundler -v 1.16.4
   - bundler --version
   - bundle install
 build_script:

data/doc/Development.adoc

@@ -2,21 +2,20 @@
 :toc:
 :toc-placement!:
 
-The following should get you started on setting up your development environment. As a prerequisite you will need a Ruby 2.2 environment. We
-recommend to use https://rvm.io/[RVM] to create an isolated development
-environment. On Windows the http://rubyinstaller.org/[RubyInstaller for
-Windows] is probably the easiest way to get started. In this case you
-will need the http://rubyinstaller.org/add-ons/devkit/[DevKit] as well.
+The following should get you started on setting up your development environment.
+As a prerequisite you will need a Ruby environment (Ruby version >= 2.2, 2.5 recommended).
+We recommend to use https://rvm.io/[RVM] to create an isolated development environment.
+On Windows the http://rubyinstaller.org/[RubyInstaller for Windows] is probably the easiest way to get started.
+In this case you will need the http://rubyinstaller.org/add-ons/devkit/[DevKit] as well.
 
 '''
 toc::[]
 '''
 
-Once you have a working Ruby environment it is time to
-https://help.github.com/articles/fork-a-repo/[fork] the repository. Refer to the link:../CONTRIBUTING.adoc[Contributing] guide for more information.
+Once you have a working Ruby environment it is time to https://help.github.com/articles/fork-a-repo/[fork] the repository.
+Refer to the link:../CONTRIBUTING.adoc[Contributing] guide for more information.
 
-The following sections list the most important commands you will need for
-development.
+The following sections list the most important commands you will need for development.
 
 == Setup
 
@@ -25,11 +24,13 @@ development.
 ....
 $ gem install bundler
 ....
+
 * Install dependencies:
 +
 ....
 $ bundle install
 ....
+
 * Get a list of all available build tasks:
 +
 ....
@@ -39,8 +40,9 @@ $ bundle exec rake -T
 * Build the Landrush gem:
 +
 ....
-$ bundle exec rake install
+$ bundle exec rake build
 ....
+
 * Clean all generated files:
 +
 ....
@@ -54,11 +56,18 @@ $ bundle exec rake clean clobber
 ....
 $ 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.
+To make testing simpler, each test will be configured against a newly created temporary working directly which will be deleted on teardown.
+Refer to https://github.com/vagrant-landrush/landrush/blob/master/test/test_helper.rb#L173[test_helper.rb] to see how this setup and teardown works.
+
 * Run a single test file:
 +
 ....
 $ bundle exec rake test TEST=<path to test file>
 ....
+
 * Run cucumber/aruba acceptance tests:
 +
 ....
@@ -66,10 +75,9 @@ $ 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_. See *Linux* in the *Visibility on the Host* section of the link:Usage.adoc[Usage guide]. On Windows,
-the acceptance tests won't work due to a bug in
-https://github.com/cucumber/aruba/issues/387[Aruba].
+On Linux, one has to manually configure the host visibility for the TLD _landrush-acceptance-test_.
+See *Linux* in the *Visibility on the Host* section of the link:Usage.adoc[Usage guide].
+On Windows, the acceptance tests won't work due to a bug in https://github.com/cucumber/aruba/issues/387[Aruba].
 
 * Run a single cucumber/aruba acceptance tests:
 +
@@ -82,7 +90,7 @@ $ bundle exec rake features FEATURE=features/<feature-filename>.feature
 The documentation of this plugin is written in http://asciidoctor.org[Asciidoc]. If you need some syntax help,
 refer to the http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc Syntax Quick Reference].
 
-To build the documentation you can execute
+To build the documentation you can execute:
 
 ----
 $ bundle exec rake html
@@ -91,16 +99,13 @@ $ bundle exec rake html
 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
+You can execute:
 
 ----
 $ bundle exec guard
 ----
 
 and your HTML documentation will be automatically updated on each change to an Asciidoc source file.
-https://github.com/guard/guard-livereload[Live reload] is also enabled, so you just need to install the right
-http://livereload.com/extensions/#installing-sections[LiveReload Safari/Chrome/Firefox extension] and your
-browser can refresh the page each time you save a change to your Asciidoc files.
 
 == Misc
 

data/doc/Usage.adoc

@@ -148,15 +148,15 @@ To disable this functionality:
 config.landrush.host_redirect_dns = false
 ....
 
-* OS X
+* macOS
 +
-If you are on an OS X host, we use a nice trick to unobtrusively add a
+If you are on an macOS host, we use a nice trick to unobtrusively add a
 secondary DNS server only for specific domains. During startup Landrush automatically adds
 a file into `/etc/resolver` that points
 lookups for hostnames ending in your `config.landrush.tld` domain to its
-DNS server. (See `man 5 resolver` on your Mac OS X host for more
+DNS server. (See `man 5 resolver` on your host for more
 information on this file's syntax.)
-
++
 * Linux
 +
 Landrush tries to achieve the same behavior on Linux hosts using
@@ -195,8 +195,7 @@ Windows 10 and VirtualBox.
 When running VirtualBox on Windows in combination with Landrush the
 Network Connections
 (`Control Panel\Network and Internet\Network Connections`) looks
-somewhat like this after a successful `vagrant up`: +
- +
+somewhat like this after a successful `vagrant up`:
 +
 image:img/network-connections.png[Network
 Connections,title="Network Connections"] +
@@ -268,4 +267,16 @@ You might want to resolve Landrush's DNS-entries on _additional_
 computing devices, like a mobile phone.
 Please refer to link:ProxyMobile.adoc[mobile instructions] for further details.
 
+[TIP]
+====
+Multiple TLDs can also be provided as an array.
+On Linux and macOS a dnsmasq resp. resolver configuration will be created for each TLD.
+
+....
+config.landrush.tld = ['acme.com', 'example.com']
+config.landrush.host 'www.acme.com', '1.2.3.4'
+config.landrush.host 'www.foo.bar', '2.3.4.5'
+....
+====
+
 You can refer to the link:Troubleshooting.adoc[Troubleshooting guide] if you encounter any problems while using Landrush.

data/features/dns_resolution.feature

@@ -29,6 +29,9 @@ Feature: dns_resolution
     Then the hostname "my-static-cname-host.landrush-acceptance-test" should resolve to "42.42.42.42" on the internal DNS server
     And the hostname "my-static-cname-host.landrush-acceptance-test" should resolve to "42.42.42.42" on the host
 
+    When I successfully run `bundle exec vagrant landrush stop`
+    Then Landrush is not running
+
     Examples:
       | box                           | provider   |
       | debian/jessie64               | virtualbox |

data/features/docker_provider.feature

@@ -0,0 +1,32 @@
+Feature: Landrush with Docker provider
+  Landrush should work with Docker provider
+
+  Scenario: Booting box with Docker provider
+    Given a file named "Vagrantfile" with:
+    """
+    Vagrant.configure(2) do |config|
+      config.vm.provider "docker" do |d|
+        # https://github.com/tknerr/vagrant-docker-baseimages
+        d.image = "tknerr/baseimage-ubuntu:18.04"
+        d.has_ssh = true
+        d.privileged = true
+      end
+
+      config.vm.provision "shell", inline: 'apt-get install -y net-tools dnsutils'
+
+      config.landrush.enabled = true
+      config.vm.hostname = "foo.vagrant.test"
+
+      config.landrush.host 'static1.example.com', '1.2.3.4'
+      config.landrush.host 'static2.example.com', '2.3.4.5'
+    end
+    """
+    When I successfully run `bundle exec vagrant up`
+    Then Landrush is running
+
+    When I successfully run `bundle exec vagrant ssh -- dig +noall +answer +nocomments static1.example.com`
+    Then stdout from "bundle exec vagrant ssh -- dig +noall +answer +nocomments static1.example.com" should match /.*1\.2\.3\.4/
+
+    When I successfully run `bundle exec vagrant landrush stop`
+    Then Landrush is not running
+