landrush 0.19.0 → 1.0.0

data/lib/landrush/store.rb

@@ -1,11 +1,19 @@
+require 'pathname'
+require 'json'
+
 module Landrush
   class Store
     def self.hosts
-      @hosts ||= new(Landrush.working_dir.join('hosts.json'))
+      @hosts ||= new(Server.working_dir.join('hosts.json'))
     end
 
     def self.config
-      @config ||= new(Landrush.working_dir.join('config.json'))
+      @config ||= new(Server.working_dir.join('config.json'))
+    end
+
+    def self.reset
+      @config = nil
+      @hosts = nil
     end
 
     attr_accessor :backing_file
@@ -28,14 +36,14 @@ module Landrush
 
     def has?(key, value = nil)
       if value.nil?
-        current_config.has_key? key
+        current_config.key? key
       else
         current_config[key] == value
       end
     end
 
     def find(search)
-      search = (IPAddr.new(search).reverse) if (IPAddr.new(search) rescue nil)
+      search = IPAddr.new(search).reverse if (IPAddr.new(search) rescue nil)
       current_config.keys.detect do |key|
         key.casecmp(search) == 0   ||
           search =~ /#{key}$/i     ||

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.19.0"
+  VERSION = '1.0.0'.freeze
 end

data/test/landrush/action/setup_test.rb

@@ -5,12 +5,17 @@ require 'landrush/action/setup'
 module Landrush
   module Action
     describe Setup do
-      before { ResolverConfig.sudo = ''     }
-      after  { ResolverConfig.sudo = 'sudo' }
+      before do
+        ResolverConfig.sudo = ''
+      end
+
+      after do
+        ResolverConfig.sudo = 'sudo'
+      end
 
       it "calls the next app in the chain" do
         env = fake_environment
-        app = lambda { |e| e[:called] = true }
+        app = -> (e) { e[:called] = true }
         setup = Setup.new(app, nil)
 
         setup.call(env)
@@ -19,7 +24,7 @@ module Landrush
       end
 
       it "records the booting host as a dependent VM" do
-        app = Proc.new {}
+        app = proc {}
         setup = Setup.new(app, nil)
         env = fake_environment
 
@@ -29,7 +34,7 @@ module Landrush
       end
 
       it "starts the landrush server if it's not already started" do
-        app = Proc.new {}
+        app = proc {}
         setup = Setup.new(app, nil)
         env = fake_environment
 
@@ -39,7 +44,7 @@ module Landrush
       end
 
       it "does not attempt to start the server if it's already up" do
-        app = Proc.new {}
+        app = proc {}
         setup = Setup.new(app, nil)
         env = fake_environment
 
@@ -53,7 +58,7 @@ module Landrush
       end
 
       it "does nothing if it is not enabled via config" do
-        app = Proc.new {}
+        app = proc {}
         setup = Setup.new(app, nil)
         env = fake_environment
 
@@ -65,7 +70,7 @@ module Landrush
 
       describe 'after boot' do
         it "stores the machine's hostname => ip address" do
-          app = Proc.new {}
+          app = proc {}
           setup = Setup.new(app, nil)
           env = fake_environment
 
@@ -75,7 +80,7 @@ module Landrush
         end
 
         it "does nothing if it is not enabled via config" do
-          app = Proc.new {}
+          app = proc {}
           setup = Setup.new(app, nil)
           env = fake_environment(enabled: false)
 

data/test/landrush/action/teardown_test.rb

@@ -7,7 +7,7 @@ module Landrush
     describe Teardown do
       it "calls the next app in the chain" do
         env = fake_environment
-        app = lambda { |e| e[:called] = true }
+        app = -> (e) { e[:called] = true }
         teardown = Teardown.new(app, nil)
 
         teardown.call(env)
@@ -16,7 +16,7 @@ module Landrush
       end
 
       it "clears the machine's hostname => ip address" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
 
@@ -27,7 +27,7 @@ module Landrush
       end
 
       it "removes the machine as a dependent VM" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
 
@@ -38,7 +38,7 @@ module Landrush
       end
 
       it "stops the landrush server when there are no dependent machines left" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
 
@@ -49,7 +49,7 @@ module Landrush
       end
 
       it "leaves the landrush server when other dependent vms exist" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
         DependentVMs.add('otherhost.vagrant.test')
@@ -61,7 +61,7 @@ module Landrush
       end
 
       it "leaves static entries when other dependent vms exist" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
         DependentVMs.add('otherhost.vagrant.test')
@@ -74,7 +74,7 @@ module Landrush
       end
 
       it "leaves the server alone if it's not running" do
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
         env = fake_environment
 
@@ -88,7 +88,7 @@ module Landrush
         # disabled in the first place, but oh well
         Store.hosts.set('somehost.vagrant.test', '1.2.3.4')
 
-        app = Proc.new {}
+        app = proc {}
         teardown = Teardown.new(app, nil)
 
         env = fake_environment
@@ -101,4 +101,3 @@ module Landrush
     end
   end
 end
-

data/test/landrush/cap/linux/configured_dns_servers_test.rb

@@ -19,14 +19,14 @@ describe Landrush::Cap::Linux::ConfiguredDnsServers do
     it 'parses out multiple the resolv.conf dns servers' do
       machine.communicate.stubs(:sudo).yields(:stdout, [
         "nameserver 12.23.34.45",
-        "nameserver    45.34.23.12",
+        "nameserver    45.34.23.12"
       ].join("\n"))
 
       dns_servers = Landrush::Cap::Linux::ConfiguredDnsServers.configured_dns_servers(machine)
 
       dns_servers.must_equal([
         "12.23.34.45",
-        "45.34.23.12",
+        "45.34.23.12"
       ])
     end
   end

data/test/landrush/cap/linux/read_host_visible_ip_address_test.rb

@@ -3,10 +3,9 @@ require 'test_helper'
 module Landrush
   module Cap
     module Linux
-
       describe ReadHostVisibleIpAddress do
         describe 'read_host_visible_ip_address' do
-          let (:machine) { fake_machine }
+          let(:machine) { fake_machine }
 
           it 'should read the last address' do
             machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "1.2.3.4 5.6.7.8\n")
@@ -20,20 +19,19 @@ module Landrush
 
           it 'should fail on invalid address' do
             machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "hello world\n")
-            lambda {
+            lambda do
               machine.guest.capability(:read_host_visible_ip_address)
-            }.must_raise(IPAddr::InvalidAddressError)
+            end.must_raise(IPAddr::InvalidAddressError)
           end
 
           it 'should fail without address' do
             machine.communicate.stub_command(Landrush::Cap::Linux::ReadHostVisibleIpAddress.command, "\n")
-            lambda {
+            lambda do
               machine.guest.capability(:read_host_visible_ip_address)
-            }.must_raise(RuntimeError, 'Cannot detect IP address, command `hostname -I` returned ``')
+            end.must_raise(RuntimeError, 'Cannot detect IP address, command `hostname -I` returned ``')
           end
         end
       end
-
     end
   end
 end

data/test/landrush/cap/linux/redirect_dns_test.rb

@@ -18,7 +18,7 @@ describe Landrush::Cap::Linux::RedirectDns do
       Landrush::Cap::Linux::RedirectDns.redirect_dns(
         machine,
         host: '2.3.4.5',
-        port: '4321',
+        port: '4321'
       )
     end
   end

data/test/landrush/resolver_config_test.rb

@@ -16,8 +16,6 @@ module Landrush
           port #{Server.port}
         EOF
       end
-
-
     end
   end
 end

data/test/landrush/server_test.rb

@@ -1,17 +1,16 @@
 require 'test_helper'
+require 'resolv'
 
 module Landrush
   describe Server do
     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
+      Resolv::DNS.open(:nameserver_port => [["127.0.0.1", Server.port]]) do |r|
+        r.getaddress(host).to_s
+      end
     end
 
-    def query_ptr(host)
-      output = `dig ptr -p #{Server.port} @127.0.0.1 #{host}`
-      answer_line = output.split("\n").grep(/^#{Regexp.escape(host)}/).first
-      answer_line.split.last
+    def wait_for_port
+      sleep 1 until (TCPSocket.open('127.0.0.1', Server.port) rescue nil)
     end
 
     describe 'start/stop' do
@@ -24,11 +23,15 @@ module Landrush
       end
 
       # FIXME: This test requires network access.
-      #        Which is not airplane hacking friendly. >:p
+      #       Which is not airplane hacking friendly. >:p
       it 'can be queried for upstream entries' do
-        skip("needs network, and I am on an airplane without wifi")
+        # skip("needs network, and I am on an airplane without wifi")
+        Store.config.set('upstream', [[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]])
+
         Server.start
 
+        wait_for_port
+
         query("phinze.com").must_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
       end
 
@@ -40,9 +43,9 @@ module Landrush
 
         Store.hosts.set(fake_host, fake_ip)
 
-        query(fake_host).must_equal fake_ip
-        query_ptr(fake_host).must_equal fake_ip+'.'
+        wait_for_port
 
+        query(fake_host).must_equal fake_ip
       end
 
       it 'responds properly to configured cname entries' do
@@ -55,8 +58,9 @@ module Landrush
         Store.hosts.set(fake_host, fake_ip)
         Store.hosts.set(fake_cname, fake_host)
 
-        query(fake_cname).must_equal fake_host+'.'
+        wait_for_port
 
+        query(fake_cname).must_equal fake_ip
       end
 
       it 'also resolves wildcard subdomains to a given machine' do
@@ -67,6 +71,8 @@ module Landrush
 
         Store.hosts.set(fake_host, fake_ip)
 
+        wait_for_port
+
         query("green.#{fake_host}").must_match(fake_ip)
         query("blue.#{fake_host}").must_match(fake_ip)
       end

data/test/landrush/store_test.rb

@@ -2,13 +2,14 @@ require 'test_helper'
 
 module Landrush
   describe Store do
-    before {
-      @store = Store.new(Tempfile.new(%w[landrush_test_store .json]))
-    }
+    before do
+      @temp_file = Tempfile.new(%w[landrush_test_store .json])
+      @store = Store.new(@temp_file)
+    end
 
-    after {
-      @store.backing_file.unlink
-    }
+    after do
+      @temp_file.unlink
+    end
 
     describe "set" do
       it "sets the key to the value and makes it available for getting" do

data/test/support/clear_dependent_vms.rb

@@ -5,6 +5,8 @@ module ClearDependentVms
   end
 end
 
-class MiniTest::Spec
-  include ClearDependentVms
+module MiniTest
+  class Spec
+    include ClearDependentVms
+  end
 end

data/test/support/create_fake_working_dir.rb

@@ -0,0 +1,19 @@
+module CreateFakeWorkingDirHooks
+  def setup
+    super
+    tempdir = Dir.mktmpdir('vagrant_landrush_test_working_dir-')
+    working_dir = File.join(tempdir, 'data', 'landrush')
+    FileUtils.mkpath working_dir
+
+    # Make sure that for all tests where we use Landrush::Server the working directory
+    # is set to a temp directory.
+    # this gets deleted in DeleteFakeWorkingDirHooks
+    Landrush::Server.working_dir = working_dir
+  end
+end
+
+module MiniTest
+  class Spec
+    include CreateFakeWorkingDirHooks
+  end
+end

data/test/support/delete_fake_working_dir.rb

@@ -0,0 +1,12 @@
+module DeleteFakeWorkingDirHooks
+  def teardown
+    super
+    Landrush::Server.working_dir.rmtree if Landrush::Server.working_dir.directory?
+  end
+end
+
+module MiniTest
+  class Spec
+    include DeleteFakeWorkingDirHooks
+  end
+end

data/test/support/fake_resolver_config.rb

@@ -1,7 +1,10 @@
+require 'tmpdir'
+
 module FakeResolverConfigHooks
   def setup
     super
-    @test_resolver_config_dir = Pathname('/tmp/landrush_fake_resolver')
+    tempdir = Dir.mktmpdir('vagrant_landrush_fake_resolver-')
+    @test_resolver_config_dir = Pathname(tempdir)
     Landrush::ResolverConfig.config_dir = @test_resolver_config_dir
     Landrush::ResolverConfig.sudo       = ''
   end
@@ -15,6 +18,8 @@ module FakeResolverConfigHooks
   end
 end
 
-class MiniTest::Spec
-  include FakeResolverConfigHooks
+module MiniTest
+  class Spec
+    include FakeResolverConfigHooks
+  end
 end

data/test/support/test_server_daemon.rb

@@ -1,28 +1,30 @@
 # Set test port so there's nothing colliding
-Landrush::Server.port = 11153
+Landrush::Server.port = 111_53
 
 module SilenceOutput
-  def silence
-    orig_out, orig_err = $stdout, $stderr
-    $stdout, $stderr   = StringIO.new, StringIO.new
-
+  def self.silence
+    orig_out = $stdout
+    orig_err = $stderr
+    $stdout = StringIO.new
+    $stderr = StringIO.new
     yield
   ensure
     $stdout = orig_out
     $stderr = orig_err
   end
 
-  def start
-    silence { super }
-  end
-
-  def stop
-    silence { super }
+  def self.included(base)
+    orig_stop_method = base.method(:stop)
+    base.define_singleton_method :stop do
+      SilenceOutput.silence {orig_stop_method.call}
+    end
   end
 end
 
-class Landrush::Server
-  extend SilenceOutput
+module Landrush
+  class Server
+    include SilenceOutput
+  end
 end
 
 module TestServerHooks
@@ -32,9 +34,12 @@ module TestServerHooks
     if Landrush::Server.running?
       Landrush::Server.stop
     end
+    Landrush::Store.reset
   end
 end
 
-class MiniTest::Spec
-  include TestServerHooks
+module MiniTest
+  class Spec
+    include TestServerHooks
+  end
 end