fog 0.0.59 → 0.0.60

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 59
+:patch: 60
 :build: 

data/bin/fog

@@ -16,22 +16,28 @@ require File.join(lib_dir, 'fog', 'rackspace', 'bin')
 require File.join(lib_dir, 'fog', 'slicehost', 'bin')
 require File.join(lib_dir, 'fog', 'terremark', 'bin')
 
-ARGV.clear # Avoid passing args to IRB
-IRB.setup(nil)
-@irb = IRB::Irb.new(nil)
-IRB.conf[:MAIN_CONTEXT] = @irb.context
-IRB.conf[:PROMPT][:FOG] = IRB.conf[:PROMPT][:SIMPLE].dup
-IRB.conf[:PROMPT][:FOG][:RETURN] = "%s\n"
-@irb.context.prompt_mode = :FOG
-@irb.context.workspace = IRB::WorkSpace.new(binding)
-
-services = Fog.services.map{|service| service.to_s}
-available_services = if services.length > 1
-  services[0...-1].join(', ') << ' and ' << services[-1]
+if ARGV.length > 1
+  p instance_eval(ARGV[1..-1].join(' ')).to_json
 else
-  services.first
-end
-print "Welcome to fog interactive!\n"
-print "Your '#{Fog.credential.to_s}' configuration provides access to #{available_services}.\n"
 
-catch(:IRB_EXIT) { @irb.eval_input }
+  ARGV.clear # Avoid passing args to IRB
+  IRB.setup(nil)
+  @irb = IRB::Irb.new(nil)
+  IRB.conf[:MAIN_CONTEXT] = @irb.context
+  IRB.conf[:PROMPT][:FOG] = IRB.conf[:PROMPT][:SIMPLE].dup
+  IRB.conf[:PROMPT][:FOG][:RETURN] = "%s\n"
+  @irb.context.prompt_mode = :FOG
+  @irb.context.workspace = IRB::WorkSpace.new(binding)
+
+  services = Fog.services.map{|service| service.to_s}
+  available_services = if services.length > 1
+    services[0...-1].join(', ') << ' and ' << services[-1]
+  else
+    services.first
+  end
+  print "Welcome to fog interactive!\n"
+  print "Your '#{Fog.credential.to_s}' configuration provides access to #{available_services}.\n"
+
+  catch(:IRB_EXIT) { @irb.eval_input }
+
+end

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.59"
+  s.version = "0.0.60"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-03-28}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{geemus@gmail.com}
@@ -326,17 +326,20 @@ Gem::Specification.new do |s|
     "spec/slicehost/models/flavors_spec.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"
+    "spec/spec_helper.rb",
+    "tests/slicehost/requests/create_slice_tests.rb",
+    "tests/slicehost/requests/delete_slice_tests.rb",
+    "tests/slicehost/requests/get_backups_tests.rb",
+    "tests/slicehost/requests/get_flavor_tests.rb",
+    "tests/slicehost/requests/get_flavors_tests.rb",
+    "tests/slicehost/requests/get_image_tests.rb",
+    "tests/slicehost/requests/get_images_tests.rb",
+    "tests/slicehost/requests/get_slice_tests.rb",
+    "tests/slicehost/requests/get_slices_tests.rb",
+    "tests/slicehost/requests/reboot_slice_tests.rb",
+    "tests/slicehost/slicehost_helper.rb",
+    "tests/test_helper.rb",
+    "tests/test_helper_tests.rb"
   ]
   s.homepage = %q{http://github.com/geemus/fog}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -449,16 +452,6 @@ Gem::Specification.new do |s|
     "spec/slicehost/models/flavors_spec.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"
   ]
 

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

@@ -42,10 +42,12 @@ module Fog
             end
           end
           directory.files.merge_attributes(options)
-          directory.files.instance_variable_set(:@loaded, true)
-          data['Contents'].each do |file|
-            directory.files << directory.files.new(file)
+          files = data['Contents']
+          while data['IsTruncated']
+            data = connection.get_bucket(name, options.merge!('marker' => files.last['Key'])).body
+            files.concat(data['Contents'])
           end
+          directory.files.load(files)
           directory
         rescue Excon::Errors::NotFound
           nil

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

@@ -39,6 +39,7 @@ module Fog
             'max-keys'    => @max_keys,
             'prefix'      => @prefix
           }.merge!(options)
+          options = options.reject {|key,value| value.nil? || value.empty?}
           data = connection.get_object(directory.name, key, options, &block)
           file_data = {
             :body => data.body,

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -38,6 +38,7 @@ module Fog
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
+          options.reject! {|key, value| !['prefix', 'marker', 'max-keys', 'delimiter'].include?(key)}
           query = ''
           for key, value in options
             query << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')};"

data/lib/fog/collection.rb

@@ -145,6 +145,10 @@ module Fog
       Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
     end
 
+    def to_json
+      self.map {|member| member}.to_json
+    end
+
     private
 
     def lazy_load

data/lib/fog/model.rb

@@ -102,6 +102,10 @@ module Fog
       end
     end
 
+    def to_json
+      attributes.to_json
+    end
+
     def wait_for(timeout = 600, &block)
       start = Time.now
       until instance_eval(&block)

data/lib/fog/slicehost.rb

@@ -66,7 +66,7 @@ module Fog
       def request(params)
         @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         headers = {
-          'Authorization' => "Basic #{Base64.encode64(@slicehost_password).chomp!}"
+          'Authorization' => "Basic #{Base64.encode64(@slicehost_password).delete("\r\n")}"
         }
         case params[:method]
         when 'DELETE', 'GET', 'HEAD'

data/tests/slicehost/requests/create_slice_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('Slicehost#create_slice', 'slicehost') do
+  tests('success') do
+
+    before do
+      @data = Slicehost[:slices].create_slice(1, 3, 'fogcreateslice').body
+      @id = @data['id']
+    end
+
+    after do
+      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Slicehost[:slices].delete_slice(@id)
+    end
+
+    test('has proper output format') do
+      validate_data_format(@data, Slicehost::Formats::SLICE.merge('root-password' => String))
+    end
+
+  end
+end

data/tests/slicehost/requests/delete_slice_tests.rb

@@ -0,0 +1,28 @@
+Shindo.tests('Slicehost#delete_slice', 'slicehost') do
+  tests('success') do
+
+    before do
+      @data = Slicehost[:slices].create_slice(1, 3, 'fogdeleteslice').body
+      @id = @data['id']
+    end
+
+    test('has proper output format') do
+      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Slicehost[:slices].delete_slice(@id)
+    end
+
+  end
+
+  tests('failure') do
+
+    test('raises NotFound error if slice does not exist') do
+      begin
+        Slicehost[:slices].delete_slice(0)
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+end

data/tests/slicehost/requests/get_backups_tests.rb

@@ -0,0 +1,14 @@
+Shindo.tests('Slicehost#get_backups', 'slicehost') do
+  tests('success') do
+
+    before do
+      @data = Slicehost[:slices].get_backups.body
+    end
+
+    # TODO: ensure this still works with a non-empty list
+    test('has proper output format') do
+      validate_data_format(@data, { 'backups' => [Slicehost::Formats::BACKUP] })
+    end
+
+  end
+end

data/tests/slicehost/requests/get_flavor_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('Slicehost#get_flavor', 'slicehost') do
+  tests('success') do
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_flavor(1).body
+      validate_data_format(@data, Slicehost::Formats::FLAVOR)
+    end
+
+  end
+
+  tests('failure') do
+
+    test('raises Forbidden error if flavor does not exist') do
+      begin
+        Slicehost[:slices].get_flavor(0)
+        false
+      rescue Excon::Errors::Forbidden
+        true
+      end
+    end
+
+  end
+end

data/tests/slicehost/requests/get_flavors_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Slicehost#get_flavors', 'slicehost') do
+  tests('success') do
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_flavors.body
+      validate_data_format(@data, { 'flavors' => [Slicehost::Formats::FLAVOR] })
+    end
+
+  end
+end

data/tests/slicehost/requests/get_image_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('Slicehost#get_image', 'slicehost') do
+  tests('success') do
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_image(3).body
+      validate_data_format(@data, Slicehost::Formats::IMAGE)
+    end
+
+  end
+
+  tests('failure') do
+
+    test('raises Forbidden error if flavor does not exist') do
+      begin
+        Slicehost[:slices].get_image(0)
+        false
+      rescue Excon::Errors::Forbidden
+        true
+      end
+    end
+
+  end
+end

data/tests/slicehost/requests/get_images_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Slicehost#get_images', 'slicehost') do
+  tests('success') do
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_images.body
+      validate_data_format(@data, { 'images' => [Slicehost::Formats::IMAGE] })
+    end
+
+  end
+end

data/tests/slicehost/requests/get_slice_tests.rb

@@ -0,0 +1,33 @@
+Shindo.tests('Slicehost#get_slice', 'slicehost') do
+  tests('success') do
+
+    before do
+      @data = Slicehost[:slices].create_slice(1, 3, 'foggetslice').body
+      @id = @data['id']
+    end
+
+    after do
+      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Slicehost[:slices].delete_slice(@id)
+    end
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_slice(@id).body
+      validate_data_format(@data, Slicehost::Formats::SLICE)
+    end
+
+  end
+
+  tests('failure') do
+
+    test('raises Forbidden error if flavor does not exist') do
+      begin
+        Slicehost[:slices].get_slice(0)
+        false
+      rescue Excon::Errors::Forbidden
+        true
+      end
+    end
+
+  end
+end

data/tests/slicehost/requests/get_slices_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Slicehost#get_slices', 'slicehost') do
+  tests('success') do
+
+    test('has proper output format') do
+      @data = Slicehost[:slices].get_slices.body
+      validate_data_format(@data, { 'slices' => [Slicehost::Formats::SLICE] })
+    end
+
+  end
+end

data/tests/slicehost/requests/reboot_slice_tests.rb

@@ -0,0 +1,34 @@
+Shindo.tests('Slicehost#reboot_slice', 'slicehost') do
+  tests('success') do
+
+    before do
+      @data = Slicehost[:slices].create_slice(1, 3, 'fogrebootslice').body
+      @id = @data['id']
+      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      @data = Slicehost[:slices].reboot_slice(@id).body
+    end
+
+    after do
+      wait_for { Slicehost[:slices].get_slice(@id).body['status'] == 'active' }
+      Slicehost[:slices].delete_slice(@id)
+    end
+
+    test('has proper output format') do
+      validate_data_format(@data, Slicehost::Formats::SLICE)
+    end
+
+  end
+
+  tests('failure') do
+
+    test('raises Forbidden error if flavor does not exist') do
+      begin
+        Slicehost[:slices].reboot_slice(0)
+        false
+      rescue Excon::Errors::Forbidden
+        true
+      end
+    end
+
+  end
+end

data/tests/slicehost/slicehost_helper.rb

@@ -0,0 +1,51 @@
+module Slicehost
+
+  def self.[](service)
+    @@connections ||= Hash.new do |hash, key|
+      credentials = Fog.credentials.reject do |k, v|
+        ![:slicehost_password].include?(k)
+      end
+      hash[key] = case key
+      when :slices
+        Fog::Slicehost.new(credentials)
+      end
+    end
+    @@connections[service]
+  end
+
+  module Formats
+
+    BACKUP = {
+      'date'      => String,
+      'id'        => Integer,
+      'name'      => String,
+      'slice-id'  => Integer
+    }
+
+    FLAVOR = {
+      'id'    => Integer,
+      'name'  => String,
+      'price' => Integer,
+      'ram'   => Integer
+    }
+
+    IMAGE = {
+      'id'    => Integer,
+      'name'  => String
+    }
+
+    SLICE = {
+      'addresses'     => [String],
+      'bw-in'         => Float,
+      'bw-out'        => Float,
+      'flavor-id'     => Integer,
+      'id'            => Integer,
+      'image-id'      => Integer,
+      'name'          => String,
+      'progress'      => Integer,
+      'status'        => String
+    }
+
+  end
+
+end

data/tests/test_helper.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog', 'bin'))
+
+# TODO: Currently is true even if some of the keys in format do not appear in 
+def validate_data_format(original_data, format)
+  valid = true
+  data = original_data.dup
+  for key, value in format
+    valid &&= data.has_key?(key)
+    datum = data.delete(key)
+    case value
+    when Array
+      valid &&= datum.is_a?(Array)
+      for element in datum
+        type = value.first
+        if type.is_a?(Hash)
+          valid &&= validate_data_format({:element => element}, {:element => type})
+        else
+          valid &&= element.is_a?(type)
+        end
+      end
+    when Hash
+      valid &&= datum.is_a?(Hash)
+      valid &&= validate_data_format(datum, value)
+    else
+      valid &&= datum.is_a?(value)
+    end
+  end
+  unless data.empty?
+    p "validate_data_format did not validate [#{data.inspect}]"
+  end
+  valid &&= data.empty?
+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

data/tests/test_helper_tests.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+Shindo.tests('test_helper') do
+  tests('#validate_data_format') do
+
+    tests('returns true') do
+
+      test('when format of value matches') do
+        validate_data_format({:a => :b}, {:a => Symbol})
+      end
+
+      test('when format of nested array elements matches') do
+        validate_data_format({:a => [:b, :c]}, {:a => [Symbol]})
+      end
+
+      test('when format of nested hash matches') do
+        validate_data_format({:a => {:b => :c}}, {:a => {:b => Symbol}})
+      end
+
+    end
+
+    tests('returns false') do
+
+      test('when format of value does not match') do
+        !validate_data_format({:a => :b}, {:a => String})
+      end
+
+      test('when not all keys are checked') do
+        !validate_data_format({:a => :b}, {})
+      end
+
+      test('when some keys do not appear') do
+        !validate_data_format({}, {:a => String})
+      end
+
+    end
+
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 59
-  version: 0.0.59
+  - 60
+  version: 0.0.60
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -07:00
+date: 2010-03-28 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -410,17 +410,20 @@ files:
 - spec/slicehost/models/flavors_spec.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
+- tests/slicehost/requests/create_slice_tests.rb
+- tests/slicehost/requests/delete_slice_tests.rb
+- tests/slicehost/requests/get_backups_tests.rb
+- tests/slicehost/requests/get_flavor_tests.rb
+- tests/slicehost/requests/get_flavors_tests.rb
+- tests/slicehost/requests/get_image_tests.rb
+- tests/slicehost/requests/get_images_tests.rb
+- tests/slicehost/requests/get_slice_tests.rb
+- tests/slicehost/requests/get_slices_tests.rb
+- tests/slicehost/requests/reboot_slice_tests.rb
+- tests/slicehost/slicehost_helper.rb
+- tests/test_helper.rb
+- tests/test_helper_tests.rb
 has_rdoc: true
 homepage: http://github.com/geemus/fog
 licenses: []
@@ -556,14 +559,4 @@ test_files:
 - spec/slicehost/models/flavors_spec.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

data/spec/slicehost/requests/create_slice_spec.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe 'Slicehost.create_slice' do
-  describe 'success' do
-
-    after(:each) do
-      eventually(128) do
-        Slicehost[:slices].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[:slices].create_slice(1, 3, 'fog_create_slice').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)
-      @slice_id = actual['id']
-      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

@@ -1,18 +0,0 @@
-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[:slices].create_slice(1, 3, 'fog_delete_slice').body['id']
-    end
-
-    it "should return proper attributes" do
-      eventually(128) do
-        actual = Slicehost[:slices].delete_slice(@slice_id)
-      end
-    end
-
-  end
-end

data/spec/slicehost/requests/get_backups_spec.rb

@@ -1,17 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe 'Slicehost.get_backups' do
-  describe 'success' do
-
-    it "should return proper attributes" do
-      actual = Slicehost[:slices].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_flavor_spec.rb

@@ -1,24 +0,0 @@
-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_flavors_spec.rb

@@ -1,17 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe 'Slicehost.get_flavors' do
-  describe 'success' do
-
-    it "should return proper attributes" do
-      actual = Slicehost[:slices].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_image_spec.rb

@@ -1,24 +0,0 @@
-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_images_spec.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe 'Slicehost.get_images' do
-  describe 'success' do
-
-    it "should return proper attributes" do
-      actual = Slicehost[:slices].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_slice_spec.rb

@@ -1,41 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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['backup-id'].should be_an(Integer)
-      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
-end

data/spec/slicehost/requests/reboot_slice_spec.rb

@@ -1,41 +0,0 @@
-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