dory 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 78281e4844cc2720db9d465be198522dd0a89b83
4
- data.tar.gz: 0aff6a8d3ca04ab8cbd999834031f131015f6595
3
+ metadata.gz: 49a33137371df2a16e439572e7089d10516ae490
4
+ data.tar.gz: 6a4b080407d2e8a6bbb5d6b8097f395c2aa79fad
5
5
  SHA512:
6
- metadata.gz: d5e3972cfea9164e794ce7e85606c542fe44f3a8b36d92639054e8ebd017e4ebc097cd0e9391f622242fdcbce39b178975de6ea246944271f57e67827632e278
7
- data.tar.gz: 78cf5d4c8161b9290b1c8b751cdfcb187ea2aa272f7d2b5ea6a81c3a4f6e9bbc0adb1c2b954d87e9408a40fd95c0deb2c64f6848d8d1e37802a071b08edc3673
6
+ metadata.gz: 3dbe85b3861e2ff536c0039d99c8c5447b41d7b337623f8fbe4bc0c1b51b686cb7b82f45c7d153cefb0462662d1535e23eb2019e0ebc7e2908b89635f4fdb61b
7
+ data.tar.gz: 0ba2bdcd799e4cfe2537f860283b57c21d3fad48d67a69913e8bbef8bb94a70acfcca1ad32d7c10389f756eb6172132f3c5d5de124a8a74761c88a0130ec4603
@@ -81,8 +81,8 @@ module Dory
81
81
  # If there's a single domain and address, upgrade to the array format
82
82
  if newsettings[:dory][:dnsmasq][:domain]
83
83
  newsettings[:dory][:dnsmasq][:domains] = [{
84
- domain: newsettings[:dory][:dnsmasq][:domain],
85
- address: newsettings[:dory][:dnsmasq][:address] || '127.0.0.1'
84
+ domain: newsettings[:dory][:dnsmasq][:domain],
85
+ address: newsettings[:dory][:dnsmasq][:address] || '127.0.0.1'
86
86
  }]
87
87
  newsettings[:dory][:dnsmasq].delete(:domain)
88
88
  newsettings[:dory][:dnsmasq].delete(:address)
@@ -30,13 +30,14 @@ module Dory
30
30
  def self.handle_error(command_output)
31
31
  puts "[DEBUG] handling dnsmasq start error" if Dory::Config.debug?
32
32
  # If we've already tried to handle failure, prevent infinite recursion
33
- if @@first_attempt_failed || !Dory::Dinghy.installed?
34
- if Dory::Config.debug?
35
- puts "[DEBUG] Attempt to kill conflicting service failed" if Dory
36
- end
33
+ if @@first_attempt_failed
34
+ puts "[DEBUG] Attempt to kill conflicting service failed" if Dory::Config.debug?
37
35
  return false
38
36
  else
39
- puts "[DEBUG] First attempt to start dnsmasq failed. There is probably a conflicting service present" if Dory::Config.debug?
37
+ if Dory::Config.debug?
38
+ puts "[DEBUG] First attempt to start dnsmasq failed." \
39
+ "There is probably a conflicting service present"
40
+ end
40
41
  @@first_attempt_failed = true
41
42
  self.start(handle_error: false)
42
43
  end
@@ -1,4 +1,4 @@
1
1
  module Dory
2
- VERSION = '0.4.1'
2
+ VERSION = '0.4.2'
3
3
  DATE = '2016-02-08'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dory
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Porter