fog 0.0.72 → 0.0.73

data/.gitignore

@@ -3,4 +3,5 @@
 coverage
 rdoc
 pkg
-spec/credentials.yml
+spec/credentials.yml
+.bundle

data/Gemfile

@@ -0,0 +1,11 @@
+source 'http://gemcutter.org'
+
+gem 'rake'
+gem 'excon', '>= 0.0.21'
+gem 'formatador', ">= 0.0.10"
+gem 'json', ">= 0"
+gem 'mime-types', ">= 0"
+gem 'nokogiri', ">= 0"
+gem 'ruby-hmac', ">= 0"
+gem 'rspec', '>= 0'
+gem 'shindo', '>= 0'

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 72
+:patch: 73
 :build: 

data/fog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.72"
+  s.version = "0.0.73"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".gitignore",
+    "Gemfile",
     "README.rdoc",
     "Rakefile",
     "VERSION.yml",

data/lib/fog.rb

@@ -29,7 +29,15 @@ require 'fog/terremark'
 module Fog
 
   module Mock
-    DELAY = 1
+    @delay = 1
+    def self.delay
+      @delay
+    end
+
+    def self.delay=(new_delay)
+      raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
+      @delay = new_delay
+    end
   end
 
   class MockNotImplemented < StandardError; end

data/lib/fog/aws/ec2.rb

@@ -21,6 +21,26 @@ module Fog
           require 'fog/aws/models/ec2/snapshots'
           require 'fog/aws/models/ec2/volume'
           require 'fog/aws/models/ec2/volumes'
+          require 'fog/aws/parsers/ec2/allocate_address'
+          require 'fog/aws/parsers/ec2/attach_volume'
+          require 'fog/aws/parsers/ec2/basic'
+          require 'fog/aws/parsers/ec2/create_key_pair'
+          require 'fog/aws/parsers/ec2/create_snapshot'
+          require 'fog/aws/parsers/ec2/create_volume'
+          require 'fog/aws/parsers/ec2/describe_addresses'
+          require 'fog/aws/parsers/ec2/describe_availability_zones'
+          require 'fog/aws/parsers/ec2/describe_images'
+          require 'fog/aws/parsers/ec2/describe_instances'
+          require 'fog/aws/parsers/ec2/describe_key_pairs'
+          require 'fog/aws/parsers/ec2/describe_regions'
+          require 'fog/aws/parsers/ec2/describe_reserved_instances'
+          require 'fog/aws/parsers/ec2/describe_security_groups'
+          require 'fog/aws/parsers/ec2/describe_snapshots'
+          require 'fog/aws/parsers/ec2/describe_volumes'
+          require 'fog/aws/parsers/ec2/detach_volume'
+          require 'fog/aws/parsers/ec2/get_console_output'
+          require 'fog/aws/parsers/ec2/run_instances'
+          require 'fog/aws/parsers/ec2/terminate_instances'
           require 'fog/aws/requests/ec2/allocate_address'
           require 'fog/aws/requests/ec2/associate_address'
           require 'fog/aws/requests/ec2/attach_volume'

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/allocate_address'
-
         # Acquire an elastic IP address.
         #
         # ==== Returns

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Associate an elastic IP address with an instance
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/attach_volume'
-
         # Attach an Amazon EBS volume with a running instance, exposing as specified device
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Add permissions to a security group
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_key_pair'
-
         # Create a new key pair
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Create a new security group
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_snapshot'
-
         # Create a snapshot of an EBS volume and store it in S3
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/create_volume'
-
         # Create an EBS volume
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a key pair that you own
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a security group that you own
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete a snapshot of an EBS volume that you own
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Delete an EBS volume
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_addresses'
-
         # Describe all or specified IP addresses.
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_availability_zones'
-
         # Describe all or specified availability zones
         #
         # ==== Params

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_images'
-
         # Describe all or specified images.
         #
         # ==== Params

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_instances'
-
         # Describe all or specified instances
         #
         # ==== Parameters
@@ -71,44 +69,44 @@ module Fog
             instance_set = @data[:instances].values
           end
 
-          instance_set.each do |instance|
-            case instance['instanceState']['name']
-            when 'pending'
-              if Time.now - instance['launchTime'] > Fog::Mock::DELAY
-                instance['dnsName']           = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
-                instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
-                instance['privateDnsName']    = "ip-#{instance['privateIpAddress'].gsub('.','-')}.ec2.internal"
-                instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
-              end
-            when 'rebooting'
-              instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
-            when 'shutting-down'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY * 2
-                @data[:deleted_at].delete(instance['instanceId'])
-                @data[:instances].delete(instance['instanceId'])
-              elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
-                instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
-              end
-            when 'terminating'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock::DELAY
-                @data[:deleted_at].delete(instance['instanceId'])
-                @data[:instances].delete(instance['instanceId'])
-              end
-            end
-          end
-
           if instance_id.length == 0 || instance_id.length == instance_set.length
-            instance_set = instance_set.reject {|instance| !@data[:instances][instance['instanceId']]}
             response.status = 200
             reservation_set = {}
+
             instance_set.each do |instance|
-              reservation_set[instance['reservationId']] ||= {
-                'groupSet'      => instance['groupSet'],
-                'instancesSet'  => [],
-                'ownerId'       => instance['ownerId'],
-                'reservationId' => instance['reservationId']
-              }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+              case instance['instanceState']['name']
+              when 'pending'
+                if Time.now - instance['launchTime'] > Fog::Mock.delay
+                  instance['dnsName']           = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
+                  instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
+                  instance['privateDnsName']    = "ip-#{instance['privateIpAddress'].gsub('.','-')}.ec2.internal"
+                  instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
+                end
+              when 'rebooting'
+                instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
+              when 'shutting-down'
+                if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay * 2
+                  @data[:deleted_at].delete(instance['instanceId'])
+                  @data[:instances].delete(instance['instanceId'])
+                elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
+                  instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
+                end
+              when 'terminating'
+                if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
+                  @data[:deleted_at].delete(instance['instanceId'])
+                  @data[:instances].delete(instance['instanceId'])
+                end
+              end
+
+              if @data[:instances][instance['instanceId']]
+                reservation_set[instance['reservationId']] ||= {
+                  'groupSet'      => instance['groupSet'],
+                  'instancesSet'  => [],
+                  'ownerId'       => instance['ownerId'],
+                  'reservationId' => instance['reservationId']
+                }
+                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+              end
             end
 
             response.body = {

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_key_pairs'
-
         # Describe all or specified key pairs
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_regions'
-
         # Describe all or specified regions
         #
         # ==== Params

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_reserved_instances'
-
         # Describe all or specified reserved instances
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_security_groups'
-
         # Describe all or specified security groups
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_snapshots'
-
         # Describe all or specified snapshots
         #
         # ==== Parameters
@@ -41,20 +39,20 @@ module Fog
             snapshot_set = @data[:snapshots].values
           end
 
-          snapshot_set.each do |snapshot|
-            case snapshot['status']
-            when 'in progress', 'pending'
-              if Time.now - snapshot['startTime'] > Fog::Mock::DELAY * 2
-                snapshot['progress']  = '100%'
-                snapshot['status']    = 'completed'
-              elsif Time.now - snapshot['startTime'] > Fog::Mock::DELAY
-                snapshot['progress']  = '50%'
-                snapshot['status']    = 'in progress'
+          if snapshot_id.length == 0 || snapshot_id.length == snapshot_set.length
+            snapshot_set.each do |snapshot|
+              case snapshot['status']
+              when 'in progress', 'pending'
+                if Time.now - snapshot['startTime'] > Fog::Mock.delay * 2
+                  snapshot['progress']  = '100%'
+                  snapshot['status']    = 'completed'
+                elsif Time.now - snapshot['startTime'] > Fog::Mock.delay
+                  snapshot['progress']  = '50%'
+                  snapshot['status']    = 'in progress'
+                end
               end
             end
-          end
 
-          if snapshot_id.length == 0 || snapshot_id.length == snapshot_set.length
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_volumes'
-
         # Describe all or specified volumes.
         #
         # ==== Parameters
@@ -47,26 +45,26 @@ module Fog
             volume_set = @data[:volumes].values
           end
 
-          volume_set.each do |volume|
-            case volume['status']
-            when 'attaching'
-              if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock::DELAY
-                volume['attachmentSet'].first['status'] = 'attached'
-                volume['status'] = 'attached'
-              end
-            when 'creating'
-              if Time.now - volume['createTime'] > Fog::Mock::DELAY
-                volume['status'] = 'available'
-              end
-            when 'deleting'
-              if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock::DELAY
-                @data[:deleted_at].delete(volume['volumeId'])
-                @data[:volumes].delete(volume['volumeId'])
+          if volume_id.length == 0 || volume_id.length == volume_set.length
+            volume_set.each do |volume|
+              case volume['status']
+              when 'attaching'
+                if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
+                  volume['attachmentSet'].first['status'] = 'attached'
+                  volume['status'] = 'attached'
+                end
+              when 'creating'
+                if Time.now - volume['createTime'] > Fog::Mock.delay
+                  volume['status'] = 'available'
+                end
+              when 'deleting'
+                if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock.delay
+                  @data[:deleted_at].delete(volume['volumeId'])
+                  @data[:volumes].delete(volume['volumeId'])
+                end
               end
             end
-          end
 
-          if volume_id.length == 0 || volume_id.length == volume_set.length
             volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]}
             response.status = 200
             response.body = {

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/detach_volume'
-
         # Detach an Amazon EBS volume from a running instance
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Disassociate an elastic IP address from its instance (if any)
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/get_console_output'
-
         # Retrieve console output for specified instance
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Reboot specified instances
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Release an elastic IP address.
         #
         # ==== Returns

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/basic'
-
         # Remove permissions from a security group
         #
         # ==== Parameters

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/run_instances'
-
         # Launch specified instances
         #
         # ==== Parameters
@@ -106,11 +104,10 @@ module Fog
 
           min_count.times do |i|
             instance_id = Fog::AWS::Mock.instance_id
-            data = {
+            instance = {
               'amiLaunchIndex'      => i,
               'blockDeviceMapping'  => [],
               'dnsName'             => '',
-              'groupSet'            => group_set,
               'imageId'             => image_id,
               'instanceId'          => instance_id,
               'instanceState'       => { 'code' => 0, 'name' => 'pending' },
@@ -119,18 +116,20 @@ module Fog
               'keyName'             => options['KeyName'] || '',
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'ownerId'             => @owner_id,
               'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
               'privateDnsName'      => '',
-              'privateIpAddress'    => '',
               'productCodes'        => [],
               'ramdiskId'           => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
               'reason'              => '',
-              'reservationId'       => reservation_id,
               'rootDeviceType'      => 'instance-store'
             }
-            @data[:instances][instance_id] = data
-            instances_set << data.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+            instances_set << instance
+            @data[:instances][instance_id] = instance.merge({
+              'groupSet'            => group_set,
+              'ownerId'             => @owner_id,
+              'privateIpAddress'    => '',
+              'reservationId'       => reservation_id,
+            })
           end
           response.body = {
             'groupSet'      => group_set,

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

@@ -3,8 +3,6 @@ module Fog
     module EC2
       class Real
 
-        require 'fog/aws/parsers/ec2/terminate_instances'
-
         # Terminate specified instances
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/copy_object.rb

@@ -3,8 +3,6 @@ module Fog
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/copy_object'
-
         # Copy an object from one S3 bucket to another
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -3,8 +3,6 @@ module Fog
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket'
-
         # List information about objects in an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -3,8 +3,6 @@ module Fog
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_location'
-
         # Get location constraint for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -3,8 +3,6 @@ module Fog
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_request_payment'
-
         # Get configured payer for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_service.rb

@@ -3,8 +3,6 @@ module Fog
     module S3
       class Real
 
-        require 'fog/aws/parsers/s3/get_service'
-
         # List information about S3 buckets for authorized user
         #
         # ==== Returns

data/lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -3,8 +3,6 @@ module Fog
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/domain_metadata'
-
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -3,8 +3,6 @@ module Fog
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/get_attributes'
-
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

data/lib/fog/aws/requests/simpledb/list_domains.rb

@@ -3,8 +3,6 @@ module Fog
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/list_domains'
-
         # List SimpleDB domains
         #
         # ==== Parameters

data/lib/fog/aws/requests/simpledb/select.rb

@@ -3,8 +3,6 @@ module Fog
     module SimpleDB
       class Real
 
-        require 'fog/aws/parsers/simpledb/select'
-
         # Select item data from SimpleDB
         #
         # ==== Parameters

data/lib/fog/aws/s3.rb

@@ -9,6 +9,11 @@ module Fog
           require 'fog/aws/models/s3/directory'
           require 'fog/aws/models/s3/files'
           require 'fog/aws/models/s3/file'
+          require 'fog/aws/parsers/s3/copy_object'
+          require 'fog/aws/parsers/s3/get_bucket'
+          require 'fog/aws/parsers/s3/get_bucket_location'
+          require 'fog/aws/parsers/s3/get_request_payment'
+          require 'fog/aws/parsers/s3/get_service'
           require 'fog/aws/requests/s3/copy_object'
           require 'fog/aws/requests/s3/delete_bucket'
           require 'fog/aws/requests/s3/delete_object'

data/lib/fog/aws/simpledb.rb

@@ -5,6 +5,10 @@ module Fog
       def self.new(options={})
 
         unless @required
+          require 'fog/aws/parsers/simpledb/domain_metadata'
+          require 'fog/aws/parsers/simpledb/get_attributes'
+          require 'fog/aws/parsers/simpledb/list_domains'
+          require 'fog/aws/parsers/simpledb/select'
           require 'fog/aws/requests/simpledb/batch_put_attributes'
           require 'fog/aws/requests/simpledb/create_domain'
           require 'fog/aws/requests/simpledb/delete_attributes'

data/lib/fog/terremark.rb

@@ -4,6 +4,19 @@ module Fog
     def self.new(options={})
 
       unless @required
+        require 'fog/terremark/parsers/get_catalog'
+        require 'fog/terremark/parsers/get_catalog_item'
+        require 'fog/terremark/parsers/get_organization'
+        require 'fog/terremark/parsers/get_organizations'
+        require 'fog/terremark/parsers/get_public_ips'
+        require 'fog/terremark/parsers/get_tasks_list'
+        require 'fog/terremark/parsers/get_vapp_template'
+        require 'fog/terremark/parsers/get_vdc'
+        require 'fog/terremark/parsers/instantiate_vapp_template'
+        require 'fog/terremark/parsers/internet_service'
+        require 'fog/terremark/parsers/node_service'
+        require 'fog/terremark/parsers/task'
+        require 'fog/terremark/parsers/vapp'
         require 'fog/terremark/requests/add_internet_service'
         require 'fog/terremark/requests/add_node_service'
         require 'fog/terremark/requests/create_internet_service'

data/lib/fog/terremark/requests/add_internet_service.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/internet_service'
-
       # Reserve requested resources and deploy vApp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/add_node_service.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/node_service'
-
       # Reserve requested resources and deploy vApp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/create_internet_service.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/internet_service'
-
       # Reserve requested resources and deploy vApp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/deploy_vapp.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Reserve requested resources and deploy vApp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_catalog.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_catalog'
-
       # Get details of a catalog
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_catalog_item.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_catalog_item'
-
       # Get details of a catalog item
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_organization.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_organization'
-
       # Get details of an organization
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_organizations.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_organizations'
-
       # Get list of organizations
       #
       # ==== Returns

data/lib/fog/terremark/requests/get_public_ips.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_public_ips'
-
       # Get list of public ips
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_task.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Get details of a task
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_tasks_list.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_tasks_list'
-
       # Get list of tasks
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_vapp.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/vapp'
-
       # Get details of a vapp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_vapp_template.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_vapp_template'
-
       # Get details of a vapp template
       #
       # ==== Parameters

data/lib/fog/terremark/requests/get_vdc.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/get_vdc'
-
       # Get details of a vdc
       #
       # ==== Parameters

data/lib/fog/terremark/requests/instantiate_vapp_template.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/instantiate_vapp_template'
-
       # Instatiate a vapp template
       #
       # ==== Parameters

data/lib/fog/terremark/requests/power_off.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Power off a vapp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/power_on.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Power on a vapp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/reset.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Reset a vapp
       #
       # ==== Parameters

data/lib/fog/terremark/requests/shutdown.rb

@@ -2,8 +2,6 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/task'
-
       # Shutdown a vapp
       #
       # ==== Parameters

data/spec/slicehost/models/flavors_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../shared_examples/flavors_examples'
 
 describe 'Fog::AWS::Slicehost::Flavors' do
 
@@ -11,4 +11,4 @@ describe 'Fog::AWS::Slicehost::Flavors' do
     @flavors = Slicehost[:slices].flavors
   end
 
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 72
-  version: 0.0.72
+  - 73
+  version: 0.0.73
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -104,6 +104,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - README.rdoc
 - Rakefile
 - VERSION.yml