poolparty 1.4.6 → 1.4.7

data/test/fixtures/clouds/rds_missing_params.rb

@@ -0,0 +1,11 @@
+# test RDS pool
+
+pool :poolparty do
+  cloud :fake_cloud do
+    keypair File.dirname(__FILE__)+"/../keys/test_key"
+    using :ec2
+
+    rds :db1 do
+    end
+  end
+end

data/test/fixtures/ec2/ec2-describe-security-groups_response_body.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+  <securityGroupInfo>
+    <item>
+      <ownerId>1234567890</ownerId>
+      <groupName>poolparty-fake_cloud</groupName>
+      <groupDescription>poolparty-fake_cloud</groupDescription>
+      <ipPermissions>
+        <item>
+          <ipProtocol>tcp</ipProtocol>
+          <fromPort>80</fromPort>
+          <toPort>80</toPort>
+          <groups/>
+          <ipRanges>
+            <item>
+              <cidrIp>0.0.0.0/0</cidrIp>
+            </item>
+          </ipRanges>
+        </item>
+      </ipPermissions>
+    </item>
+  </securityGroupInfo>
+</DescribeSecurityGroupsResponse>

data/test/fixtures/ec2/rds-describe-db-instances-empty_response_body.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeDBInstancesResponse xmlns="http://rds.amazonaws.com/admin/2009-10-16/">
+  <DescribeDBInstancesResult>
+    <DBInstances/>
+  </DescribeDBInstancesResult>
+  <ResponseMetadata>
+    <RequestId>5e547870-fa2d-11de-8e05-53428aa3290f</RequestId>
+  </ResponseMetadata>
+</DescribeDBInstancesResponse>

data/test/lib/poolparty/rds_test.rb

@@ -0,0 +1,35 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+stub_ec2_calls
+
+class RdsTest < Test::Unit::TestCase
+  def setup
+    stub_response(AWS::EC2::Base, :describe_security_groups, 'ec2-describe-security-groups')
+    stub_response(AWS::EC2::Base, :run_instances,            'ec2-run-instances')
+    stub_response(AWS::RDS::Base, :describe_db_instances,    'rds-describe-db-instances-empty')
+    reset!
+  end
+
+  def test_basic
+    scenario "rds_cloud"
+  end
+
+  def test_required_properties
+    assert_raises(RuntimeError) { scenario "rds_missing_params" }
+  end
+
+  private
+
+  def scenario(filename)
+    clear!
+
+    @filepath = fixtures_dir/"clouds/#{filename}.rb"
+    require @filepath
+    @cloud = pool.clouds[pool.clouds.keys.first]
+
+    @cloud.run
+  end
+
+  def stub_response(klass, method, fixture_filename)
+    klass.any_instance.stubs(method).returns AWS::Response.parse(:xml => open(fixtures_dir/"ec2/#{fixture_filename}_response_body.xml").read)
+  end
+end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ end
 require "test_methods"
 
 modify_env_with_hash(
-  "EC2_ACCESS_KEY" => "fake_access_key", 
+  "EC2_ACCESS_KEY" => "fake_access_key",
   "EC2_SECRET_KEY" => "fake_secret_key",
   "EC2_PRIVATE_KEY" => ::File.dirname(__FILE__) + "/fixtures/keys/test_key",
   "EC2_CERT"        => ::File.dirname(__FILE__) + "/fixtures/keys/test_key",
@@ -20,10 +20,10 @@ modify_env_with_hash(
 require 'poolparty'
 require "rubygems"
 require "test/unit"
-# TODO: Rip out shoulda and matchy
-require "matchy"
+# TODO: Rip out shoulda
 require "shoulda"
- 
+require 'mocha' # ARG!  don't want to introduce additional test dependencies, but FakeWeb can only handle one fake post per URL!!!
+
 require 'git-style-binary/command'
 
 GitStyleBinary.run = true

data/vendor/gems/amazon-ec2/ChangeLog

@@ -1,3 +1,18 @@
+=== 0.7.4 2009-12-05
+ * Initial support for new EBS AMI's
+ * Updated EC2 API version
+ * Added US West 1 Data Center to list of valid endpoints. (us-west-1.ec2.amazonaws.com)
+ * Updated exceptions.rb to be in sync with latest documented exceptions.
+ * Updated #run_instances to support EBS AMI's and sync with latest options.
+ * Added new #stop_instances and #start_instances methods.
+ * Added new #create_image to allow bundling of a running instance to an EBS backed AMI.
+ * Added stub methods for all known missing EC2 methods. (Please help with patches + tests!)
+ * Added and updated tests for new/modified methods.
+
+=== 0.6.1 2009-10-13
+ * Additional commits for AutoScaling.  Thanks to Ari (auser)!
+ * Updated README.rdoc installation instructions.  Reflects removal of deprecated GitHub gem building.
+
 === 0.6.0 2009-09-30
  * Added support for AWS AutoScaling for EC2.  Thanks to Ari Lerner (auser)!
 

data/vendor/gems/amazon-ec2/README.rdoc

@@ -6,11 +6,18 @@ Amazon Web Services offers a compute power on demand capability known as the Ela
 
 This 'amazon-ec2' Ruby Gem is an interface library that can be used to interact with the Amazon EC2 system and control server resources on demand from your Ruby scripts, or from applications written in your Ruby framework of choice (Ruby on Rails, Merb, etc.).
 
+More recently, support has been added for the following EC2 related AWS API's as well:
+
+* Autoscaling
+* Cloudwatch
+* Elastic Load Balancing (ELB)
+* Relational Database Service (RDS)
+
 For the most complete and up-to date README information please visit the project homepage at:
 
 http://github.com/grempe/amazon-ec2/tree/master
 
-or the EC2 website at http://aws.amazon.com/ec2
+or the official EC2 website at http://aws.amazon.com/ec2
 
 
 == Installation
@@ -30,41 +37,39 @@ The following gems should be installed automatically as part of your install of
   Rcov (optional for testing)
   Test-Spec (optional for testing)
 
-=== Install the amazon-ec2 gem
 
-  # Install the stable release gem from Gemcutter ( learn more here : http://gemcutter.org/pages/faq )
+=== Install the amazon-ec2 gem (Canonical Release)
+
+This is the standard install for stable releases from Gemcutter.
 
-  sudo gem install gemcutter (one time only)
+  # Install the stable release gem from Gemcutter (one time only) ( learn more here : http://gemcutter.org/pages/faq )
+  sudo gem install gemcutter
 
-  # Set Gemcutter to be your canonical gems source
+  # Set Gemcutter to be your canonical gems source (one time only)
   sudo gem tumble
 
   # Install the gem
   sudo gem install amazon-ec2
 
-  # OR skip the Gemcutter setup
-
+  # OR if you want to skip the Gemcutter setup
   sudo gem install amazon-ec2 -s http://gemcutter.org
 
 
-=== Install the amazon-ec2 gem (for more bleeding edge versions)
-
-For those who intend to do development on the gem, or want the bleeding edge.
+=== Install from local Git clone (for amazon-ec2 developers)
 
-  # ONE TIME ONLY
-  # Execute this on each machine where you install gems to add GitHub as a gem source
-  # Do this only once or you'll end up with multiple entries in 'gem sources'
-  gem sources -a http://gems.github.com/
+GitHub has unfortunately given up on the feature they had where they would build gems
+when pushed to git.  Too bad.  So to install from git, you'll need to clone and build.
 
-  # Install the gem from the GitHub bleeding edge as a normal runtime install
-  sudo gem install grempe-amazon-ec2
+  git clone git://github.com/grempe/amazon-ec2.git
+  cd amazon-ec2
+  rake gemspec
+  rake build
+  rake install
 
-  # OR
 
-  # Install the gem from the GitHub bleeding edge with all developer dependencies
-  sudo gem install grempe-amazon-ec2 --development
+=== EXPERIMENTAL : Install the amazon-ec2 gem using Rip (for more bleeding edge versions)
 
-  # OR
+For those who intend to do development on the gem, or want the bleeding edge.  Install Rip as described at hellorip.com.
 
   # (Experimental) Install using Rip (hellorip.com) instead of RubyGems
   rip install git://github.com/grempe/amazon-ec2.git
@@ -83,10 +88,9 @@ The 'ec2sh' and 'ec2-gem-example.rb' scripts which will be introduced to you sho
 
 Edit the file ~/.bash_login and add the following to the existing contents:
 
+  # OPTIONAL : Why 'export RUBYOPT'? Because we leave loading libs up to you... See : http://gist.github.com/54177
   export RUBYOPT="rubygems"
 
-  Why 'export RUBYOPT'? Because we leave loading libs up to you... See : http://gist.github.com/54177
-
   # For amazon-ec2 and amazon s3 ruby gems
   export AMAZON_ACCESS_KEY_ID="YOUR_ACCESS_KEY_ID"
   export AMAZON_SECRET_ACCESS_KEY="YOUR_SECRET_ACCESS_KEY_ID"
@@ -196,8 +200,7 @@ Try out the following bit of code. This should walk through each image returned
 
   Rails::Initializer.run do |config|
    ...
-   # INSERT THIS LINE IN YOUR CONFIG
-   config.gem "amazon-ec2", :lib => "EC2"
+   config.gem "amazon-ec2", :lib => "AWS", :source => "http://gemcutter.org/"
    ...
   end
 

data/vendor/gems/amazon-ec2/README_dev.rdoc

@@ -4,8 +4,6 @@ Publishing the gem using Jeweler:
 
   rake version:bump:patch release
 
-  rake rubyforge:release rubyforge:release:docs
-
 Push the gem to gemcutter:
 
   gem push pkg/amazon-ec2-X.Y.Z.gem

data/vendor/gems/amazon-ec2/Rakefile

@@ -6,22 +6,17 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "amazon-ec2"
   gem.summary = %Q{Amazon EC2 Ruby Gem}
-  gem.description = %Q{A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2), Elastic Load Balancer (ELB), Cloudwatch, and Autoscaling API's.}
+  gem.description = %Q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
   gem.email = "glenn@rempe.us"
   gem.homepage = "http://github.com/grempe/amazon-ec2"
   gem.authors = ["Glenn Rempe"]
   gem.rdoc_options = ["--title", "amazon-ec2 documentation", "--line-numbers", "--main", "README.rdoc"]
   gem.rubyforge_project = 'amazon-ec2'
   gem.add_dependency('xml-simple', '>= 1.0.12')
-  gem.add_development_dependency('mocha', '>= 0.9.7')
+  gem.add_development_dependency('mocha', '>= 0.9.8')
   gem.add_development_dependency('test-spec', '>= 0.10.0')
-  gem.add_development_dependency('relevance-rcov', '>= 0.8.5.1')
-  gem.add_development_dependency('perftools.rb', '= 0.1.6')
-end
-
-# make the jeweler rubyforge tasks available.
-Jeweler::RubyforgeTasks.new do |rubyforge|
-  rubyforge.doc_task = "rdoc"
+  gem.add_development_dependency('rcov', '>= 0.9.6')
+  gem.add_development_dependency('perftools.rb', '>= 0.3.9')
 end
 
 require 'rake/testtask'
@@ -41,11 +36,10 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: [sudo] gem install relevance-rcov"
+    abort "RCov is not available. In order to run rcov, you must: [sudo] gem install rcov"
   end
 end
 
-
 task :default => :test
 
 require 'rake/rdoctask'
@@ -67,35 +61,10 @@ YARD::Rake::YardocTask.new do |t|
   #t.files   = ['lib/**/*.rb']
 end
 
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and YARD documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish YARD docs to RubyForge."
-      task :docs => [:doc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/amazon-ec2/"
-        local_dir = 'doc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-
 desc "Generate a perftools.rb profile"
 task :profile do
-  system("CPUPROFILE=perftools/ec2prof RUBYOPT='-r/usr/local/lib/ruby/gems/1.8/gems/perftools.rb-0.1.6/lib/perftools.bundle' ruby -r'rubygems' bin/ec2-gem-profile.rb")
+  system("CPUPROFILE=perftools/ec2prof RUBYOPT='-r/Library/Ruby/Gems/1.8/gems/perftools.rb-0.3.2/lib/perftools.bundle' ruby -r'rubygems' bin/ec2-gem-profile.rb")
   system("pprof.rb --text --ignore=Gem perftools/ec2prof > perftools/ec2prof-results.txt")
   system("pprof.rb --dot --ignore=Gem perftools/ec2prof > perftools/ec2prof-results.dot")
-end
+end
+

data/vendor/gems/amazon-ec2/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.8

data/vendor/gems/amazon-ec2/amazon-ec2.gemspec

@@ -1,16 +1,16 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.6.0"
+  s.version = "0.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2009-09-30}
-  s.description = %q{A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2), Elastic Load Balancer (ELB), Cloudwatch, and Autoscaling API's.}
+  s.date = %q{2009-12-21}
+  s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
   s.extra_rdoc_files = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/AWS/EC2.rb",
      "lib/AWS/EC2/availability_zones.rb",
      "lib/AWS/EC2/console.rb",
+     "lib/AWS/EC2/devpay.rb",
      "lib/AWS/EC2/elastic_ips.rb",
      "lib/AWS/EC2/image_attributes.rb",
      "lib/AWS/EC2/images.rb",
@@ -53,6 +54,8 @@ Gem::Specification.new do |s|
      "lib/AWS/EC2/volumes.rb",
      "lib/AWS/ELB.rb",
      "lib/AWS/ELB/load_balancers.rb",
+     "lib/AWS/RDS.rb",
+     "lib/AWS/RDS/rds.rb",
      "lib/AWS/exceptions.rb",
      "lib/AWS/responses.rb",
      "perftools/ec2prof",
@@ -75,11 +78,14 @@ Gem::Specification.new do |s|
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
+     "test/test_RDS.rb",
      "test/test_helper.rb",
      "wsdl/2007-08-29.ec2.wsdl",
      "wsdl/2008-02-01.ec2.wsdl",
      "wsdl/2008-05-05.ec2.wsdl",
-     "wsdl/2008-12-01.ec2.wsdl"
+     "wsdl/2008-12-01.ec2.wsdl",
+     "wsdl/2009-10-31.ec2.wsdl",
+     "wsdl/2009-11-30.ec2.wsdl"
   ]
   s.homepage = %q{http://github.com/grempe/amazon-ec2}
   s.rdoc_options = ["--title", "amazon-ec2 documentation", "--line-numbers", "--main", "README.rdoc"]
@@ -104,7 +110,8 @@ Gem::Specification.new do |s|
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/test_RDS.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -113,22 +120,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.12"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<test-spec>, [">= 0.10.0"])
-      s.add_development_dependency(%q<relevance-rcov>, [">= 0.8.5.1"])
-      s.add_development_dependency(%q<perftools.rb>, ["= 0.1.6"])
+      s.add_development_dependency(%q<rcov>, [">= 0.9.6"])
+      s.add_development_dependency(%q<perftools.rb>, [">= 0.3.9"])
     else
       s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<test-spec>, [">= 0.10.0"])
-      s.add_dependency(%q<relevance-rcov>, [">= 0.8.5.1"])
-      s.add_dependency(%q<perftools.rb>, ["= 0.1.6"])
+      s.add_dependency(%q<rcov>, [">= 0.9.6"])
+      s.add_dependency(%q<perftools.rb>, [">= 0.3.9"])
     end
   else
     s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<test-spec>, [">= 0.10.0"])
-    s.add_dependency(%q<relevance-rcov>, [">= 0.8.5.1"])
-    s.add_dependency(%q<perftools.rb>, ["= 0.1.6"])
+    s.add_dependency(%q<rcov>, [">= 0.9.6"])
+    s.add_dependency(%q<perftools.rb>, [">= 0.3.9"])
   end
 end
+

data/vendor/gems/amazon-ec2/bin/setup.rb

@@ -20,6 +20,7 @@ if ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY']
   @ec2 = AWS::EC2::Base.new(opts)
   @elb = AWS::ELB::Base.new(opts)
   @as = AWS::Autoscaling::Base.new(opts)
+  @rds = AWS::RDS::Base.new(opts)
 end
 
 puts "EC2 Server: #{opts[:server]}"

data/vendor/gems/amazon-ec2/lib/AWS/Autoscaling/autoscaling.rb

@@ -42,8 +42,8 @@ module AWS
       # @option options [String] :launch_configuration_name (nil) the name of the launch_configuration group
       # @option options [String] :min_size (nil) minimum size of the group
       # @option options [String] :max_size (nil) the maximum size of the group
-      # @option options [String] :load_balancer_names (nil) the names of the load balancers
-      # @option options [String] :cooldown (nil) the amount of time after a scaling activity complese before any further trigger-related scaling activities can start
+      # @option options [optional,Array] :load_balancer_names (nil) the names of the load balancers
+      # @option options [optional,String] :cooldown (nil) the amount of time after a scaling activity complese before any further trigger-related scaling activities can start
       def create_autoscaling_group( options = {} )
         raise ArgumentError, "No :autoscaling_group_name provided" if options[:autoscaling_group_name].nil? || options[:autoscaling_group_name].empty?
         raise ArgumentError, "No :availability_zones provided" if options[:availability_zones].nil? || options[:availability_zones].empty?
@@ -58,9 +58,9 @@ module AWS
         params['AutoScalingGroupName'] = options[:autoscaling_group_name]
         params['MinSize'] = options[:min_size].to_s
         params['MaxSize'] = options[:max_size].to_s
-        params.merge!(pathlist("LoadBalancerNames.member", options[:load_balancer_names])) if options[:load_balancer_names]
+        params.merge!(pathlist("LoadBalancerNames.member", [options[:load_balancer_names]].flatten)) if options.has_key?(:load_balancer_names)
         params['CoolDown'] = options[:cooldown] if options[:cooldown]
-        
+
         return response_generator(:action => "CreateAutoScalingGroup", :params => params)
       end
 
@@ -112,7 +112,7 @@ module AWS
           params["Dimensions.member.1.Name"] = options[:dimensions][:name]
           params["Dimensions.member.1.Value"] = options[:dimensions][:value]
         else
-          raise ArgumentError, "Dimensions must be either an array or a hash"
+          raise ArgumentError, "Dimensionss must be either an array or a hash"
         end
         params['MeasureName'] = options[:measure_name]
         params['Statistic'] = options[:statistic]
@@ -262,19 +262,9 @@ module AWS
         params['MinSize'] = options[:min_size] if options.has_key?(:min_size)
         params['MaxSize'] = options[:max_size] if options.has_key?(:max_size)
         params['CoolDown'] = options[:cooldown]  if options.has_key?(:cooldown)
-        
-        return response_generator(:action => "UpdateAutoScalingGroup", :params => params)
 
-      end
+        return response_generator(:action => "UpdateAutoScalingGroup", :params => params)
 
-      # Convenience methods
-      # Return an array of hashes describing the autoscaling groups
-      def list
-        describe_autoscaling_groups.DescribeAutoScalingGroupsResult.AutoScalingGroups.member
-      end
-      # Return an array of autoscaling group names
-      def names
-        list.collect{|a| a.AutoScalingGroupName}
       end
 
     end

data/vendor/gems/amazon-ec2/lib/AWS/EC2/availability_zones.rb

@@ -15,6 +15,14 @@ module AWS
         return response_generator(:action => "DescribeAvailabilityZones", :params => params)
       end
 
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_regions( options = {} )
+        raise "Not yet implemented"
+      end
+
     end
   end
 end

data/vendor/gems/amazon-ec2/lib/AWS/EC2/console.rb

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The GetConsoleOutput operation retrieves console output that has been posted for the specified instance.
       #
       # Instance console output is buffered and posted shortly after instance boot, reboot and once the instance
@@ -17,6 +18,7 @@ module AWS
         return response_generator(:action => "GetConsoleOutput", :params => params)
       end
 
+
     end
   end
 end

data/vendor/gems/amazon-ec2/lib/AWS/EC2/devpay.rb

@@ -0,0 +1,18 @@
+module AWS
+  module EC2
+    class Base < AWS::Base
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def confirm_product_instance( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+    end
+  end
+end
+

data/vendor/gems/amazon-ec2/lib/AWS/EC2/elastic_ips.rb

@@ -2,43 +2,13 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The AllocateAddress operation acquires an elastic IP address for use with your account.
       #
       def allocate_address
         return response_generator(:action => "AllocateAddress")
       end
 
-      # The DescribeAddresses operation lists elastic IP addresses assigned to your account.
-      #
-      # @option options [Array] :public_ip ([]) an IP address to be described
-      #
-      def describe_addresses( options = {} )
-        options = { :public_ip => [] }.merge(options)
-        params = pathlist("PublicIp", options[:public_ip])
-        return response_generator(:action => "DescribeAddresses", :params => params)
-      end
-
-      # The ReleaseAddress operation releases an elastic IP address associated with your account.
-      #
-      # If you run this operation on an elastic IP address that is already released, the address
-      # might be assigned to another account which will cause Amazon EC2 to return an error.
-      #
-      # Note : Releasing an IP address automatically disassociates it from any instance
-      # with which it is associated. For more information, see DisassociateAddress.
-      #
-      # Important! After releasing an elastic IP address, it is released to the IP
-      # address pool and might no longer be available to your account. Make sure
-      # to update your DNS records and any servers or devices that communicate
-      # with the address.
-      #
-      # @option options [String] :public_ip ('') an IP address to be released.
-      #
-      def release_address( options = {} )
-        options = { :public_ip => '' }.merge(options)
-        raise ArgumentError, "No ':public_ip' provided" if options[:public_ip].nil? || options[:public_ip].empty?
-        params = { "PublicIp" => options[:public_ip] }
-        return response_generator(:action => "ReleaseAddress", :params => params)
-      end
 
       # The AssociateAddress operation associates an elastic IP address with an instance.
       #
@@ -60,6 +30,18 @@ module AWS
         return response_generator(:action => "AssociateAddress", :params => params)
       end
 
+
+      # The DescribeAddresses operation lists elastic IP addresses assigned to your account.
+      #
+      # @option options [Array] :public_ip ([]) an IP address to be described
+      #
+      def describe_addresses( options = {} )
+        options = { :public_ip => [] }.merge(options)
+        params = pathlist("PublicIp", options[:public_ip])
+        return response_generator(:action => "DescribeAddresses", :params => params)
+      end
+
+
       # The DisassociateAddress operation disassociates the specified elastic IP
       # address from the instance to which it is assigned. This is an idempotent
       # operation. If you enter it more than once, Amazon EC2 does not return
@@ -74,8 +56,31 @@ module AWS
         return response_generator(:action => "DisassociateAddress", :params => params)
       end
 
-    end
 
+      # The ReleaseAddress operation releases an elastic IP address associated with your account.
+      #
+      # If you run this operation on an elastic IP address that is already released, the address
+      # might be assigned to another account which will cause Amazon EC2 to return an error.
+      #
+      # Note : Releasing an IP address automatically disassociates it from any instance
+      # with which it is associated. For more information, see DisassociateAddress.
+      #
+      # Important! After releasing an elastic IP address, it is released to the IP
+      # address pool and might no longer be available to your account. Make sure
+      # to update your DNS records and any servers or devices that communicate
+      # with the address.
+      #
+      # @option options [String] :public_ip ('') an IP address to be released.
+      #
+      def release_address( options = {} )
+        options = { :public_ip => '' }.merge(options)
+        raise ArgumentError, "No ':public_ip' provided" if options[:public_ip].nil? || options[:public_ip].empty?
+        params = { "PublicIp" => options[:public_ip] }
+        return response_generator(:action => "ReleaseAddress", :params => params)
+      end
+
+
+    end
   end
 end