dory 0.3.11 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe229155242d96775501058747764d20efd538e
-  data.tar.gz: f5a532c02a8967343d446f3aa017b1f3f0ece493
+  metadata.gz: 065982a17c11138746bc3cf24270e3d047b0c16a
+  data.tar.gz: 7985ebfd3972c8661ca99385ef47eebc2b6d0885
 SHA512:
-  metadata.gz: 615eafda6a4d6be301db192656072cf7dfd34071f540dbf7bbd006d16251f85e63d4cc3763905efe77f2628440d7aef15676d9eced89e4a345397701a04e0c73
-  data.tar.gz: 09eed7aea3d2e71c812d4736b8e476595cc3e45e358dbde27ead70dcaf97387b984c6455ac0781bacf5bcb9c38893492f66ac3e70e60f9057d0d82f8d519d881
+  metadata.gz: b08b713daa9363fbb32ff43efbbfecfc786cc26adc57a0bdd442a4117735cc67c6fafab4d1be41257e4b9594b74e784fe816d42a9b2131de2f9519cfa8573050
+  data.tar.gz: 9f0aff75f6c853d976632bd0c25baf0513739e0443d7279d57b0c7e0f8a06d54d35f9f68b9990b2d29500a776dc53bcdcb7870d58204d182f48c10f240ed1501

data/lib/dory/dinghy.rb

@@ -0,0 +1,29 @@
+require 'colorize'
+
+module Dory
+  module Dinghy
+    class DinghyError < RuntimeError
+    end
+
+    def self.installed?
+      Bash.run_command("which dinghy >/dev/null 2>&1").success?
+    end
+
+    def self.ip
+      res = Bash.run_command("dinghy ip").stdout.chomp
+      unless res =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+        raise DinghyError.new(<<-ERROR)
+          Dinghy responded with: '#{res}', but we expected an IP address.
+          Please make sure the dinghy vm is running, and that running
+          `dinghy ip` gives you an IP address
+        ERROR
+      end
+      res
+    end
+
+    def self.match?(str)
+      # be lenient cause I typo this all the time
+      str =~ /^:?din.?.?y:?/
+    end
+  end
+end

data/lib/dory/dnsmasq.rb

@@ -30,8 +30,10 @@ module Dory
     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?
+      if @@first_attempt_failed || !Dory::Dinghy.installed?
+        if Dory::Config.debug?
+          puts "[DEBUG] Attempt to kill conflicting service failed" if Dory
+        end
         return false
       else
         puts "[DEBUG] First attempt to start dnsmasq failed. There is probably a conflicting service present" if Dory::Config.debug?
@@ -40,6 +42,11 @@ module Dory
       end
     end
 
+    def self.ip_from_dinghy?
+      Dory::Dinghy.match?(self.address(self.old_address)) || 
+        self.domains.any?{ |domain| Dory::Dinghy.match?(self.address(domain[:address])) }
+    end
+
     def self.port
       return 53 unless Os.macos?
       p = Dory::Config.settings[:dory][:dnsmasq][:port]
@@ -66,12 +73,16 @@ module Dory
       Dory::Config.settings[:dory][:dnsmasq][:address]
     end
 
+    def self.address(addr)
+      Dory::Dinghy.match?(addr) ? Dory::Dinghy.ip : addr
+    end
+
     def self.domain_addr_arg_string
       if self.old_domain
-        "#{Shellwords.escape(self.old_domain)} #{Shellwords.escape(self.old_address)}"
+        "#{Shellwords.escape(self.old_domain)} #{Shellwords.escape(self.address(self.old_address))}"
       else
         self.domains.map do |domain|
-          "#{Shellwords.escape(domain[:domain])} #{Shellwords.escape(domain[:address])}"
+          "#{Shellwords.escape(domain[:domain])} #{Shellwords.escape(self.address(domain[:address]))}"
         end.join(" ")
       end
     end

data/lib/dory/docker_service.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'ostruct'
 
 module Dory
   module DockerService
@@ -28,16 +29,20 @@ module Dory
             puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting" if Dory::Config.debug?
             self.delete
           end
-          if Dory::Config.debug?
-            puts "[DEBUG] '#{self.container_name}' does not exist.  Creating/starting " \
-                 "'#{self.container_name}' with '#{self.run_command}'"
-          end
-          status = Sh.run_command(self.run_command)
-          unless status.success?
-            if !handle_error || !self.handle_error(status)
-              puts "Failed to start docker container '#{self.container_name}' " \
-                   ".  Command '#{self.run_command}' failed".red
+          begin
+            if Dory::Config.debug?
+              puts "[DEBUG] '#{self.container_name}' does not exist.  Creating/starting " \
+                   "'#{self.container_name}' with '#{self.run_command}'"
+            end
+            status = Sh.run_command(self.run_command)
+            unless status.success?
+              if !handle_error || !self.handle_error(status)
+                puts "Failed to start docker container '#{self.container_name}' " \
+                     ".  Command '#{self.run_command}' failed".red
+              end
             end
+          rescue DinghyError => e
+            puts e.message.red
           end
         else
           err_msg = "Docker does not appear to be installed /o\\\n" \

data/lib/dory/resolv/macos.rb

@@ -30,8 +30,13 @@ module Dory
         self.resolv_file_names.map{ |f| "#{self.resolv_dir}/#{f}" }
       end
 
+      def self.configured_to_use_dinghy
+        Dory::Dinghy.match?(Dory::Config.settings[:dory][:resolv][:nameserver])
+      end
+
       def self.nameserver
-        Dory::Config.settings[:dory][:resolv][:nameserver]
+        ns = Dory::Config.settings[:dory][:resolv][:nameserver]
+        Dory::Dinghy.match?(ns) ? Dory::Dinghy.ip : ns
       end
 
       def self.file_nameserver_line
@@ -60,6 +65,9 @@ module Dory
           puts "Requesting sudo to write to #{filename}".green
           Bash.run_command("echo -e '#{self.resolv_contents}' | sudo tee #{Shellwords.escape(filename)} >/dev/null")
         end
+      rescue DinghyError => e
+        puts e.message.red
+        false
       end
 
       def self.clean
@@ -88,7 +96,14 @@ module Dory
       end
 
       def self.contents_has_our_nameserver?(contents)
-        !!((contents =~ /#{self.file_comment}/) && (contents =~ /#{self.file_nameserver_line}/) && (contents =~ /port.#{self.port}/))
+        comment_match = contents =~ /#{self.file_comment}/
+        port_match = contents =~ /port.#{self.port}/
+        if configured_to_use_dinghy
+          !!(comment_match && port_match)
+        else
+          nameserver_match = contents =~ /#{self.file_nameserver_line}/
+          !!(comment_match && port_match && nameserver_match)
+        end
       end
     end
   end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.3.11'
-  DATE    = '2016-12-07'
+  VERSION = '0.4.0'
+  DATE    = '2016-12-14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -136,6 +136,7 @@ files:
 - bin/dory
 - lib/dory.rb
 - lib/dory/config.rb
+- lib/dory/dinghy.rb
 - lib/dory/dnsmasq.rb
 - lib/dory/docker_service.rb
 - lib/dory/os.rb