vagrant-powerdns 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84f73045d0de48fadf6269e73e9bacf6cc4bc85
-  data.tar.gz: f70af2316504e9829acd92d6cc4c6276e451a9f3
+  metadata.gz: cc8b1b7a3bec8ad99768ddd3b9a121c4c8e11d3f
+  data.tar.gz: 41e9ba6a0ef85ba5868e9004f88c4dc00ac24c25
 SHA512:
-  metadata.gz: c2b3d2219acb1bc69d9ea58e13a1362e31882f726e67357360853eaa3ee4bbda0d174d281a670c4114afc363c563c00d30bd8275a7ac0ffe420cf1f55fd6272b
-  data.tar.gz: 164724893991e6ef290a125a8a15e3f86e18c1b69b38045f8ba92f95ed63abb2f8c55941f88e3ddfdcf5cfd3795fc78c4e79d82dedbeea99747ff470793f89fd
+  metadata.gz: 78c6d01a68e63df6c00c1edb0b1b16705fd158fd923cc6176bdbaf5e5e34724f0e0c0479743b8454073bd48a1cc9cd90531abbd5fe994626bae009fc3ac91357
+  data.tar.gz: a61c70169d0ab2a0e2c3588fa8f62bac74597b520cdc0b2e1386b5fc285e34a58825e0f0fe6fffd8d0dcb1905cebc9060549d27858ceb71029ea6718e1f1b366

data/lib/vagrant-powerdns/action.rb

@@ -5,18 +5,19 @@ module Vagrant
       def initialize(app, env)
         @app = app
         @machine = env[:machine]
-        @zone = env[:machine].config.powerdns.default_zone
-        @host = env[:machine].config.vm.hostname.nil? ?
-          env[:machine].name.to_s : env[:machine].config.vm.hostname.to_s
-        @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
-
-        # Identify who i am
-        @myuser = Etc.getlogin.gsub(/\s+/, '')
-        @myhost = Socket.gethostname
       end
 
       def call(env)
         if @machine.config.powerdns.enabled?
+          @zone = env[:machine].config.powerdns.default_zone
+          @host = env[:machine].config.vm.hostname.nil? ?
+            env[:machine].name.to_s : env[:machine].config.vm.hostname.to_s
+          @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
+
+          # Identify who i am
+          @myuser = Etc.getlogin.gsub(/\s+/, '')
+          @myhost = Socket.gethostname
+
           # assume default gateway address
           @machine.communicate.sudo "ip route get to 8.8.8.8 | head -n 1" do |type,data|
             stdout = data.chomp if type == :stdout
@@ -27,10 +28,14 @@ module Vagrant
 
               p = PdnsRestApiClient.new(env[:machine].config.powerdns.api_url,
                                         env[:machine].config.powerdns.api_key)
-
-              # Only update if IP changed or inactive
-              record_not_found = p.zone(zone)["records"].select {|v| v["type"] == "A" and v["name"] == @domain and v["content"] == ip}.empty?
-              record_disabled = p.zone(zone)["records"].select { |v| v["type"] == "A" and v["name"] == @domain and v["disable"]}.empty?
+              begin
+                # Only update if IP changed or inactive
+                record_not_found = p.zone(zone)["records"].select {|v| v["type"] == "A" and v["name"] == @domain and v["content"] == ip}.empty?
+                record_disabled = p.zone(zone)["records"].select { |v| v["type"] == "A" and v["name"] == @domain and v["disable"]}.empty?
+              rescue
+                env[:ui].info "PowerDNS: Error while calling PowernDNS API. Skip DNS action..."
+                return
+              end
 
               if record_not_found or record_disabled
                 env[:ui].info "PowerDNS action..."
@@ -79,26 +84,30 @@ module Vagrant
       def initialize(app, env)
         @app = app
         @machine = env[:machine]
-        @zone = env[:machine].config.powerdns.default_zone
-        @host = env[:machine].config.vm.hostname.nil? ?
-          env[:machine].name.to_s : env[:machine].config.vm.hostname.to_s
-        @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
-
-        # Identify who i am
-        @myuser = Etc.getlogin.gsub(/\s+/, '')
-        @myhost = Socket.gethostname
       end
 
       def call(env)
         if @machine.config.powerdns.enabled?
+          @zone = env[:machine].config.powerdns.default_zone
+          @host = env[:machine].config.vm.hostname.nil? ?
+            env[:machine].name.to_s : env[:machine].config.vm.hostname.to_s
+          @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
+
+          # Identify who i am
+          @myuser = Etc.getlogin.gsub(/\s+/, '')
+          @myhost = Socket.gethostname
           p = PdnsRestApiClient.new(env[:machine].config.powerdns.api_url,
                                     env[:machine].config.powerdns.api_key)
 
           zone = @zone.name
-          # Get A record
-          record = p.zone(zone)["records"].find {|v| v["name"] == @domain}
-          # Get comments for this domain
-          comments = p.zone(zone)["comments"].select {|v| v["name"] == @domain}
+          begin
+            record = p.zone(zone)["records"].find {|v| v["name"] == @domain}
+            # Get comments for this domain
+            comments = p.zone(zone)["comments"].select {|v| v["name"] == @domain}
+          rescue
+            env[:ui].info "PowerDNS: Error while calling PowernDNS API. Skip DNS action..."
+            return
+          end          # Get A record
 
           # only disable if active
           if !record.nil? and not record["disabled"]

data/lib/vagrant-powerdns/config.rb

@@ -15,9 +15,11 @@ module Vagrant
       end
 
       def finalize!
-
         if @default_zone == UNSET_VALUE
           @default_zone = nil
+        elsif @default_zone.nil?
+          # Completely disable if no default zone
+          @disable = true
         elsif !@default_zone.is_a?(Zone)
           @default_zone = Zone.new @default_zone;
         end
@@ -29,7 +31,7 @@ module Vagrant
       end
 
       def enabled?
-        @api_url.is_a?(String) or @api_key.is_a?(String) or @default_zone.is_a?(String)
+        @api_url.is_a?(String) and @api_key.is_a?(String) and @default_zone.is_a?(Zone)
       end
 
       def validate(machine)

data/lib/vagrant-powerdns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module PowerDNS
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-powerdns
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sayid Munawar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler