fog 0.3.22 → 0.3.23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.22)
+    fog (0.3.23)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.16)

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.3.22'
-  s.date              = '2010-11-18'
+  s.version           = '0.3.23'
+  s.date              = '2010-11-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -18,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.22'
+    VERSION = '0.3.23'
   end
 
   module Mock

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

@@ -19,7 +19,7 @@ module Fog
         def destroy
           requires :public_ip
 
-          connection.release_address(@public_ip)
+          connection.release_address(public_ip)
           true
         end
 
@@ -33,8 +33,9 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          data = connection.allocate_address
-          @public_ip = data.body['publicIp']
+          data = connection.allocate_address.body
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
           if @server
             self.server = @server
           end
@@ -48,14 +49,14 @@ module Fog
             @server = new_server
           else
             @server = nil
-            @server_id = new_server.id
+            self.server_id = new_server.id
             connection.associate_address(@server_id, @public_ip)
           end
         end
 
         def disassociate
           @server = nil
-          @server_id = nil
+          self.server_id = nil
           unless new_record?
             connection.disassociate_address(@public_ip)
           end

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

@@ -13,16 +13,16 @@ module Fog
         model Fog::AWS::Compute::Address
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
+        def all(filters = filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('public-ip' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
-          @filters = filters
+          self.filters = filters
           data = connection.describe_addresses(filters).body
           load(
             data['addressesSet'].map do |address|

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

@@ -24,18 +24,14 @@ module Fog
         attribute :tags,                  :aliases => 'tagSet'
 
         def deregister(delete_snapshot = false)
-          connection.deregister_image(@id)
-
-          if(delete_snapshot && @root_device_type=="ebs")
-            @block_device_mapping.each do |block_device|
-              next if block_device["deviceName"] != @root_device_name
-              snapshot_id = block_device["snapshotId"]
-              snapshot = @connection.snapshots.get(snapshot_id)
-              return snapshot.destroy
-            end
-          end
+          connection.deregister_image(id)
 
-          return true
+          if(delete_snapshot && root_device_type == "ebs")
+            block_device = block_device_mapping.select {|block_device| block_device['deviceName'] == root_device_name}
+            @connection.snapshots.new(:id => block_device['snapshotId']).destroy
+          else
+            true
+          end
         end
 
       end

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

@@ -12,13 +12,13 @@ module Fog
         model Fog::AWS::Compute::Image
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
         def all(filters = @filters)
-          @filters = filters
-          data = connection.describe_images(@filters).body
+          self.filters = filters
+          data = connection.describe_images(filters).body
           load(data['imagesSet'])
         end
 

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

@@ -18,7 +18,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(@name)
+          connection.delete_key_pair(name)
           true
         end
 

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

@@ -7,21 +7,22 @@ module Fog
 
       class KeyPairs < Fog::Collection
 
+        attribute :filters
         attribute :key_name
 
         model Fog::AWS::Compute::KeyPair
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
+        def all(filters = filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'key-name' => [*filters]}
           end
-          @filters = filters
+          self.filters = filters
           data = connection.describe_key_pairs(filters).body
           load(data['keySet'])
         end

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

@@ -16,7 +16,7 @@ module Fog
           requires :name
 
           connection.authorize_security_group_ingress(
-            'GroupName'                   => @name,
+            'GroupName'                   => name,
             'SourceSecurityGroupName'     => group,
             'SourceSecurityGroupOwnerId'  => owner
           )
@@ -28,7 +28,7 @@ module Fog
           connection.authorize_security_group_ingress(
             'CidrIp'      => options[:cidr_ip] || '0.0.0.0/0',
             'FromPort'    => range.min,
-            'GroupName'   => @name,
+            'GroupName'   => name,
             'ToPort'      => range.max,
             'IpProtocol'  => options[:ip_protocol] || 'tcp'
           )
@@ -37,7 +37,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_security_group(@name)
+          connection.delete_security_group(name)
           true
         end
 
@@ -45,7 +45,7 @@ module Fog
           requires :name
 
           connection.revoke_security_group_ingress(
-            'GroupName'                   => @name,
+            'GroupName'                   => name,
             'SourceSecurityGroupName'     => group,
             'SourceSecurityGroupOwnerId'  => owner
           )
@@ -57,7 +57,7 @@ module Fog
           connection.revoke_security_group_ingress(
             'CidrIp'      => options[:cidr_ip] || '0.0.0.0/0',
             'FromPort'    => range.min,
-            'GroupName'   => @name,
+            'GroupName'   => name,
             'ToPort'      => range.max,
             'IpProtocol'  => options[:ip_protocol] || 'tcp'
           )
@@ -66,7 +66,7 @@ module Fog
         def save
           requires :description, :name
 
-          data = connection.create_security_group(@name, @description).body
+          data = connection.create_security_group(name, description).body
           true
         end
 

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

@@ -12,16 +12,16 @@ module Fog
         model Fog::AWS::Compute::SecurityGroup
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
+        def all(filters = filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
-          @filters = filters
+          self.filters = filters
           data = connection.describe_security_groups(@filters).body
           load(data['securityGroupInfo'])
         end

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

@@ -10,7 +10,7 @@ module Fog
 
         attr_accessor :architecture
         attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
-        attribute :availability_zone,     :aliases => ['availabilityZone', 'placement']
+        attribute :availability_zone,     :aliases => ['availabilityZone', 'placement'], :squash => 'availabilityZone'
         attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
         attribute :client_token,          :aliases => 'clientToken'
         attribute :dns_name,              :aliases => 'dnsName'
@@ -22,7 +22,7 @@ module Fog
         attribute :kernel_id,             :aliases => 'kernelId'
         attribute :key_name,              :aliases => 'keyName'
         attribute :created_at,            :aliases => 'launchTime'
-        attribute :monitoring
+        attribute :monitoring,            :squash => 'state'
         attribute :product_codes,         :aliases => 'productCodes'
         attribute :private_dns_name,      :aliases => 'privateDnsName'
         attribute :private_ip_address,    :aliases => 'privateIpAddress'
@@ -30,7 +30,7 @@ module Fog
         attribute :reason
         attribute :root_device_name,      :aliases => 'rootDeviceName'
         attribute :root_device_type,      :aliases => 'rootDeviceType'
-        attribute :state,                 :aliases => 'instanceState'
+        attribute :state,                 :aliases => 'instanceState', :squash => 'name'
         attribute :state_reason,          :aliases => 'stateReason'
         attribute :subnet_id,             :aliases => 'subnetId'
         attribute :tags,                  :aliases => 'tagSet'
@@ -40,8 +40,8 @@ module Fog
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          @groups ||= ["default"] unless attributes[:subnet_id]
-          @flavor_id ||= 'm1.small'
+          self.groups ||= ["default"] unless attributes[:subnet_id]
+          self.flavor_id ||= 'm1.small'
           super
         end
 
@@ -51,31 +51,22 @@ module Fog
           connection.addresses(:server => self)
         end
 
-        remove_method :availability_zone=
-        def availability_zone=(new_availability_zone)
-          if new_availability_zone.is_a?(Hash)
-            @availability_zone = new_availability_zone['availabilityZone']
-          else
-            @availability_zone = new_availability_zone
-          end
-        end
-
         def console_output
           requires :id
 
-          connection.get_console_output(@id)
+          connection.get_console_output(id)
         end
 
         def destroy
           requires :id
 
-          connection.terminate_instances(@id)
+          connection.terminate_instances(id)
           true
         end
 
         remove_method :flavor_id
         def flavor_id
-          @flavor && @flavor.id || @flavor_id
+          @flavor && @flavor.id || attributes[:flavor_id]
         end
 
         def flavor=(new_flavor)
@@ -83,26 +74,17 @@ module Fog
         end
 
         def flavor
-          @flavor ||= connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
+          @flavor ||= connection.flavors.all.detect {|flavor| flavor.id == flavor_id}
         end
 
         def key_pair
           requires :key_name
 
-          connection.keypairs.all(@key_name).first
+          connection.keypairs.all(key_name).first
         end
 
         def key_pair=(new_keypair)
-          @key_name = new_keypair && new_keypair.name
-        end
-
-        remove_method :monitoring=
-        def monitoring=(new_monitoring)
-          if new_monitoring.is_a?(Hash)
-            @monitoring = new_monitoring['state']
-          else
-            @monitoring = new_monitoring
-          end
+          key_name = new_keypair && new_keypair.name
         end
 
         def private_key_path
@@ -124,12 +106,12 @@ module Fog
         end
 
         def ready?
-          @state == 'running'
+          state == 'running'
         end
 
         def reboot
           requires :id
-          connection.reboot_instances(@id)
+          connection.reboot_instances(id)
           true
         end
 
@@ -191,13 +173,13 @@ module Fog
 
         def start
           requires :id
-          connection.start_instances(@id)
+          connection.start_instances(id)
           true
         end
 
         def stop
           requires :id
-          connection.stop_instances(@id)
+          connection.stop_instances(id)
           true
         end
 
@@ -210,17 +192,6 @@ module Fog
           connection.volumes(:server => self)
         end
 
-        private
-
-        remove_method :state=
-        def state=(new_state)
-          if new_state.is_a?(Hash)
-            @state = new_state['name']
-          else
-            @state = new_state
-          end
-        end
-
       end
 
     end

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

@@ -9,21 +9,19 @@ module Fog
 
         attribute :filters
 
-        attribute :server_id
-
         model Fog::AWS::Compute::Server
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
+        def all(filters = self.filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
-          @filters = filters
+          self.filters = filters
           data = connection.describe_instances(filters).body
           load(
             data['reservationSet'].map do |reservation|

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

@@ -22,7 +22,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_snapshot(@id)
+          connection.delete_snapshot(id)
           true
         end
 
@@ -34,7 +34,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :volume_id
 
-          data = connection.create_snapshot(@volume_id, @description).body
+          data = connection.create_snapshot(volume_id, description).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
@@ -42,13 +42,13 @@ module Fog
 
         def volume
           requires :id
-          connection.describe_volumes(@volume_id)
+          connection.describe_volumes(volume_id)
         end
 
         private
 
         def volume=(new_volume)
-          @volume_id = new_volume.volume_id
+          self.volume_id = new_volume.volume_id
         end
 
       end