landrush 0.4.1 → 0.5.0

data/README.md

@@ -2,7 +2,7 @@
 
 Simple DNS that's visible on both the guest and the host.
 
-> Because even a Vagrant needs a place to settle down once in a while.
+> Even a Vagrant needs a place to settle down once in a while.
 
 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
@@ -14,6 +14,8 @@ Install under Vagrant (1.1 or later):
 
     $ vagrant plugin install landrush
 
+If you're on OS X, see **Visibility on the Host** below.
+
 ## Usage
 
 ### Get started
@@ -32,7 +34,6 @@ And you should be able to get your hostname from your host:
 
 If you shut down your guest, the entries associated with it will be removed.
 
-
 ### Static entries
 
 You can add static host entries to the DNS server in your `Vagrantfile` like so:
@@ -41,6 +42,10 @@ 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.
 
+### 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.dev -> 1.2.3.4`, both `foo.myhost.vagrant.dev` and `bar.myhost.vagrant.dev` will also resolve to `1.2.3.4`.
+
 ### 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.
@@ -81,16 +86,7 @@ vagrant landrush install
 
 Check out `vagrant landrush` for additional commands to monitor the DNS server daemon.
 
-## Work in Progress - Lots to do!
-
-* The guest visibility strategy assumes iptables-based firewall.
-* Lots of static values that need configurin' - config location, ports, etc.
-* Tests tests tests.
+## Help Out!
 
-## Contributing
+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.
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/lib/landrush/server.rb

@@ -49,11 +49,11 @@ module Landrush
       server = self
       RubyDNS::run_server(:listen => interfaces) do
         self.logger.level = Logger::INFO
-        
+
         match(/.*/, IN::A) do |transaction|
-          ip = Store.hosts.get(transaction.name)
-          if ip
-            transaction.respond!(ip)
+          host = Store.hosts.find(transaction.name)
+          if host
+            transaction.respond!(Store.hosts.get(host))
           else
             transaction.passthrough!(server.upstream)
           end

data/lib/landrush/store.rb

@@ -18,6 +18,12 @@ module Landrush
       write(current_config.reject { |k, _| k == key })
     end
 
+    def find(search)
+      current_config.keys.detect do |key|
+        search == key || search.match(/\.#{key}$/)
+      end
+    end
+
     def get(key)
       current_config[key]
     end

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/test/landrush/server_test.rb

@@ -2,34 +2,48 @@ require 'test_helper'
 
 module Landrush
   describe Server do
-    after {
-      if Server.running?
-        Server.stop
-      end
-    }
+    def query(host)
+      output = `dig -p #{Server.port} @127.0.0.1 #{host}`
+      answer_line = output.split("\n").grep(/^#{Regexp.escape(host)}/).first
+      answer_line.split.last
+    end
+
     describe 'start/stop' do
       it 'starts and stops a daemon' do
-        hush { Server.start }
-
+        Server.start
         Server.running?.must_equal true
 
-        hush { Server.stop }
-
+        Server.stop
         Server.running?.must_equal false
       end
 
       it 'can be queried for upstream entries' do
-        hush { Server.start }
+        Server.start
 
-        output = `dig -p #{Server.port} @127.0.0.1 phinze.com`
+        query("phinze.com").must_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+      end
+
+      it 'responds properly to configured machine entries' do
+        Server.start
+
+        fake_host = 'boogers.vagrant.dev'
+        fake_ip = '99.98.97.96'
+
+        Store.hosts.set(fake_host, fake_ip)
+
+        query(fake_host).must_equal fake_ip
+      end
 
-        answer_line = output.split("\n").grep(/^phinze\.com\./).first
+      it 'also resolves wildcard subdomains to a given machine' do
+        Server.start
 
-        answer_line.wont_equal nil
+        fake_host = 'boogers.vagrant.dev'
+        fake_ip = '99.98.97.96'
 
-        ip_address = answer_line.split.last
+        Store.hosts.set(fake_host, fake_ip)
 
-        ip_address.must_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+        query("green.#{fake_host}").must_match(fake_ip)
+        query("blue.#{fake_host}").must_match(fake_ip)
       end
     end
   end

data/test/landrush/store_test.rb

@@ -51,5 +51,21 @@ module Landrush
         @store.get('now').must_equal nil # you don't!
       end
     end
+
+    describe "find" do
+      it "returns the key that matches the end of the search term" do
+        @store.set('somehost.vagrant.dev', 'here')
+
+        @store.find('foo.somehost.vagrant.dev').must_equal 'somehost.vagrant.dev'
+        @store.find('bar.somehost.vagrant.dev').must_equal 'somehost.vagrant.dev'
+        @store.find('foo.otherhost.vagrant.dev').must_equal nil
+        @store.find('host.vagrant.dev').must_equal nil
+      end
+
+      it "returns exact matches too" do
+        @store.set('somehost.vagrant.dev', 'here')
+        @store.find('somehost.vagrant.dev').must_equal 'somehost.vagrant.dev'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -134,12 +134,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -227825973048311947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -227825973048311947
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -159,4 +165,3 @@ test_files:
 - test/support/fake_working_dir.rb
 - test/support/test_server_daemon.rb
 - test/test_helper.rb
-has_rdoc: