awsborn 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-08-25}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [

data/lib/awsborn/load_balancer.rb

@@ -28,24 +28,39 @@ module Awsborn
       @elb ||= Elb.new(@region)
     end
 
-    def aws_dns_name
-      elb.dns_name(@name)
+    def route53
+      @route53 ||= Route53.new
     end
 
-    def instances
-      elb.instances(@name)
+    def ec2
+      @ec2 ||= Ec2.new(@region)
+    end
+
+    def aws_dns_name
+      elb.dns_name(@name)
     end
 
     def canonical_hosted_zone_name_id
       elb.canonical_hosted_zone_name_id(@name)
     end
 
+    def instances
+      elb.instances(@name)
+    end
+
     def instances= (new_instances)
       previous_instances = self.instances
       register_instances(new_instances - previous_instances)
       deregister_instances(previous_instances - new_instances)
     end
 
+    def instances_dns_names
+      instances.map do |instance_id|
+        ec2.instance_id = instance_id
+        (ec2.describe_instance || {})[:dns_name]
+      end.compact
+    end
+
     def zones
       elb.zones(@name)
     end
@@ -120,10 +135,6 @@ module Awsborn
       end
     end
 
-    def route53
-      @route53 ||= Route53.new
-    end
-
     def dns_info
       if dns_alias
         route53.zone_for(dns_alias)

data/spec/load_balancer_spec.rb

@@ -16,6 +16,9 @@ describe Awsborn::LoadBalancer do
                        :configure_health_check => true)
     Awsborn::Elb.stub!(:new).and_return(@mocked_elb)
 
+    @mocked_ec2 = mock(:ec2)
+    Awsborn::Ec2.stub!(:new).and_return(@mocked_ec2)
+
     @mocked_route53 = mock(:route53,
       :zone_exists? => true,
       :add_alias_record => true,
@@ -141,6 +144,57 @@ describe Awsborn::LoadBalancer do
     end
   end
 
+  describe "instances_dns_names" do
+    before do
+      @balancer = Awsborn::LoadBalancer.new(
+        'some-name',
+        :region => :eu_west_1
+      )
+      @desc_fixture = {
+        :private_ip_address    => "10.240.7.99",
+        :aws_image_id          => "ami-c2a3f5d4",
+        :ip_address            => "174.129.134.109",
+        :dns_name              => "ec2-174-129-134-109.compute-1.amazonaws.com",
+        :aws_instance_type     => "m1.small",
+        :aws_owner             => "826693181925",
+        :root_device_name      => "/dev/sda1",
+        :instance_class        => "elastic",
+        :aws_state             => "running",
+        :private_dns_name      => "domU-12-31-39-04-00-95.compute-1.internal",
+        :aws_reason            => "",
+        :aws_launch_time       => "2009-11-18T14:03:25.000Z",
+        :aws_reservation_id    => "r-54d38542",
+        :aws_state_code        => 16,
+        :ami_launch_index      => "0",
+        :aws_availability_zone => "us-east-1a",
+        :aws_groups            => ["default"],
+        :monitoring_state      => "disabled",
+        :aws_product_codes     => [],
+        :ssh_key_name          => "",
+        :block_device_mappings => [],
+        :aws_instance_id       => "i-8ce84ae4"
+      }
+    end
+    it "returns a list of the dns names of the instances of the load balancer" do
+      desc1 = @desc_fixture.merge(:aws_instance_id => 'i-00000001', :dns_name => 'server1.example.com')
+      desc2 = @desc_fixture.merge(:aws_instance_id => 'i-00000002', :dns_name => 'server2.example.com')
+      @mocked_elb.should_receive(:instances).with('some-name').and_return(['i-00000001', 'i-00000002'])
+      @mocked_ec2.should_receive(:instance_id=).with('i-00000001')
+      @mocked_ec2.should_receive(:describe_instance).and_return(desc1)
+      @mocked_ec2.should_receive(:instance_id=).with('i-00000002')
+      @mocked_ec2.should_receive(:describe_instance).and_return(desc2)
+      @balancer.instances_dns_names.should == ['server1.example.com', 'server2.example.com']
+    end
+    it "returns empty list if no description is available" do
+      @mocked_elb.should_receive(:instances).with('some-name').and_return(['i-00000001', 'i-00000002'])
+      @mocked_ec2.should_receive(:instance_id=).with('i-00000001')
+      @mocked_ec2.should_receive(:describe_instance).and_return(nil)
+      @mocked_ec2.should_receive(:instance_id=).with('i-00000002')
+      @mocked_ec2.should_receive(:describe_instance).and_return(nil)
+      @balancer.instances_dns_names.should be_empty
+    end
+  end
+
   describe "zones" do
     it "delegates to elb" do
       @mocked_elb.should_receive(:zones).with('some-name').and_return('zones')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +02:00
+date: 2011-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency