vagrant-powerdns 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b98ac2809c2093b13f504075eec9735f4481722
-  data.tar.gz: 3cda97d2e2071e4dc42c72f7a03c4cc431ec1d18
+  metadata.gz: acb0cb8a88a2a042926f73b8413195f26f54296b
+  data.tar.gz: a9884828fe4222180e4e60bc4d85ab499a2ef8b6
 SHA512:
-  metadata.gz: 6fe362fb842a4b5502f5c53e049d968048f216e48f5d3dd85190c94bbe4799d57fef412b5b977ca25b4d85655bae4edb1246d6ab1d30c70cf12219637ba2b3d2
-  data.tar.gz: 71767572bba48605415ffd2febc5b56a09e5bf7fab432e8d186013337ca606d08295ffdc58b2f7ce583fcce0a177b48bc0bcf76c09d4dea5bdf00c9f1d310d9a
+  metadata.gz: e85525301d3762ae8eeb431a70d567e7e49363c14a942820db88cbad19339c7212609cc24c0e158ec3113e3377bfbce2fbf5fe5dea33321ddc4ce3b9c6b183f7
+  data.tar.gz: 7fe9fc614097755d8af7b5e9243bcf0531ce7f5b820e658b2ea89da832f0082e9022af301bd823f2f1fff2ec2b25efa64da4a3e34a05ad38be107d83f695966d

data/lib/vagrant-powerdns/action.rb

@@ -28,10 +28,11 @@ module Vagrant
               p = PdnsRestApiClient.new(env[:machine].config.powerdns.api_url,
                                         env[:machine].config.powerdns.api_key)
 
-              # Only update if IP changed
-              if p.zone(@zone)["records"].select { |v| v["type"] == "A" and
-                v["name"] == @domain and v["content"] == ip}.empty?
+              # 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?
 
+              if record_not_found or record_disabled
                 env[:ui].info "PowerDNS action..."
                 # Append new comment
                 new_comment = {

data/lib/vagrant-powerdns/config.rb

@@ -22,57 +22,39 @@ module Vagrant
           @default_zone = Zone.new @default_zone;
         end
 
+        @api_url = nil if @api_url == UNSET_VALUE
+        @api_key = nil if @api_key == UNSET_VALUE
         @disable = false if @disable == UNSET_VALUE
 
-        # default way to obtain ip address
-        if @ip == UNSET_VALUE
-          @ip = proc do |guest_machine|
-            ips = nil
-            puts "SUDO SUUUUUU............"
-            guest_machine.communicate.sudo("hostname -I") do |type, data|
-              ips = data.scan /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/
-            end
-            ips
-          end
-        end
-
       end
 
       def enabled?
-        not @disable and not @api_url.nil? and not @api_key.nil?
+        @api_url.is_a?(String) or @api_key.is_a?(String) or @default_zone.is_a?(String)
       end
 
       def validate(machine)
-        return unless enabled?
+        if enabled?
+          #return if not @api_url.nil? and not @api_key.nil? and not @default_zone.nil?
 
-        errors = []
+          errors = []
 
-        # verify @disable
-        if @disable != true and @disable != false then errors << 'invalid disable setting' end
+          # verify @disable
+          if @disable != true and @disable != false then errors << 'invalid disable setting' end
 
-        # verify zone
-        begin @default_zone = Zone.new @default_zone; rescue => e; errors << e.message end
+          # verify zone
+          begin @default_zone = Zone.new @default_zone; rescue => e; errors << e.message end
 
-        # verify ip
-        if @ip.is_a? Array
-          @ip.map!{|ip| begin Ip.new(ip); rescue => e; errors << e.message end}
+          # verify api_url
+          begin @api_url = String.new @api_url; rescue => e; errors << "powerdns.api_url: Invalid URL. It should be like `http://ns.example.com:8081'" end
 
-        elsif @ip.is_a? String
-          begin @ip = Ip.new(@ip); rescue => e; errors << e.message end
-          @ip = [@ip]
+          # verify api_key
+          begin @api_key = String.new @api_key; rescue => e; errors << "powerdns.api_key: Invalid API Key. It should be like `api_key_of_powerdns'"  end
 
-        elsif @ip.is_a? Proc
-          # okay, there is nothing to verify at the moment
-        else
-          @ip = nil
-        end
+          # verify zone
+          #begin @default_zone = Zone.new @default_zone; rescue => e; errors << "config.powerdns.default_zone: Invalid Zone #{@default_zone}. It should be like: `dev.example.com'" end
 
-        # verify API URL/key
-        #if @resolver
-        # errors << "file '#{@dnsmasqconf}' does not exist" unless File.exists? @dnsmasqconf
-        #end
-
-        return { 'PowerDNS configuration' => errors }
+          return { 'PowerDNS configuration' => errors }
+        end
       end
 
     end

data/lib/vagrant-powerdns/includes/Zone.class.rb

@@ -12,7 +12,8 @@ class Zone
       name = name.dotted
     end
 
-    raise ArgumentError, "no domain name given" if name.empty?
+    raise ArgumentError, "Invalid Zone: #{name.to_s}" if !name.is_a?(String)
+    raise ArgumentError, "no zone name given" if name.empty?
 
     # parse domain name ...
     name = name.to_s

data/lib/vagrant-powerdns/version.rb

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

data/lib/vagrant-powerdns.rb

@@ -12,20 +12,20 @@ module Vagrant
       description "A PowerDNS Vagrant plugin that manages the zone record via vagrant up/destroy"
 
       inc_path = Pathname.new(File.expand_path("../vagrant-powerdns/includes", __FILE__))
-      require inc_path.join("Zone.class.rb")
-      require inc_path.join("Ip.class.rb")
-
+      lib_path = Pathname.new(File.expand_path("../vagrant-powerdns", __FILE__))
       util_path = Pathname.new(File.expand_path("../vagrant-powerdns/util", __FILE__))
-      require util_path.join("pdns_api")
 
-      lib_path = Pathname.new(File.expand_path("../vagrant-powerdns", __FILE__))
-      require lib_path.join("action")
+      require inc_path.join("Zone.class.rb")
+      require inc_path.join("Ip.class.rb")
 
       config "powerdns" do
         require lib_path.join("config")
         Config
       end
 
+      require util_path.join("pdns_api")
+      require lib_path.join("action")
+
       action_hook(:powerdns, :machine_action_up) do |hook|
         hook.append(Vagrant::Action::Up)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-powerdns
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sayid Munawar