amazon-ec2 0.4.8 → 0.5.0

data/test/test_EC2_security_groups.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 security groups " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @create_security_group_response_body = <<-RESPONSE
     <CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -92,16 +92,16 @@ context "EC2 security groups " do
     @ec2.stubs(:make_request).with('CreateSecurityGroup', {"GroupName"=>"WebServers", "GroupDescription"=>"Web"}).
       returns stub(:body => @create_security_group_response_body, :is_a? => true)
 
-    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => "Web" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.create_security_group() }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => "Web" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.create_security_group() }.should.raise(AWS::ArgumentError)
 
     # :group_name can't be nil or empty
-    lambda { @ec2.create_security_group( :group_name => "", :group_description => "Web" ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.create_security_group( :group_name => nil, :group_description => "Web" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.create_security_group( :group_name => "", :group_description => "Web" ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.create_security_group( :group_name => nil, :group_description => "Web" ) }.should.raise(AWS::ArgumentError)
 
     # :group_description can't be nil or empty
-    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => "" ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => nil ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => "" ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.create_security_group( :group_name => "WebServers", :group_description => nil ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -116,12 +116,12 @@ context "EC2 security groups " do
     @ec2.stubs(:make_request).with('DeleteSecurityGroup', {"GroupName"=>"WebServers"}).
       returns stub(:body => @delete_security_group_response_body, :is_a? => true)
 
-    lambda { @ec2.delete_security_group( :group_name => "WebServers" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.delete_security_group() }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.delete_security_group( :group_name => "WebServers" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.delete_security_group() }.should.raise(AWS::ArgumentError)
 
     # :group_name can't be nil or empty
-    lambda { @ec2.delete_security_group( :group_name => "" ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.delete_security_group( :group_name => nil ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.delete_security_group( :group_name => "" ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.delete_security_group( :group_name => nil ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -156,7 +156,7 @@ context "EC2 security groups " do
     @ec2.stubs(:make_request).with('DescribeSecurityGroups', {"GroupName.1"=>"WebServers"}).
       returns stub(:body => @describe_security_groups_response_body, :is_a? => true)
 
-      lambda { @ec2.describe_security_groups( :group_name => "WebServers" ) }.should.not.raise(EC2::ArgumentError)
+      lambda { @ec2.describe_security_groups( :group_name => "WebServers" ) }.should.not.raise(AWS::ArgumentError)
 
   end
 

data/test/test_EC2_snapshots.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 snaphots " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @describe_snapshots_response_body = <<-RESPONSE
     <DescribeSnapshotsResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">

data/test/test_EC2_volumes.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 volumes " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @describe_volumes_response_body = <<-RESPONSE
     <DescribeVolumesResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">

data/test/test_ELB_load_balancers.rb

@@ -0,0 +1,239 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "elb load balancers " do
+  before do
+    @elb = AWS::ELB::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @valid_create_load_balancer_params = {
+      :load_balancer_name => 'Test Name',
+      :availability_zones => ['east-1a'],
+      :listeners => [{:protocol => 'HTTP', :load_balancer_port => '80', :instance_port => '80'}]
+    }
+
+    @create_load_balancer_response_body = <<-RESPONSE
+    <CreateLoadBalancerResult>
+      <DNSName>TestLoadBalancer-380544827.us-east-1.ec2.amazonaws.com</DNSName>
+    </CreateLoadBalancerResult>
+    RESPONSE
+
+    @valid_delete_load_balancer_params = {
+      :load_balancer_name => 'Test Name'
+    }
+
+    @delete_load_balancer_response_body = <<-RESPONSE
+    <DeleteLoadBalancerResult>
+      <return>true</return>
+    </DeleteLoadBalancerResult>
+    RESPONSE
+
+    @valid_describe_load_balancer_params = {
+    }
+
+    @describe_load_balancer_response_body = <<-RESPONSE
+    <DescribeLoadBalancersResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2009-05-15/">
+      <DescribeLoadBalancersResult>
+        <LoadBalancerDescriptions>
+          <member>
+            <Listeners>
+              <member>
+                <Protocol>HTTP</Protocol>
+                <LoadBalancerPort>80</LoadBalancerPort>
+                <InstancePort>80</InstancePort>
+              </member>
+            </Listeners>
+            <CreatedTime>2009-07-02T01:07:55.080Z</CreatedTime>
+            <LoadBalancerName>TestLB</LoadBalancerName>
+            <DNSName>TestLB-1459724896.us-east-1.elb.amazonaws.com</DNSName>
+            <HealthCheck>
+              <Interval>30</Interval>
+              <Target>TCP:80</Target>
+              <HealthyThreshold>10</HealthyThreshold>
+              <Timeout>5</Timeout>
+              <UnhealthyThreshold>2</UnhealthyThreshold>
+            </HealthCheck>
+            <Instances/>
+            <AvailabilityZones>
+              <member>us-east-1a</member>
+            </AvailabilityZones>
+          </member>
+        </LoadBalancerDescriptions>
+      </DescribeLoadBalancersResult>
+      <ResponseMetadata>
+        <RequestId>67dd800e-66a5-11de-b844-07deabfcc881</RequestId>
+      </ResponseMetadata>
+    </DescribeLoadBalancersResponse>
+    RESPONSE
+
+    @valid_register_instances_with_load_balancer_params = {
+      :load_balancer_name => 'Test Name',
+      :instances => ['i-6055fa09']
+    }
+
+    @register_instances_with_load_balancer_response_body = <<-RESPONSE
+    <RegisterInstancesWithLoadBalancerResult>
+    	    <Instances>
+    		      <member>
+    			        <InstanceId>i-6055fa09</InstanceId>
+    		      </member>
+    	    </Instances>
+    </RegisterInstancesWithLoadBalancerResult>
+    RESPONSE
+
+    @valid_deregister_instances_from_load_balancer_params = @valid_register_instances_with_load_balancer_params
+    @deregister_instances_from_load_balancer_response_body = <<-RESPONSE
+    <DeregisterInstancesFromLoadBalancerResult>
+    	<Instances/>
+    </DeregisterInstancesFromLoadBalancerResult>
+    RESPONSE
+
+    @valid_configure_health_check_params = {
+      :load_balancer_name => 'Test Name',
+      :health_check => {
+        :target   => 'HTTP:80/servlets-examples/servlet/',
+        :timeout  => '2',
+        :interval => '5',
+        :unhealthy_threshold => '2',
+        :healthy_threshold   =>  '2'
+      }
+    }
+    @configure_health_check_response_body = <<-RESPONSE
+    <ConfigureHealthCheckResult>
+    	<HealthCheck>
+    		<Interval>5</Interval>
+    		<Target>HTTP:80/servlets-examples/servlet/</Target>
+    		<HealthyThreshold>2</HealthyThreshold>
+    		<Timeout>2</Timeout>
+    		<UnhealthyThreshold>2</UnhealthyThreshold>
+    	</HealthCheck>
+    </ConfigureHealthCheckResult>
+    RESPONSE
+  end
+
+  specify "should be able to be created" do
+    @elb.stubs(:make_request).with('CreateLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'AvailabilityZones.member.1' => 'east-1a',
+      'Listeners.member.1.Protocol' => 'HTTP',
+      'Listeners.member.1.LoadBalancerPort' => '80',
+      'Listeners.member.1.InstancePort' => '80'
+    }).returns stub(:body => @create_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.create_load_balancer(@valid_create_load_balancer_params)
+    response.should.be.an.instance_of Hash
+    response.DNSName.should.equal "TestLoadBalancer-380544827.us-east-1.ec2.amazonaws.com"
+  end
+
+  specify "method create_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('CreateLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'AvailabilityZones.member.1' => 'east-1a',
+      'Listeners.member.1.Protocol' => 'HTTP',
+      'Listeners.member.1.LoadBalancerPort' => '80',
+      'Listeners.member.1.InstancePort' => '80'
+    }).returns stub(:body => @create_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:load_balancer_name=>'')) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:availability_zones=>'')) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:availability_zones=>[])) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:listeners=>[])) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:listeners=>nil)) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to be deleted with delete_load_balancer" do
+    @elb.stubs(:make_request).with('DeleteLoadBalancer', {'LoadBalancerName' => 'Test Name'}).
+      returns stub(:body => @delete_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.delete_load_balancer( :load_balancer_name => "Test Name" )
+    response.should.be.an.instance_of Hash
+    response.return.should.equal "true"
+  end
+
+  specify "should be able to be described with describe_load_balancer" do
+    @elb.stubs(:make_request).with('DescribeLoadBalancers', {}).
+      returns stub(:body => @describe_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.describe_load_balancers()
+    response.should.be.an.instance_of Hash
+
+    response.DescribeLoadBalancersResult.LoadBalancerDescriptions.member.length.should == 1
+  end
+
+  specify "should be able to be register instances to load balancers with register_instances_with_load_balancer" do
+    @elb.stubs(:make_request).with('RegisterInstancesWithLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+    }).returns stub(:body => @register_instances_with_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params)
+    response.should.be.an.instance_of Hash
+
+    response.Instances.member.length.should == 1
+  end
+
+  specify "method register_instances_with_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('RegisterInstancesWithLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+    }).returns stub(:body => @register_instances_with_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:instances=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+    @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+     }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
+
+     response = @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params)
+     response.should.be.an.instance_of Hash
+  end
+
+  specify "method deregister_instances_from_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+    }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:instances=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+    @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    response = @elb.configure_health_check(@valid_configure_health_check_params)
+    response.should.be.an.instance_of Hash
+  end
+
+  specify "method degregister_instances_from_load_balancer should reject bad arguments" do
+   @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check=>nil)) }.should.raise(AWS::ArgumentError)
+  end
+
+end
+

data/test/test_helper.rb

@@ -16,4 +16,4 @@
   end
 }
 
-require File.dirname(__FILE__) + '/../lib/EC2'
+require File.dirname(__FILE__) + '/../lib/AWS'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.6
     version: 
-description: An interface library that allows Ruby applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate cloud servers.
+description: A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2) and Elastic Load Balancer (ELB) API's.
 email: glenn@rempe.us
 executables: 
 - ec2-gem-example.rb
@@ -75,11 +75,13 @@ extra_rdoc_files:
 - ChangeLog
 - LICENSE
 - README.rdoc
+- README_dev.rdoc
 files: 
 - .gitignore
 - ChangeLog
 - LICENSE
 - README.rdoc
+- README_dev.rdoc
 - Rakefile
 - VERSION
 - amazon-ec2.gemspec
@@ -88,20 +90,23 @@ files:
 - bin/ec2sh
 - bin/setup.rb
 - deps.rip
-- lib/EC2.rb
-- lib/EC2/availability_zones.rb
-- lib/EC2/console.rb
-- lib/EC2/elastic_ips.rb
-- lib/EC2/exceptions.rb
-- lib/EC2/image_attributes.rb
-- lib/EC2/images.rb
-- lib/EC2/instances.rb
-- lib/EC2/keypairs.rb
-- lib/EC2/products.rb
-- lib/EC2/responses.rb
-- lib/EC2/security_groups.rb
-- lib/EC2/snapshots.rb
-- lib/EC2/volumes.rb
+- lib/AWS.rb
+- lib/AWS/EC2.rb
+- lib/AWS/EC2/availability_zones.rb
+- lib/AWS/EC2/console.rb
+- lib/AWS/EC2/elastic_ips.rb
+- lib/AWS/EC2/image_attributes.rb
+- lib/AWS/EC2/images.rb
+- lib/AWS/EC2/instances.rb
+- lib/AWS/EC2/keypairs.rb
+- lib/AWS/EC2/products.rb
+- lib/AWS/EC2/security_groups.rb
+- lib/AWS/EC2/snapshots.rb
+- lib/AWS/EC2/volumes.rb
+- lib/AWS/ELB.rb
+- lib/AWS/ELB/load_balancers.rb
+- lib/AWS/exceptions.rb
+- lib/AWS/responses.rb
 - perftools/ec2prof
 - perftools/ec2prof-results.dot
 - perftools/ec2prof-results.txt
@@ -120,6 +125,7 @@ files:
 - test/test_EC2_security_groups.rb
 - test/test_EC2_snapshots.rb
 - test/test_EC2_volumes.rb
+- test/test_ELB_load_balancers.rb
 - test/test_helper.rb
 - wsdl/2007-08-29.ec2.wsdl
 - wsdl/2008-02-01.ec2.wsdl
@@ -176,4 +182,5 @@ test_files:
 - test/test_EC2_security_groups.rb
 - test/test_EC2_snapshots.rb
 - test/test_EC2_volumes.rb
+- test/test_ELB_load_balancers.rb
 - test/test_helper.rb

data/lib/EC2/availability_zones.rb

@@ -1,41 +0,0 @@
-#--
-# Amazon Web Services EC2 Query API Ruby library
-#
-# Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
-# License::   Distributes under the same terms as Ruby
-# Home::      http://github.com/grempe/amazon-ec2/tree/master
-#++
-
-module EC2
-
-  class Base
-
-    #Amazon Developer Guide Docs:
-    #
-    # The DescribeAvailabilityZones operation describes availability zones that are currently
-    # available to the account and their states.
-    #
-    # An optional list of zone names can be passed.
-    #
-    #Required Arguments:
-    #
-    # none
-    #
-    #Optional Arguments:
-    #
-    # :zone_name => Array (default : [])
-    #
-
-    def describe_availability_zones( options = {} )
-
-      options = { :zone_name => [] }.merge(options)
-
-      params = pathlist("ZoneName", options[:zone_name] )
-
-      return response_generator(:action => "DescribeAvailabilityZones", :params => params)
-
-    end
-  end
-end