landrush 0.19.0 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [Unreleased][unreleased]
+
+- Added: Acceptance CI tests ([#136](https://github.com/vagrant-landrush/landrush/issues/136))
+- Fixed: Making sure that the right Vagrant data dir is used ([#172](https://github.com/vagrant-landrush/landrush/pull/172))
+- Added: Getting Landrush to work on Windows ([#170](https://github.com/vagrant-landrush/landrush/pull/170))
+
 ## [0.19.0] - 2016-03-10
 - Added: Support for libvirt provider (#138)
 - Added: support for CNAME records (#99)
@@ -13,7 +19,8 @@
 ## [0.16.0] - 2015-01-18
 - Added: Support for IN::PTR records (#98)
 
-[unreleased]: https://github.com/phinze/landrush/compare/v0.18.0...HEAD
+[unreleased]: https://github.com/phinze/landrush/compare/v0.19.0...HEAD
+[0.19.0]: https://github.com/phinze/landrush/compare/v0.18.0...v0.19.0
 [0.18.0]: https://github.com/phinze/landrush/compare/v0.17.0...v0.18.0
 [0.17.0]: https://github.com/phinze/landrush/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/phinze/landrush/compare/v0.15.4...v0.16.0

data/CONTRIBUTING.md

@@ -9,9 +9,9 @@ they will be added to this document.
 
 ## Pull Requests
 
-* All changes should be made by pull request (PR), even from maintainers. 
+* All changes should be made by pull request (PR), even from maintainers.
 * All changes should include documentation updates.
-* Small changes need only 1 ACK.  Larger changes need 2 ACKs from
+* Small changes need only 1 ACK. Larger changes need 2 ACKs from
   maintainers before they will be merged. If the author of the PR is a
   maintainer, the submission is considered 1 of the 2 ACKs. Therefore PRs
   from maintainers only require one additional ACK. By "2 ACKs" we mean
@@ -34,9 +34,9 @@ Prereqs:
 
 Steps:
 
-1. Update `lib/version.rb` with version number.
+1. Update `lib/landrush/version.rb` with version number.
 2. Update `CHANGELOG.md` header with version number and current date.
-3. Make release commit: `git add lib/version.rb CHANGELOG.md; git commit -m 'cut vX.Y.Z'`
+3. Make release commit: `git add lib/landrush/version.rb CHANGELOG.md; git commit -m 'cut vX.Y.Z'`
 4. Make release tag: `git tag -m vX.Y.Z vX.Y.Z`
 5. Push release commit: `git push origin master`
 6. Build release: `rake build`
@@ -45,9 +45,10 @@ Steps:
 
 ## Maintainers
 
-* Reto Kaiser ([@njam](http://github.com/njam))
-* Eric Sorenson ([@ahpook](http://github.com/ahpook))
-* Josef Strzibny ([@strzibny](http://github.com/strzibny))
-* Florian Holzhauer ([@fh](http://github.com/fh))
-* Brian Exelbierd ([@bexelbie](http://github.com/bexelbie))
-* Paul Hinze ([@phinze](http://github.com/phinze))
+* Brian Exelbierd (@bexelbie)
+* Eric Sorenson (@ahpook)
+* Florian Holzhauer (@fh)
+* Hardy Ferentschik (@hferentschik)
+* Josef Strzibny (@strzibny)
+* Paul Hinze (@phinze)
+* Reto Kaiser (@njam)

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Can't use `gemspec` to pull in dependencies, because the landrush gem needs
 # to be in the :plugins group for Vagrant to detect and load it in development
 
-gem 'rubydns', '1.0.2'
-gem 'rexec'
+gem 'rubydns', '0.8.5'
 gem 'rake'
+gem 'json'
 
 # Vagrant's special group
 group :plugins do
@@ -18,10 +18,13 @@ end
 
 group :development do
   gem 'vagrant',
-    :git => 'git://github.com/mitchellh/vagrant.git',
-    :ref => 'v1.8.1'
+      :git => 'git://github.com/mitchellh/vagrant.git',
+      :ref => 'v1.8.1'
 
   gem 'byebug'
   gem 'mocha'
   gem 'minitest'
+  gem 'cucumber', '~> 2.1'
+  gem 'aruba', '~> 0.13'
+  gem 'komenda', '~> 0.1.6'
 end

data/Gemfile.lock

@@ -0,0 +1,178 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: c1c00e2f3cf69c579a5aa6922d67bb838a2de9cd
+  ref: v1.8.1
+  specs:
+    vagrant (1.8.1)
+      bundler (>= 1.5.2, <= 1.10.6)
+      childprocess (~> 0.5.0)
+      erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
+      i18n (>= 0.6.0, <= 0.8.0)
+      listen (~> 3.0.2)
+      log4r (~> 1.1.9, < 1.1.11)
+      net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
+      net-ssh (~> 3.0.1)
+      nokogiri (= 1.6.3.1)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
+      wdm (~> 0.1.0)
+      winrm (~> 1.3)
+      winrm-fs (~> 0.2.2)
+
+PATH
+  remote: .
+  specs:
+    landrush (1.0.0)
+      rubydns (= 0.8.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aruba (0.14.1)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    ast (2.2.0)
+    builder (3.2.2)
+    byebug (8.2.1)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    contracts (0.13.0)
+    cucumber (2.3.3)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 3.2.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.2.5)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    erubis (2.7.0)
+    eventmachine (1.0.8)
+    events (0.9.8)
+    ffi (1.9.10)
+    ffi (1.9.10-x64-mingw32)
+    gherkin (3.2.0)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashicorp-checkpoint (0.1.4)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httpclient (2.7.1)
+    i18n (0.7.0)
+    json (1.8.3)
+    komenda (0.1.6)
+      events (~> 0.9.8)
+    listen (3.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    little-plugger (1.1.4)
+    log4r (1.1.10)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    metaclass (0.0.4)
+    mime-types (2.99)
+    mini_portile (0.6.0)
+    minitest (5.8.4)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.0.2)
+    netrc (0.11.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.3.1-x64-mingw32)
+      mini_portile (= 0.6.0)
+    nori (2.6.0)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.4)
+      ffi (>= 0.5.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rest-client (1.8.0-x64-mingw32)
+      ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
+    rubydns (0.8.5)
+      eventmachine (~> 1.0.0)
+    rubyntlm (0.4.0)
+    rubyzip (1.1.7)
+    thor (0.19.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.1-x64-mingw32)
+    unicode-display_width (1.0.3)
+    uuidtools (2.1.5)
+    wdm (0.1.1)
+    winrm (1.3.6)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.4.0)
+      uuidtools (~> 2.1.2)
+    winrm-fs (0.2.3)
+      erubis (~> 2.7)
+      logging (~> 1.6, >= 1.6.1)
+      rubyzip (~> 1.1)
+      winrm (~> 1.3.0)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  aruba (~> 0.13)
+  byebug
+  cucumber (~> 2.1)
+  json
+  komenda (~> 0.1.6)
+  landrush!
+  minitest
+  mocha
+  rake
+  rubocop (~> 0.38.0)
+  rubydns (= 0.8.5)
+  vagrant!

data/README.md

@@ -1,19 +1,46 @@
-# Landrush: DNS for Vagrant [![Build Status](https://travis-ci.org/phinze/landrush.png)](https://travis-ci.org/phinze/landrush)
-
-Simple DNS that's visible on both the guest and the host.
-
-Spins up a small DNS server and redirects DNS traffic from your VMs to use it,
-automatically registers/deregisters IP addresseses of guests as they come up
-and down.
-
+# Landrush: DNS for Vagrant [![Build Status](https://travis-ci.org/vagrant-landrush/landrush.png)](https://travis-ci.org/vagrant-landrush/landrush)
+
+Simple cross-platform DNS that's visible on both the guest and the host.
+
+Landrush 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 down.
+
+**Note**: Windows support is currently considered experimental. If you having
+problems using Landrush on Windows please let us know.
+
+<!-- MarkdownTOC -->
+
+- [Installation](#installation)
+- [Usage](#usage)
+    - [Get started](#get-started)
+    - [Dynamic entries](#dynamic-entries)
+    - [Static entries](#static-entries)
+    - [Wildcard Subdomains](#wildcard-subdomains)
+    - [Unmatched Queries](#unmatched-queries)
+    - [Visibility on the Guest](#visibility-on-the-guest)
+    - [Visibility on the Host](#visibility-on-the-host)
+        - [OS X](#os-x)
+        - [Linux](#linux)
+        - [Windows](#windows)
+        - [Other Devices \(phone\)](#other-devices-phone)
+    - [Additional CLI commands](#additional-cli-commands)
+- [Development](#development)
+- [Help Out!](#help-out)
+
+<!-- /MarkdownTOC -->
+
+<a name="installation"></a>
 ## Installation
 
 Install under Vagrant (1.1 or later):
 
     $ vagrant plugin install landrush
 
+<a name="usage"></a>
 ## Usage
 
+<a name="get-started"></a>
 ### Get started
 
 Enable the plugin in your `Vagrantfile`:
@@ -32,6 +59,7 @@ If you shut down your guest, the entries associated with it will be removed.
 
 Landrush assigns your vm's hostname from either the vagrant config (see the `examples/Vagrantfile`) or system's actual hostname by running the `hostname` command. A default of "guest-vm" is assumed if hostname is otherwise not available.
 
+<a name="dynamic-entries"></a>
 ### Dynamic entries
 
 Every time a VM is started, its IP address is automatically detected and a DNS record is created that maps the hostname to its IP.
@@ -42,6 +70,7 @@ If for any reason the auto-detection detects no IP address or the wrong IP addre
 
 If you are using a multi-machine `Vagrantfile`, configure this inside each of your `config.vm.define` sections.
 
+<a name="static-entries"></a>
 ### Static entries
 
 You can add static host entries to the DNS server in your `Vagrantfile` like so:
@@ -50,6 +79,7 @@ You can add static host entries to the DNS server in your `Vagrantfile` like so:
 
 This is great for overriding production services for nodes you might be testing locally. For example, perhaps you might want to override the hostname of your puppetmaster to point to a local vagrant box instead.
 
+<a name="wildcard-subdomains"></a>
 ### Wildcard Subdomains
 
 For your convenience, any subdomain of a DNS entry known to landrush will resolve to the same IP address as the entry. For example: given `myhost.vagrant.test -> 1.2.3.4`, both `foo.myhost.vagrant.test` and `bar.myhost.vagrant.test` will also resolve to `1.2.3.4`.
@@ -60,6 +90,7 @@ If you would like to configure your guests to be accessible from the host as sub
 
 Note that from the __host__, you will only be able to access subdomains of your configured TLD by default- so wildcard subdomains only apply to that space. For the __guest__, wildcard subdomains work for anything.
 
+<a name="unmatched-queries"></a>
 ### Unmatched Queries
 
 Any DNS queries that do not match will be passed through to an upstream DNS server, so this will be able to serve as the one-stop shop for your guests' DNS needs.
@@ -72,6 +103,7 @@ If you would like to configure your own upstream servers, add upstream entries t
     # If your upstream is TCP only for some strange reason
     config.landrush.upstream '10.1.3.10', 1001, :tcp
 
+<a name="visibility-on-the-guest"></a>
 ### Visibility on the Guest
 
 Linux guests should automatically have their DNS traffic redirected via `iptables` rules to the Landrush DNS server. File an issue if this does not work for you.
@@ -83,12 +115,20 @@ To disable this functionality:
 You may want to do this if you are already proxying all your DNS requests through your host (e.g. using VirtualBox's natdnshostresolver1 option) and you
 have DNS servers that you can easily set as upstreams in the daemon (e.g. DNS requests that go through the host's VPN connection).
 
+<a name="visibility-on-the-host"></a>
 ### Visibility on the Host
 
+<a name="os-x"></a>
+#### OS X
+
 If you're on an OS X host, we use a nice trick to unobtrusively add a secondary DNS server only for specific domains.
 Landrush adds a file into `/etc/resolver` that points lookups for hostnames ending in your `config.landrush.tld` domain
 name to its DNS server. (Check out `man 5 resolver` on your Mac OS X host for more information on this file's syntax.)
 
+
+<a name="linux"></a>
+#### Linux
+
 Though it's not automatically set up by landrush, similar behavior can be achieved on Linux hosts with `dnsmasq`. You
 can integrate Landrush with dnsmasq on Ubuntu like so (tested on Ubuntu 13.10):
 
@@ -98,59 +138,132 @@ can integrate Landrush with dnsmasq on Ubuntu like so (tested on Ubuntu 13.10):
 
 If you use a TLD other than the default `vagrant.test`, replace the TLD in the above instructions accordingly. Please be aware that anything ending in '.local' as TLD will not work because the `avahi` daemon reserves this TLD for its own uses.
 
-### Visibility on other Devices (phone)
+<a name="windows"></a>
+#### Windows
+
+**Note**: Windows support is currently considered experimental. If you having
+problems using Landrush on Windows please let us know.
+
+On Windows a secondary DNS server can be configured via the properties of a
+network adapter. This will be illustrated in the following using Windows 10 with
+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`:
+
+![Network Connections](doc/img/network-connections.png "Network Connections")
+
+There will be at least one VirtualBox network adapter. There might be multiple
+depending on your configuration (number of networks configured) and how many VMs
+you have running, but you just need to modify one.
+
+In a first step you need to identify the VirtualBox network adapter used for the
+private network of your VM. Landrush requires a private network adapter to work
+and will create one in case you are not explicitly configuring one in your
+`Vagrantfile`.
+
+To quickly view the settings of each network adapter you can run the following
+command in a shell:
+
+    netsh interface ip show config
+
+The output should look something like that:
+
+    Configuration for interface "Ethernet0"
+        DHCP enabled:                         Yes
+        IP Address:                           172.16.74.143
+        Subnet Prefix:                        172.16.74.0/24 (mask 255.255.255.0)
+        Default Gateway:                      172.16.74.2
+        Gateway Metric:                       0
+        InterfaceMetric:                      10
+        DNS servers configured through DHCP:  172.16.74.2
+        Register with which suffix:           Primary only
+        WINS servers configured through DHCP: 172.16.74.2
+
+    Configuration for interface "VirtualBox Host-Only Network"
+        DHCP enabled:                         No
+        IP Address:                           10.1.2.1
+        Subnet Prefix:                        10.1.2.0/24 (mask 255.255.255.0)
+        InterfaceMetric:                      10
+        Statically Configured DNS Servers:    None
+        Register with which suffix:           Primary only
+        Statically Configured WINS Servers:   None
+
+
+In our case we are interested in the `VirtualBox Host-Only Network` which
+has in this example the private network IP 10.1.2.1. If you don't have a static
+private network IP configured and you cannot determine the right adapter via
+the `netsh` output, ssh into the VM (`vagrant ssh`) and run `ifconfig` to view
+the network configuration of the VM.
+
+Once you identified the right network adapter run the following as Administrator
+(using the network adapter name of the adapter with the determined private
+network IP):
+
+     netsh interface ipv4 add dnsserver "VirtualBox Host-Only Network" address=127.0.0.1 index=1
+
+This should be enough for Windows 10. On other Windows versions, you might have to
+also add your TLD to the DNS suffix list on the DNS Advanced TCP/IP Settings tab:
+
+![Advanced TCP/IP Settings](doc/img/advanced-tcp-properties.png "Advanced TCP/IP Settings")
+
+<a name="other-devices-phone"></a>
+#### Other Devices (phone)
 
 You might want to resolve Landrush's DNS-entries on *additional* computing devices, like a mobile phone.
 
 Please refer to [/doc/proxy-mobile](/doc/proxy-mobile) for instructions.
 
+<a name="additional-cli-commands"></a>
 ### Additional CLI commands
 
 Check out `vagrant landrush` for additional commands to monitor the DNS server daemon.
 
-## RoadMap
 
-The committers met and have set a basic roadmap as of 3 March 2016:
+<a name="development"></a>
+## Development
 
-1. 0.19 will be released as soon as possible.  The goal is to make newer
-code commits available and document the release process.
+* Install dependencies:
 
-2. Release 0.20 will occur soon.  We would like to try to land two PRs:
+        $ bundle install
 
-  * PR #125 - Multiple TLDs
-  * PR #144 - Cucumber Acceptance Tests
+* Get a list of all available build tasks:
 
-  The release goal is by 1 April 2016
+        $ bundle exec rake -T
 
-3. Release 0.90 (or 1.0) will occur afterward.  Goals:
+* Run the test suite:
 
-  * PR #122 - Enhanced IP/NIC selection
-  * PR #154 Windows support for EventMachine/DNS
-    * We need your help, eventmachine has not proven to be very stable.
-    * Can we find an alternative to RubyDNS?  Should we try something
-      in Go or another contained cross-platform binary?
-    * This would deal with the RubyDNS dependency tree and challenges
-  * PR #160 - Cygwin Fix
+        $ bundle exec rake test
 
-4. With Release 0.90 or 1.0 or later
+* Run a single test file:
 
-  * PR #62 - Arbitrary record types
+        $ bundle exec rake test TEST=<path to test file>
 
-## Development
+* Run cucumber/aruba acceptance tests:
+
+        $ bundle exec cucumber
+
+  Note, that the acceptance tests currently only work out of the box on OS X.
+  On Linux one has to manually configure the host visibility for the TLD
+  _landrush-acceptance-test_. See for [Linux](#linux). On Windows the acceptance
+  tests won't work due to a current bug in [Aruba](https://github.com/cucumber/aruba/issues/387).
 
-Install dependencies:
+* Build the Landrush gem:
 
-    bundle install
+        $ bundle exec rake install
 
-Run the test suite:
+* Clean all generated files:
 
-    bundle exec rake
+        $ bundle exec rake clean clobber
 
-Run the vagrant binary with the landrush plugin loaded from your local source code:
+* Run the vagrant binary with the Landrush plugin loaded from your local
+source code:
 
-    bundle exec vagrant landrush <command>
+        bundle exec vagrant landrush <command>
 
-### Help Out!
+<a name="help-out"></a>
+## Help Out!
 
 This project could use your feedback and help! Please don't hesitate to open issues or submit pull requests. NO HESITATION IS ALLOWED. NONE WHATSOEVER.  See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.