dory 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d77f426394ec85bbbe2bab82c51827a606b5f3
-  data.tar.gz: 3c1f263e12aeb27daa447956eafd76cb8d2784af
+  metadata.gz: 044e607a99a4f25539f2cc21b25bdd44967dbbb3
+  data.tar.gz: bb755b5e86eacfd5d50d4b2e689cd9899e09cd0e
 SHA512:
-  metadata.gz: 4b6628655fa991c06bf885fac5e5e51a9e8529d0cf2e7ab89e9ac71d0ce4770f37e34ace70b03697f5c909b707e84bab711305387a31c62d2a62c6fe857fcb93
-  data.tar.gz: 32bcb7f13b507fb798f6e4882f4a4640edd31630e5a3b7578a3416273650001ffbe9d9f57850bcf56566f9a8e66e001158bcb74c558190b7540453daeb4fea26
+  metadata.gz: 33a1572f8e8d9d7602f131d87dd950c590b82975ba719c079707161864de56af9f9fbe1e7b6b2c74b9b1527e575ec252ed423d9710d4e9f07e16e289a646d71e
+  data.tar.gz: c614e5556ec5ae284334ac52dea2cc067f7a73a88aaf5a075602eda509ca7ad28cee0224faeaecc2cee633a700f5bedd86ac61afe43f11e1385da875e7314daa

data/bin/dory

@@ -113,7 +113,7 @@ class DoryBin < Thor
   def exec_up(options)
     puts "Reading settings file at '#{Dory::Config.filename}'".green if options[:verbose]
     settings = Dory::Config.settings
-    if settings[:dory][:nginx_proxy][:enabled]
+    if nginx_proxy_enabled?(settings)
       puts "nginx_proxy enabled in config file".green if options[:verbose]
       if Dory::Proxy.start
         puts "Successfully started nginx proxy".green
@@ -124,7 +124,7 @@ class DoryBin < Thor
       puts "nginx_proxy disabled in config file".yellow
     end
 
-    if settings[:dory][:dnsmasq][:enabled]
+    if dnsmasq_enabled?(settings)
       puts "dnsmasq enabled in config file".green if options[:verbose]
       if Dory::Dnsmasq.start
         puts "Successfully started dnsmasq".green
@@ -135,7 +135,7 @@ class DoryBin < Thor
       puts "dnsmasq disabled in config file".yellow
     end
 
-    if settings[:dory][:resolv][:enabled]
+    if resolv_enabled?(settings)
       if Dory::Resolv.configure
         puts "Successfully configured local resolver".green
       else
@@ -148,11 +148,12 @@ class DoryBin < Thor
   end
 
   def exec_status(_options)
+    puts "Reading settings file at '#{Dory::Config.filename}'".green if options[:verbose]
     settings = Dory::Config.settings
 
     if Dory::Proxy.running?
       puts "[*] Nginx proxy:  Running as docker container #{Dory::Proxy.container_name}".green
-    elsif !settings[:dory][:nginx_proxy][:enabled]
+    elsif !nginx_proxy_enabled?(settings)
       puts "[*] Nginx proxy is disabled in config file".yellow
     else
       puts "[*] Nginx proxy is not running".red
@@ -160,7 +161,7 @@ class DoryBin < Thor
 
     if Dory::Dnsmasq.running?
       puts "[*] Dnsmasq:  Running as docker container #{Dory::Dnsmasq.container_name}".green
-    elsif !settings[:dory][:dnsmasq][:enabled]
+    elsif !dnsmasq_enabled?(settings)
       puts "[*] Dnsmasq is disabled in config file".yellow
     else
       puts "[*] Dnsmasq is not running".red
@@ -168,7 +169,7 @@ class DoryBin < Thor
 
     if Dory::Resolv.has_our_nameserver?
       puts "[*] Resolv:  configured with #{Dory::Resolv.file_nameserver_line}".green
-    elsif !settings[:dory][:resolv][:enabled]
+    elsif !resolv_enabled?(settings)
       puts "[*] Resolv is disabled in config file".yellow
     else
       puts "[*] Resolv is not configured".red
@@ -176,38 +177,77 @@ class DoryBin < Thor
   end
 
   def exec_down(options)
+    puts "Reading settings file at '#{Dory::Config.filename}'".green if options[:verbose]
+    settings = Dory::Config.settings
+
     if Dory::Resolv.clean
-      puts "nameserver removed from resolv file".green
+      if resolv_enabled?(settings)
+        puts "nameserver removed from resolv file".green
+      else
+        puts "Resolv disabled in config file".yellow
+      end
     else
       puts "Unable to remove nameserver from resolv file".red
     end
 
     if Dory::Dnsmasq.stop
-      puts "Dnsmasq container stopped".green
-      if options[:destroy]
-        if Dory::Dnsmasq.delete
-          puts "Dnsmasq container successfully deleted".green
-        else
-          puts "Dnsmasq container failed to delete".red
+      if dnsmasq_enabled?(settings)
+        puts "Dnsmasq container stopped".green
+        if options[:destroy]
+          if Dory::Dnsmasq.delete
+            puts "Dnsmasq container successfully deleted".green
+          else
+            puts "Dnsmasq container failed to delete".red
+          end
         end
+      else
+        puts "dnsmasq disabled in config file".yellow
       end
     else
       puts "Dnsmasq container failed to stop".red
     end
 
     if Dory::Proxy.stop
-      puts "Nginx proxy stopped".green
-      if options[:destroy]
-        if Dory::Proxy.delete
-          puts "Nginx proxy container successfully deleted".green
-        else
-          puts "Nginx proxy container failed to delete".red
+      if nginx_proxy_enabled?(settings)
+        puts "Nginx proxy stopped".green
+        if options[:destroy]
+          if Dory::Proxy.delete
+            puts "Nginx proxy container successfully deleted".green
+          else
+            puts "Nginx proxy container failed to delete".red
+          end
         end
+      else
+        puts "Nginx proxy disabled in config file".yellow
       end
     else
       puts "Nginx proxy failed to stop".red
     end
   end
+
+  def nginx_proxy_enabled?(settings)
+    settings[:dory][:nginx_proxy][:enabled]
+  end
+
+  def nginx_proxy_disabled?(settings)
+    !nginx_proxy_enabled?(settings)
+  end
+
+  def dnsmasq_enabled?(settings)
+    settings[:dory][:dnsmasq][:enabled]
+  end
+
+  def dnsmasq_disabled?(settings)
+    !dnsmasq_enabled?(settings)
+  end
+
+  def resolv_enabled?(settings)
+    settings[:dory][:resolv][:enabled]
+  end
+
+  def resolv_disabled?(settings)
+    !resolv_enabled?(settings)
+  end
 end
 
 aliases = {

data/lib/dory/docker_service.rb

@@ -14,15 +14,17 @@ module Dory
 
     def start(handle_error: true)
       if self.running?
-        puts "Container '#{self.container_name}' is already running"
+        if Dory::Config.debug?
+          puts "[DEBUG] Container '#{self.container_name}' is already running. Doing nothing"
+        end
       else
         self.run_preconditions
         if self.container_exists?
-           puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting"
-           self.delete
+          puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting" if Dory::Config.debug?
+          self.delete
         end
         if Dory::Config.debug?
-          puts "[DEBUG] does not exist.  Creating/starting " \
+          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)

data/lib/dory/resolv.rb

@@ -81,7 +81,7 @@ module Dory
     end
 
     def self.contents_has_our_nameserver?(contents)
-     !!((contents =~ /#{self.file_comment}/) || (contents =~ /#{self.file_nameserver_line}/))
+     !!((contents =~ /#{self.file_comment}/) && (contents =~ /#{self.file_nameserver_line}/))
     end
   end
 end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.2.1'
-  DATE    = '2016-06-09'
+  VERSION = '0.2.2'
+  DATE    = '2016-06-23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize