dory 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec64b6e363092ca0e8606e48b00919f3afaeabb
-  data.tar.gz: bd6fe5e581f9a0409fe4dd2d5957129f92d25490
+  metadata.gz: b636e5e451b94e93e9ef2ce598f7b41af8e49463
+  data.tar.gz: 4513ecc2eace13190f46355ff93ec0ca0f9a0b57
 SHA512:
-  metadata.gz: 78c31bf4c794289423ba2dfe98d0416910758de62c3e71e6b5e0ab4a816591274ba0c88e6a720f1e6e335541cb0e8d0a4f91cf421f7d8de4b2c290c1a2c0484d
-  data.tar.gz: be91b0456c880c941de2e31b2fd2a3c48e80d9c5d032a893b51252d3df63e0fe81cb16cebdb3fbe7df88d103006ef2ea21324c441b63b4e0e9809c822bc8a7c1
+  metadata.gz: 12db07585ec03aa4478c969586976c1365595bbbd72dd8dba8dce2daede46aedd96d59b3cff68247a9b1285183e8213d56d71ae4fd0216a63963d9ec9ff078f6
+  data.tar.gz: 4efa86ae20f8bf1ef7386f4ef61891396e6c84016fc68742d843a66513a9c1f491c47cb5a9b932e3771af3ec03e01d3132b764a3e619f09b4cb0617458917ac6

data/lib/dory/dnsmasq.rb

@@ -4,6 +4,38 @@ module Dory
   class Dnsmasq
     extend Dory::DockerService
 
+    @@first_attempt_failed = false
+
+    def self.run_preconditions
+      puts "[DEBUG] dnsmasq service running preconditions" if Dory::Config.debug?
+
+      # we don't want to hassle the user with checking the port unless necessary
+      if @@first_attempt_failed
+        puts "[DEBUG] First attempt failed.  Checking port 53" if Dory::Config.debug?
+        listener_list = self.check_port(53)
+        unless listener_list.empty?
+          return self.offer_to_kill(listener_list)
+        end
+        return false
+      else
+        puts "[DEBUG] Skipping preconditions on first run" if Dory::Config.debug?
+        return true
+      end
+    end
+
+    def self.handle_error(command_output)
+      puts "[DEBUG] handling dnsmasq start error" if Dory::Config.debug?
+      # If we've already tried to handle failure, prevent infinite recursion
+      if @@first_attempt_failed
+        puts "[DEBUG] Attempt to kill conflicting service failed" if Dory::Config.debug?
+        return false
+      else
+        puts "[DEBUG] First attempt to start dnsmasq failed. There is probably a conflicting service present" if Dory::Config.debug?
+        @@first_attempt_failed = true
+        self.start(handle_error: false)
+      end
+    end
+
     def self.dnsmasq_image_name
       'freedomben/dory-dnsmasq'
     end
@@ -20,10 +52,50 @@ module Dory
       Dory::Config.settings[:dory][:dnsmasq][:address]
     end
 
-    def self.run_cmd(domain = self.domain, addr = self.addr)
+    def self.run_command(domain = self.domain, addr = self.addr)
       "docker run -d -p 53:53/tcp -p 53:53/udp --name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
       "#{Shellwords.escape(domain)} #{Shellwords.escape(addr)}"
     end
+
+    def self.check_port(port_num)
+      puts "Requesting sudo to check if something is bound to port 53".green
+      ret = Sh.run_command('sudo lsof -i :53')
+      return [] unless ret.success?
+
+      list = ret.stdout.split("\n")
+      list.shift  # get rid of the column headers
+      list.map! do |process|
+        command, pid, user, fd, type, device, size, node, name = process.split(/\s+/)
+        OpenStruct.new({
+          command: command,
+          pid: pid,
+          user: user,
+          fd: fd,
+          type: type,
+          device: device,
+          size: size,
+          node: node,
+          name: name
+        })
+      end
+    end
+
+    def self.offer_to_kill(listener_list, answer: nil)
+      listener_list.each do |process|
+        puts "Process '#{process.command}' with PID '#{process.pid}' is listening on #{process.node} port 53."
+      end
+      pids = listener_list.uniq(&:pid).map(&:pid)
+      pidstr = pids.join(' and ')
+      print "This interferes with Dory's dnsmasq container.  Would you like me to kill PID #{pidstr}? (Y/N): "
+      conf = answer ? answer : STDIN.gets.chomp
+      if conf =~ /y/i
+        puts "Requesting sudo to kill PID #{pidstr}"
+        return Sh.run_command("sudo kill #{pids.join(' ')}").success?
+      else
+        puts "OK, not killing PID #{pidstr}.  Please kill manually and try starting dory again.".red
+        return false
+      end
+    end
   end
 end

data/lib/dory/docker_service.rb

@@ -2,25 +2,38 @@ require 'shellwords'
 
 module Dory
   module DockerService
-    def start
+    def run_preconditions
+      # Override if preconditions are needed
+      return true
+    end
+
+    def handle_error(command_output)
+      # Override to provide error handling
+      return false
+    end
+
+    def start(handle_error: true)
       unless self.running?
-        success = if self.container_exists?
+        self.run_preconditions
+        status = if self.container_exists?
                     if Dory::Config.debug?
                       puts "[DEBUG] Container '#{self.container_name}' already exists.  " \
                            "Starting with '#{self.start_cmd}'"
                     end
-                    Sh.run_command(self.start_cmd).success?
+                    Sh.run_command(self.start_cmd)
                   else
                     if Dory::Config.debug?
                       puts "[DEBUG] Container '#{self.container_name}' does not exist.  " \
-                           "Creating/starting with '#{self.run_cmd}'"
+                           "Creating/starting with '#{self.run_command}'"
                     end
-                    Sh.run_command(self.run_cmd).success?
+                    Sh.run_command(self.run_command)
                   end
-        unless success
-          raise RuntimeError.new(
-            "Failed to run #{self.container_name}.  Command #{self.run_cmd} failed"
-          )
+        unless status.success?
+          if !handle_error || !self.handle_error(status)
+            raise RuntimeError.new(
+              "Failed to run #{self.container_name}.  Command #{self.run_command} failed"
+            )
+          end
         end
       end
       self.running?

data/lib/dory/proxy.rb

@@ -33,7 +33,7 @@ module Dory
       end
     end
 
-    def self.run_cmd
+    def self.run_command
       "docker run -d -p 80:80 #{self.tls_arg} #{self.certs_arg} "\
         "-v /var/run/docker.sock:/tmp/docker.sock -e " \
         "'CONTAINER_NAME=#{Shellwords.escape(self.container_name)}' --name " \

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.0.8'
-  DATE    = '2016-04-05'
+  VERSION = '0.1.0'
+  DATE    = '2016-05-15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize