vagrant-rubydns 0.0.1 → 0.0.2

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 
 .vagrant
+.vagrant_dns.json

data/Rakefile

@@ -1 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+  t.libs << 'test'
+end
+
+task :default => :test

data/{Vagrantfile → examples/Vagrantfile}

@@ -4,8 +4,8 @@
 # If you're doing development and want to run this locally you can simply
 # `bundle install`, then prefix all your vagrant commands with `bundle exec`, like so:
 #
-#   bundle exec vagrant up
-#   bundle exce vagrant halt
+#   VAGRANT_CWD=examples bundle exec vagrant up
+#   VAGRANT_CWD=examples bundle exce vagrant halt
 #
 
 # This line is unnecessary when the plugin is installed normally; it's just

data/lib/vagrant-rubydns/action/setup.rb

@@ -6,35 +6,14 @@ module VagrantRubydns
       end
 
       def call(env)
-        @env = env
+        hostname, ip_address = Util.host_and_ip(env[:machine])
 
-        configfile = ".vagrant_dns.json"
+        env[:ui].info "setting #{hostname} to #{ip_address} in in DNS"
 
-        config = JSON.parse(File.read(configfile))
-
-        config[hostname] = ip_address
-
-        File.open(configfile, "w") do |f|
-          f.write(JSON.pretty_generate(config))
-        end
+        Config.set(hostname, ip_address)
 
         @app.call(env)
       end
-
-      def hostname
-        @env[:machine].config.vm.hostname
-      end
-
-      def ip_address
-        @env[:machine].config.vm.networks.each do |type, options|
-          if type == :private_network && options[:ip].is_a?(String)
-            return options[:ip]
-          end
-        end
-
-        nil
-      end
-
     end
   end
 end

data/lib/vagrant-rubydns/action/teardown.rb

@@ -3,29 +3,17 @@ module VagrantRubydns
     class Teardown
       def initialize(app, env)
         @app = app
-        puts "I AM RUBYDNS TEARDOWN init"
       end
 
       def call(env)
-        @env = env
+        hostname = Util.hostname(env[:machine])
 
-        configfile = ".vagrant_dns.json"
+        env[:ui].info "removing #{hostname} from DNS"
 
-        config = JSON.parse(File.read(configfile))
-
-        config.delete hostname
-
-        File.open(configfile, "w") do |f|
-          f.write(JSON.pretty_generate(config))
-        end
+        Config.delete(hostname)
 
         @app.call(env)
       end
-
-      def hostname
-        @env[:machine].config.vm.hostname
-      end
-
     end
   end
 end

data/lib/vagrant-rubydns/command.rb

@@ -1,7 +1,6 @@
 module VagrantRubydns
   class Command < Vagrant.plugin('2', :command)
     def execute
-      puts "i am rubydns command"
       require_relative 'server'
       Server.run
       0

data/lib/vagrant-rubydns/config.rb

@@ -0,0 +1,37 @@
+module VagrantRubydns
+  class Config
+    CONFIG_FILE = Pathname('.vagrant_dns.json')
+
+    def self.set(key, value)
+      write(current_config.merge(key => value))
+    end
+
+    def self.delete(key)
+      write(current_config.reject { |k, _| k == key })
+    end
+
+    def self.get(key)
+      current_config[key]
+    end
+
+    def self.clear!
+      write({})
+    end
+
+    protected
+
+    def self.current_config
+      if CONFIG_FILE.exist?
+        JSON.parse(File.read(CONFIG_FILE))
+      else
+        {}
+      end
+    end
+
+    def self.write(config)
+      File.open(CONFIG_FILE, "w") do |f|
+        f.write(JSON.pretty_generate(config))
+      end
+    end
+  end
+end

data/lib/vagrant-rubydns/plugin.rb

@@ -1,14 +1,14 @@
 module VagrantRubydns
   class Plugin < Vagrant.plugin('2')
-    name "vagrant-rubydns"
+    name 'vagrant-rubydns'
 
-    command "rubydns" do
-      require_relative "command"
+    command 'rubydns' do
+      require_relative 'command'
       Command
     end
 
-    provisioner "rubydns" do
-      require_relative "provisioner"
+    provisioner 'rubydns' do
+      require_relative 'provisioner'
       Provisioner
     end
 

data/lib/vagrant-rubydns/provisioner.rb

@@ -7,19 +7,31 @@ module VagrantRubydns
     def configure(root_config)
     end
 
-    def ip_addresses
-      @machine.config.vm.networks.map { |type, params|
-        params if type == :private_network
-      }.compact.map { |params| params[:ip] } 
-    end
+    def provision
+      # hostname, ip_address = Util.host_and_ip(@machine)
+      # Config.set(hostname, ip_address)
+
+      @machine.env.ui.info "setting up machine's DNS to point to our server"
 
-    def hostname
-      @machine.config.vm.hostname
+      redirect_dns_to_unpriviledged_port_tcp = 'OUTPUT -t nat -d 10.0.2.2 -p tcp --dport 53 -j DNAT --to-destination 10.0.2.2:10053'
+      command = %Q(iptables -C #{redirect_dns_to_unpriviledged_port_tcp} 2> /dev/null || iptables -A #{redirect_dns_to_unpriviledged_port_tcp})
+      _run_command(command)
+
+      redirect_dns_to_unpriviledged_port_udp = 'OUTPUT -t nat -d 10.0.2.2 -p udp --dport 53 -j DNAT --to-destination 10.0.2.2:10053'
+      command = %Q(iptables -C #{redirect_dns_to_unpriviledged_port_udp} 2> /dev/null || iptables -A #{redirect_dns_to_unpriviledged_port_udp})
+      _run_command(command)
+
+      command = %q(sed -i'' -e 's/10.0.2.3/10.0.2.2/' /etc/resolv.conf)
+      _run_command(command)
     end
 
-    def provision
-      puts "hi i am rubydns provisioner"
-      puts "i wanna set #{ip_addresses.inspect} to #{hostname}"
+    def _run_command(command)
+      @machine.communicate.sudo(command) do |data, type|
+        if [:stderr, :stdout].include?(type)
+          color = (type == :stdout) ? :green : :red
+          @machine.env.ui.info(data.chomp, :color => color, :prefix => false)
+        end
+      end
     end
   end
 end

data/lib/vagrant-rubydns/server.rb

@@ -18,21 +18,13 @@ module VagrantRubydns
       Pathname('.vagrant_dns.json')
     end
 
-    def self.entries
-      if configfile.exist?
-        JSON.parse(File.read('.vagrant_dns.json'))
-      else
-        {}
-      end
-    end
-
     def self.run
-      # Start the RubyDNS server
       server = self
       RubyDNS::run_server(:listen => INTERFACES) do
         match(/vagrant.dev/, IN::A) do |transaction|
-          if server.entries.has_key? transaction.name
-            transaction.respond!(server.entries[transaction.name])
+          ip = Config.get(transaction.name)
+          if ip
+            transaction.respond!(ip)
           else
             transaction.passthrough!(server.upstream)
           end

data/lib/vagrant-rubydns/util.rb

@@ -0,0 +1,25 @@
+module VagrantRubydns
+  module Util
+    def self.host_and_ip(machine)
+      [hostname(machine), ip_address(machine)]
+    end
+
+    def self.hostname(machine)
+      return nil unless machine
+
+      machine.config.vm.hostname
+    end
+
+    def self.ip_address(machine)
+      return nil unless machine
+
+      machine.config.vm.networks.each do |type, options|
+        if type == :private_network && options[:ip].is_a?(String)
+          return options[:ip]
+        end
+      end
+
+      nil
+    end
+  end
+end

data/lib/vagrant-rubydns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Rubydns
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/vagrant-rubydns.rb

@@ -1,12 +1,12 @@
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant RubyDNS plugin must be run within Vagrant."
+  raise 'The Vagrant RubyDNS plugin must be run within Vagrant.'
 end
 
-require "vagrant-rubydns/version"
-require "vagrant-rubydns/plugin"
-
-module VagrantRubydns
-end
+require 'vagrant-rubydns/config'
+require 'vagrant-rubydns/plugin'
+require 'vagrant-rubydns/util'
+require 'vagrant-rubydns/version'
 
+module VagrantRubydns; end

data/test/support/fake_ui.rb

@@ -0,0 +1,4 @@
+class FakeUI
+  def self.info(*args)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,38 @@
+$:.push(File.expand_path('../../lib', __FILE__))
+
+require 'bundler/setup'
+require 'minitest/spec'
+
+require 'support/fake_ui'
+
+require 'vagrant-rubydns'
+
+# must be called before minitest/autorun to ensure proper at_exit ordering
+MiniTest::Unit.after_tests { VagrantRubydns::Config.clear! }
+
+require 'minitest/autorun'
+
+def fake_environment_with_machine(hostname, ip)
+  provider_cls = Class.new do
+    def initialize(machine)
+    end
+  end 
+
+  env = Vagrant::Environment.new
+
+  machine = Vagrant::Machine.new(
+    'fake_machine',
+    'fake_provider',
+    provider_cls,
+    'provider_config',
+    env.config_global,
+    Pathname('data_dir'),
+    'box',
+    env
+  )
+
+  machine.config.vm.hostname = hostname
+  machine.config.vm.network :private_network, ip: ip
+
+  { machine: machine, ui: FakeUI }
+end

data/test/vagrant-rubydns/action/setup_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+require 'vagrant-rubydns/action/setup'
+
+module VagrantRubydns
+  module Action
+    describe Setup do
+      it "calls the next app in the chain" do
+        env = {called: false, ui: FakeUI}
+        app = lambda { |e| e[:called] = true }
+
+        setup = Setup.new(app, nil)
+        setup.call(env)
+
+        env[:called].must_equal true
+      end
+
+      it "stores the machine's hostname => ip address in the config" do
+        Config.clear!
+
+        app = Proc.new {}
+        setup = Setup.new(app, nil)
+
+        env = fake_environment_with_machine('somehost.vagrant.dev', '1.2.3.4')
+        setup.call(env)
+
+        Config.get('somehost.vagrant.dev').must_equal '1.2.3.4'
+      end
+    end
+  end
+end

data/test/vagrant-rubydns/action/teardown_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'vagrant-rubydns/action/teardown'
+
+module VagrantRubydns
+  module Action
+    describe Teardown do
+      it "calls the next app in the chain" do
+        env = {called: false, ui: FakeUI}
+        app = lambda { |e| e[:called] = true }
+
+        teardown = Teardown.new(app, nil)
+        teardown.call(env)
+
+        env[:called].must_equal true
+      end
+
+      it "stores the machine's hostname => ip address in the config" do
+        Config.set('somehost.vagrant.dev', '1.2.3.4')
+
+        app = Proc.new {}
+        teardown = Teardown.new(app, nil)
+
+        env = fake_environment_with_machine('somehost.vagrant.dev', '1.2.3.4')
+        teardown.call(env)
+
+        Config.get('somehost.vagrant.dev').must_equal nil
+      end
+    end
+  end
+end
+

data/test/vagrant-rubydns/config_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+module VagrantRubydns
+  describe Config do
+    before { Config.clear! }
+    
+    describe "set" do
+      it "sets the key to the value and makes it available for getting" do
+        Config.set('foo', 'bar')
+
+        Config.get('foo').must_equal 'bar'
+      end
+
+      it "allows updating keys that already exist" do
+        Config.set('foo', 'bar')
+        Config.set('foo', 'qux')
+
+        Config.get('foo').must_equal 'qux'
+      end
+    end
+
+    describe "get" do
+      it "returns nil for unset values" do
+        Config.get('notakey').must_equal nil
+      end
+
+      it "returns the latest set value (no caching)" do
+        Config.set('foo', 'first')
+        Config.get('foo').must_equal 'first'
+        Config.set('foo', 'second')
+        Config.get('foo').must_equal 'second'
+        Config.delete('foo')
+        Config.get('foo').must_equal nil
+      end
+    end
+
+    describe "delete" do
+      it "removes the key from the store" do
+        Config.set('now', 'you see me')
+
+        Config.get('now').must_equal 'you see me'
+
+        Config.delete('now')
+
+        Config.get('now').must_equal nil # you don't!
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rubydns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -71,15 +71,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile
+- examples/Vagrantfile
 - lib/vagrant-rubydns.rb
 - lib/vagrant-rubydns/action/setup.rb
 - lib/vagrant-rubydns/action/teardown.rb
 - lib/vagrant-rubydns/command.rb
+- lib/vagrant-rubydns/config.rb
 - lib/vagrant-rubydns/plugin.rb
 - lib/vagrant-rubydns/provisioner.rb
 - lib/vagrant-rubydns/server.rb
+- lib/vagrant-rubydns/util.rb
 - lib/vagrant-rubydns/version.rb
+- test/support/fake_ui.rb
+- test/test_helper.rb
+- test/vagrant-rubydns/action/setup_test.rb
+- test/vagrant-rubydns/action/teardown_test.rb
+- test/vagrant-rubydns/config_test.rb
 - vagrant-rubydns.gemspec
 homepage: ''
 licenses:
@@ -106,5 +113,10 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a simple dns server for vagrant guests
-test_files: []
+test_files:
+- test/support/fake_ui.rb
+- test/test_helper.rb
+- test/vagrant-rubydns/action/setup_test.rb
+- test/vagrant-rubydns/action/teardown_test.rb
+- test/vagrant-rubydns/config_test.rb
 has_rdoc: