landrush 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a10b90a70d8404fbed3044066323382600826b
-  data.tar.gz: 4455aef5af2dfc204a7612897f400c60f9bf786b
+  metadata.gz: ce32119bf22f210583466e45565a25bb76d50c11
+  data.tar.gz: 1422b70557f4fb76170b4a234eddf8e151c6ac40
 SHA512:
-  metadata.gz: 016a6c53d68daaea9fd7ee7a918c14c02d7b7f84bf271011c2029cdb8882fd973f3e6b1d3a3b825141187d32f7099b3547fef403eec32fafe7500183d14e5694
-  data.tar.gz: ad09ecd2eb80a60d12fad7c80a94014f4b2eebc5cf9379f7a6730992c0924bea1d5eeeac4be884eba1a21e1a54598cb73597c191328a2b1455878b18a4871f19
+  metadata.gz: 4ffb382a44d8bb6812ca230d15d25db1832737888dde303daba4f1c0f67e6e6f03692a4e6d34ca0f2fe0c7ea10d3d08e695d2654b4864ec9469b43f0a7fad1ab
+  data.tar.gz: 73f06fab9d25d8c2958b66e1a0390e83c342035ee48b8268fb3dd136fa3052ad99b4efe4bb8dd81fc11298dec3c13390caed8f6fab6fc427847ba6468aa80de5

data/Gemfile

@@ -17,4 +17,5 @@ group :development do
     :ref => 'v1.6.1'
 
   gem 'byebug'
+  gem 'mocha'
 end

data/lib/landrush/cap/linux/{configured_dns_server.rb → configured_dns_servers.rb}

@@ -1,15 +1,15 @@
 module Landrush
   module Cap
     module Linux
-      module ConfiguredDnsServer
-        def self.configured_dns_server(machine)
-          return @dns_server if @dns_server
+      module ConfiguredDnsServers
+        def self.configured_dns_servers(machine)
+          return @dns_servers if @dns_servers
           machine.communicate.sudo('cat /etc/resolv.conf | grep ^nameserver') do |type, data|
             if type == :stdout
-              @dns_server = data.scan(/\d+\.\d+\.\d+\.\d+/).first
+              @dns_servers = Array(data.scan(/\d+\.\d+\.\d+\.\d+/))
             end
           end
-          @dns_server
+          @dns_servers
         end
       end
     end

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

@@ -3,18 +3,17 @@ module Landrush
     module Linux
       module RedirectDns
         def self.redirect_dns(machine, target={})
+          dns_servers = machine.guest.capability(:configured_dns_servers)
           %w[tcp udp].each do |proto|
-            machine.guest.capability(
-              :add_iptables_rule,
-              _redirect_dns_rule(proto, _current(machine), target.fetch(:host), target.fetch(:port))
-            )
+            dns_servers.each do |dns_server|
+              machine.guest.capability(
+                :add_iptables_rule,
+                _redirect_dns_rule(proto, dns_server, target.fetch(:host), target.fetch(:port))
+              )
+            end
           end
         end
 
-        def self._current(machine)
-          machine.guest.capability(:configured_dns_server)
-        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}"
         end

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

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

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+describe Landrush::Cap::Linux::ConfiguredDnsServers do
+  let(:machine) { fake_machine }
+
+  before do
+    Landrush::Cap::Linux::ConfiguredDnsServers.instance_variable_set("@dns_servers", nil)
+  end
+
+  describe 'configured_dns_servers' do
+    it 'parses out a single resolv.conf dns server' do
+      machine.communicate.stubs(:sudo).yields(:stdout, "nameserver 12.23.34.45")
+
+      dns_servers = Landrush::Cap::Linux::ConfiguredDnsServers.configured_dns_servers(machine)
+
+      dns_servers.must_equal(["12.23.34.45"])
+    end
+
+    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",
+      ].join("\n"))
+
+      dns_servers = Landrush::Cap::Linux::ConfiguredDnsServers.configured_dns_servers(machine)
+
+      dns_servers.must_equal([
+        "12.23.34.45",
+        "45.34.23.12",
+      ])
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+describe Landrush::Cap::Linux::RedirectDns do
+  let(:machine) { fake_machine }
+
+  describe 'redirect_dns' do
+    it 'fetches the dns servers from the machine, and adds one iptables rule per server' do
+      machine.guest.stubs(:capability).with(:configured_dns_servers).returns([
+        '1.2.3.4',
+        '4.5.6.7'
+      ])
+
+      machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p tcp -d 1.2.3.4 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once
+      machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p udp -d 1.2.3.4 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once
+      machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p tcp -d 4.5.6.7 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once
+      machine.guest.expects(:capability).with(:add_iptables_rule, "OUTPUT -t nat -p udp -d 4.5.6.7 --dport 53 -j DNAT --to-destination 2.3.4.5:4321").once
+
+      Landrush::Cap::Linux::RedirectDns.redirect_dns(
+        machine,
+        host: '2.3.4.5',
+        port: '4321',
+      )
+    end
+  end
+end

data/test/test_helper.rb

@@ -4,9 +4,12 @@ require 'bundler/setup'
 require 'minitest/spec'
 
 require 'landrush'
+require 'landrush/cap/linux/configured_dns_servers'
 require 'landrush/cap/linux/read_host_visible_ip_address'
+require 'landrush/cap/linux/redirect_dns'
 
 require 'minitest/autorun'
+require 'mocha/mini_test'
 
 def fake_environment(options = { enabled: true })
   { machine: fake_machine(options), ui: FakeUI }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -66,7 +66,7 @@ files:
 - lib/landrush/cap/debian/install_iptables.rb
 - lib/landrush/cap/debian/iptables_installed.rb
 - lib/landrush/cap/linux/add_iptables_rule.rb
-- lib/landrush/cap/linux/configured_dns_server.rb
+- lib/landrush/cap/linux/configured_dns_servers.rb
 - lib/landrush/cap/linux/read_host_visible_ip_address.rb
 - lib/landrush/cap/linux/redirect_dns.rb
 - lib/landrush/cap/redhat/install_iptables.rb
@@ -81,7 +81,9 @@ files:
 - lib/landrush/version.rb
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
+- test/landrush/cap/linux/configured_dns_servers_test.rb
 - test/landrush/cap/linux/read_host_visible_ip_address_test.rb
+- test/landrush/cap/linux/redirect_dns_test.rb
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/resolver_config_test.rb
@@ -120,7 +122,9 @@ summary: a vagrant plugin providing consistent DNS visible on host and guests
 test_files:
 - test/landrush/action/setup_test.rb
 - test/landrush/action/teardown_test.rb
+- test/landrush/cap/linux/configured_dns_servers_test.rb
 - test/landrush/cap/linux/read_host_visible_ip_address_test.rb
+- test/landrush/cap/linux/redirect_dns_test.rb
 - test/landrush/config_test.rb
 - test/landrush/dependent_vms_test.rb
 - test/landrush/resolver_config_test.rb