fog 0.2.21 → 0.2.22

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.2.21'
-  s.date              = '2010-07-29'
+  s.version           = '0.2.22'
+  s.date              = '2010-08-01'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -117,6 +117,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/ec2/describe_volumes.rb
     lib/fog/aws/parsers/ec2/detach_volume.rb
     lib/fog/aws/parsers/ec2/get_console_output.rb
+    lib/fog/aws/parsers/ec2/register_image.rb
     lib/fog/aws/parsers/ec2/run_instances.rb
     lib/fog/aws/parsers/ec2/start_stop_instances.rb
     lib/fog/aws/parsers/ec2/terminate_instances.rb
@@ -170,7 +171,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/disassociate_address.rb
     lib/fog/aws/requests/ec2/get_console_output.rb
     lib/fog/aws/requests/ec2/modify_image_attributes.rb
+    lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb
     lib/fog/aws/requests/ec2/reboot_instances.rb
+    lib/fog/aws/requests/ec2/register_image.rb
     lib/fog/aws/requests/ec2/release_address.rb
     lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
     lib/fog/aws/requests/ec2/run_instances.rb

data/lib/fog.rb

@@ -41,7 +41,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.21'
+    VERSION = '0.2.22'
   end
 
   module Mock

data/lib/fog/aws/ec2.rb

@@ -1,4 +1,4 @@
-module Fog
+	module Fog
   module AWS
     module EC2
       extend Fog::Service
@@ -54,8 +54,10 @@ module Fog
       request 'disassociate_address'
       request 'get_console_output'
       request 'modify_image_attributes'
+      request 'modify_snapshot_attribute'
       request 'reboot_instances'
       request 'release_address'
+      request 'register_image'
       request 'revoke_security_group_ingress'
       request 'run_instances'
       request 'terminate_instances'

data/lib/fog/aws/parsers/ec2/register_image.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Parsers
+    module AWS
+      module EC2
+
+        class RegisterImage < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId', 'imageId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        # Modify snapshot attributes
+        #
+        # ==== Parameters
+        # * snapshot_id<~String> - Id of snapshot to modify
+        # * attribute<~String> - Attribute to modify, in ['createVolumePermission']
+        # * operation_type<~String> - Operation to perform on attribute, in ['add', 'remove']
+        #
+        def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
+          params = {}
+          params.merge!(AWS.indexed_param('UserId', options['UserId'], 1))
+          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup'], 1))
+          request({
+            'Action'        => 'ModifySnapshotAttribute',
+            'Attribute'     => attribute,
+            'SnapshotId'    => snapshot_id,
+            'OperationType' => operation_type,
+            :idempotent     => true,
+            :parser         => Fog::Parsers::AWS::EC2::Basic.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/register_image.rb

@@ -0,0 +1,89 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        require 'fog/aws/parsers/ec2/register_image'
+
+        # register an image
+        #
+        # ==== Parameters
+        # * Name<~String> - Name of the AMI to be registered
+        # * Description<~String> - AMI description
+        # * Location<~String> - S3 manifest location (for S3 backed AMIs)
+        # or
+        # * RootDeviceName<~String> - Name of Root Device (for EBS snapshot backed AMIs)
+        # * BlockDevices<~Array>:
+        #   * BlockDeviceOptions<~Hash>:
+        #     * DeviceName<~String> - Name of the Block Device
+        #     * VirtualName<~String> - Name of the Virtual Device
+        #     * SnapshotId<~String> - id of the EBS Snapshot
+        #     * VolumeSize<~Integer> - Size of the snapshot (optional)
+        #     * NoDevice<~Boolean> - Do not use an ebs device (def: true)
+        #     * DeleteOnTermation<~Boolean> - Delete EBS volume on instance term (def: true)
+        # * Options<~Hash>:
+        #   * Architecture<~String> - i386 or x86_64
+        #   * KernelId<~String> - kernelId
+        #   * RamdiskId<~String> - ramdiskId
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'imageId'<~String> - Id of newly created AMI
+
+        def register_image(name, description, location, block_devices=[], options={})
+          common_options = {
+            'Action'      => 'RegisterImage',
+            'Name'        => name,
+            'Description' => description,
+            :parser       => Fog::Parsers::AWS::EC2::RegisterImage.new
+          }
+
+          # This determines if we are doing a snapshot or a S3 backed AMI.
+          if(location =~ /^\/dev\/sd[a-p]\d{0,2}$/)
+            common_options['RootDeviceName'] = location
+          else
+            common_options['ImageLocation'] = location
+          end
+
+          bdi = 0
+          block_devices.each do |bd|
+            bdi += 1
+            ["DeviceName","VirtualName"].each do |n|
+              common_options["BlockDeviceMapping.#{bdi}.#{n}"] = bd["#{n}"] if bd["#{n}"]
+            end
+            ["SnapshotId","VolumeSize","NoDevice","DeleteOnTermination"].each do |n|
+              common_options["BlockDeviceMapping.#{bdi}.Ebs.#{n}"] = bd["#{n}"] if bd["#{n}"]
+            end
+
+          end
+
+          request(common_options.merge!(options))
+        end
+
+      end
+
+      class Mock
+
+        def register_image(name, description, location, block_devices=[], options={})
+          response = Excon::Response.new
+          if !name.empty?
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'imageId' => Fog::AWS::Mock.image_id
+            }
+            response
+          else
+            message = 'MissingParameter => '
+            if name.empty?
+              message << 'The request must contain the parameter name'
+            end
+            raise Fog::AWS::EC2::Error.new(message)
+          end
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-08-01 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,6 +211,7 @@ files:
 - lib/fog/aws/parsers/ec2/describe_volumes.rb
 - lib/fog/aws/parsers/ec2/detach_volume.rb
 - lib/fog/aws/parsers/ec2/get_console_output.rb
+- lib/fog/aws/parsers/ec2/register_image.rb
 - lib/fog/aws/parsers/ec2/run_instances.rb
 - lib/fog/aws/parsers/ec2/start_stop_instances.rb
 - lib/fog/aws/parsers/ec2/terminate_instances.rb
@@ -264,7 +265,9 @@ files:
 - lib/fog/aws/requests/ec2/disassociate_address.rb
 - lib/fog/aws/requests/ec2/get_console_output.rb
 - lib/fog/aws/requests/ec2/modify_image_attributes.rb
+- lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb
 - lib/fog/aws/requests/ec2/reboot_instances.rb
+- lib/fog/aws/requests/ec2/register_image.rb
 - lib/fog/aws/requests/ec2/release_address.rb
 - lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
 - lib/fog/aws/requests/ec2/run_instances.rb