fog 0.0.42 → 0.0.43

data/spec/slicehost/models/server_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../shared_examples/server_examples'
+
+describe 'Fog::Slicehost::Server' do
+
+  it_should_behave_like "Server"
+
+  # flavor 1 = 256, image 3 = gentoo 2008.0
+  subject { @server = @servers.new(:flavor_id => 1, :image_id => 3, :name => Time.now.to_i.to_s) }
+
+  before(:each) do
+    @servers = Slicehost[:slices].servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      server = @servers.new({
+        'addresses'       => 'addresses',
+        'backup-id'       => 'backup_id',
+        'bw-in'           => 'bw_in',
+        'bw-out'          => 'bw_out',
+        'flavor-id'       => 'flavor_id',
+        'image-id'        => 'image_id',
+        'name'            => 'name',
+        'root-password'   => 'password',
+        'progress'        => 'progress',
+        'status'          => 'status'
+      })
+      server.addresses.should == 'addresses'
+      server.backup_id.should == 'backup_id'
+      server.bw_in.should == 'bw_in'
+      server.bw_out.should == 'bw_out'
+      server.flavor_id.should == 'flavor_id'
+      server.image_id.should == 'image_id'
+      server.name.should == 'name'
+      server.password.should == 'password'
+      server.progress.should == 'progress'
+      server.status.should == 'status'
+    end
+
+  end
+
+end

data/spec/slicehost/models/servers_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../shared_examples/servers_examples'
+
+describe 'Fog::Slicehost::Servers' do
+
+  it_should_behave_like "Servers"
+
+  # flavor 1 = 256, image 3 = gentoo 2008.0
+  subject { @server = @servers.new(:flavor_id => 1, :image_id => 3, :name => Time.now.to_i.to_s) }
+
+  before(:each) do
+    @servers = Slicehost[:slices].servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+end

data/spec/slicehost/requests/get_flavor_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_flavor' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = Slicehost[:slices].get_flavor(1).body
+      actual['id'].should be_an(Integer)
+      actual['name'].should be_an(String)
+      actual['price'].should be_a(Integer)
+      actual['ram'].should be_an(Integer)
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a Forbidden error if the flavor does not exist" do
+      lambda {
+        Slicehost[:slices].get_flavor(0)
+      }.should raise_error(Excon::Errors::Forbidden)
+    end
+
+  end
+end

data/spec/slicehost/requests/get_image_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_image' do
+  describe 'success' do
+
+    it "should return proper attributes" do
+      actual = Slicehost[:slices].get_image.body
+      actual['id'].should be_an(Integer)
+      actual['name'].should be_a(String)
+    end
+
+  end
+
+  describe 'failure' do
+
+    it "should raise a Forbidden error if the flavor does not exist" do
+      lambda {
+        Slicehost[:slices].get_image(0)
+      }.should raise_error(Excon::Errors::Forbidden)
+    end
+
+  end
+
+end

data/spec/slicehost/requests/get_slice_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.get_slice' do
+  describe 'success' do
+
+    before(:each) do
+      # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
+      @slice_id = Slicehost[:slices].create_slice(1, 3, 'fog_create_slice').body['id']
+    end
+
+    after(:each) do
+      eventually(128) do
+        Slicehost[:slices].delete_slice(@slice_id)
+      end
+    end
+
+    it "should return proper attributes" do
+      actual = Slicehost[:slices].get_slice(@slice_id).body
+      actual['addresses'].should be_a(Array)
+      # actual['backup-id'].should be_an(Integer)
+      actual['bw-in'].should be_a(Float)
+      actual['bw-out'].should be_a(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['status'].should be_an(String)
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a Forbidden error if the server does not exist" do
+      lambda {
+        Slicehost[:slices].get_slice(0)
+      }.should raise_error(Excon::Errors::Forbidden)
+    end
+
+  end
+end

data/spec/slicehost/requests/get_slices_spec.rb

@@ -3,20 +3,31 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe 'Slicehost.get_slices' do
   describe 'success' do
 
+    before(:each) do
+      # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
+      @slice_id = Slicehost[:slices].create_slice(1, 3, 'fog_create_slice').body['id']
+    end
+
+    after(:each) do
+      eventually(128) do
+        Slicehost[:slices].delete_slice(@slice_id)
+      end
+    end
+
     it "should return proper attributes" do
       actual = Slicehost[:slices].get_slices.body
       actual['slices'].should be_an(Array)
       slice = actual['slices'].first
-      # slice['addresses'].should be_a(Array)
+      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)
+      slice['bw-in'].should be_a(Float)
+      slice['bw-out'].should be_a(Float)
+      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

data/spec/slicehost/requests/reboot_slice_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'Slicehost.reboot_slice' do
+  describe 'success' do
+
+    before(:each) do
+      # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
+      @slice_id = Slicehost[:slices].create_slice(1, 3, 'fog_create_slice').body['id']
+      wait_for { Slicehost[:slices].get_slice(@slice_id).body['status'] == 'active' }
+    end
+
+    after(:each) do
+      wait_for { Slicehost[:slices].get_slice(@slice_id).body['status'] == 'active' }
+      Slicehost[:slices].delete_slice(@slice_id)
+    end
+
+    it "should return proper attributes" do
+      actual = Slicehost[:slices].reboot_slice(@slice_id).body
+      actual['addresses'].should be_a(Array)
+      # actual['backup-id'].should be_an(Integer)
+      actual['bw-in'].should be_a(Float)
+      actual['bw-out'].should be_a(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['status'].should be_an(String)
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a Forbidden error if the server does not exist" do
+      lambda {
+        Slicehost[:slices].reboot_slice(0)
+      }.should raise_error(Excon::Errors::Forbidden)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -100,6 +100,16 @@ def eventually(max_delay = 16, &block)
   end
 end
 
+def wait_for(timeout = 600, &block)
+  start = Time.now
+  until instance_eval(&block)
+    if Time.now - start > timeout
+      break
+    end
+    sleep(1)
+  end
+end
+
 unless defined?(GENTOO_AMI)
   GENTOO_AMI = 'ami-5ee70037'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -08:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.18
     version: 
+- !ruby/object:Gem::Dependency 
+  name: formatador
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
   type: :runtime
@@ -83,6 +93,7 @@ files:
 - fog.gemspec
 - lib/fog.rb
 - lib/fog/aws.rb
+- lib/fog/aws/bin.rb
 - lib/fog/aws/ec2.rb
 - lib/fog/aws/models/ec2/address.rb
 - lib/fog/aws/models/ec2/addresses.rb
@@ -185,11 +196,13 @@ files:
 - lib/fog/aws/requests/simpledb/select.rb
 - lib/fog/aws/s3.rb
 - lib/fog/aws/simpledb.rb
+- lib/fog/bin.rb
 - lib/fog/collection.rb
 - lib/fog/connection.rb
 - lib/fog/model.rb
 - lib/fog/parser.rb
 - lib/fog/rackspace.rb
+- lib/fog/rackspace/bin.rb
 - lib/fog/rackspace/files.rb
 - lib/fog/rackspace/models/servers/flavor.rb
 - lib/fog/rackspace/models/servers/flavors.rb
@@ -224,17 +237,45 @@ files:
 - lib/fog/rackspace/requests/servers/update_server.rb
 - lib/fog/rackspace/servers.rb
 - lib/fog/slicehost.rb
+- lib/fog/slicehost/bin.rb
+- lib/fog/slicehost/models/flavor.rb
+- lib/fog/slicehost/models/flavors.rb
+- lib/fog/slicehost/models/image.rb
+- lib/fog/slicehost/models/images.rb
+- lib/fog/slicehost/models/server.rb
+- lib/fog/slicehost/models/servers.rb
 - lib/fog/slicehost/parsers/create_slice.rb
 - lib/fog/slicehost/parsers/get_backups.rb
+- lib/fog/slicehost/parsers/get_flavor.rb
 - lib/fog/slicehost/parsers/get_flavors.rb
+- lib/fog/slicehost/parsers/get_image.rb
 - lib/fog/slicehost/parsers/get_images.rb
+- lib/fog/slicehost/parsers/get_slice.rb
 - lib/fog/slicehost/parsers/get_slices.rb
 - lib/fog/slicehost/requests/create_slice.rb
 - lib/fog/slicehost/requests/delete_slice.rb
 - lib/fog/slicehost/requests/get_backups.rb
+- lib/fog/slicehost/requests/get_flavor.rb
 - lib/fog/slicehost/requests/get_flavors.rb
+- lib/fog/slicehost/requests/get_image.rb
 - lib/fog/slicehost/requests/get_images.rb
+- lib/fog/slicehost/requests/get_slice.rb
 - lib/fog/slicehost/requests/get_slices.rb
+- lib/fog/slicehost/requests/reboot_slice.rb
+- lib/fog/terremark.rb
+- lib/fog/terremark/bin.rb
+- lib/fog/terremark/parsers/get_catalog.rb
+- lib/fog/terremark/parsers/get_catalog_item.rb
+- lib/fog/terremark/parsers/get_organization.rb
+- lib/fog/terremark/parsers/get_organizations.rb
+- lib/fog/terremark/parsers/get_vapp_template.rb
+- lib/fog/terremark/parsers/get_vdc.rb
+- lib/fog/terremark/requests/get_catalog.rb
+- lib/fog/terremark/requests/get_catalog_item.rb
+- lib/fog/terremark/requests/get_organization.rb
+- lib/fog/terremark/requests/get_organizations.rb
+- lib/fog/terremark/requests/get_vapp_template.rb
+- lib/fog/terremark/requests/get_vdc.rb
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
@@ -332,12 +373,18 @@ files:
 - spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb
+- spec/slicehost/models/server_spec.rb
+- spec/slicehost/models/servers_spec.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb
+- spec/slicehost/requests/get_flavor_spec.rb
 - spec/slicehost/requests/get_flavors_spec.rb
+- spec/slicehost/requests/get_image_spec.rb
 - spec/slicehost/requests/get_images_spec.rb
+- spec/slicehost/requests/get_slice_spec.rb
 - spec/slicehost/requests/get_slices_spec.rb
+- spec/slicehost/requests/reboot_slice_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/geemus/fog
@@ -497,10 +544,16 @@ test_files:
 - spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb
+- spec/slicehost/models/server_spec.rb
+- spec/slicehost/models/servers_spec.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb
+- spec/slicehost/requests/get_flavor_spec.rb
 - spec/slicehost/requests/get_flavors_spec.rb
+- spec/slicehost/requests/get_image_spec.rb
 - spec/slicehost/requests/get_images_spec.rb
+- spec/slicehost/requests/get_slice_spec.rb
 - spec/slicehost/requests/get_slices_spec.rb
+- spec/slicehost/requests/reboot_slice_spec.rb
 - spec/spec_helper.rb