fog 0.0.22 → 0.0.23

data/README.rdoc

@@ -10,9 +10,11 @@ fog helps you interact with cloud services. fog is a work in progress.
 
 == Supports
 
-* AWS EC2 (missing security group mocking, just starting on models)
+* AWS EC2
 * AWS S3
-* AWS SimpleDB (missing models)
+* AWS SimpleDB (no models yet)
+* Rackspace Files (no models yet, just getting started on requests)
+* Rackspace Servers (some requests, server model, just getting started)
 
 == Synopsis
 

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-21}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -149,8 +149,11 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/requests/servers/get_server_details.rb",
      "lib/fog/rackspace/requests/servers/list_flavors.rb",
      "lib/fog/rackspace/requests/servers/list_images.rb",
+     "lib/fog/rackspace/requests/servers/list_images_detail.rb",
      "lib/fog/rackspace/requests/servers/list_servers.rb",
-     "lib/fog/rackspace/requests/servers/list_servers_details.rb",
+     "lib/fog/rackspace/requests/servers/list_servers_detail.rb",
+     "lib/fog/rackspace/requests/servers/reboot_server.rb",
+     "lib/fog/rackspace/requests/servers/update_server.rb",
      "lib/fog/rackspace/servers.rb",
      "lib/fog/response.rb",
      "spec/aws/models/ec2/address_spec.rb",
@@ -223,13 +226,18 @@ Gem::Specification.new do |s|
      "spec/lorem.txt",
      "spec/rackspace/requests/files/get_containers_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_image_spec.rb",
      "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_image.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_spec.rb",
+     "spec/rackspace/requests/servers/list_images_detail.rb",
      "spec/rackspace/requests/servers/list_images_spec.rb",
-     "spec/rackspace/requests/servers/list_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
      "spec/rackspace/requests/servers/list_servers_spec.rb",
+     "spec/rackspace/requests/servers/reboot_server.rb",
+     "spec/rackspace/requests/servers/update_server.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -309,13 +317,18 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/rackspace/requests/files/get_containers_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_image_spec.rb",
      "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_image.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_spec.rb",
+     "spec/rackspace/requests/servers/list_images_detail.rb",
      "spec/rackspace/requests/servers/list_images_spec.rb",
-     "spec/rackspace/requests/servers/list_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
      "spec/rackspace/requests/servers/list_servers_spec.rb",
+     "spec/rackspace/requests/servers/reboot_server.rb",
+     "spec/rackspace/requests/servers/update_server.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/fog.rb

@@ -1,3 +1,13 @@
+require 'rubygems'
+require 'rubygems'
+require 'base64'
+require 'cgi'
+require 'digest/md5'
+require 'hmac-sha1'
+require 'hmac-sha2'
+require 'json'
+require 'mime/types'
+
 __DIR__ = File.dirname(__FILE__)
 
 $LOAD_PATH.unshift __DIR__ unless

data/lib/fog/aws.rb

@@ -1,11 +1,3 @@
-require 'rubygems'
-require 'base64'
-require 'cgi'
-require 'digest/md5'
-require 'hmac-sha1'
-require 'hmac-sha2'
-require 'mime/types'
-
 module Fog
   module AWS
 

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

@@ -24,8 +24,13 @@ module Fog
         end
 
         def instance=(new_instance)
-          @instance_id = new_instance.instance_id
-          connection.associate_address(@instance_id, @public_ip)
+          if !@public_ip
+            @instance = new_instance
+          elsif new_instance
+            @instance = nil
+            @instance_id = new_instance.instance_id
+            connection.associate_address(@instance_id, @public_ip)
+          end
         end
 
         def reload
@@ -36,6 +41,9 @@ module Fog
         def save
           data = connection.allocate_address
           @public_ip = data.body['publicIp']
+          if @instance
+            instance = @instance
+          end
           true
         end
 

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

@@ -2,14 +2,16 @@ module Fog
   module AWS
     class EC2
 
-      def addresses
-        Fog::AWS::EC2::Addresses.new(:connection => self)
+      def addresses(attributes = {})
+        Fog::AWS::EC2::Addresses.new({
+          :connection => self
+        }.merge!(attributes))
       end
 
       class Addresses < Fog::Collection
 
         attribute :public_ip
-        attribute :instance_id
+        attribute :instance
 
         def initialize(attributes)
           @public_ip ||= []
@@ -28,8 +30,8 @@ module Fog
               :connection => connection
             }.merge!(address))
           end
-          if instance_id
-            addresses = addresses.select {|address| address.instance_id == instance_id}
+          if instance
+            addresses = addresses.select {|address| address.instance_id == instance.id}
           end
           addresses
         end
@@ -49,7 +51,8 @@ module Fog
         def new
           Fog::AWS::EC2::Address.new(
             :addresses  => self,
-            :connection => connection
+            :connection => connection,
+            :instance   => instance
           )
         end
 

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

@@ -16,15 +16,14 @@ module Fog
         attribute :key_name,          'keyName'
         attribute :launch_time,       'launchTime'
         attribute :monitoring
-        attribute :placement
         attribute :product_codes,     'productCodes'
         attribute :private_dns_name,  'privateDnsName'
         attribute :ramdisk_id,        'ramdiskId'
         attribute :reason
         attribute :user_data
 
-        def address
-          connection.addresses(:instance_id => instance_id).all.first
+        def addresses
+          connection.addresses(:instance => self)
         end
 
         def destroy
@@ -82,7 +81,7 @@ module Fog
             options['groupId'] = @group_id
           end
           if @instance_type
-            options['instanceType'] = @instance_type
+            options['InstanceType'] = @instance_type
           end
           if @kernel_id
             options['KernelId'] = @kernel_id
@@ -105,7 +104,7 @@ module Fog
         end
 
         def volumes
-          connection.volumes(:instance_id => instance_id)
+          connection.volumes(:instance => self)
         end
 
         private

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

@@ -27,8 +27,13 @@ module Fog
         end
 
         def instance=(new_instance)
-          @instance_id = new_instance.instance_id
-          connection.attach_volume(@instance_id, @volume_id, @device)
+          if !@volume_id
+            @instance = new_instance
+          elsif new_instance
+            @instance = nil
+            @instance_id = new_instance.instance_id
+            connection.attach_volume(@instance_id, @volume_id, @device)
+          end
         end
 
         def reload
@@ -40,6 +45,9 @@ module Fog
           data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
+          if @instance
+            instance = @instance
+          end
           true
         end
 

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

@@ -11,7 +11,7 @@ module Fog
       class Volumes < Fog::Collection
 
         attribute :volume_id
-        attribute :instance_id
+        attribute :instance
 
         def initialize(attributes)
           @volume_id ||= []
@@ -30,8 +30,8 @@ module Fog
               :volumes    => self
             }.merge!(volume))
           end
-          if instance_id
-            volumes = volumes.select {|volume| volume.instance_id == instance_id}
+          if instance
+            volumes = volumes.select {|volume| volume.instance_id == instance.id}
           end
           volumes
         end
@@ -49,10 +49,11 @@ module Fog
         end
 
         def new(attributes = {})
-          Fog::AWS::EC2::Volume.new(
+          volume = Fog::AWS::EC2::Volume.new(
             attributes.merge!(
-              :connection => connection,
-              :volumes    => self
+              :connection   => connection,
+              :instance     => instance,
+              :volumes      => self
             )
           )
         end

data/lib/fog/aws/models/s3/bucket.rb

@@ -5,7 +5,6 @@ module Fog
       class Bucket < Fog::Model
 
         attribute :creation_date, 'CreationDate'
-        attribute :location
         attribute :name,          'Name'
         attribute :owner
 

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

@@ -64,6 +64,9 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationId'<~String> - Id of reservation
         def run_instances(image_id, min_count, max_count, options = {})
+          if options['UserData']
+            options['UserData'] = Base64.encode64(options['UserData'])
+          end
           request({
             'Action' => 'RunInstances',
             'ImageId' => image_id,

data/lib/fog/rackspace.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'json'
-
 module Fog
   module Rackspace
 

data/lib/fog/rackspace/requests/servers/create_server.rb

@@ -21,19 +21,19 @@ unless Fog.mocking?
         # ==== Returns
         # * response<~Fog::AWS::Response>:
         #   * body<~Hash>:
-        #   * 'servers'<~Hash>:
-        #     * 'adminPass'<~String> - Admin password for server
-        #     * 'id'<~Integer> - Id of server
-        #     * 'name<~String> - Name of server
-        #     * 'imageId'<~Integer> - Id of image used to boot server
-        #     * 'flavorId'<~Integer> - Id of servers current flavor
-        #     * 'hostId'<~String>
-        #     * 'status'<~String> - Current server status
-        #     * 'progress'<~Integer> - Progress through current status
+        #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
         #       * 'public'<~Array> - public address strings
         #       * 'private'<~Array> - private address strings
+        #     * 'adminPass'<~String> - Admin password for server
+        #     * 'flavorId'<~Integer> - Id of servers current flavor
+        #     * 'hostId'<~String>
+        #     * 'id'<~Integer> - Id of server
+        #     * 'imageId'<~Integer> - Id of image used to boot server
         #     * 'metadata'<~Hash> - metadata
+        #     * 'name<~String> - Name of server
+        #     * 'progress'<~Integer> - Progress through current status
+        #     * 'status'<~String> - Current server status
         def create_server(flavor_id, image_id, options = {})
           data = {
             'server' => {

data/lib/fog/rackspace/requests/servers/get_server_details.rb

@@ -4,23 +4,23 @@ unless Fog.mocking?
     module Rackspace
       class Servers
 
-        # List server details for id
+        # Get details about a server
         #
         # ==== Returns
         # * response<~Fog::AWS::Response>:
         #   * body<~Hash>:
-        #   * 'servers'<~Array>:
-        #     * 'id'<~Integer> - Id of server
-        #     * 'name<~String> - Name of server
-        #     * 'imageId'<~Integer> - Id of image used to boot server
-        #     * 'flavorId'<~Integer> - Id of servers current flavor
-        #     * 'hostId'<~String>
-        #     * 'status'<~String> - Current server status
-        #     * 'progress'<~Integer> - Progress through current status
+        #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
         #       * 'public'<~Array> - public address strings
         #       * 'private'<~Array> - private address strings
+        #     * 'flavorId'<~Integer> - Id of servers current flavor
+        #     * 'hostId'<~String>
+        #     * 'id'<~Integer> - Id of server
+        #     * 'imageId'<~Integer> - Id of image used to boot server
         #     * 'metadata'<~Hash> - metadata
+        #     * 'name<~String> - Name of server
+        #     * 'progress'<~Integer> - Progress through current status
+        #     * 'status'<~String> - Current server status
         def get_server_details(id)
           request(
             :expects  => 200,

data/lib/fog/rackspace/requests/servers/list_images.rb

@@ -11,12 +11,9 @@ unless Fog.mocking?
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the image
         #     * 'name'<~String> - Name of the image
-        #     * 'updated'<~String> - Last update timestamp for image
-        #     * 'created'<~String> - Creation timestamp for image
-        #     * 'status'<~String> - Status of image
         def list_images
           request(
-            :expects  => 200,
+            :expects  => [200, 203],
             :method   => 'GET',
             :path     => 'images.json'
           )

data/lib/fog/rackspace/requests/servers/list_images_detail.rb

@@ -0,0 +1,42 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # List all images
+        #
+        # ==== Returns
+        # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'id'<~Integer> - Id of the image
+        #     * 'name'<~String> - Name of the image
+        #     * 'updated'<~String> - Last update timestamp for image
+        #     * 'created'<~String> - Creation timestamp for image
+        #     * 'status'<~String> - Status of image
+        def list_images_detail
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => 'images/detail.json'
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def list_images
+        end
+
+      end
+    end
+  end
+
+end

data/lib/fog/rackspace/requests/servers/{list_servers_details.rb → list_servers_detail.rb}

@@ -21,7 +21,7 @@ unless Fog.mocking?
         #       * 'public'<~Array> - public address strings
         #       * 'private'<~Array> - private address strings
         #     * 'metadata'<~Hash> - metadata
-        def list_servers_details
+        def list_servers_detail
           request(
             :expects  => [200, 203],
             :method   => 'GET',

data/lib/fog/rackspace/requests/servers/reboot_server.rb

@@ -0,0 +1,42 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # Reboot an existing server
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to reboot
+        # * type<~String> - Type of reboot, must be in ['HARD', 'SOFT']
+        #
+        def reboot_server(server_id, type)
+          data = {
+            'reboot' => { 'type' => type }
+          }
+          request(
+            :body     => data.to_json,
+            :expects  => 202,
+            :method   => 'POST',
+            :path     => "servers/#{id}"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def update_server
+        end
+
+      end
+    end
+  end
+
+end

data/lib/fog/rackspace/requests/servers/update_server.rb

@@ -0,0 +1,41 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # Update an existing server
+        #
+        # ==== Parameters
+        # # server_id<~Integer> - Id of server to update
+        # * options<~Hash>:
+        #   * name<~String> - New name for server
+        #   * adminPass<~String> - New admin password for server
+        #
+        def update_server(server_id, options = {})
+          request(
+            :body     => options.to_json,
+            :expects  => 204,
+            :method   => 'PUT',
+            :path     => "servers/#{id}"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def update_server
+        end
+
+      end
+    end
+  end
+
+end

data/lib/fog/rackspace/servers.rb

@@ -13,8 +13,11 @@ module Fog
         load "fog/rackspace/requests/servers/get_server_details.rb"
         load "fog/rackspace/requests/servers/list_flavors.rb"
         load "fog/rackspace/requests/servers/list_images.rb"
+        load "fog/rackspace/requests/servers/list_images_detail.rb"
         load "fog/rackspace/requests/servers/list_servers.rb"
-        load "fog/rackspace/requests/servers/list_servers_details.rb"
+        load "fog/rackspace/requests/servers/list_servers_detail.rb"
+        load "fog/rackspace/requests/servers/reboot_server.rb"
+        load "fog/rackspace/requests/servers/update_server.rb"
       end
 
       def initialize(options={})

data/spec/aws/models/ec2/instance_spec.rb

@@ -39,8 +39,17 @@ describe 'Fog::AWS::EC2::Instance' do
 
   end
 
-  describe "#address" do
-    it "should have tests"
+  describe "#addresses" do
+
+    it "should return a Fog::AWS::EC2::Addresses" do
+      instance = ec2.instances.new
+      instance.addresses.should be_a(Fog::AWS::EC2::Addresses)
+    end
+
+    it "should not associate the address to a not yet saved instance"
+    it "should associate the address after saving a new instance"
+    it "should associate the address to an existing instance"
+
   end
 
   describe "#destroy" do
@@ -132,6 +141,10 @@ describe 'Fog::AWS::EC2::Instance' do
       instance.volumes.should be_a(Fog::AWS::EC2::Volumes)
     end
 
+    it "should not attach the volume to a not yet saved instance"
+    it "should attach the volume after saving a new instance"
+    it "should attach the volume to an existing instance"
+
   end
 
 end

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

@@ -8,6 +8,7 @@ describe 'EC2.run_instances' do
     end
 
     it "should return proper attributes" do
+      # ami-5ee70037 = gentoo
       actual = ec2.run_instances('ami-5ee70037', 1, 1)
       @instance_id = actual.body['instancesSet'].first['instanceId']
       actual.body['groupSet'].should be_an(Array)

data/spec/rackspace/requests/servers/{list_servers_details_spec.rb → create_image_spec.rb}

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Rackspace::Servers.list_servers_details' do
+describe 'Rackspace::Servers.create_image' do
   describe 'success' do
 
     it "should return proper attributes" do
-      p servers.list_servers_details
+      pending
+      p servers.create_image(id)
     end
 
   end

data/spec/rackspace/requests/servers/create_server_spec.rb

@@ -3,18 +3,30 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Rackspace::Servers.create_server' do
   describe 'success' do
 
-    it "should return proper attributes" do
-      # flavor 1 = 256
-      # image 3 = gentoo 2008.0
-      data = servers.create_server(1, 3)
-      p data
-      while true do
-        sleep(1)
-        details = servers.list_servers_details.body
-        p details['servers'].first['progress']
-        break if details['servers'].first['status'] == 'ACTIVE'
+    after(:each) do
+      eventually(128) do
+        servers.delete_server(@server_id)
       end
-      servers.delete_server(data.body['server']['id'])
+    end
+
+    it "should return proper attributes" do
+      # flavor 1 = 256, image 3 = gentoo 2008.0
+      actual = servers.create_server(1, 3).body['server']
+      @server_id = actual['id']
+      actual['addresses'].should be_a(Hash)
+      actual['addresses']['private'].should be_an(Array)
+      actual['addresses']['private'].first.should be_a(String)
+      actual['addresses']['public'].should be_an(Array)
+      actual['addresses']['public'].first.should be_a(String)
+      actual['adminPass'].should be_a(String)
+      actual['flavorId'].should be_an(Integer)
+      actual['hostId'].should be_a(String)
+      actual['id'].should be_an(Integer)
+      actual['imageId'].should be_an(Integer)
+      actual['metadata'].should be_a(Hash)
+      actual['name'].should be_a(String)
+      actual['progress'].should be_an(Integer)
+      actual['status'].should be_a(String)
     end
 
   end

data/spec/rackspace/requests/servers/delete_image.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.delete_image' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      pending
+      p servers.delete_image(id)
+    end
+
+  end
+end

data/spec/rackspace/requests/servers/delete_server_spec.rb

@@ -3,8 +3,24 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Rackspace::Servers.delete_server' do
   describe 'success' do
 
+    before(:each) do
+      # flavor 1 = 256, image 3 = gentoo 2008.0
+      @server_id = servers.create_server(1, 3).body['server']['id']
+    end
+
     it "should return proper attributes" do
-      p servers.delete_server(id)
+      eventually(128) do
+        servers.delete_server(@server_id)
+      end
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a NotFound error if the server does not exist" do
+      lambda {
+        servers.delete_server(0)
+      }.should raise_error(Fog::Errors::NotFound)
     end
 
   end

data/spec/rackspace/requests/servers/get_server_details_spec.rb

@@ -3,8 +3,41 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Rackspace::Servers.get_server_details' do
   describe 'success' do
 
+    before(:each) do
+      # flavor 1 = 256, image 3 = gentoo 2008.0
+      @server_id = servers.create_server(1, 3).body['server']['id']
+    end
+
+    after(:each) do
+      eventually(128) do
+        servers.delete_server(@server_id)
+      end
+    end
+
     it "should return proper attributes" do
-      p servers.get_server_details(id)
+      actual = servers.get_server_details(@server_id).body['server']
+      actual['addresses'].should be_a(Hash)
+      actual['addresses']['private'].should be_an(Array)
+      actual['addresses']['private'].first.should be_a(String)
+      actual['addresses']['public'].should be_an(Array)
+      actual['addresses']['public'].first.should be_a(String)
+      actual['flavorId'].should be_an(Integer)
+      actual['hostId'].should be_a(String)
+      actual['id'].should be_an(Integer)
+      actual['imageId'].should be_an(Integer)
+      actual['metadata'].should be_a(Hash)
+      actual['name'].should be_a(String)
+      actual['progress'].should be_an(Integer)
+      actual['status'].should be_a(String)
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a NotFound error if the server does not exist" do
+      lambda {
+        servers.get_server_details(0)
+      }.should raise_error(Fog::Errors::NotFound)
     end
 
   end

data/spec/rackspace/requests/servers/list_flavors_spec.rb

@@ -4,6 +4,7 @@ describe 'Rackspace::Servers.list_flavors' do
   describe 'success' do
 
     it "should return proper attributes" do
+      pending
       p servers.list_flavors
     end
 

data/spec/rackspace/requests/servers/list_images_detail.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.list_images_detail' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      pending
+      p servers.list_images_detail
+    end
+
+  end
+end

data/spec/rackspace/requests/servers/list_images_spec.rb

@@ -4,6 +4,7 @@ describe 'Rackspace::Servers.list_images' do
   describe 'success' do
 
     it "should return proper attributes" do
+      pending
       p servers.list_images
     end
 

data/spec/rackspace/requests/servers/list_servers_detail_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.list_servers_detail' do
+  describe 'success' do
+
+    before(:each) do
+      # flavor 1 = 256, image 3 = gentoo 2008.0
+      @server_id = servers.create_server(1, 3).body['server']['id']
+    end
+
+    after(:each) do
+      eventually(128) do
+        servers.delete_server(@server_id)
+      end
+    end
+
+    it "should return proper attributes" do
+      actual = servers.list_servers_detail.body['servers'].first
+      actual['addresses'].should be_a(Hash)
+      actual['addresses']['private'].should be_an(Array)
+      actual['addresses']['private'].first.should be_a(String)
+      actual['addresses']['public'].should be_an(Array)
+      actual['addresses']['public'].first.should be_a(String)
+      actual['flavorId'].should be_an(Integer)
+      actual['hostId'].should be_a(String)
+      actual['id'].should be_an(Integer)
+      actual['imageId'].should be_an(Integer)
+      actual['metadata'].should be_a(Hash)
+      actual['name'].should be_a(String)
+      actual['progress'].should be_an(Integer)
+      actual['status'].should be_a(String)
+    end
+
+  end
+end

data/spec/rackspace/requests/servers/list_servers_spec.rb

@@ -3,9 +3,22 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Rackspace::Servers.list_servers' do
   describe 'success' do
 
+    before(:each) do
+      # flavor 1 = 256, image 3 = gentoo 2008.0
+      @server_id = servers.create_server(1, 3).body['server']['id']
+    end
+
+    after(:each) do
+      eventually(128) do
+        servers.delete_server(@server_id)
+      end
+    end
+
     it "should return proper attributes" do
-      p servers.list_servers
+      actual = servers.list_servers.body['servers'].first
+      actual['id'].should be_an(Integer)
+      actual['name'].should be_a(String)
     end
 
   end
-end
+end

data/spec/rackspace/requests/servers/reboot_server.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.reboot_server' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      pending
+      p servers.reboot_server(id, 'HARD')
+    end
+
+  end
+end

data/spec/rackspace/requests/servers/update_server.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Servers.update_server' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      pending
+      p servers.update_server(id, :name => 'foo', :adminPass => 'bar')
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -07:00
+date: 2009-10-21 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,8 +182,11 @@ files:
 - lib/fog/rackspace/requests/servers/get_server_details.rb
 - lib/fog/rackspace/requests/servers/list_flavors.rb
 - lib/fog/rackspace/requests/servers/list_images.rb
+- lib/fog/rackspace/requests/servers/list_images_detail.rb
 - lib/fog/rackspace/requests/servers/list_servers.rb
-- lib/fog/rackspace/requests/servers/list_servers_details.rb
+- lib/fog/rackspace/requests/servers/list_servers_detail.rb
+- lib/fog/rackspace/requests/servers/reboot_server.rb
+- lib/fog/rackspace/requests/servers/update_server.rb
 - lib/fog/rackspace/servers.rb
 - lib/fog/response.rb
 - spec/aws/models/ec2/address_spec.rb
@@ -256,13 +259,18 @@ files:
 - spec/lorem.txt
 - spec/rackspace/requests/files/get_containers_spec.rb
 - spec/rackspace/requests/files/head_containers_spec.rb
+- spec/rackspace/requests/servers/create_image_spec.rb
 - spec/rackspace/requests/servers/create_server_spec.rb
+- spec/rackspace/requests/servers/delete_image.rb
 - spec/rackspace/requests/servers/delete_server_spec.rb
 - spec/rackspace/requests/servers/get_server_details_spec.rb
 - spec/rackspace/requests/servers/list_flavors_spec.rb
+- spec/rackspace/requests/servers/list_images_detail.rb
 - spec/rackspace/requests/servers/list_images_spec.rb
-- spec/rackspace/requests/servers/list_servers_details_spec.rb
+- spec/rackspace/requests/servers/list_servers_detail_spec.rb
 - spec/rackspace/requests/servers/list_servers_spec.rb
+- spec/rackspace/requests/servers/reboot_server.rb
+- spec/rackspace/requests/servers/update_server.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -363,11 +371,16 @@ test_files:
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/rackspace/requests/files/get_containers_spec.rb
 - spec/rackspace/requests/files/head_containers_spec.rb
+- spec/rackspace/requests/servers/create_image_spec.rb
 - spec/rackspace/requests/servers/create_server_spec.rb
+- spec/rackspace/requests/servers/delete_image.rb
 - spec/rackspace/requests/servers/delete_server_spec.rb
 - spec/rackspace/requests/servers/get_server_details_spec.rb
 - spec/rackspace/requests/servers/list_flavors_spec.rb
+- spec/rackspace/requests/servers/list_images_detail.rb
 - spec/rackspace/requests/servers/list_images_spec.rb
-- spec/rackspace/requests/servers/list_servers_details_spec.rb
+- spec/rackspace/requests/servers/list_servers_detail_spec.rb
 - spec/rackspace/requests/servers/list_servers_spec.rb
+- spec/rackspace/requests/servers/reboot_server.rb
+- spec/rackspace/requests/servers/update_server.rb
 - spec/spec_helper.rb