fog 0.0.31 → 0.0.32

data/lib/fog/slicehost/requests/get_flavors.rb

@@ -0,0 +1,38 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of flavors
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      #     * 'id'<~Integer> - Id of the flavor
+      #     * 'name'<~String> - Name of the flavor
+      #     * 'price'<~Integer> - Price in cents
+      #     * 'ram'<~Integer> - Amount of ram for the flavor
+      def get_flavors
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Slicehost::GetFlavors.new,
+          :path     => 'flavors.xml'
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_flavors
+      end
+
+    end
+  end
+
+end

data/lib/fog/slicehost/requests/get_images.rb

@@ -0,0 +1,36 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of images
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      #     * 'id'<~Integer> - Id of the image
+      #     * 'name'<~String> - Name of the image
+      def get_images
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Slicehost::GetImages.new,
+          :path     => 'images.xml'
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_images
+      end
+
+    end
+  end
+
+end

data/lib/fog/slicehost/requests/get_slices.rb

@@ -0,0 +1,44 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of slices
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      #     * 'addresses'<~Array> - Ip addresses for the slice
+      #     * 'backup-id'<~Integer> - Id of backup slice was booted from
+      #     * 'bw-in'<~Float> - Incoming bandwidth total for current billing cycle, in Gigabytes
+      #     * 'bw-out'<~Float> - Outgoing bandwidth total for current billing cycle, in Gigabytes
+      #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
+      #     * 'id'<~Integer> - Id of the slice
+      #     * 'image-id'<~Integer> - Id of image slice was booted from
+      #     * 'name'<~String> - Name of the slice
+      #     * 'progress'<~Integer> - Progress of current action, in percentage
+      #     * 'status'<~String> - Current status of the slice
+      def get_slices
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Slicehost::GetSlices.new,
+          :path     => 'slices.xml'
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_slices
+      end
+
+    end
+  end
+
+end

data/spec/aws/requests/s3/put_object_spec.rb

@@ -31,5 +31,13 @@ describe 'S3.put_object' do
       }.should raise_error(Excon::Errors::NotFound)
     end
 
+    it 'should not raise an error if the object already exists' do
+      s3.put_bucket('fogputobject')
+      s3.put_object('fogputobject', 'fog_put_object', lorem_file)
+      s3.put_object('fogputobject', 'fog_put_object', lorem_file)
+      s3.delete_object('fogputobject', 'fog_put_object')
+      s3.delete_bucket('fogputobject')
+    end
+
   end
 end

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.create_image' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -11,7 +11,7 @@ describe 'Rackspace::Servers.create_server' do
 
     it "should return proper attributes" do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      actual = servers.create_server(1, 3).body['server']
+      actual = servers.create_server(1, 3, 'name').body['server']
       @server_id = actual['id']
       actual['addresses'].should be_a(Hash)
       actual['addresses']['private'].should be_an(Array)

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

@@ -5,8 +5,8 @@ describe 'Rackspace::Servers.delete_image' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
-      @image_id = servers.create_image(@server_id)
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
+      @image_id = servers.create_image(@server_id).body['image']['id']
     end
 
     it "should return proper attributes" do
@@ -16,16 +16,18 @@ describe 'Rackspace::Servers.delete_image' do
     end
 
     it "should return proper attributes" do
-      servers.delete_image(@image_id)
+      eventually(128) do
+        servers.delete_image(@image_id)
+      end
     end
 
   end
   describe 'failure' do
 
-    it "should raise a NotFound error if the image does not exist" do
+    it "should raise a BadRequest error if the image does not exist" do
       lambda do
         servers.delete_image(0)
-      end.should raise_error(Excon::Errors::NotFound)
+      end.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.delete_server' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     it "should return proper attributes" do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.get_server_details' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.list_addresses' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.list_private_addresses' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.list_public_addresses' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.list_servers_detail' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
     
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.list_servers' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.reboot_server' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

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

@@ -5,7 +5,7 @@ describe 'Rackspace::Servers.update_server' do
 
     before(:each) do
       # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = servers.create_server(1, 3).body['server']['id']
+      @server_id = servers.create_server(1, 3, 'name').body['server']['id']
     end
 
     after(:each) do

data/spec/slicehost/requests/create_slice_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.create_slice' do
+  describe 'success' do
+
+    after(:each) do
+      eventually(128) do
+        slicehost.delete_slice(@slice_id)
+      end
+    end
+
+    it "should return proper attributes" do
+      # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
+      actual = slicehost.create_slice(1, 3, 'fogslice').body      
+      actual['addresses'].should be_a(Array)
+      # actual['backup-id'].should be_an(Integer)
+      actual['bw-in'].should be_an(Float)
+      actual['bw-out'].should be_an(Float)
+      actual['flavor-id'].should be_an(Integer)
+      actual['id'].should be_an(Integer)
+      actual['image-id'].should be_an(Integer)
+      actual['name'].should be_an(String)
+      actual['progress'].should be_an(Integer)
+      actual['root-password'].should be_a(String)
+      actual['status'].should be_an(String)
+    end
+
+  end
+end

data/spec/slicehost/requests/delete_slice_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.delete_slice' do
+  describe 'success' do
+
+    before(:each) do
+      # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
+      @slice_id = slicehost.create_slice(1, 3, 'fog_slice').body['id']
+    end
+
+    it "should return proper attributes" do
+      eventually(128) do
+        actual = slicehost.delete_slice(@slice_id)
+      end
+    end
+
+  end
+end

data/spec/slicehost/requests/get_backups_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_backups' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = slicehost.get_backups.body
+      actual['backups'].should be_an(Array)
+      backup = actual['backups'].first
+      # backup['date'].should be_a(String)
+      # backup['id'].should be_an(Integer)
+      # backup['name'].should be_an(String)
+      # backup['slice-id'].should be_an(Integer)
+    end
+
+  end
+end

data/spec/slicehost/requests/get_flavors_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_flavors' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = slicehost.get_flavors.body
+      actual['flavors'].should be_an(Array)
+      flavor = actual['flavors'].first
+      flavor['id'].should be_an(Integer)
+      flavor['name'].should be_an(String)
+      flavor['price'].should be_a(Integer)
+      flavor['ram'].should be_an(Integer)
+    end
+
+  end
+end

data/spec/slicehost/requests/get_images_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_images' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = slicehost.get_images.body
+      actual['images'].should be_an(Array)
+      image = actual['images'].first
+      image['id'].should be_an(Integer)
+      image['name'].should be_a(String)
+    end
+
+  end
+end

data/spec/slicehost/requests/get_slices_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_slices' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = slicehost.get_slices.body
+      actual['slices'].should be_an(Array)
+      slice = actual['slices'].first
+      # slice['addresses'].should be_a(Array)
+      # slice['backup-id'].should be_an(Integer)
+      # slice['bw-in'].should be_an(Integer)
+      # slice['bw-out'].should be_an(Integer)
+      # slice['flavor-id'].should be_an(Integer)
+      # slice['id'].should be_an(Integer)
+      # slice['image-id'].should be_an(Integer)
+      # slice['name'].should be_an(String)
+      # slice['progress'].should be_an(Integer)
+      # slice['status'].should be_an(String)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -5,54 +5,52 @@ current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
 # Fog.mock!
 
-def credentials
-  @credentials ||= begin
-    credentials_path = File.expand_path('~/.fog')
-    credentials_data = File.open(credentials_path).read
-    YAML.load(credentials_data)
-  end
-end
-
 def ec2
   Fog::AWS::EC2.new(
-    :aws_access_key_id => credentials[:aws_access_key_id],
-    :aws_secret_access_key => credentials[:aws_secret_access_key]
+    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
   )
 end
 
 def eu_s3
   Fog::AWS::S3.new(
-    :aws_access_key_id => credentials[:aws_access_key_id],
-    :aws_secret_access_key => credentials[:aws_secret_access_key],
+    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key],
     :host => 's3-external-3.amazonaws.com'
   )
 end
 
 def files
   Fog::Rackspace::Files.new(
-    :rackspace_api_key => credentials[:rackspace_api_key],
-    :rackspace_username => credentials[:rackspace_username]
+    :rackspace_api_key => Fog.credentials[:rackspace_api_key],
+    :rackspace_username => Fog.credentials[:rackspace_username]
   )
 end
 
 def sdb
   Fog::AWS::SimpleDB.new(
-    :aws_access_key_id => credentials[:aws_access_key_id],
-    :aws_secret_access_key => credentials[:aws_secret_access_key]
+    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
+  )
+end
+
+def s3
+  Fog::AWS::S3.new(
+    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
   )
 end
 
 def servers
   Fog::Rackspace::Servers.new(
-    :rackspace_api_key => credentials[:rackspace_api_key],
-    :rackspace_username => credentials[:rackspace_username]
+    :rackspace_api_key => Fog.credentials[:rackspace_api_key],
+    :rackspace_username => Fog.credentials[:rackspace_username]
   )
 end
 
-def s3
-  Fog::AWS::S3.new(
-    :aws_access_key_id => credentials[:aws_access_key_id],
-    :aws_secret_access_key => credentials[:aws_secret_access_key]
+def slicehost
+  Fog::Slicehost.new(
+    :password => Fog.credentials[:slicehost_password]
   )
 end