fog 0.2.23 → 0.2.24

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.23'
-  s.date              = '2010-08-16'
+  s.version           = '0.2.24'
+  s.date              = '2010-08-17'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

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

data/lib/fog/aws/models/ec2/server.rb

@@ -29,10 +29,11 @@ module Fog
         attribute :root_device_name,      'rootDeviceName'
         attribute :root_device_type,      'rootDeviceType'
         attribute :state,                 'instanceState'
+        attribute :subnet_id,             'subnetId'
         attribute :user_data
 
         def initialize(attributes={})
-          @groups ||= ["default"]
+          @groups ||= ["default"] if attributes[:subnet_id].blank?
           @flavor_id ||= 'm1.small'
           super
         end
@@ -124,8 +125,18 @@ module Fog
             'Placement.AvailabilityZone'  => @availability_zone,
             'RamdiskId'                   => @ramdisk_id,
             'SecurityGroup'               => @groups,
+            'SubnetId'                    => subnet_id,
             'UserData'                    => @user_data
           }
+          
+          # If subnet is defined we are working on a virtual private cloud.
+          # subnet & security group cannot co-exist. I wish VPC just ignored
+          # the security group parameter instead, it would be much easier!
+          if subnet_id.blank?
+            options.delete('SubnetId') 
+          else
+            options.delete('SecurityGroup')
+          end
 
           data = connection.run_instances(@image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)

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

@@ -76,6 +76,8 @@ module Fog
               else
                 @instance['monitoring'][name] = false
               end
+            when 'subnetId'
+              @response[name] = @value
             end
           end
 

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

@@ -26,7 +26,7 @@ module Fog
         #     * 'Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
         #     * 'Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
         #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
-        #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances
+        #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (you must omit this parameter if using Virtual Private Clouds)
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
         #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 23
-  version: 0.2.23
+  - 24
+  version: 0.2.24
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-17 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency