dory 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78281e4844cc2720db9d465be198522dd0a89b83
-  data.tar.gz: 0aff6a8d3ca04ab8cbd999834031f131015f6595
+  metadata.gz: 49a33137371df2a16e439572e7089d10516ae490
+  data.tar.gz: 6a4b080407d2e8a6bbb5d6b8097f395c2aa79fad
 SHA512:
-  metadata.gz: d5e3972cfea9164e794ce7e85606c542fe44f3a8b36d92639054e8ebd017e4ebc097cd0e9391f622242fdcbce39b178975de6ea246944271f57e67827632e278
-  data.tar.gz: 78cf5d4c8161b9290b1c8b751cdfcb187ea2aa272f7d2b5ea6a81c3a4f6e9bbc0adb1c2b954d87e9408a40fd95c0deb2c64f6848d8d1e37802a071b08edc3673
+  metadata.gz: 3dbe85b3861e2ff536c0039d99c8c5447b41d7b337623f8fbe4bc0c1b51b686cb7b82f45c7d153cefb0462662d1535e23eb2019e0ebc7e2908b89635f4fdb61b
+  data.tar.gz: 0ba2bdcd799e4cfe2537f860283b57c21d3fad48d67a69913e8bbef8bb94a70acfcca1ad32d7c10389f756eb6172132f3c5d5de124a8a74761c88a0130ec4603

data/lib/dory/config.rb

@@ -81,8 +81,8 @@ module Dory
       # If there's a single domain and address, upgrade to the array format
       if newsettings[:dory][:dnsmasq][:domain]
         newsettings[:dory][:dnsmasq][:domains] = [{
-            domain: newsettings[:dory][:dnsmasq][:domain],
-            address: newsettings[:dory][:dnsmasq][:address] || '127.0.0.1'
+          domain: newsettings[:dory][:dnsmasq][:domain],
+          address: newsettings[:dory][:dnsmasq][:address] || '127.0.0.1'
         }]
         newsettings[:dory][:dnsmasq].delete(:domain)
         newsettings[:dory][:dnsmasq].delete(:address)

data/lib/dory/dnsmasq.rb

@@ -30,13 +30,14 @@ 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 || !Dory::Dinghy.installed?
-        if Dory::Config.debug?
-          puts "[DEBUG] Attempt to kill conflicting service failed" if Dory
-        end
+      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?
+        if Dory::Config.debug?
+          puts "[DEBUG] First attempt to start dnsmasq failed." \
+               "There is probably a conflicting service present"
+        end
         @@first_attempt_failed = true
         self.start(handle_error: false)
       end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
   DATE    = '2016-02-08'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ben Porter