aws 2.1.10 → 2.1.11

data/README.markdown

@@ -18,6 +18,10 @@ http://groups.google.com/group/ruby-aws
 
 http://appoxy.lighthouseapp.com/projects/38441-aws/overview
 
+## Documentation
+
+http://rdoc.info/projects/appoxy/aws
+
 ## Appoxy Amazon Web Services Ruby Gems
 
 Published by Appoxy LLC, under the MIT License. Special thanks to RightScale from which this project is forked.

data/lib/elb/elb_interface.rb

@@ -306,8 +306,11 @@ module Aws
             end
 
             def tagstart(name, attributes)
-                puts 'tagstart ' + name + ' -- ' + @xmlpath
-                if (name == 'member' && @xmlpath == 'RegisterInstancesWithLoadBalancerResponse/RegisterInstancesWithLoadBalancerResult/Instances/member')
+#                puts 'tagstart ' + name + ' -- ' + @xmlpath
+                if (name == 'member' &&
+                        (@xmlpath == 'RegisterInstancesWithLoadBalancerResponse/RegisterInstancesWithLoadBalancerResult/Instances' ||
+                        @xmlpath == 'DeregisterInstancesFromLoadBalancerResponse/DeregisterInstancesFromLoadBalancerResult/Instances')
+                )
                     @member = { }
                 end
 
@@ -331,7 +334,7 @@ module Aws
             end
 
             def tagstart(name, attributes)
-                puts 'tagstart ' + name + ' -- ' + @xmlpath
+#                puts 'tagstart ' + name + ' -- ' + @xmlpath
                 if (name == 'member' && @xmlpath == 'DescribeInstanceHealthResponse/DescribeInstanceHealthResult/InstanceStates')
                     @member = { }
                 end

data/test/elb/test_elb.rb

@@ -2,50 +2,67 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require 'pp'
 require File.dirname(__FILE__) + '/../test_credentials.rb'
 
-class TestEc2 < Test::Unit::TestCase
+class TestElb < Test::Unit::TestCase
 
     # Some of RightEc2 instance methods concerning instance launching and image registration
     # are not tested here due to their potentially risk.
 
-  def setup
-    TestCredentials.get_credentials
-    @ec2   = Aws::Elb.new(TestCredentials.aws_access_key_id,
-                                 TestCredentials.aws_secret_access_key)
-    @key   = 'right_ec2_awesome_test_key'
-    @group = 'right_ec2_awesome_test_security_group'
-  end
-
-  def test_01_create_elb
-    
-  end
-
-  def test_02_register_instances
-    assert @ec2.create_security_group(@group,'My awesone test group'), 'Create_security_group fail'
-    group = @ec2.describe_security_groups([@group])[0]
-    assert_equal @group, group[:aws_group_name], 'Group must be created but does not exist'
-  end
-
-  def test_03_deregister_instances
-    assert @ec2.authorize_security_group_named_ingress(@group, TestCredentials.account_number, 'default')
-    assert @ec2.authorize_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
-  end
-
-  def test_04_describe_instance_health
-    assert_equal 2, @ec2.describe_security_groups([@group])[0][:aws_perms].size
-  end
-
-  def test_05_describe_elb
-    assert @ec2.revoke_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
-    assert @ec2.revoke_security_group_named_ingress(@group,
-                                                    TestCredentials.account_number, 'default')
-  end
-
-  def test_06_delete_elb
-    images = @ec2.describe_images
-    assert images.size>0, 'Amazon must have at least some public images'
-      # unknown image
-    assert_raise(Aws::AwsError){ @ec2.describe_images(['ami-ABCDEFGH'])}
-  end
+    def setup
+        TestCredentials.get_credentials
+
+        @ec2 = Aws::Ec2.new(TestCredentials.aws_access_key_id,
+                            TestCredentials.aws_secret_access_key)
+
+        @elb = Aws::Elb.new(TestCredentials.aws_access_key_id,
+                            TestCredentials.aws_secret_access_key)
+        @key = 'right_ec2_awesome_test_key'
+        @group = 'right_ec2_awesome_test_security_group'
+    end
+
+    def test_01_create_elb
+
+        # Create elb
+
+        # Launch instance and add to elb
+        new_key = @ec2.create_key_pair(@key)
+        assert @ec2.create_security_group(@group, 'My awesone test group'), 'Create_security_group fail'
+        # LAUNCH HERE
+
+        # SHUTDOWN HERE
+
+        # Remove artifacts
+        assert @ec2.delete_security_group(@group), 'Delete_security_group fail'
+        assert @ec2.delete_key_pair(@key), 'Delete_key_pair fail'
+
+    end
+
+    def test_02_register_instances
+        assert @ec2.create_security_group(@group, 'My awesone test group'), 'Create_security_group fail'
+        group = @ec2.describe_security_groups([@group])[0]
+        assert_equal @group, group[:aws_group_name], 'Group must be created but does not exist'
+    end
+
+    def test_03_deregister_instances
+        assert @ec2.authorize_security_group_named_ingress(@group, TestCredentials.account_number, 'default')
+        assert @ec2.authorize_security_group_IP_ingress(@group, 80, 80, 'udp', '192.168.1.0/8')
+    end
+
+    def test_04_describe_instance_health
+        assert_equal 2, @ec2.describe_security_groups([@group])[0][:aws_perms].size
+    end
+
+    def test_05_describe_elb
+        assert @ec2.revoke_security_group_IP_ingress(@group, 80, 80, 'udp', '192.168.1.0/8')
+        assert @ec2.revoke_security_group_named_ingress(@group,
+                                                        TestCredentials.account_number, 'default')
+    end
+
+    def test_06_delete_elb
+        images = @ec2.describe_images
+        assert images.size>0, 'Amazon must have at least some public images'
+        # unknown image
+        assert_raise(Aws::AwsError){ @ec2.describe_images(['ami-ABCDEFGH'])}
+    end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -08:00
+date: 2009-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency