zerigo-designate 0.0.8.pre.2 → 0.0.8.pre.4

data/designate.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
   s.add_dependency("rest-client", "= 1.6.7")
+  s.add_dependency("capify-ec2", ">=1.2.4")
   s.add_dependency("crack", "= 0.3.1")
   s.add_development_dependency('shoulda')
 end

data/lib/designate/capistrano.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), '../designate')
 require 'rubygems'
 require 'capistrano'
+require 'capify-ec2'
 
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :zerigo do
@@ -11,7 +12,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       roles.each do |role| 
         dns_names << role[1].instance_variable_get("@static_servers").first.instance_variable_get("@host")
       end
-
       zone = Designate::Client.new().find_or_create_zone()
       zone.create_host('CNAME', dns_names.first, {:hostname => hostname})
       
@@ -20,11 +20,30 @@ Capistrano::Configuration.instance(:must_exist).load do
       else
         subzone = Designate::Client.new().find_or_create_zone("#{zerigo_config[:subdomain]}.#{zerigo_config[:domain]}")
         subzone.create_host('CNAME', "#{hostname}.#{zerigo_config[:domain]}", {:hostname => "#{hostname}"})
+        cleanup_hosts(subzone, zone)
       end
     end
     
     def zerigo_config()
       YAML.load(File.new("config/zerigo.yml"))
     end
+    
+    def cleanup_hosts(subzone, zone)
+      return if !zerigo_config[:host_prefix]
+      expired_hosts = get_expired_hosts(subzone)
+      delete_hosts(expired_hosts, subzone)
+      delete_hosts(expired_hosts, zone)
+    end
+    
+    def get_expired_hosts(subzone)
+      hostnames = CapifyEc2.new().desired_instances.select {|instance| instance.name.match(zerigo_config[:host_prefix])}.map {|instance| instance.name}
+      subzone.hosts.delete_if {|host| hostnames.find {|hostname| hostname == host.hostname} || 
+        !host.hostname.match(zerigo_config[:host_prefix])}.map {|host| host.hostname}
+    end
+    
+    def delete_hosts(expired_hosts, zone)
+      zone.hosts.delete_if {|host| !expired_hosts.find {|hostname| hostname == host.hostname}}
+      zone.hosts.each {|host| p "Deleting host: #{host.fqdn}"; host.destroy}
+    end
   end
 end

data/lib/designate/version.rb

@@ -1,3 +1,3 @@
 module Designate
-  VERSION = "0.0.8.pre.2"
+  VERSION = "0.0.8.pre.4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: zerigo-designate
 version: !ruby/object:Gem::Version 
-  hash: 1923832045
+  hash: 1923832033
   prerelease: 6
   segments: 
   - 0
   - 0
   - 8
   - pre
-  - 2
-  version: 0.0.8.pre.2
+  - 4
+  version: 0.0.8.pre.4
 platform: ruby
 authors: 
 - James Miller
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-13 00:00:00 +00:00
+date: 2012-03-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,9 +38,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: crack
+  name: capify-ec2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: crack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -52,11 +68,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,7 +82,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Designate is a simple Ruby gem wrapper for the Zerigo DNS API v1.1 specification.
 email: 
 - bensie@gmail.com