poolparty 1.4.6 → 1.4.7

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

@@ -3,36 +3,33 @@ module AWS
 
     class Base < AWS::Base
 
+
       # The DescribeSnapshots operation describes the status of Amazon EBS snapshots.
       #
-      # @option options [Array] :snapshot_id ([])
+      # @option options [optional,Array] :snapshot_id ([]) The ID of the Amazon EBS snapshot.
+      # @option options [optional,String] :owner ('') Returns snapshots owned by the specified owner. Multiple owners can be specified. Valid values self | amazon | AWS Account ID
+      # @option options [optional,String] :restorable_by ('') Account ID of a user that can create volumes from the snapshot.
       #
       def describe_snapshots( options = {} )
-
-        options = { :snapshot_id => [] }.merge(options)
-
-        params = pathlist("SnapshotId", options[:snapshot_id] )
-
+        params = {}
+        params.merge!(pathlist("SnapshotId", options[:snapshot_id] )) unless options[:snapshot_id].nil? || options[:snapshot_id] == []
+        params["RestorableBy"] = options[:restorable_by] unless options[:restorable_by].nil?
+        params["Owner"] = options[:owner] unless options[:owner].nil?
         return response_generator(:action => "DescribeSnapshots", :params => params)
-
       end
 
+
       # The CreateSnapshot operation creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups, to launch instances from identical snapshots, and to save data before shutting down an instance.
       #
       # @option options [String] :volume_id ('')
       #
       def create_snapshot( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         params = {
           "VolumeId" => options[:volume_id]
         }
-
         return response_generator(:action => "CreateSnapshot", :params => params)
-
       end
 
 
@@ -41,19 +38,43 @@ module AWS
       # @option options [String] :snapshot_id ('')
       #
       def delete_snapshot( options = {} )
-
         options = { :snapshot_id => '' }.merge(options)
-
         raise ArgumentError, "No :snapshot_id provided" if options[:snapshot_id].nil? || options[:snapshot_id].empty?
-
         params = {
           "SnapshotId" => options[:snapshot_id]
         }
-
         return response_generator(:action => "DeleteSnapshot", :params => params)
+      end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def modify_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
       end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def reset_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
     end
   end
-end
+end
+

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

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The DescribeVolumes operation lists one or more Amazon EBS volumes that you own, If you do not specify any volumes, Amazon EBS returns all volumes that you own.
       #
       # @option options [optional, String] :volume_id ([])
@@ -12,6 +13,7 @@ module AWS
         return response_generator(:action => "DescribeVolumes", :params => params)
       end
 
+
       # The CreateVolume operation creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.
       #
       # @option options [String] :availability_zone ('')
@@ -19,43 +21,33 @@ module AWS
       # @option options [optional, String] :snapshot_id ('')
       #
       def create_volume( options = {} )
-
-        # defaults
         options = { :availability_zone => '' }.merge(options)
-
         raise ArgumentError, "No :availability_zone provided" if options[:availability_zone].nil? || options[:availability_zone].empty?
-
         options = { :size => '' }.merge(options)
         options = { :snapshot_id => '' }.merge(options)
-
         params = {
           "AvailabilityZone" => options[:availability_zone],
           "Size" => options[:size],
           "SnapshotId" => options[:snapshot_id]
         }
-
         return response_generator(:action => "CreateVolume", :params => params)
-
       end
 
+
       # The DeleteVolume operation deletes an Amazon EBS volume.
       #
       # @option options [String] :volume_id ('')
       #
       def delete_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         params = {
           "VolumeId" => options[:volume_id]
         }
-
         return response_generator(:action => "DeleteVolume", :params => params)
-
       end
 
+
       # The AttachVolume operation attaches an Amazon EBS volume to an instance.
       #
       # @option options [String] :volume_id ('')
@@ -63,11 +55,9 @@ module AWS
       # @option options [String] :device ('')
       #
       def attach_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
         options = { :instance_id => '' }.merge(options)
         options = { :device => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
         raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
         raise ArgumentError, "No :device provided" if options[:device].nil? || options[:device].empty?
@@ -77,11 +67,10 @@ module AWS
           "InstanceId" => options[:instance_id],
           "Device" => options[:device]
         }
-
         return response_generator(:action => "AttachVolume", :params => params)
-
       end
 
+
       # The DetachVolume operation detaches an Amazon EBS volume from an instance.
       #
       # @option options [String] :volume_id ('')
@@ -90,25 +79,21 @@ module AWS
       # @option options [optional, Boolean] :force ('')
       #
       def detach_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         options = { :instance_id => '' }.merge(options)
         options = { :device => '' }.merge(options)
         options = { :force => '' }.merge(options)
-
         params = {
           "VolumeId" => options[:volume_id],
           "InstanceId" => options[:instance_id],
           "Device" => options[:device],
           "Force" => options[:force]
         }
-
         return response_generator(:action => "DetachVolume", :params => params)
       end
 
+
     end
   end
 end

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

@@ -8,7 +8,7 @@ module AWS
     #   export EC2_URL='https://ec2.amazonaws.com'
     if ENV['EC2_URL']
       EC2_URL = ENV['EC2_URL']
-      VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
+      VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://us-west-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
       raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
       DEFAULT_HOST = URI.parse(EC2_URL).host
     else
@@ -16,7 +16,7 @@ module AWS
       DEFAULT_HOST = 'ec2.amazonaws.com'
     end
 
-    API_VERSION = '2009-07-15'
+    API_VERSION = '2009-11-30'
 
     class Base < AWS::Base
       def api_version

data/vendor/gems/amazon-ec2/lib/AWS/ELB/load_balancers.rb

@@ -92,9 +92,7 @@ module AWS
         raise ArgumentError, "No :instances provided" if options[:instances].nil? || options[:instances].empty?
         raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
         params = {}
-        params.merge!(pathhashlist('Instances.member', [options[:instances]].flatten, {
-          :instance_id => 'InstanceId'
-        }))
+        params.merge!(pathhashlist('Instances.member', options[:instances].flatten.collect{|e| {:instance_id => e}}, {:instance_id => 'InstanceId'}))
         params['LoadBalancerName'] = options[:load_balancer_name]
         return response_generator(:action => "RegisterInstancesWithLoadBalancer", :params => params)
       end
@@ -116,12 +114,8 @@ module AWS
       def deregister_instances_from_load_balancer( options = {} )
         raise ArgumentError, "No :instances provided" if options[:instances].nil? || options[:instances].empty?
         raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
-        
         params = {}
-        params.merge!(pathhashlist('Instances.member', [options[:instances]].flatten, {
-          :instance_id => 'InstanceId'
-        }))
-        
+        params.merge!(pathlist('Instances.member', [options[:instances]].flatten))
         params['LoadBalancerName'] = options[:load_balancer_name]
         return response_generator(:action => "DeregisterInstancesFromLoadBalancer", :params => params)
       end
@@ -155,49 +149,28 @@ module AWS
         return response_generator(:action => "ConfigureHealthCheck", :params => params)
       end
 
+      # Not yet implemented
       #
-      # @todo Document this method
+      # @todo Implement this method
       #
       def describe_instance_health( options = {} )
-        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
-        
-        params = {}
-        params['LoadBalancerName'] = options[:load_balancer_name]
-        return response_generator(:action => "DescribeInstanceHealth", :params => params)
+        raise "Not yet implemented"
       end
 
+      # Not yet implemented
       #
-      # @todo Document this method
+      # @todo Implement this method
       #
       def disable_availability_zones_for_load_balancer( options = {} )
-        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
-        raise ArgumentError, "No availability_zones specified" unless options[:availability_zones]
-        
-        params = {}
-        params['LoadBalancerName'] = options[:load_balancer_name]
-        params.merge!(pathlist("AvailabilityZones.member", options[:availability_zones]))
-        
-        return response_generator(:action => "DisableAvailabilityZonesForLoadBalancer", :params => params)
+        raise "Not yet implemented"
       end
 
+      # Not yet implemented
       #
-      # @todo Document this method
+      # @todo Implement this method
       #
       def enable_availability_zones_for_load_balancer( options = {} )
-        raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
-        raise ArgumentError, "No availability_zones specified" unless options[:availability_zones]
-        
-        params = {}
-        params['LoadBalancerName'] = options[:load_balancer_name]
-        params.merge!(pathlist("AvailabilityZones.member", options[:availability_zones]))
-        
-        return response_generator(:action => "EnableAvailabilityZonesForLoadBalancer", :params => params)
-      end
-      
-      #convenience methods
-      # return an array of hashes describing the load_balancers
-      def list
-        describe_load_balancers.DescribeLoadBalancersResult.LoadBalancerDescriptions.member
+        raise "Not yet implemented"
       end
 
     end