dory 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9980430347948f1151abdb39a42392ab21114200
-  data.tar.gz: 407c1ba0e59201032ed2fc34979b2bcfb50d9d5d
+  metadata.gz: fe6595b7b6ee94069e023936a54b69aaea571ee9
+  data.tar.gz: df08791895d7d8b224ed912a7ddf4d8263e5532b
 SHA512:
-  metadata.gz: a80c27a7d3bb2f328eb86cb2fb66330927a9d9565c43730a94dc0cb5d010ead704b4658888d8cd3c317c35b6c518955a2325fdc80329f9796eac665b505ab0b6
-  data.tar.gz: 4d9c83fc5edb56bc000c40a2cd5c9b6582be8a416d29d8b5d15b30661d8a22d63436720a047a2d5e452b1df9f259d2d1e0a8738fcf0c37ed3e202cc7b4ab71e0
+  metadata.gz: 95dad5c161778f6acb218cb79248901b17d374b71f9828cd69f558d3e65d5752958f6b0c55200e2e8724b52cfed8f6a1cbd02a4df4db7b666c9550f6cf44b311
+  data.tar.gz: 3551802e1fd92fa42c9c46322b6ada62ea39574267f2b9b5d95aab917946f9fcf7af82cbdeebed56cc78a7481bda53c306ed5c2c05703ec6ad6c625b90aff043

data/lib/dory/config.rb

@@ -26,6 +26,7 @@ module Dory
               - domain: dev
                 address: 127.0.0.1
             container_name: dory_dnsmasq
+            port: 53  # port to listen for dns requests on.  must be 53 on linux. can be anything that's open on macos
           nginx_proxy:
             enabled: true
             container_name: dory_dinghy_http_proxy
@@ -34,6 +35,7 @@ module Dory
           resolv:
             enabled: true
             nameserver: 127.0.0.1
+            port: 53  # port where the nameserver listens. On linux it must be 53
       ).split("\n").map{|s| s.sub(' ' * 8, '')}.join("\n")
     end
 

data/lib/dory/dnsmasq.rb

@@ -6,13 +6,17 @@ module Dory
 
     @@first_attempt_failed = false
 
+    def self.dnsmasq_image_name
+      'freedomben/dory-dnsmasq:1.1.0'
+    end
+
     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)
+        puts "[DEBUG] First attempt failed.  Checking port #{self.port}" if Dory::Config.debug?
+        listener_list = self.check_port(self.port)
         unless listener_list.empty?
           return self.offer_to_kill(listener_list)
         end
@@ -36,8 +40,14 @@ module Dory
       end
     end
 
-    def self.dnsmasq_image_name
-      'freedomben/dory-dnsmasq:1.1.0'
+    def self.port
+      return 53 unless Os.macos?
+      p = Dory::Config.settings[:dory][:dnsmasq][:port]
+      p.nil? || p == 0 ? 19323 : self.sanitize_port(p)
+    end
+
+    def self.sanitize_port(port)
+      port.to_s.gsub(/\D/, '').to_i
     end
 
     def self.container_name
@@ -67,14 +77,15 @@ module Dory
     end
 
     def self.run_command(domains = self.domains)
-      "docker run -d -p 53:53/tcp -p 53:53/udp --name=#{Shellwords.escape(self.container_name)} " \
+      "docker run -d -p #{self.port}:#{self.port}/tcp -p #{self.port}:#{self.port}/udp " \
+      "--name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
       "#{self.domain_addr_arg_string}"
     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')
+      puts "Requesting sudo to check if something is bound to port #{self.port}".green
+      ret = Sh.run_command("sudo lsof -i :#{self.port}")
       return [] unless ret.success?
 
       list = ret.stdout.split("\n")
@@ -97,7 +108,7 @@ module Dory
 
     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."
+        puts "Process '#{process.command}' with PID '#{process.pid}' is listening on #{process.node} port #{self.port}."
       end
       pids = listener_list.uniq(&:pid).map(&:pid)
       pidstr = pids.join(' and ')

data/lib/dory/{linux.rb → os.rb}

@@ -1,5 +1,5 @@
 module Dory
-  module Linux
+  module Os
     def self.bash(command)
       system("bash -c '#{command}'")
     end
@@ -16,9 +16,9 @@ module Dory
       self.bash(self.arch_cmd)
     end
 
-		def self.osx?
+    def self.macos?
       self.bash('uname -a | grep "Darwin" > /dev/null')
-		end
+    end
 
     def self.ubuntu_cmd
       %q(

data/lib/dory/resolv.rb

@@ -2,86 +2,29 @@ require 'colorize'
 
 module Dory
   module Resolv
-    def self.common_resolv_file
-      '/etc/resolv.conf'
+    def self.get_module
+      return Dory::Resolv::Macos if Os.macos?
+      Dory::Resolv::Linux
     end
 
-    def self.ubuntu_resolv_file
-      #'/etc/resolvconf/resolv.conf.d/base'
-      # For now, use the common_resolv_file
-      self.common_resolv_file
-    end
+#    def self.method_missing(method_sym, *arguments, &block)
+#      self.get_module.send(method_sym, arguments, &block)
+#    end
 
-    def self.file_comment
-      '# added by dory'
-    end
+#    def self.respond_to?(method_sym, include_private = false)
+#      self.get_module.respond_to?(method_sym, include_private)
+#    end
 
-    def self.nameserver
-      Dory::Config.settings[:dory][:resolv][:nameserver]
-    end
-
-    def self.file_nameserver_line
-      "nameserver #{self.nameserver}"
-    end
-
-    def self.nameserver_contents
-      "#{self.file_nameserver_line}  #{self.file_comment}"
-    end
-
-    def self.resolv_file
-      if Linux.ubuntu?
-        return self.ubuntu_resolv_file if Linux.ubuntu?
-      elsif Linux.fedora? || Linux.arch? || File.exist?(self.common_resolv_file)
-        return self.common_resolv_file
-      else
-        raise RuntimeError.new(
-          "Unable to determine location of resolv file"
-        )
-      end
+    def self.has_our_nameserver?
+      self.get_module.has_our_nameserver?
     end
 
     def self.configure
-      # we want to be the first nameserver in the list for performance reasons
-      # we only want to add the nameserver if it isn't already there
-      prev_conts = self.resolv_file_contents
-      unless self.contents_has_our_nameserver?(prev_conts)
-        if prev_conts =~ /nameserver/
-          prev_conts.sub!(/nameserver/, "#{self.nameserver_contents}\nnameserver")
-        else
-          prev_conts = "#{prev_conts}\n#{self.nameserver_contents}"
-        end
-        prev_conts.gsub!(/\s+$/, '')
-        self.write_to_file(prev_conts)
-      end
-      self.has_our_nameserver?
+      self.get_module.configure
     end
 
     def self.clean
-      prev_conts = self.resolv_file_contents
-      if self.contents_has_our_nameserver?(prev_conts)
-        prev_conts.gsub!(/#{Regexp.escape(self.nameserver_contents + "\n")}/, '')
-        prev_conts.gsub!(/\s+$/, '')
-        self.write_to_file(prev_conts)
-      end
-      !self.has_our_nameserver?
-    end
-
-    def self.write_to_file(contents)
-      # have to use this hack cuz we don't run as root :-(
-      puts "Requesting sudo to write to #{self.resolv_file}".green
-      Bash.run_command("echo -e '#{contents}' | sudo tee #{Shellwords.escape(self.resolv_file)} >/dev/null")
-    end
-
-    def self.resolv_file_contents
-      File.read(self.resolv_file)
-    end
-
-    def self.has_our_nameserver?
-      self.contents_has_our_nameserver?(self.resolv_file_contents)
-    end
-
-    def self.contents_has_our_nameserver?(contents)
-     !!((contents =~ /#{self.file_comment}/) && (contents =~ /#{self.file_nameserver_line}/))
+      self.get_module.clean
     end
   end
 end

data/lib/dory/resolv/linux.rb

@@ -0,0 +1,93 @@
+require 'colorize'
+
+module Dory
+  module Resolv
+    module Linux
+      def self.common_resolv_file
+        '/etc/resolv.conf'
+      end
+
+      def self.ubuntu_resolv_file
+        #'/etc/resolvconf/resolv.conf.d/base'
+        # For now, use the common_resolv_file
+        self.common_resolv_file
+      end
+
+      def self.file_comment
+        '# added by dory'
+      end
+
+      def self.nameserver
+        Dory::Config.settings[:dory][:resolv][:nameserver]
+      end
+
+      # Note that we ignore any ports present in the config
+      # file because only port 53 is supported on linux
+      # (and there's not a way to specify it in the resolv.conf
+      # even if we wanted to, which someday hopefully we can)
+      def self.file_nameserver_line
+        "nameserver #{self.nameserver}"
+      end
+
+      def self.nameserver_contents
+        "#{self.file_nameserver_line}  #{self.file_comment}"
+      end
+
+      def self.resolv_file
+        if Os.ubuntu?
+          return self.ubuntu_resolv_file if Os.ubuntu?
+        elsif Os.fedora? || Os.arch? || File.exist?(self.common_resolv_file)
+          return self.common_resolv_file
+        else
+          raise RuntimeError.new(
+            "Unable to determine location of resolv file"
+          )
+        end
+      end
+
+      def self.configure
+        # we want to be the first nameserver in the list for performance reasons
+        # we only want to add the nameserver if it isn't already there
+        prev_conts = self.resolv_file_contents
+        unless self.contents_has_our_nameserver?(prev_conts)
+          if prev_conts =~ /nameserver/
+            prev_conts.sub!(/nameserver/, "#{self.nameserver_contents}\nnameserver")
+          else
+            prev_conts = "#{prev_conts}\n#{self.nameserver_contents}"
+          end
+          prev_conts.gsub!(/\s+$/, '')
+          self.write_to_file(prev_conts)
+        end
+        self.has_our_nameserver?
+      end
+
+      def self.clean
+        prev_conts = self.resolv_file_contents
+        if self.contents_has_our_nameserver?(prev_conts)
+          prev_conts.gsub!(/#{Regexp.escape(self.nameserver_contents + "\n")}/, '')
+          prev_conts.gsub!(/\s+$/, '')
+          self.write_to_file(prev_conts)
+        end
+        !self.has_our_nameserver?
+      end
+
+      def self.write_to_file(contents)
+        # have to use this hack cuz we don't run as root :-(
+        puts "Requesting sudo to write to #{self.resolv_file}".green
+        Bash.run_command("echo -e '#{contents}' | sudo tee #{Shellwords.escape(self.resolv_file)} >/dev/null")
+      end
+
+      def self.resolv_file_contents
+        File.read(self.resolv_file)
+      end
+
+      def self.has_our_nameserver?
+        self.contents_has_our_nameserver?(self.resolv_file_contents)
+      end
+
+      def self.contents_has_our_nameserver?(contents)
+       !!((contents =~ /#{self.file_comment}/) && (contents =~ /#{self.file_nameserver_line}/))
+      end
+    end
+  end
+end

data/lib/dory/resolv/macos.rb

@@ -0,0 +1,91 @@
+require 'colorize'
+
+module Dory
+  module Resolv
+    module Macos
+      def self.system_resolv_file
+        '/etc/resolv.conf'
+      end
+
+      def self.port
+        Dory::Config.settings[:dory][:resolv][:port] || 19323
+      end
+
+      def self.resolv_dir
+        '/etc/resolver'
+      end
+
+      def self.resolv_file_names
+        # on macos the file name should match the domain
+        if Dory::Config.settings[:dory][:dnsmasq][:domain]
+          [Dory::Config.settings[:dory][:dnsmasq][:domain]]
+        elsif Dory::Config.settings[:dory][:dnsmasq][:domains]
+          Dory::Config.settings[:dory][:dnsmasq][:domains].map{ |d| d[:domain] }
+        else
+          ['docker']
+        end
+      end
+
+      def self.resolv_files
+        self.resolv_file_names.map{ |f| "#{self.resolv_dir}/#{f}" }
+      end
+
+      def self.nameserver
+        Dory::Config.settings[:dory][:resolv][:nameserver]
+      end
+
+      def self.file_nameserver_line
+        "nameserver #{self.nameserver}"
+      end
+
+      def self.file_comment
+        '# added by dory'
+      end
+
+      def self.resolv_contents
+        <<-EOF.gsub(' ' * 10, '')
+          #{self.file_comment}
+          #{self.file_nameserver_line}
+          port #{self.port}
+        EOF
+      end
+
+      def self.configure
+        # have to use this hack cuz we don't run as root :-(
+        unless Dir.exist?(self.resolv_dir)
+          puts "Requesting sudo to create directory #{self.resolv_dir}".green
+          Bash.run_command("sudo mkdir -p #{self.resolv_dir}")
+        end
+        self.resolv_files.each do |filename|
+          puts "Requesting sudo to write to #{filename}".green
+          Bash.run_command("echo -e '#{self.resolv_contents}' | sudo tee #{Shellwords.escape(filename)} >/dev/null")
+        end
+      end
+
+      def self.clean
+        self.resolv_files.each do |filename|
+          puts "Requesting sudo to delete '#{filename}'"
+          Bash.run_command("sudo rm -f #{filename}")
+        end
+      end
+
+      def self.system_resolv_file_contents
+        File.read(self.system_resolv_file)
+      end
+
+      def self.resolv_file_contents
+        File.read(self.resolv_file)
+      end
+
+      def self.has_our_nameserver?
+        self.resolv_files.all? do |filename|
+          self.contents_has_our_nameserver?(File.read(filename))
+        end
+      end
+
+      def self.contents_has_our_nameserver?(contents)
+        !!((contents =~ /#{self.file_comment}/) && (contents =~ /#{self.file_nameserver_line}/) && (contents =~ /port.#{self.port}/))
+      end
+    end
+  end
+end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.2.4'
-  DATE    = '2016-06-28'
+  VERSION = '0.3.0'
+  DATE    = '2016-06-29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 description: The slack web api is good, but very raw.  What you need is a great ruby
   framework to abstract away all that.  This is it!  This framework allows you to
   write bots easily by providing methods that are easy to call.  Behind the scenes,
@@ -140,9 +140,11 @@ files:
 - lib/dory/config.rb
 - lib/dory/dnsmasq.rb
 - lib/dory/docker_service.rb
-- lib/dory/linux.rb
+- lib/dory/os.rb
 - lib/dory/proxy.rb
 - lib/dory/resolv.rb
+- lib/dory/resolv/linux.rb
+- lib/dory/resolv/macos.rb
 - lib/dory/shell.rb
 - lib/dory/upgrade.rb
 - lib/dory/version.rb
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more