fog 0.8.1 → 0.8.2

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

@@ -0,0 +1,32 @@
+require 'fog/core/collection'
+require 'fog/compute/models/linode/server'
+
+module Fog
+  module Linode
+    class Compute
+      class Servers < Fog::Collection
+        model Fog::Linode::Compute::Server
+
+        def all
+          load servers
+        end
+
+        def get(id)
+          new servers(id).first
+        rescue Fog::Linode::Compute::NotFound
+          nil
+        end
+
+        private
+        def servers(id=nil)
+          connection.linode_list(id).body['DATA'].map { |server| map_server server }
+        end
+        
+        def map_server(server)
+          server = server.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
+          server.merge! :id => server[:linodeid], :name => server[:label]
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/models/linode/stack_script.rb

@@ -0,0 +1,13 @@
+require 'fog/core/model'
+
+module Fog
+  module Linode
+    class Compute
+      class StackScript < Fog::Model
+        attr_accessor :options
+        identity :id
+        attribute :name
+      end
+    end
+  end
+end

data/lib/fog/compute/models/linode/stack_scripts.rb

@@ -0,0 +1,32 @@
+require 'fog/core/collection'
+require 'fog/compute/models/linode/stack_script'
+
+module Fog
+  module Linode
+    class Compute
+      class StackScripts < Fog::Collection
+        model Fog::Linode::Compute::StackScript
+
+        def all
+          load stackscripts
+        end
+
+        def get(id)
+          new stackscripts(id).first
+        rescue Fog::Linode::Compute::NotFound
+          nil
+        end        
+
+        private
+        def stackscripts(id=nil)
+          connection.stackscript_list(id).body['DATA'].map { |script| map_stackscript script }
+        end
+        
+        def map_stackscript(script)
+          script = script.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
+          script.merge! :id => script[:stackscriptid], :name => script[:label]
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Fog
         attribute :name
         attribute :personality
         attribute :progress
-        attribute :status
+        attribute :state,       :aliases => 'status'
 
         attr_reader :password
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
@@ -75,7 +75,7 @@ module Fog
         end
 
         def ready?
-          status == 'ACTIVE'
+          self.state == 'ACTIVE'
         end
 
         def reboot(type = 'SOFT')

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

@@ -16,7 +16,7 @@ module Fog
         attribute :image_id,      :aliases => 'image-id'
         attribute :name
         attribute :progress
-        attribute :status
+        attribute :state,         :aliases => 'status'
 
         attr_accessor :password
         alias_method :'root-password=', :password=
@@ -71,7 +71,7 @@ module Fog
         end
 
         def ready?
-          status == 'active'
+          self.state == 'active'
         end
 
         def reboot(type = 'SOFT')

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

@@ -32,7 +32,7 @@ module Fog
         end
 
         def ready?
-          status == 'SUCCEEDED'
+          self.state == 'SUCCEEDED'
         end
 
         def private_ip_address
@@ -49,8 +49,8 @@ module Fog
           true
         end
 
-        def status
-          @status ||= connection.voxcloud_status(id).body['devices'].first['status']
+        def state
+          @state ||= connection.voxcloud_status(id).body['devices'].first['status']
         end
 
         def save

data/lib/fog/compute/new_servers.rb

@@ -25,6 +25,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -34,12 +38,14 @@ module Fog
           end
 
           @new_server_username = options[:new_servers_username]
-          @data = self.class.data[@new_server_username]
+        end
+
+        def data
+          self.class.data[@new_server_username]
         end
 
         def reset_data
           self.class.data.delete(@new_server_username)
-          @data = self.class.data[@new_server_username]
         end
 
       end

data/lib/fog/compute/rackspace.rb

@@ -53,6 +53,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -62,12 +66,14 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
-          @data = self.class.data[@rackspace_username]
+        end
+
+        def data
+          self.class.data[@rackspace_username]
         end
 
         def reset_data
           self.class.data.delete(@rackspace_username)
-          @data = self.class.data[@rackspace_username]
         end
 
       end

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

@@ -12,6 +12,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'publicIp'<~String> - The acquired address
         #     * 'requestId'<~String> - Id of the request
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AllocateAddress.html]
         def allocate_address
           request(
             'Action'  => 'AllocateAddress',
@@ -25,14 +27,14 @@ module Fog
 
         def allocate_address
           response = Excon::Response.new
-          if describe_addresses.body['addressesSet'].size < @data[:limits][:addresses]
+          if describe_addresses.body['addressesSet'].size < self.data[:limits][:addresses]
             response.status = 200
             public_ip = Fog::AWS::Mock.ip_address
             data ={
               'instanceId' => nil,
               'publicIp'   => public_ip
             }
-            @data[:addresses][public_ip] = data
+            self.data[:addresses][public_ip] = data
             response.body = {
               'publicIp'  => public_ip,
               'requestId' => Fog::AWS::Mock.request_id

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

@@ -16,6 +16,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateAddress.html]
         def associate_address(instance_id, public_ip)
           request(
             'Action'      => 'AssociateAddress',
@@ -33,8 +35,8 @@ module Fog
         def associate_address(instance_id, public_ip)
           response = Excon::Response.new
           response.status = 200
-          instance = @data[:instances][instance_id]
-          address = @data[:addresses][public_ip]
+          instance = self.data[:instances][instance_id]
+          address = self.data[:addresses][public_ip]
           if instance && address
             address['instanceId'] = instance_id
             instance['originalIpAddress'] = instance['ipAddress']

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

@@ -21,6 +21,8 @@ module Fog
         #     * 'requestId'<~String> - Id of request
         #     * 'status'<~String> - Status of volume
         #     * 'volumeId'<~String> - Reference to volume
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AttachVolume.html]
         def attach_volume(instance_id, volume_id, device)
           request(
             'Action'      => 'AttachVolume',
@@ -40,8 +42,8 @@ module Fog
           response = Excon::Response.new
           if instance_id && volume_id && device
             response.status = 200
-            instance = @data[:instances][instance_id]
-            volume = @data[:volumes][volume_id]
+            instance = self.data[:instances][instance_id]
+            volume = self.data[:volumes][volume_id]
             if instance && volume
               unless volume['status'] == 'available'
                 raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")

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

@@ -24,6 +24,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AuthorizeSecurityGroupIngress.html]
         def authorize_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
             location = caller.first
@@ -56,14 +58,14 @@ module Fog
           end
 
           response = Excon::Response.new
-          group = @data[:security_groups][group_name]
+          group = self.data[:security_groups][group_name]
 
           if group
             group['ipPermissions'] ||= []
             if group_name && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
               ['tcp', 'udp'].each do |protocol|
                 group['ipPermissions'] << {
-                  'groups'      => [{'groupName' => group_name, 'userId' => @owner_id}],
+                  'groups'      => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}],
                   'fromPort'    => 1,
                   'ipRanges'    => [],
                   'ipProtocol'  => protocol,
@@ -71,7 +73,7 @@ module Fog
                 }
               end
               group['ipPermissions'] << {
-                'groups'      => [{'groupName' => group_name, 'userId' => @owner_id}],
+                'groups'      => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}],
                 'fromPort'    => -1,
                 'ipRanges'    => [],
                 'ipProtocol'  => 'icmp',

data/lib/fog/compute/requests/aws/create_image.rb

@@ -18,7 +18,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'imageId'<~String> - The ID of the created AMI.
         #     * 'requestId'<~String> - Id of request.
-        
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateImage.html]
         def create_image(instance_id, name, description, no_reboot = false)
           request(
             'Action'            => 'CreateImage',

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

@@ -17,6 +17,8 @@ module Fog
         #     * 'keyMaterial'<~String> - Unencrypted encoded PEM private key
         #     * 'keyName'<~String> - Name of key
         #     * 'requestId'<~String> - Id of request
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateKeyPair.html]
         def create_key_pair(key_name)
           request(
             'Action'  => 'CreateKeyPair',
@@ -31,14 +33,14 @@ module Fog
 
         def create_key_pair(key_name)
           response = Excon::Response.new
-          unless @data[:key_pairs][key_name]
+          unless self.data[:key_pairs][key_name]
             response.status = 200
             data = {
               'keyFingerprint'  => Fog::AWS::Mock.key_fingerprint,
               'keyMaterial'     => Fog::AWS::Mock.key_material,
               'keyName'         => key_name
             }
-            @data[:key_pairs][key_name] = data
+            self.data[:key_pairs][key_name] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)

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

@@ -16,6 +16,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSecurityGroup.html]
         def create_security_group(name, description)
           request(
             'Action'            => 'CreateSecurityGroup',
@@ -31,14 +33,14 @@ module Fog
 
         def create_security_group(name, description)
           response = Excon::Response.new
-          unless @data[:security_groups][name]
+          unless self.data[:security_groups][name]
             data = {
               'groupDescription'  => description,
               'groupName'         => name,
               'ipPermissions'     => [],
-              'ownerId'           => @owner_id
+              'ownerId'           => self.data[:owner_id]
             }
-            @data[:security_groups][name] = data
+            self.data[:security_groups][name] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
               'return'    => true

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

@@ -19,6 +19,8 @@ module Fog
         #     * 'startTime'<~Time> - timestamp when snapshot was initiated
         #     * 'status'<~String> - state of snapshot
         #     * 'volumeId'<~String> - id of volume snapshot targets
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSnapshot.html]
         def create_snapshot(volume_id, description = nil)
           request(
             'Action'      => 'CreateSnapshot',
@@ -40,12 +42,12 @@ module Fog
         
         def create_snapshot(volume_id, description = nil)
           response = Excon::Response.new
-          if volume = @data[:volumes][volume_id]
+          if volume = self.data[:volumes][volume_id]
             response.status = 200
             snapshot_id = Fog::AWS::Mock.snapshot_id
             data = {
               'description' => description,
-              'ownerId'     => @owner_id,
+              'ownerId'     => self.data[:owner_id],
               'progress'    => nil,
               'snapshotId'  => snapshot_id,
               'startTime'   => Time.now,
@@ -53,11 +55,11 @@ module Fog
               'volumeId'    => volume_id,
               'volumeSize'  => volume['size']
             }
-            @data[:snapshots][snapshot_id] = data
+            self.data[:snapshots][snapshot_id] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)
-            @data[:snapshots][snapshot_id]['tagSet'] = {}
+            self.data[:snapshots][snapshot_id]['tagSet'] = {}
           else
             response.status = 400
             raise(Excon::Errors.status_error({:expects => 200}, response))

data/lib/fog/compute/requests/aws/create_tags.rb

@@ -16,6 +16,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateTags.html]
         def create_tags(resources, tags)
           resources = [*resources]
           for key, value in tags
@@ -51,7 +53,7 @@ module Fog
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
             end
-            if type && @data[:"#{type}s"][resource_id]
+            if type && self.data[:"#{type}s"][resource_id]
               { 'resourceId' => resource_id, 'resourceType' => type }
             else
               raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
@@ -59,11 +61,11 @@ module Fog
           end
 
           tags.each do |key, value|
-            @data[:tags][key] ||= {}
-            @data[:tags][key][value] ||= []
-            @data[:tags][key][value] = @data[:tags][key][value] & tagged
+            self.data[:tags][key] ||= {}
+            self.data[:tags][key][value] ||= []
+            self.data[:tags][key][value] = self.data[:tags][key][value] & tagged
             
-            tagged.each {|resource| @data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value}
+            tagged.each {|resource| self.data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value}
           end
 
           response = Excon::Response.new

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

@@ -21,6 +21,8 @@ module Fog
         #     * 'snapshotId'<~String> - Snapshot volume was created from, if any
         #     * 'status's<~String> - State of volume
         #     * 'volumeId'<~String> - Reference to volume
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html]
         def create_volume(availability_zone, size, snapshot_id = nil)
           request(
             'Action'            => 'CreateVolume',
@@ -38,7 +40,7 @@ module Fog
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Excon::Response.new
           if availability_zone && size
-            if snapshot_id && !@data[:snapshots][snapshot_id]
+            if snapshot_id && !self.data[:snapshots][snapshot_id]
               raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
             end
 
@@ -54,7 +56,7 @@ module Fog
               'tagSet'            => {},
               'volumeId'          => volume_id
             }
-            @data[:volumes][volume_id] = data
+            self.data[:volumes][volume_id] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) })