vagrant-dnsdock-hostupdater 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3573580bb55bd09385772c7bcdd7cff5564d6e4
-  data.tar.gz: 7aa965373fe6f88c2c4347895a1d69bcb6a98f7c
+  metadata.gz: 4443b4ad71d5f0411f5fe45885f00076e6e198bb
+  data.tar.gz: 176b2520288f6ce58893bcac0c9009414f4497a5
 SHA512:
-  metadata.gz: 882ec6bc80ec52c62c1b2106209df03f8b6c00a0951dca92ca1901c750e6d87ba4e691c0313cc6643d48d084c67a15fc6a29d5c7568473a349d3a8483b9bf617
-  data.tar.gz: a6dbbf6cab2d0dafda674da90e5cb9700bb17276a86166727ad67e198b14e90c934c0d35fd821c32951eb8f1eb79b220bc444689b62ca3e111b20726832aaf80
+  metadata.gz: 7fd4a704daf039d44eab40326217dd69b78cf32dc990d1a6aa38ef6b7775fe3adac922114f1d9662cc731f5c23509b87f352c688637d951b70c4a9f6e0338413
+  data.tar.gz: 07c71b202a4351546927880e9ad45ba32d9aa7c37811e3b87e3a17cc59f3a387be23b5726cfa1941af1efac652c025bc35c0a106ac8b0e14d7b2e2fd9188da98

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    vagrant-dnsdock-hostupdater (0.0.22)
+      docker-api (~> 1.33)
+      linebreak (~> 2.1.0)
+      log4r (~> 1.1.10)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    docker-api (1.33.2)
+      excon (>= 0.38.0)
+      json
+    excon (0.54.0)
+    json (2.0.3)
+    linebreak (2.1.0)
+    log4r (1.1.10)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  vagrant-dnsdock-hostupdater!
+
+BUNDLED WITH
+   1.14.6

data/vagrant-dnsdock-hostupdater.gemspec

@@ -0,0 +1,27 @@
+require_relative 'lib/version'
+
+Gem::Specification.new do |s|
+  s.name            = 'vagrant-dnsdock-hostupdater'
+  s.version         = Vagrant::DnsdockHostUpdater::VERSION
+  s.summary         = 'Update hosts'
+  s.description     = <<-DESCRIPTION
+vagrant-dnsdock-hostupdater is a Vagrant plugin which provides the ability to keep the host machines hosts file
+configured to point at bridged docker containers based on container names: e.g. <container_name>.local.signal.sh.
+DNSDock should be configured on the guest machine to enable containers to resolve these hosts.
+  DESCRIPTION
+  s.authors         = ['Brian Coit']
+  s.email           = 'brian.coit@cellosignal.com'
+  s.files           = Dir['{lib}'] + ['Rakefile', 'Gemfile', 'Gemfile.lock', 'vagrant-dnsdock-hostupdater.gemspec']
+  s.executables     = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.require_paths   = ['lib']
+  s.homepage        = 'https://bitbucket.org/briancoit'
+  s.license         = 'ISC'
+
+
+  s.required_ruby_version = '>= 2.0.0'
+
+  s.add_runtime_dependency 'docker-api', '~> 1.33'
+# gem 'hosts', '~> 0.1.1'
+  s.add_runtime_dependency 'log4r', '~> 1.1.10'
+  s.add_runtime_dependency 'linebreak', '~> 2.1.0'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsdock-hostupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Brian Coit
@@ -62,28 +62,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - Rakefile
-- lib/client.rb
-- lib/event-watcher.rb
-- lib/host-manager.rb
-- lib/hosts/aef/hosts.rb
-- lib/hosts/aef/hosts/comment.rb
-- lib/hosts/aef/hosts/element.rb
-- lib/hosts/aef/hosts/empty_element.rb
-- lib/hosts/aef/hosts/entry.rb
-- lib/hosts/aef/hosts/file.rb
-- lib/hosts/aef/hosts/helpers.rb
-- lib/hosts/aef/hosts/section.rb
-- lib/hosts/aef/hosts/version.rb
-- lib/hosts/aef/linebreak/linebreak.rb
-- lib/hosts/hosts.rb
-- lib/hosts/hosts/bare.rb
-- lib/launch-control
-- lib/server.rb
-- lib/vagrant-dnsdock-hostupdater.rb
-- lib/vagrant-dnsdock-hostupdater/command.rb
-- lib/vagrant-dnsdock-hostupdater/plugin.rb
-- lib/version.rb
+- vagrant-dnsdock-hostupdater.gemspec
 homepage: https://bitbucket.org/briancoit
 licenses:
 - ISC

data/lib/client.rb

@@ -1,4 +0,0 @@
-require_relative 'host-manager'
-
-HostManager::Client
-    .create('192.168.200.1', 2991)

data/lib/event-watcher.rb

@@ -1,51 +0,0 @@
-require_relative 'host-manager'
-require 'yaml'
-require 'pp'
-
-module HostManager
-  class DockerEvent
-
-    def self.update(ip, port, host_suffix)
-      client = HostManager::Client.create(ip, port)
-      client.host_suffix host_suffix
-      client.sync_hosts Docker::Container.all({:all => true})
-      client.close
-    end
-
-    def self.run(ip, port, host_suffix)
-      # sync existing host entries on start (normally this will remove old left-over entries)
-      self.update(ip, port, host_suffix)
-
-      sleep(2)
-      loop {
-        run_once(ip, port, host_suffix)
-      }
-    end
-
-    private
-    def self.run_once(ip, port, host_suffix)
-      begin
-        Docker::Event.stream { |event|
-          HostManager.log.info 'Connected to docker socket. Listening for events.'
-          # respond to all container events
-
-          begin
-            if event.type == 'container' && %w(start die).include?(event.action)
-              self.update(ip, port, host_suffix)
-            end
-
-          rescue => e
-            puts e.inspect
-          end
-
-          break
-        }
-
-      rescue Docker::Error::TimeoutError
-        HostManager.log.info 'Docker socket connection timed out whilst listening for events. Reconnecting...'
-      end
-    end
-  end
-end
-
-HostManager::DockerEvent.run('192.168.200.1', 2991, '.local.signal.sh')

data/lib/host-manager.rb

@@ -1,298 +0,0 @@
-require 'socket' # Get sockets from stdlib
-require 'json'
-require_relative 'hosts/hosts'
-require 'docker'
-require 'logger'
-require 'log4r'
-
-module OS
-  def OS.windows?
-    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def OS.mac?
-    (/darwin/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def OS.unix?
-    !OS.windows?
-  end
-
-  def OS.linux?
-    OS.unix? and not OS.mac?
-  end
-end
-
-module HostManager
-
-  def self.log
-    unless @log
-      @log = Log4r::Logger.new('main')
-      @log.outputters << Log4r::Outputter.stdout
-      @log.outputters << Log4r::FileOutputter.new('logmain', :filename => 'host-manager.log')
-    end
-
-    @log
-  end
-
-  def self.comment_prefix
-    'Managed by Vagrant plugin - do not remove.'
-  end
-
-  def self.host_file_path
-    OS.windows? ? `echo %SystemRoot%\\System32\\drivers\\etc\\hosts`.chomp : '/etc/hosts'
-  end
-
-  class Base
-
-    def log
-      HostManager.log
-    end
-
-    def host_name(container_name)
-      if container_name.include?('.')
-        container_name
-      else
-        sanitize_host_value(container_name) + host_suffix
-      end
-    end
-
-    def compose_host_names(container)
-      names = []
-      labels = container.info['Config']['Labels']
-
-      name = labels['com.docker.compose.project']
-      service = labels['com.docker.compose.service']
-
-
-      if name != nil && service != nil
-        service = sanitize_host_value(service)
-        name = sanitize_host_value(name)
-
-        container_num = labels['com.docker.compose.container-number']
-        if container_num == '1'
-          names.push("#{service}.#{name}#{host_suffix}")
-        else
-          names.push("#{service}-#{container_num}.#{name}#{host_suffix}")
-        end
-      else
-        names.push(host_name(container.info['Name']))
-      end
-
-      names
-    end
-
-    def host_suffix(suffix = nil)
-      if suffix != nil
-        @domain_suffix = suffix
-      else
-        @domain_suffix
-      end
-    end
-
-    # Determine if entry is managed by this utility or not
-    def valid_entry?(element)
-      # check it's a managed host first
-      if element.respond_to?(:comment) && element.comment.to_s.start_with?(HostManager.comment_prefix)
-        # check we have hostname and ip
-        if element.respond_to?(:name) && element.respond_to?(:address)
-          return true
-        end
-      end
-    end
-
-    def get_hosts
-      unless @host_manager
-        @host_manager = Hosts::File.read(HostManager.host_file_path)
-      end
-
-      @host_manager
-    end
-
-    def build_hosts_data(container_data)
-      data = []
-
-      if container_data && container_data.is_a?(Array)
-        container_data.each do |container_info|
-          container = Docker::Container.get(container_info.info['id'])
-
-          if container.info['State']['Running']
-            name = container.info['Name']
-
-            if name
-              ip = container.info['NetworkSettings']['IPAddress']
-
-              if ip
-                compose_host_names(container).each do |hostname|
-                  item = {
-                      :hostname => hostname,
-                      :ip => ip,
-                      :containerId => container.info['id']
-                  }
-
-                  data.push(item)
-                end
-              else
-                log.warn("Ignored request to create hosts entry due to no IP being returned from container: #{name}")
-              end
-            end
-          end
-
-        end
-      end
-
-      data
-    end
-
-    def update_hosts_file(data)
-      if data.is_a?(Hash)
-        required_keys = %w(action hostname ip containerId)
-        required_keys.each do |key|
-          unless data.key?(key)
-            raise "Data for key #{key} not provided."
-          end
-        end
-        execute(data['action'], data['hostname'], data['ip'], data['containerId'])
-
-      elsif data.is_a?(Array)
-        hosts = get_hosts
-
-        # initially remove all entries
-        hosts.elements.delete_if do |element|
-          if valid_entry?(element)
-            log.info 'Removing entry for ' + element.name
-            true
-          end
-        end
-
-        # add recieved entries
-        data.each do |entry|
-          add_entry(entry, hosts)
-          hosts.write
-        end
-
-        hosts.write
-
-      end
-    end
-
-    def add_entry(entry, hosts)
-      if entry[:ip] && entry[:containerId] && entry[:hostname]
-        comment = HostManager.comment_prefix + (entry['containerId'] ? " Container ID: #{entry[:containerId]}" : '')
-        log.info "Adding entry: #{entry[:hostname]} => #{entry[:ip]}"
-        hosts.elements << Hosts::Entry.new(entry[:ip], entry[:hostname], :comment => comment)
-
-      else
-        log.warn 'Unable to write entry due to missing values [ip,containerId,hostname]: ' + entry.to_json
-      end
-    end
-
-    def execute(action, hostname, ip, container_id = nil)
-      hosts = get_hosts
-
-      if action == 'create'
-        hosts.elements.each do |element|
-          if valid_entry?(element) && hostname == element.name
-            raise "Entry already exists! (#{ip} #{hostname})"
-          end
-        end
-
-        comment = HostManager.comment_prefix + (container_id ? " Container ID: #{container_id}" : '')
-
-        hosts.elements << Hosts::Entry.new(ip, hostname, :comment => comment)
-        hosts.write
-
-      elsif action == 'delete'
-        hosts.elements.delete_if do |element|
-          if valid_entry?(element)
-            if hostname == element.name
-              log.info 'Removing entry for ' + element.name
-              true
-            end
-          end
-        end
-
-        hosts.write
-      else
-        raise 'No valid action specified.'
-      end
-    end
-
-    private
-
-    def sanitize_host_value(value)
-      value.sub(/^\//, '').gsub(/_/, '-')
-    end
-
-  end
-
-  class Server < Base
-    def run(ip, port)
-      HostManager.log.info "Running on host manager service on #{ip}:#{port}"
-      @tcp_server = TCPServer.new ip, port
-
-      loop {
-
-        client = @tcp_server.accept
-        content = client.gets
-
-        log.debug("Recieved data: #{content.to_s.strip}")
-
-        begin
-          unless content.to_s.chomp.strip.empty?
-            data = JSON.parse(content)
-            update_hosts_file(data)
-          end
-
-        rescue => e
-          log.error("Caught exception attempting to execute with data #{content}. #{e}")
-        end
-
-        client.close
-      }
-
-    end
-
-    def self.create(ip, port)
-      server = self.new
-      server.run(ip, port)
-    end
-  end
-
-  class Client < Base
-
-    def initialize(ip, port)
-      @socket = TCPSocket.new(ip, port)
-    end
-
-    def close
-      log.info('Closing client connection.')
-      @socket.close
-    end
-
-    def sync_hosts(container_data)
-      data = build_hosts_data(container_data)
-
-      begin
-        update_hosts_file(data)
-
-        `service dnsmasq restart`
-
-      rescue => e
-        log.error("Caught exception attempting to write to hosts file with data #{data.to_json}. #{e}")
-      end
-
-      send(data)
-    end
-
-    def send(data)
-      log.info("Sending data via client: #{data.to_json}")
-      @socket.write data.to_json + "\n"
-    end
-
-    def self.create(ip, port)
-      self.new(ip, port)
-    end
-  end
-
-end