fog 0.0.45 → 0.0.46

data/Rakefile

@@ -8,7 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.add_dependency('excon', '>=0.0.18')
-    gem.add_dependency('formatador')
+    gem.add_dependency('formatador', '>=0.0.8')
     gem.add_dependency('json')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 45
+:patch: 46
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.45"
+  s.version = "0.0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-02-22}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -491,14 +491,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<excon>, [">= 0.0.18"])
-      s.add_runtime_dependency(%q<formatador>, [">= 0"])
+      s.add_runtime_dependency(%q<formatador>, [">= 0.0.8"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
       s.add_dependency(%q<excon>, [">= 0.0.18"])
-      s.add_dependency(%q<formatador>, [">= 0"])
+      s.add_dependency(%q<formatador>, [">= 0.0.8"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -506,7 +506,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<excon>, [">= 0.0.18"])
-    s.add_dependency(%q<formatador>, [">= 0"])
+    s.add_dependency(%q<formatador>, [">= 0.0.8"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

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

@@ -6,21 +6,27 @@ module Fog
 
         identity  :id,                'instanceId'
 
-        attribute :ami_launch_index,  'amiLaunchIndex'
-        attribute :availability_zone, 'availabilityZone'
-        attribute :dns_name,          'dnsName'
+        attribute :architecture
+        attribute :ami_launch_index,      'amiLaunchIndex'
+        attribute :availability_zone,     'availabilityZone'
+        attribute :block_device_mapping,  'blockDeviceMapping'
+        attribute :dns_name,              'dnsName'
         attribute :groups
-        attribute :image_id,          'imageId'
-        attribute :state,             'instanceState'
-        attribute :flavor_id,            'instanceType'
-        attribute :kernel_id,         'kernelId'
-        attribute :key_name,          'keyName'
-        attribute :created_at,        'launchTime'
+        attribute :flavor_id,             'instanceType'
+        attribute :image_id,              'imageId'
+        attribute :ip_address,            'ipAddress'
+        attribute :kernel_id,             'kernelId'
+        attribute :key_name,              'keyName'
+        attribute :created_at,            'launchTime'
         attribute :monitoring
-        attribute :product_codes,     'productCodes'
-        attribute :private_dns_name,  'privateDnsName'
-        attribute :ramdisk_id,        'ramdiskId'
+        attribute :product_codes,         'productCodes'
+        attribute :private_dns_name,      'privateDnsName'
+        attribute :private_ip_address,    'privateIpAddress'
+        attribute :ramdisk_id,            'ramdiskId'
         attribute :reason
+        attribute :root_device_name,      'rootDeviceName'
+        attribute :root_device_type,      'rootDeviceType'
+        attribute :state,                 'instanceState'
         attribute :user_data
 
         def initialize(attributes)
@@ -50,7 +56,7 @@ module Fog
         # end
 
         def flavor_id
-          @flavor && @flavor.id || 'm1.small'
+          @flavor_id || @flavor && @flavor.id || 'm1.small'
         end
 
         def flavor=(new_flavor)

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

@@ -6,15 +6,19 @@ module Fog
         class DescribeInstances < Fog::Parsers::Base
 
           def reset
-            @instance = { 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+            @block_device_mapping = {}
+            @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
             @reservation = { 'groupSet' => [], 'instancesSet' => [] }
             @response = { 'reservationSet' => [] }
           end
 
           def start_element(name, attrs = [])
-            if name == 'groupSet' || name == 'productCodes'
+            case name
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = true
+            when'groupSet', 'productCodes'
               @in_subset = true
-            elsif name == 'instancesSet'
+            when 'instancesSet'
               @in_instances_set = true
             end
             @value = ''
@@ -26,20 +30,38 @@ module Fog
               @instance[name] = @value.to_i
             when 'availabilityZone'
               @instance['placement'][name] = @value
+            when 'architecture', 'dnsName', 'imageId', 'instanceId',
+                  'instanceType', 'ipAddress', 'kernelId', 'keyName',
+                  'privateDnsName', 'privateIpAddress', 'ramdiskId', 'reason',
+                  'rootDeviceType'
+              @instance[name] = @value
+            when 'attachTime'
+              @block_device_mapping[name] = Time.parse(@value)
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = false
             when 'code'
               @instance['instanceState'][name] = @value.to_i
-            when 'dnsName', 'imageId', 'instanceId', 'instanceType', 'kernelId', 'keyName', 'privateDnsName', 'ramdiskId', 'reason'
-              @instance[name] = @value
+            when 'deleteOnTermination'
+              if @value == 'true'
+                @block_device_mapping[name] = true
+              else
+                @block_device_mapping[name] = false
+              end
+            when 'deviceName', 'status', 'volumeId'
+              @block_device_mapping[name] = @value
             when 'groupId'
               @reservation['groupSet'] << @value
-            when 'groupSet'
+            when 'groupSet', 'productCodes'
               @in_subset = false
             when 'instancesSet'
               @in_instances_set = false
             when 'item'
-              if @in_instances_set
+              if @in_block_device_mapping
+                @instance['blockDeviceMapping'] << @block_device_mapping
+                @block_device_mapping = {}
+              elsif @in_instances_set
                 @reservation['instancesSet'] << @instance
-                @instance = { 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+                @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
               elsif !@in_subset
                 @response['reservationSet'] << @reservation
                 @reservation = { 'groupSet' => [], 'instancesSet' => [] }
@@ -54,8 +76,6 @@ module Fog
               @response[name] = @value
             when 'productCode'
               @instance['productCodes'] << @value
-            when 'productCodes'
-              @in_subset = false
             when 'state'
               if @value == 'true'
                 @instance['monitoring'][name] = true

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

@@ -6,14 +6,18 @@ module Fog
         class RunInstances < Fog::Parsers::Base
 
           def reset
-            @instance = { 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+            @block_device_mapping = {}
+            @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
             @response = { 'groupSet' => [], 'instancesSet' => [] }
           end
 
           def start_element(name, attrs = [])
-            if name == 'groupSet'
+            case name
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = true
+            when 'groupSet'
               @in_group_set = true
-            elsif name == 'productCodes'
+            when 'productCodes'
               @in_product_codes = true
             end
             @value = ''
@@ -23,20 +27,38 @@ module Fog
             case name
             when 'amiLaunchIndex'
               @instance[name] = @value.to_i
+            when 'architecture', 'dnsName', 'imageId', 'instanceId',
+                  'instanceType', 'ipAddress', 'kernelId', 'keyName',
+                  'privateDnsName', 'privateIpAddress', 'ramdiskId', 'reason',
+                  'rootDeviceType'
+              @instance[name] = @value
             when 'availabilityZone'
               @instance['placement'][name] = @value
+            when 'attachTime'
+              @block_device_mapping[name] = Time.parse(@value)
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = false
             when 'code'
               @instance['instanceState'][name] = @value.to_i
-            when 'dnsName', 'kernelId', 'keyName', 'imageId', 'instanceId', 'instanceType', 'platform', 'privateDnsName', 'ramdiskId', 'reason', 'requestorId'
-              @instance[name] = @value
+            when 'deleteOnTermination'
+              if @value == 'true'
+                @block_device_mapping[name] = true
+              else
+                @block_device_mapping[name] = false
+              end
+            when 'deviceName', 'status', 'volumeId'
+              @block_device_mapping[name] = @value
             when 'groupId'
               @response['groupSet'] << @value
             when 'groupSet'
               @in_group_set = false
             when 'item'
-              unless @in_group_set || @in_product_codes
+              if @in_block_device_mapping
+                @instance['blockDeviceMapping'] << @block_device_mapping
+                @block_device_mapping = {}
+              elsif !@in_group_set && !@in_product_codes
                 @response['instancesSet'] << @instance
-                @instance = { 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+                @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
               end
             when 'launchTime'
               @instance[name] = Time.parse(@value)

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

@@ -19,7 +19,14 @@ unless Fog.mocking?
         #       * 'reservationId'<~String> - Id of the reservation
         #       * 'instancesSet'<~Array>:
         #         * instance<~Hash>:
+        #           * 'architecture'<~String> - architecture of image in [i386, x86_64]
         #           * 'amiLaunchIndex'<~Integer> - reference to instance in launch group
+        #           * 'blockDeviceMapping'<~Array>
+        #             * 'attachTime'<~Time> - time of volume attachment
+        #             * 'deleteOnTermination'<~Boolean> - whether or not to delete volume on termination
+        #             * 'deviceName'<~String> - specifies how volume is exposed to instance
+        #             * 'status'<~String> - status of attached volume
+        #             * 'volumeId'<~String> - Id of attached volume
         #           * 'dnsName'<~String> - public dns name, blank until instance is running
         #           * 'imageId'<~String> - image id of ami used to launch instance
         #           * 'instanceId'<~String> - id of the instance
@@ -27,7 +34,8 @@ unless Fog.mocking?
         #             * 'code'<~Integer> - current status code
         #             * 'name'<~String> - current status name
         #           * 'instanceType'<~String> - type of instance
-        #           * 'kernelId'<~String> - Id of kernel used to launch instance
+        #           * 'ipAddress'<~String> - public ip address assigned to instance
+        #           * 'kernelId'<~String> - id of kernel used to launch instance
         #           * 'keyName'<~String> - name of key used launch instances or blank
         #           * 'launchTime'<~Time> - time instance was launched
         #           * 'monitoring'<~Hash>:
@@ -36,6 +44,9 @@ unless Fog.mocking?
         #             * 'availabilityZone'<~String> - Availability zone of the instance
         #           * 'productCodes'<~Array> - Product codes for the instance
         #           * 'privateDnsName'<~String> - private dns name, blank until instance is running
+        #           * 'privateIpAddress'<~String> - private ip address assigned to instance
+        #           * 'rootDeviceName'<~String> - specifies how the root device is exposed to the instance
+        #           * 'rootDeviceType'<~String> - root device type used by AMI in [ebs, instance-store]
         #           * 'ramdiskId'<~String> - Id of ramdisk used to launch instance
         #           * 'reason'<~String> - reason for most recent state transition, or blank
         def describe_instances(instance_id = [])

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

@@ -19,9 +19,13 @@ unless Fog.mocking?
         #   (by default the maximum for an account is 20)
         # * options<~Hash>:
         #   * 'Placement.AvailabilityZone'<~String> - Placement constraint for instances
-        #   * 'DeviceName'<~String> - ?
-        #   * 'Encoding'<~String> - ?
+        #   * 'BlockDeviceMapping.n.DeviceName'<~String> - where the volume will be exposed to instance
+        #   * 'BlockDeviceMapping.n.VirtualName'<~String> - volume virtual device name
+        #   * 'BlockDeviceMapping.n.Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
+        #   * 'BlockDeviceMapping.n.Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
+        #   * 'BlockDeviceMapping.n.Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
         #   * 'SecurityGroup.n'<~String> - Indexed names of security groups for instances
+        #   * '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']
         #     default is 'm1.small'
@@ -31,8 +35,6 @@ unless Fog.mocking?
         #     disabled
         #   * 'RamdiskId'<~String> - Id of ramdisk with which to launch
         #   * 'UserData'<~String> -  Additional data to provide to booting instances
-        #   * 'Version'<~String> - ?
-        #   * 'VirtualName'<~String> - ?
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -42,6 +44,13 @@ unless Fog.mocking?
         #     * 'instancesSet'<~Array>: returned instances
         #       * instance<~Hash>:
         #         * 'amiLaunchIndex'<~Integer> - reference to instance in launch group
+        #         * 'architecture'<~String> - architecture of image in [i386, x86_64]
+        #         * 'blockDeviceMapping'<~Array>
+        #           * 'attachTime'<~Time> - time of volume attachment
+        #           * 'deleteOnTermination'<~Boolean> - whether or not to delete volume on termination
+        #           * 'deviceName'<~String> - specifies how volume is exposed to instance
+        #           * 'status'<~String> - status of attached volume
+        #           * 'volumeId'<~String> - Id of attached volume
         #         * 'dnsName'<~String> - public dns name, blank until instance is running
         #         * 'imageId'<~String> - image id of ami used to launch instance
         #         * 'instanceId'<~String> - id of the instance
@@ -49,6 +58,7 @@ unless Fog.mocking?
         #           * 'code'<~Integer> - current status code
         #           * 'name'<~String> - current status name
         #         * 'instanceType'<~String> - type of instance
+        #         * 'ipAddress'<~String> - public ip address assigned to instance
         #         * 'kernelId'<~String> - Id of kernel used to launch instance
         #         * 'keyName'<~String> - name of key used launch instances or blank
         #         * 'launchTime'<~Time> - time instance was launched
@@ -57,9 +67,12 @@ unless Fog.mocking?
         #         * 'placement'<~Hash>:
         #           * 'availabilityZone'<~String> - Availability zone of the instance
         #         * 'privateDnsName'<~String> - private dns name, blank until instance is running
+        #         * 'privateIpAddress'<~String> - private ip address assigned to instance
         #         * 'productCodes'<~Array> - Product codes for the instance
         #         * 'ramdiskId'<~String> - Id of ramdisk used to launch instance
         #         * 'reason'<~String> - reason for most recent state transition, or blank
+        #         * 'rootDeviceName'<~String> - specifies how the root device is exposed to the instance
+        #         * 'rootDeviceType'<~String> - root device type used by AMI in [ebs, instance-store]
         #     * 'ownerId'<~String> - Id of owner
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationId'<~String> - Id of reservation

data/lib/fog/collection.rb

@@ -120,6 +120,10 @@ module Fog
       self.clear.concat(all)
     end
 
+    def table(attributes = nil)
+      Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
+    end
+
     private
 
     def lazy_load

data/spec/aws/requests/ec2/describe_instances_spec.rb

@@ -22,6 +22,8 @@ describe 'EC2.describe_instances' do
       reservation['reservationId'].should be_a(String)
       instance = reservation['instancesSet'].select {|instance| instance['instanceId'] == @instance_id}.first
       instance['amiLaunchIndex'].should be_an(Integer)
+      # instance['architecture'].should be_a(String)
+      instance['blockDeviceMapping'].should be_an(Array)
       instance['dnsName'].should be_a(String)
       instance['imageId'].should be_a(String)
       instance['instanceId'].should be_a(String)
@@ -29,6 +31,7 @@ describe 'EC2.describe_instances' do
       instance['instanceState']['code'].should be_a(Integer)
       instance['instanceState']['name'].should be_a(String)
       instance['instanceType'].should be_a(String)
+      # instance['ipAddress'].should be_a(String)
       instance['kernelId'].should be_a(String)
       instance['keyName'].should be_a(String) if instance['keyName']
       instance['launchTime'].should be_a(Time)
@@ -37,10 +40,13 @@ describe 'EC2.describe_instances' do
       instance['placement'].should be_a(Hash)
       instance['placement']['availabilityZone'].should be_a(String)
       instance['privateDnsName'].should be_a(String)
+      # instance['privateIpAddress'].should be_a(String)
       instance['productCodes'].should be_an(Array)
       instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
       instance['ramdiskId'].should be_a(String)
       instance['reason'].should be_a(String)
+      # instance['rootDeviceName'].should be_a(String)
+      instance['rootDeviceType'].should be_a(String)
     end
   
     it "should return proper attributes with params" do
@@ -52,6 +58,8 @@ describe 'EC2.describe_instances' do
       reservation['reservationId'].should be_a(String)
       instance = reservation['instancesSet'].select {|instance| instance['instanceId'] == @instance_id}.first
       instance['amiLaunchIndex'].should be_an(Integer)
+      # instance['architecture'].should be_a(String)
+      instance['blockDeviceMapping'].should be_an(Array)
       instance['dnsName'].should be_a(String)
       instance['imageId'].should be_a(String)
       instance['instanceId'].should be_a(String)
@@ -59,6 +67,7 @@ describe 'EC2.describe_instances' do
       instance['instanceState']['code'].should be_a(Integer)
       instance['instanceState']['name'].should be_a(String)
       instance['instanceType'].should be_a(String)
+      # instance['ipAddress'].should be_a(String)
       instance['kernelId'].should be_a(String)
       instance['keyName'].should be_a(String) if instance['keyName']
       instance['launchTime'].should be_a(Time)
@@ -67,10 +76,13 @@ describe 'EC2.describe_instances' do
       instance['placement'].should be_a(Hash)
       instance['placement']['availabilityZone'].should be_a(String)
       instance['privateDnsName'].should be_a(String)
+      # instance['privateIpAddress'].should be_a(String)
       instance['productCodes'].should be_an(Array)
       instance['productCodes'].first.should be_a(String) if instance['productCodes'].first
       instance['ramdiskId'].should be_a(String)
       instance['reason'].should be_a(String)
+      # instance['rootDeviceName'].should be_a(String)
+      instance['rootDeviceType'].should be_a(String)
     end
 
   end

data/spec/aws/requests/ec2/run_instances_spec.rb

@@ -16,6 +16,8 @@ describe 'EC2.run_instances' do
       actual.body['instancesSet'].should be_an(Array)
       instance = actual.body['instancesSet'].first
       instance['amiLaunchIndex'].should be_a(Integer)
+      # instance['architecture'].should be_a(String)
+      instance['blockDeviceMapping'].should be_an(Array)
       instance['dnsName'].should be_a(String)
       instance['imageId'].should be_a(String)
       instance['instanceId'].should be_a(String)
@@ -23,6 +25,7 @@ describe 'EC2.run_instances' do
       instance['instanceState']['code'].should be_an(Integer)
       instance['instanceState']['name'].should be_an(String)
       instance['instanceType'].should be_a(String)
+      # instance['ipAddress'].should be_a(String)
       instance['kernelId'].should be_a(String)
       instance['keyName'].should be_a(String) if instance['keyName']
       instance['launchTime'].should be_a(Time)
@@ -31,11 +34,14 @@ describe 'EC2.run_instances' do
       instance['placement'].should be_a(Hash)
       instance['placement']['availabilityZone'].should be_a(String)
       instance['privateDnsName'].should be_a(String)
+      # instance['privateIpAddress'].should be_a(String)
       instance['ramdiskId'].should be_a(String)
       instance['reason'].should be_a(String)
       actual.body['ownerId'].should be_a(String)
       actual.body['requestId'].should be_a(String)
       actual.body['reservationId'].should be_a(String)
+      # instance['rootDeviceName'].should be_a(String)
+      instance['rootDeviceType'].should be_a(String)
     end
 
   end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'open-uri'
 
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
+require "#{current_directory}/../lib/fog/bin"
 # Fog.mock!
 
 unless defined?(LOADED_SPEC_OPTS)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -08:00
+date: 2010-02-22 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.0.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: json