vagrant-dns-server 0.1 → 0.2

data/.gitignore

@@ -1 +1,2 @@
 pkg
+hosts.yaml

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3@dns --create
+rvm use ruby-1.9.2-p320@dns --create

data/Gemfile

@@ -1,6 +1,5 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'rubydns'
-gem 'zmq'
-gem 'thor'
+gemspec :development_group => :dev
+

data/Gemfile.lock

@@ -1,20 +1,72 @@
+PATH
+  remote: .
+  specs:
+    vagrant-dns-server (0.2)
+      em-zeromq
+      log4r
+      moneta
+      net-ping
+      rubydns
+      rubydns
+      thor
+      vagrant (~> 1.0.3)
+      zmq
+
 GEM
   remote: https://rubygems.org/
   specs:
+    archive-tar-minitar (0.5.2)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    em-zeromq (0.4.1)
+      eventmachine (>= 1.0.0)
+      ffi (>= 1.0.0)
+      ffi-rzmq (= 0.9.7)
+    erubis (2.7.0)
     eventmachine (1.0.0)
+    ffi (1.3.1)
+    ffi-rzmq (0.9.7)
+      ffi
+    i18n (0.6.1)
+    json (1.5.4)
+    log4r (1.1.10)
+    metaclass (0.0.1)
+    minitest (4.4.0)
+    mocha (0.12.8)
+      metaclass (~> 0.0.1)
+    moneta (0.7.6)
+    net-ldap (0.2.2)
+    net-ping (1.5.3)
+      ffi (>= 1.0.0)
+      net-ldap (~> 0.2.2)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
     rainbow (1.1.4)
+    rake (10.0.3)
     rexec (1.5.1)
       rainbow
     rubydns (0.5.3)
       eventmachine (~> 1.0.0)
       rexec (~> 1.5.1)
     thor (0.16.0)
+    vagrant (1.0.5)
+      archive-tar-minitar (= 0.5.2)
+      childprocess (~> 0.3.1)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (~> 1.5.1)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.2.2)
     zmq (2.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rubydns
-  thor
-  zmq
+  bundler
+  minitest
+  mocha (~> 0.12.3)
+  rake
+  vagrant-dns-server!

data/README.md

@@ -3,6 +3,15 @@ vagrant-dns enables easy dns management of multiple local Vagrant machines.
 
 It composed from a Vagrant plugin and standalone dns server, the plugin auto registers the host and ip of the VM once it boots up making it available for lookup on both the host and guest machines.
 
+Follow [this](https://www.youtube.com/watch?v=6GFobNDvwpI) this demo to see it in action.
+
+# Install
+ 
+```bash
+  $ sudo aptitude install libzmq1  libzmq-dev
+  $ gem install vagrant-dns-server
+```
+
 # Usage
 
 Add the plugin to the project Gemfile, use vagrant_dns server to boot the local dns server

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+    t.pattern = "test/*_test.rb"
+    t.verbose = true
+end

data/TODOS

@@ -0,0 +1,5 @@
+* Add 127.0.0.1 to resolve.conf on server startup, clear out on teardown ( See http://www.ubuntututorials.com/set-dns-server-ubuntu-12-04/)
+* Add 10.0.2.2 to guest resolv.conf
+* Implement remove ip on VM shutdown
+* Enable remote api to the running server (listing, adding, removing)
+* Consider adding a hardcoded list of host (useful for non vagrant machines)

data/bin/vagrant_dns

@@ -3,7 +3,31 @@
 $:.push 'lib'
 require 'rubygems'
 require 'thor'
-require 'server'
+require 'thor/group'
+require 'vagrant_dns_server'
+
+module VagrantDns
+  class Generate	< Thor::Group
+    include Thor::Actions 
+
+    argument :upstream, :type => :string, :desc => 'upstream dns server', :default => '8.8.8.8'
+    argument :zmq_url, :type => :string, :desc => 'zeromq connection url', :default => 'tcp://127.0.0.1:7005'
+
+    def self.source_root
+	# during dev time
+	if(File.dirname(__FILE__) == './bin')
+	  File.dirname('.')
+	else
+	  "#{File.dirname(__FILE__)}/../"
+	end
+    end
+
+    desc "generate DNS server settings files #{ENV['HOME']}/.vagrant_dns.yaml"
+    def create_yaml
+	template('templates/vagrant_dns.yaml', "#{ENV['HOME']}/.vagrant_dns.yaml")
+    end
+  end
+end
 
 class Main < Thor
 
@@ -11,8 +35,9 @@ class Main < Thor
   def server
     @server = VagrantDns::Server.new   
     @server.process 
-    trap("INT") { @server.shutdown;exit 0}
   end
+  register VagrantDns::Generate, 'generate', 'generate [upstream dns (8.8.8.8)] [zmq url (tcp://127.0.0.1)]', 'Generate vagrant_dns configuration file'
+
 end
 
 

data/lib/vagrant_dns/configuration.rb

@@ -0,0 +1,19 @@
+
+
+module VagrantDns
+  
+  class Configuration
+     extend Forwardable
+    def_delegator :@store, :store, :set
+    def_delegator :@store, :load, :get
+    def_delegator :@store, :delete, :delete
+
+    def initialize
+      @store = Moneta.new(:YAML,:file => "#{ENV['HOME']}/.vagrant_dns.yaml")
+    end
+ 	
+  end
+
+end
+
+CONF = VagrantDns::Configuration.new

data/lib/vagrant_dns/consts.rb

@@ -0,0 +1,2 @@
+
+CHANNEL = 'vagrant'

data/lib/vagrant_dns/dns.rb

@@ -0,0 +1,47 @@
+
+UDNS = CONF.get('upstream_dns')
+UPSTREAM = RubyDNS::Resolver.new([[:tcp, UDNS, 53], [:udp, UDNS, 53]])
+
+module VagrantDns
+
+  class Registry 
+    extend Forwardable
+    def_delegator :@store, :store, :register
+    def_delegator :@store, :load, :read
+    def_delegator :@store, :delete, :delete
+
+    def initialize
+      @store = Moneta.new(:YAML,:file => "hosts.yaml")
+    end
+  end
+
+  class DnsServer
+    def initialize
+	RubyDNS::run_server(:listen => [[:tcp, "localhost", 53],[:udp, "localhost", 53]]) do
+	  on(:start) do 
+	    if ARGV.include?("--debug")
+		@logger.level = Logger::DEBUG
+	    else
+		@logger.level = Logger::WARN
+	    end
+
+	  end
+
+	  otherwise do |transaction|
+	    ip = REG.read(transaction.name)
+	    if(ip)
+		transaction.respond!(ip)
+	    else
+		begin
+		  transaction.passthrough!(UPSTREAM)
+		rescue Exception => e
+		  puts e
+		end
+	    end
+	  end
+	end
+    end
+  end
+end
+
+REG = VagrantDns::Registry.new

data/lib/vagrant_dns/middleware/network_binder.rb

@@ -0,0 +1,46 @@
+
+require 'zmq'
+
+module VagrantDns
+
+  UI = Vagrant::UI::Colored.new('dns')
+  class NetworkBinder
+    def bind(vm)
+	(host,ip) = host_ip(vm)
+	Status.new.report(host,ip,:up)
+    end		   
+
+    def unbind(vm)
+	(host,ip) = host_ip(vm)
+	Status.new.report(host,ip,:down)
+    end		   
+
+    private 
+    def host_ip(vm)
+	networks = vm.config.vm.networks.find_all do |type,network_parameters|
+	  type == :hostonly 
+	end
+	ips = networks.map {|type,params| params.first}
+	host = vm.config.vm.host_name
+	[host,ips.first]
+    end
+  end
+
+  class Status
+    # if socket is created on middleware initialization vagrant will get stuck
+    def report(host,ip,status)
+	url = CONF.get('zmq_url')
+	if(port_open?('localhost',url.split(':')[-1]))
+	  context = ZMQ::Context.new
+	  pub = context.socket(ZMQ::PUB)
+	  pub.connect(url)
+	  UI.say(:debug,"connection made")
+	  res = pub.send("#{CHANNEL} #{host} #{ip} #{status.to_s}", ZMQ::NOBLOCK)
+	  UI.say(:info,"notifying dns server with #{status} status")
+	  pub.close
+	else
+	  UI.say(:debug,"dns server isn't up, skiping notifying #{status} status") 
+	end
+    end
+  end
+end

data/lib/vagrant_dns/middleware/remove.rb

@@ -0,0 +1,20 @@
+
+module VagrantDns
+  module Middleware
+    class Remove
+	def initialize(app, env)
+	  @app = app
+	end
+
+	def call(env)
+	  @app.call(env)
+	  remove env[:vm] if env["vm"].created?
+	end
+
+	protected
+	def remove(vm)
+        VagrantDns::NetworkBinder.new.unbind(vm)
+	end
+    end
+  end
+end

data/lib/vagrant_dns/port.rb

@@ -0,0 +1,16 @@
+require 'socket'
+require 'timeout'
+
+# see http://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
+def port_open?(ip, port, seconds=1)
+  Timeout::timeout(seconds) do
+    begin
+	TCPSocket.new(ip, port).close
+	true
+    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+	false
+    end
+  end
+rescue Timeout::Error
+  false
+end

data/lib/vagrant_dns/resolver.rb

@@ -0,0 +1,49 @@
+require 'fileutils'
+require 'tempfile'
+
+RESOLV = '/etc/resolv.conf'
+LOCAL = "nameserver 127.0.0.1\n"
+
+class Module
+  def redefine_const(name, value)
+    __send__(:remove_const, name) if const_defined?(name)
+    const_set(name, value)
+  end
+end
+
+def atomic_write(path, content)
+  temp_path = Tempfile.new(path)
+  File.open(temp_path, 'w+') do |f|
+    f.write(content)
+  end
+  FileUtils.mv(temp_path, path)
+end
+
+module VagrantDns
+  class ResolvConf
+    def append()
+	input =  IO.readlines(RESOLV)
+	ns_pos = input.find_index do |line|
+	  line.include?('nameserver')
+	end
+
+	if(!local_defined?(input,ns_pos))
+	  head = (input.slice(0,ns_pos) << LOCAL)
+	  tail = input.slice(ns_pos,input.size)
+	  newconf = head.concat(tail).join('')
+	  atomic_write(RESOLV,newconf)
+	end
+    end
+
+    def clear
+	input = IO.readlines(RESOLV)
+	cleaned = input.select{|line| !line.eql?(LOCAL)}.join('')
+      atomic_write(RESOLV,cleaned)
+    end
+
+    def local_defined?(input,pos)
+	input[pos].eql?(LOCAL.chomp)
+    end
+  end
+end
+

data/lib/vagrant_dns/server.rb

@@ -0,0 +1,51 @@
+module VagrantDns
+  class Server
+    def initialize
+	traps
+	@resolv = VagrantDns::ResolvConf.new
+    end
+
+
+    def unpack(message)
+	_, host, ip, msg = message.split ' ', 4
+	[host, ip, msg.to_sym]
+    end
+
+    def process
+	begin
+	  # @resolv.append
+	  zmq = EM::ZeroMQ::Context.new(1)
+	  EM.run {
+	    @dns = VagrantDns::DnsServer.new
+	    puts "processing "
+	    pull= zmq.socket(ZMQ::SUB)
+	    pull.bind(CONF.get('zmq_url'))
+	    pull.subscribe('vagrant')
+	    pull.on(:message) { |part|
+            host, ip, stat=  unpack(part.copy_out_string)
+		puts "[#{ip}->#{host}]: is #{stat.to_s}"
+		REG.register(host,ip) if :up.eql?(stat)
+		REG.delete(host) if :down.eql?(stat)
+		part.close
+	    }
+	  }
+	rescue => e
+	  $stderr.puts e
+	  $stderr.puts e.backtrace.join("\n")
+	  shutdown
+	end
+    end
+
+    def traps 
+	%w(INT SIGINT TERM).each{|s|
+	  Signal.trap(s) {shutdown}
+	}
+    end
+
+    def shutdown
+	$stderr.puts "Cleaning up server"
+	# @resolv.clear
+	EM::stop()
+    end
+  end
+end

data/lib/vagrant_dns_plugin.rb

@@ -0,0 +1,10 @@
+require 'vagrant'
+require 'zmq'
+# client
+require 'moneta'
+require 'vagrant_dns/consts'
+require 'vagrant_dns/configuration'
+require 'vagrant_dns/port'
+require 'vagrant_dns/middleware/update'
+require 'vagrant_dns/middleware/remove'
+require 'vagrant_dns/middleware/network_binder'

data/lib/vagrant_dns_server.rb

@@ -0,0 +1,12 @@
+require 'em-zeromq'
+require 'eventmachine'
+require 'vagrant_dns/consts'
+require 'vagrant_dns/resolver'
+require 'moneta'
+require 'forwardable'
+require 'vagrant_dns/configuration'
+require 'rubydns'
+require 'vagrant_dns/dns'
+require 'vagrant_dns/server'
+
+

data/lib/vagrant_init.rb

@@ -1,9 +1,8 @@
-require 'vagrant'
-require 'constants'
-require 'middleware/update'
-require 'middleware/network_binder'
-require 'zmq'
+require 'vagrant_dns_plugin'
 
+#see http://tinyurl.com/bfuawuj  
 Vagrant.actions[:provision].insert_after(Vagrant::Action::VM::Provision, VagrantDns::Middleware::Update)
-Vagrant.actions[:start].insert_after(Vagrant::Action::VM::Provision, VagrantDns::Middleware::Update)
+Vagrant.actions[:start].insert_after(Vagrant::Action::VM::Boot, VagrantDns::Middleware::Update)
+
+Vagrant.actions[:destroy].insert_after(Vagrant::Action::VM::ProvisionerCleanup, VagrantDns::Middleware::Remove)
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module VagrantDns
-   VERSION=0.1
+   VERSION=0.2
 end

data/templates/vagrant_dns.yaml

@@ -0,0 +1,3 @@
+--- 
+ upstream_dns: <%=upstream%>
+ zmq_url: <%=zmq_url%>

data/test/resolver_test.rb

@@ -0,0 +1,52 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require 'resolver'
+require 'fileutils'
+
+
+class Module
+  def redefine_const(name, value)
+    __send__(:remove_const, name) if const_defined?(name)
+    const_set(name, value)
+  end
+end
+
+VANILA =<<H
+# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
+# #     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+nameserver 127.0.1.1
+H
+
+DIRTY =<<H
+# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
+# #     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+nameserver 127.0.0.1
+nameserver 127.0.1.1
+H
+
+FAKED = '/tmp/resolv.conf'
+
+class TestResolver < MiniTest::Unit::TestCase
+
+  def setup
+    Object.redefine_const(:RESOLV,FAKED)
+    File.open(FAKED, 'w') {|f| f.write(VANILA) }
+    @resolver = VagrantDns::ResolvConf.new
+  end
+
+  def teardown 
+    FileUtils.rm FAKED
+  end
+
+  def test_appeding
+    @resolver.append()
+    assert_equal File.open(FAKED,'r').read, DIRTY
+  end
+
+  def test_clearing
+    @resolver.append()
+    @resolver.clear()
+    assert_equal File.open(FAKED,'r').read, VANILA
+  end
+end

data/vagrant-dns-server.gemspec

@@ -17,9 +17,16 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency  'vagrant', '~>1.0.3'
   gem.add_dependency  'rubydns'
-  gem.add_dependency  'zmq'
+  gem.add_dependency  'em-zeromq'
+  gem.add_dependency  'zmq' # required by client
+  gem.add_dependency  'thor'
+  gem.add_dependency  'rubydns'
+  gem.add_dependency  'moneta'
+  gem.add_dependency  'net-ping'
+  gem.add_dependency  'log4r'
   gem.add_development_dependency  'bundler'
   gem.add_development_dependency  'mocha', '~>0.12.3'
   gem.add_development_dependency  'rake'
+  gem.add_development_dependency  'minitest'
 
 end

metadata

@@ -1,158 +1,261 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-dns-server
-version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  version: "0.2"
 platform: ruby
-authors:
+authors: 
 - Ronen Narkis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-24 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: vagrant
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 3
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rubydns
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: em-zeromq
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: zmq
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: thor
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rubydns
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: moneta
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: net-ping
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 3
         version: 0.12.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.3
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id013
 description: A vagrant plugin to automanage dns registration on local machine
-email:
+email: 
 - narkisr@gmail.com
-executables:
+executables: 
 - vagrant_dns
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- TODOS
 - bin/vagrant_dns
-- lib/constants.rb
-- lib/dns.rb
-- lib/middleware/network_binder.rb
-- lib/middleware/update.rb
-- lib/pub.ruby
-- lib/server.rb
+- lib/vagrant_dns/configuration.rb
+- lib/vagrant_dns/consts.rb
+- lib/vagrant_dns/dns.rb
+- lib/vagrant_dns/middleware/network_binder.rb
+- lib/vagrant_dns/middleware/remove.rb
+- lib/vagrant_dns/middleware/update.rb
+- lib/vagrant_dns/port.rb
+- lib/vagrant_dns/resolver.rb
+- lib/vagrant_dns/server.rb
+- lib/vagrant_dns_plugin.rb
+- lib/vagrant_dns_server.rb
 - lib/vagrant_init.rb
 - lib/version.rb
+- templates/vagrant_dns.yaml
+- test/resolver_test.rb
 - vagrant-dns-server.gemspec
+has_rdoc: true
 homepage: https://github.com/narkisr/vagrant-dns
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3949929053861366492
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3949929053861366492
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7.1
 signing_key: 
 specification_version: 3
 summary: A vagrant plugin that sets up a local dns server
-test_files: []
+test_files: 
+- test/resolver_test.rb

data/lib/constants.rb

@@ -1,3 +0,0 @@
-
-URL = 'tcp://127.0.0.1:7005'
-CHANNEL = 'vagrant'

data/lib/dns.rb

@@ -1,47 +0,0 @@
-require 'rubydns'
-
-HOSTS = Hash[%w(jenkins artifactory x2.takadu.com).zip(15..17)]
-IN = Resolv::DNS::Resource::IN
-UPSTREAM = RubyDNS::Resolver.new([[:tcp, "8.8.8.8", 53]])
-
-module VagrantDns
-
-  class Registry 
-    def initialize
-	@reg = {}
-    end
-    def register(host,ip)
-	@reg[host] = ip	
-    end
-
-    def unregister(host)
-	@reg[host] = nil
-    end
-
-    def read(host)
-     @reg[host]	
-    end
-  end
-
-  class DnsServer
-    def initialize
-	RubyDNS::run_server(:listen => [[:tcp, "localhost", 53]]) do
-	  otherwise do |transaction|
-	    ip = REG.read(transaction.name)
-	    if(ip)
-		transaction.respond!(ip)
-	    else
-		puts "not found moving to UPSTREAM"
-		begin
-		  transaction.passthrough!(UPSTREAM)
-		rescue Exception => e
-		  puts e
-		end
-	    end
-	  end
-	end
-    end
-  end
-end
-
-REG = VagrantDns::Registry.new

data/lib/middleware/network_binder.rb

@@ -1,23 +0,0 @@
-module VagrantDns
-  class NetworkBinder
-    def bind(vm)
-	networks = vm.config.vm.networks.find_all do |type,network_parameters|
-	    type == :hostonly 
-	end
-      ips = networks.map {|type,params| params.first}
-	host = vm.config.vm.host_name
-	Status.new.up(host,ips.first)
-    end		   
-  end
-  class Status
-    # if socket is created on middleware initialization vagrant will get stuck
-    def up(host,ip)
-	context = ZMQ::Context.new
-	pub = context.socket ZMQ::PUB
-	puts "connecting to #{URL}"
-	pub.connect URL
-	pub.send "#{CHANNEL} #{host} #{ip} up"
-	pub.close
-    end
-  end
-end

data/lib/pub.ruby

@@ -1,15 +0,0 @@
-# pub.rb
-require 'zmq'
-
-context = ZMQ::Context.new
-chan    = ARGV[0]
-user    = ARGV[1]
-pub     = context.socket ZMQ::PUB
-# pub.bind 'ipc:///tmp/2'
-pub.connect 'tcp://127.0.0.1:5004'
-
-while msg = STDIN.gets
-  msg.strip!
-  pub.send "#{chan} #{user} #{msg}"
-end
-

data/lib/server.rb

@@ -1,40 +0,0 @@
-require 'zmq'
-require 'constants'
-require 'dns'
-require 'eventmachine'
-
-module VagrantDns
-  class Server
-    def initialize
-	  context = ZMQ::Context.new
-	  @sub = context.socket ZMQ::SUB
-	  puts "binding to #{URL}"
-	  @sub.bind URL
-	  @sub.setsockopt ZMQ::SUBSCRIBE, CHANNEL
-    end
-
-    def process
-	Thread.new {
-	  @dns = VagrantDns::DnsServer.new
-	}
-	puts "processing "
-	begin
-	  while line = @sub.recv
-	    chan, host, ip, msg = line.split ' ', 4
-	    puts "#{chan} [#{ip}->#{host}]: is #{msg}"
-	    REG.register(host,ip)
-	  end
-	catch Execption  => e
-	  $stderr.puts e
-	rescue 
-	  shutdown
-	end
-    end
-
-    def shutdown
-	$stderr.puts "Cleaning up server"
-	@sub.close
-	EM::stop()
-    end
-  end
-end