vagrant-powerdns 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb0cb8a88a2a042926f73b8413195f26f54296b
-  data.tar.gz: a9884828fe4222180e4e60bc4d85ab499a2ef8b6
+  metadata.gz: 72d6438d5052854280b1685c92c883236e22a28c
+  data.tar.gz: 135fdbd6e654a8e405f23ab8afc21e1092589676
 SHA512:
-  metadata.gz: e85525301d3762ae8eeb431a70d567e7e49363c14a942820db88cbad19339c7212609cc24c0e158ec3113e3377bfbce2fbf5fe5dea33321ddc4ce3b9c6b183f7
-  data.tar.gz: 7fe9fc614097755d8af7b5e9243bcf0531ce7f5b820e658b2ea89da832f0082e9022af301bd823f2f1fff2ec2b25efa64da4a3e34a05ad38be107d83f695966d
+  metadata.gz: 9f6f74dec4825318bbee4c43d67ee7aca986ce0492e65066644544cdbaa28fc0ed355e4b53f4e70e533ce9d678636b70341447d06e7614dd5a4128878bed4bb0
+  data.tar.gz: 3abc1137238395a9f5a81ec2a727ec89be1b88e64d2dbda5948716e36d4700aa98ad2592a6eb9df0b5930ad4d2e06072ec7a35766c608253e3498fc599709a62

data/lib/vagrant-powerdns/action.rb

@@ -5,13 +5,12 @@ 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 + env[:machine].config.powerdns.default_zone.to_s
-        @zone = env[:machine].config.powerdns.default_zone.name
+        @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
 
         # Identify who i am
-        @myname = Etc.getpwuid[:gecos]
         @myuser = Etc.getlogin.gsub(/\s+/, '')
         @myhost = Socket.gethostname
       end
@@ -24,27 +23,28 @@ module Vagrant
             if !stdout.empty?
               re = /src ([0-9\.]+)/
               ip = stdout.match(re)[1]
+              zone = @zone.name
 
               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?
+              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?
 
               if record_not_found or record_disabled
                 env[:ui].info "PowerDNS action..."
                 # Append new comment
                 new_comment = {
-                  content: "#{@myname} (#{@myuser}) added this record from #{@myhost}",
-                  account: @myname,
+                  content: "#{@myuser} added this record from #{@myhost}",
+                  account: @myuser,
                   name: @domain,
                   type: "A"
                 }
-                comments = p.zone(@zone)["comments"].delete_if { |v| v["name"] != @domain  }
+                comments = p.zone(zone)["comments"].delete_if { |v| v["name"] != @domain  }
                 comments << new_comment
 
-                ret = p.modify_domain(domain: @domain, ip: ip, zone_id: @zone,
+                ret = p.modify_domain(domain: @domain, ip: ip, zone_id: zone,
                                       comments: comments)
 
                 # Check return
@@ -61,9 +61,9 @@ module Vagrant
 
                 # Display ui
                 if error.nil?
-                    env[:ui].detail "=> record #{@domain}(#{ip}) in zone #{@zone} added !"
+                    env[:ui].detail "=> record #{@domain}(#{ip}) in zone #{zone} added !"
                 else
-                  env[:ui].detail "=> failed to add record #{@domain}(#{ip}) in zone #{@zone}. Error was: #{error}"
+                  env[:ui].detail "=> failed to add record #{@domain}(#{ip}) in zone #{zone}. Error was: #{error}"
                 end
               end
             end
@@ -79,13 +79,12 @@ 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 + env[:machine].config.powerdns.default_zone.to_s
-        @zone = env[:machine].config.powerdns.default_zone.name
+        @domain = @host.include?(@zone.name)? @host : @host + @zone.dotted
 
         # Identify who i am
-        @myname = Etc.getpwuid[:gecos]
         @myuser = Etc.getlogin.gsub(/\s+/, '')
         @myhost = Socket.gethostname
       end
@@ -95,17 +94,18 @@ module Vagrant
           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)
+          record = p.zone(zone)["records"].find {|v| v["name"] == @domain}
 
           # only disable if active
-          if not record["records"].find {|v| v["name"] == @domain}["disabled"]
+          if !record.nil? and not record["disabled"]
             env[:ui].info "PowerDNS action..."
 
             # Prepare comment to be appended
             new_comment = {
-              content: "#{@myname} (#{@myuser}) disabled this record from #{@myhost}",
-              account: @myname,
+              content: "#{@myuser} disabled this record from #{@myhost}",
+              account: @myuser,
               name: @domain,
               type: "A"
             }
@@ -115,7 +115,7 @@ module Vagrant
             # Get the old IP
             ip = record["records"].find {|v| v["name"] == @domain}["content"]
 
-            ret = p.disable_domain(domain: @domain, ip: ip, zone_id: @zone,
+            ret = p.disable_domain(domain: @domain, ip: ip, zone_id: zone,
                                    comments: comments)
 
             # Check return
@@ -132,9 +132,9 @@ module Vagrant
 
             # Display ui
             if error.nil?
-                env[:ui].detail "=> record #{@domain}(#{ip}) in zone #{@zone} disabled !"
+                env[:ui].detail "=> record #{@domain}(#{ip}) in zone #{zone} disabled !"
             else
-              env[:ui].detail "=> failed to disab;e record #{@domain} in zone #{@zone}. Error was: #{error}"
+              env[:ui].detail "=> failed to disab;e record #{@domain} in zone #{zone}. Error was: #{error}"
             end
           end
 

data/lib/vagrant-powerdns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module PowerDNS
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-powerdns
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sayid Munawar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,8 +83,6 @@ files:
 - bin/setup
 - lib/vagrant-powerdns.rb
 - lib/vagrant-powerdns/action.rb
-- lib/vagrant-powerdns/action/add_record.rb
-- lib/vagrant-powerdns/action/del_record.rb
 - lib/vagrant-powerdns/config.rb
 - lib/vagrant-powerdns/errors.rb
 - lib/vagrant-powerdns/includes/Ip.class.rb