awsome 0.0.15 → 0.0.16

data/lib/awsome.rb

@@ -73,6 +73,7 @@ require 'awesome_print'
 require 'awsome/ec2.rb'
 require 'awsome/elb.rb'
 require 'awsome/ssh.rb'
+require 'awsome/r53.rb'
 require 'awsome/debian.rb'
 require 'awsome/requirements.rb'
 require 'awsome/executor.rb'

data/lib/awsome/ec2/instance.rb

@@ -33,28 +33,16 @@ module Awsome
         Awsome::Ssh.ssh(@properties['public_dns_name'], *args)
       end
 
+      def associate_cnames(*cnames)
+        cnames.each { |cname| associate_cname(cname) }
+      end
+
       def associate_ips(*elastic_ips)
         elastic_ips.each do |ip|
           Awsome::Ec2.associate_address(@properties['instance_id'], ip)
         end
       end
 
-      def install_hosts_entries(ip_address, *hostnames)
-        sed = []
-        cmd = []
-
-        # we will remove all hosts entries for the given "ip_address"
-        sed << "sed '/^#{ip_address}/d'"
-
-        # we will remove all hosts entries for each of the given "hostnames"
-        sed += hostnames.collect { |h| "sed '/ #{h} /d'" }
-
-        cmd << "cat /etc/hosts | #{sed.join(' | ')} | sudo tee /etc/hosts.temp"
-        cmd << "echo '#{ip_address} #{hostnames.join(' ')} # GENERATED' | sudo tee -a /etc/hosts.temp" unless hostnames.empty?
-        cmd << "sudo mv /etc/hosts.temp /etc/hosts"
-        ssh(cmd)
-      end
-
       def reattach_volumes(*volumes)
         volumes.each do |info| 
           Awsome::Ec2.detach_volume(info['id'], info['dir'], info['preumount'])
@@ -90,6 +78,10 @@ module Awsome
           @properties = instance.properties.clone
         end
 
+        def associate_cname(cname)
+          Awsome::R53.redefine_cname(cname[:zone], cname[:name], @properties['private_dns_name'])
+        end
+
         def has_ssh?
           Awsome::Ssh.has_ssh?(@properties['public_dns_name'])
         end

data/lib/awsome/executor.rb

@@ -57,11 +57,7 @@ module Awsome
           instance.deregister_from_elbs
           instance.remove_packages(*requirement.packages_to_remove(instance))
           instance.install_packages(*requirement.packages_to_install(instance))
-
-          instances_to_use do |other_instance, other_requirement|
-            other_instance.install_hosts_entries(instance.properties['private_dns_name'], *requirement.hostnames)
-          end
-
+          instance.associate_cnames(*requirement.cnames)
           instance.associate_ips(*requirement.elastic_ips)
           instance.register_with_elbs(*requirement.elbs)
         end

data/lib/awsome/instance_requirement.rb

@@ -16,8 +16,8 @@ module Awsome
       @properties['elastic_ips'] || []
     end
 
-    def hostnames
-      @properties['hostnames'] || []
+    def cnames
+      @properties['cnames'] || []
     end
 
     def volumes_to_attach(instance)

data/lib/awsome/r53.rb

@@ -0,0 +1,25 @@
+require 'route53'
+
+module Awsome
+  module R53
+    def self.connection
+      @@connection ||= Route53::Connection.new(Awsome.config.aws_access_key, Awsome.config.aws_secret_key)
+    end
+    def self.zones
+      self.connection.get_zones
+    end
+    def self.find_zone(zone_name)
+      self.zones.find { |z| z.name == zone_name }
+    end
+    def self.find_cname(zone_name, name)
+      find_zone(zone_name).get_records('CNAME').find { |r| r.name == name }
+    end
+    def self.redefine_cname(zone_name, name, value)
+      if record = find_cname(zone_name, name)
+        record.update(nil, nil, nil, [value], nil)
+      else
+        Route53::DNSRecord.new(name, 'CNAME', 300, [value], find_zone(zone_name)).create
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: route53
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AWS library targeted specifically for continuous integration.
 email: sebastian@foodocs.com
 executables:
@@ -44,6 +60,7 @@ files:
 - lib/awsome/requirements_options.rb
 - lib/awsome/elb.rb
 - lib/awsome/debian.rb
+- lib/awsome/r53.rb
 - lib/awsome/ec2/instance.rb
 - lib/awsome/instance_requirement.rb
 - bin/awsome