fog 0.3.7 → 0.3.8

data/lib/fog/aws/models/compute/tag.rb

@@ -0,0 +1,36 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class Compute
+
+      class Tag < Fog::Model
+
+        identity  :key
+
+        attribute :value
+        attribute :resource_id,           :aliases => 'resourceId'
+        attribute :resource_type,         :aliases => 'resourceType'        
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def destroy
+          requires :key, :resource_id
+          connection.delete_tags(resource_id, key)
+          true
+        end
+
+        def save
+          requires :key, :resource_id
+          connection.create_tags(resource_id, key => value)
+          true
+        end
+
+        private
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/tags.rb

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/tag'
+
+module Fog
+  module AWS
+    class Compute
+
+      class Tags < Fog::Collection
+
+        attribute :filters
+
+        model Fog::AWS::Compute::Tag
+
+        def initialize(attributes)
+          @filters ||= {}
+          super
+        end
+
+        def all(filters = @filters)
+          @filters = filters
+          data = connection.describe_tags(@filters).body
+          load(data['tagSet'])
+        end
+
+        def get(key)
+          if key
+            self.class.new(:connection => connection).all('key' => key)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/volume.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -18,6 +18,7 @@ module Fog
         attribute :size
         attribute :snapshot_id,       :aliases => 'snapshotId'
         attribute :state,             :aliases => 'status'
+        attribute :tags,              :aliases => 'tagSet'
 
         def initialize(attributes = {})
           # assign server first to prevent race condition with new_record?
@@ -36,15 +37,8 @@ module Fog
           state == 'available'
         end
 
-        def server=(new_server)
-          if new_server
-            attach(new_server)
-          else
-            detach
-          end
-        end
-
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :availability_zone, :size
 
           data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
@@ -56,9 +50,16 @@ module Fog
           true
         end
 
+        def server=(new_server)
+          if new_server
+            attach(new_server)
+          else
+            detach
+          end
+        end
+
         def snapshots
           requires :id
-
           connection.snapshots(:volume => self)
         end
 

data/lib/fog/aws/models/compute/volumes.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/volume'
 
 module Fog
@@ -7,19 +7,23 @@ module Fog
 
       class Volumes < Fog::Collection
 
-        attribute :volume_id
+        attribute :filters
         attribute :server
 
         model Fog::AWS::Compute::Volume
 
         def initialize(attributes)
-          @volume_id ||= []
+          @filters ||= {}
           super
         end
 
-        def all(volume_id = @volume_id)
-          @volume_id = volume_id
-          data = connection.describe_volumes(volume_id).body
+        def all(filters = @filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'volume-id' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_volumes(@filters).body
           load(data['volumeSet'])
           if server
             self.replace(self.select {|volume| volume.server_id == server.id})
@@ -29,10 +33,8 @@ module Fog
 
         def get(volume_id)
           if volume_id
-            all(volume_id).first
+            self.class.new(:connection => connection).all('volume-id' => volume_id).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
 
         def new(attributes = {})

data/lib/fog/aws/models/storage/directories.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/storage/directory'
 
 module Fog

data/lib/fog/aws/models/storage/directory.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 require 'fog/aws/models/storage/files'
 
 module Fog

data/lib/fog/aws/models/storage/file.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -8,7 +8,7 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_accessor :body
+        attr_writer :body
         attribute :content_length,  :aliases => 'Content-Length'
         attribute :content_type,    :aliases => 'Content-Type'
         attribute :etag,            :aliases => ['Etag', 'ETag']
@@ -58,6 +58,7 @@ module Fog
           true
         end
 
+        remove_method :owner=
         def owner=(new_owner)
           if new_owner
             @owner = {

data/lib/fog/aws/models/storage/files.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/storage/file'
 
 module Fog
@@ -81,12 +81,6 @@ module Fog
           super({ :directory => directory }.merge!(attributes))
         end
 
-        private
-
-        def directory=(new_directory)
-          @directory = new_directory
-        end
-
       end
 
     end

data/lib/fog/aws/parsers/compute/describe_availability_zones.rb

@@ -6,7 +6,7 @@ module Fog
         class DescribeAvailabilityZones < Fog::Parsers::Base
 
           def reset
-            @availability_zone = {}
+            @availability_zone = { 'messageSet' => [] }
             @response = { 'availabilityZoneInfo' => [] }
           end
 
@@ -14,7 +14,9 @@ module Fog
             case name
             when 'item'
               @response['availabilityZoneInfo'] << @availability_zone
-              @availability_zone = {}
+              @availability_zone = { 'messageSet' => [] }
+            when 'message'
+              @availability_zone['messageSet'] << @value
             when 'regionName', 'zoneName', 'zoneState'
               @availability_zone[name] = @value
             when 'requestId'

data/lib/fog/aws/parsers/compute/describe_images.rb

@@ -6,26 +6,32 @@ module Fog
         class DescribeImages < Fog::Parsers::Base
 
           def reset
-            @image = { 'productCodes' => [], 'blockDeviceMapping' => nil }
+            @block_device_mapping = {}
+            @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
             @response = { 'imagesSet' => [] }
+            @tag = {}
           end
 
           def start_element(name, attrs = [])
             super
-            if name == 'productCodes'
+            case name
+            when 'productCodes'
               @in_product_codes = true
-            elsif name == 'blockDeviceMapping'
+            when 'blockDeviceMapping'
               @in_block_device_mapping = true
-              @image['blockDeviceMapping'] = []
-             elsif name == 'item' && @in_block_device_mapping
-              @image['blockDeviceMapping'] << {}
+            when 'tagSet'
+              @in_tag_set = true
             end
           end
-          
+
           def end_element(name)
             case name
             when 'architecture',  'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName'
               @image[name] = @value
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = false
+            when 'deviceName', 'virtualName', 'snapshotId', 'deleteOnTermination'
+              @block_device_mapping[name] = @value
             when 'isPublic'
               if @value == 'true'
                 @image[name] = true
@@ -34,21 +40,25 @@ module Fog
               end
             when 'item'
               if @in_block_device_mapping
+                @image['blockDeviceMapping'] << @block_device_mapping
+                @block_device_mapping = {}
+              elsif @in_tag_set
+                @image['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
               elsif !@in_product_codes
                 @response['imagesSet'] << @image
-                @image = { 'productCodes' => [] }
+                @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
               end
+            when 'key', 'value'
+              @tag[name] = @value
             when 'productCode'
               @image['productCodes'] << @value
             when 'productCodes'
               @in_product_codes = false
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = false
             when 'requestId'
               @response[name] = @value
-            when 'deviceName','virtualName','snapshotId','volumeSize','deleteOnTermination'
-              l = @image['blockDeviceMapping'].length
-              @image['blockDeviceMapping'][l-1].store(name,@value)
+            when 'volumeSize'
+              @block_device_mapping[name] = @value.to_i
             end
           end
 

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

@@ -7,9 +7,10 @@ module Fog
 
           def reset
             @block_device_mapping = {}
-            @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+            @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
             @reservation = { 'groupSet' => [], 'instancesSet' => [] }
             @response = { 'reservationSet' => [] }
+            @tag = {}
           end
 
           def start_element(name, attrs = [])
@@ -21,6 +22,12 @@ module Fog
               @in_subset = true
             when 'instancesSet'
               @in_instances_set = true
+            when 'instanceState'
+              @in_instance_state = true
+            when 'stateReason'
+              @in_state_reason = true
+            when 'tagSet'
+              @in_tag_set = true
             end
           end
 
@@ -30,17 +37,21 @@ 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'
+            when 'architecture', 'clientToken', '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
+              if @in_instance_state
+                @instance['instanceState'][name] = @value.to_i
+              elsif @in_state_reason
+                @instance['stateReason'][name] = @value.to_i
+              end
             when 'deleteOnTermination'
               if @value == 'true'
                 @block_device_mapping[name] = true
@@ -55,21 +66,32 @@ module Fog
               @in_subset = false
             when 'instancesSet'
               @in_instances_set = false
+            when 'instanceState'
+              @in_instance_state = false
             when 'item'
               if @in_block_device_mapping
                 @instance['blockDeviceMapping'] << @block_device_mapping
                 @block_device_mapping = {}
+              elsif @in_tag_set
+                @instance['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
               elsif @in_instances_set
                 @reservation['instancesSet'] << @instance
-                @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
+                @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
               elsif !@in_subset
                 @response['reservationSet'] << @reservation
                 @reservation = { 'groupSet' => [], 'instancesSet' => [] }
               end
+            when 'key', 'value'
+              @tag[name] = @value
             when 'launchTime'
               @instance[name] = Time.parse(@value)
             when 'name'
-              @instance['instanceState'][name] = @value
+              if @in_instance_state
+                @instance['instanceState'][name] = @value
+              elsif @in_state_reason
+                @instance['stateReason'][name] = @value
+              end
             when 'ownerId', 'reservationId'
               @reservation[name] = @value
             when 'requestId'
@@ -82,6 +104,10 @@ module Fog
               else
                 @instance['monitoring'][name] = false
               end
+            when 'stateReason'
+              @in_state_reason = false
+            when 'tagSet'
+              @in_tag_set = false
             end
           end
 

data/lib/fog/aws/parsers/compute/describe_security_groups.rb

@@ -15,11 +15,12 @@ module Fog
 
           def start_element(name, attrs = [])
             super
-            if name == 'groups'
+            case name
+            when 'groups'
               @in_groups = true
-            elsif name == 'ipPermissions'
+            when 'ipPermissions'
               @in_ip_permissions = true
-            elsif name == 'ipRanges'
+            when 'ipRanges'
               @in_ip_ranges = true
             end
           end

data/lib/fog/aws/parsers/compute/describe_snapshots.rb

@@ -7,22 +7,42 @@ module Fog
 
           def reset
             @response = { 'snapshotSet' => [] }
-            @snapshot = {}
+            @snapshot = { 'tagSet' => {} }
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if name == 'tagSet'
+              @in_tag_set = true
+            end
           end
 
           def end_element(name)
-            case name
-            when 'item'
-              @response['snapshotSet'] << @snapshot
-              @snapshot = {}
-            when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
-              @snapshot[name] = @value
-            when 'requestId'
-              @response[name] = @value
-            when 'startTime'
-              @snapshot[name] = Time.parse(@value)
-            when 'volumeSize'
-              @snapshot[name] = @value.to_i
+            if @in_tag_set
+              case name
+              when 'item'
+                @snapshot['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'key', 'value'
+                @tag[key] = value
+              when 'tagSet'
+                @in_tag_set = false
+              end
+            else
+              case name
+              when 'item'
+                @response['snapshotSet'] << @snapshot
+                @snapshot = { 'tagSet' => {} }
+              when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
+                @snapshot[name] ||= @value
+              when 'requestId'
+                @response[name] = @value
+              when 'startTime'
+                @snapshot[name] = Time.parse(@value)
+              when 'volumeSize'
+                @snapshot[name] = @value.to_i
+              end
             end
           end