diff --git a/Rakefile b/Rakefile
index 5dd5fa9e6..c81934bc0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,100 +1,146 @@
 require 'rubygems'
 require 'rake'
+require 'date'
 
-current_directory = File.dirname(__FILE__)
-require "#{current_directory}/lib/fog"
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.add_dependency('excon', '>=0.0.21')
-    gem.add_dependency('formatador', '>=0.0.10')
-    gem.add_dependency('json')
-    gem.add_dependency('mime-types')
-    gem.add_dependency('net-ssh')
-    gem.add_dependency('nokogiri')
-    gem.add_dependency('ruby-hmac')
-    gem.name = "fog"
-    gem.description = %Q{The Ruby cloud computing library.}
-    gem.summary = %Q{brings clouds to you}
-    gem.email = "geemus@gmail.com"
-    gem.homepage = "http://github.com/geemus/fog"
-    gem.authors = ["geemus (Wesley Beary)"]
-    gem.rubyforge_project = "fog"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['-c']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+def date
+  Date.today.to_s
 end
 
-namespace :specs do
-
-  task :with_mocking do
-    Fog.mock!
-    Rake::Task[:spec].invoke
-  end
-
-  task :without_mocking do
-    Fog.mock!
-    Rake::Task[:spec].invoke
-  end
-
+def rubyforge_project
+  name
 end
 
-desc 'Run specs with and without mocking'
-task :specs => %w[ specs:with_mocking specs:without_mocking ]
+def gemspec_file
+  "#{name}.gemspec"
+end
 
-task :default => :specs
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+desc "Generate RCov test coverage and open in your browser"
+task :coverage do
+  require 'rcov'
+  sh "rm -fr coverage"
+  sh "rcov test/test_*.rb"
+  sh "open coverage/index.html"
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fog #{version}"
+  rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/fog/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
 end
diff --git a/VERSION.yml b/VERSION.yml
deleted file mode 100644
index f6947f8bb..000000000
--- a/VERSION.yml
+++ /dev/null
@@ -1,5 +0,0 @@
---- 
-:major: 0
-:minor: 0
-:patch: 73
-:build: 
diff --git a/fog.gemspec b/fog.gemspec
index e6c0b06e4..acecc1967 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -1,497 +1,428 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{fog}
-  s.version = "0.0.73"
-
+  s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-04-13}
-  s.default_executable = %q{fog}
-  s.description = %q{The Ruby cloud computing library.}
-  s.email = %q{geemus@gmail.com}
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'fog'
+  s.version           = '0.0.73'
+  s.date              = '2010-04-20'
+  s.rubyforge_project = 'fog'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "brings clouds to you"
+  s.description = "The Ruby cloud computing library."
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["geemus (Wesley Beary)"]
+  s.email    = 'geemus@gmail.com'
+  s.homepage = 'http://github.com/geemus/fog'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## This sections is only necessary if you have C extensions.
+  # s.require_paths << 'ext'
+  # s.extensions = %w[ext/extconf.rb]
+
+  ## If your gem includes any executables, list them here.
   s.executables = ["fog"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".gitignore",
-    "Gemfile",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION.yml",
-    "benchs/fog_vs.rb",
-    "benchs/params.rb",
-    "benchs/parse_vs_push.rb",
-    "bin/fog",
-    "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",
-    "lib/fog/aws/models/ec2/flavor.rb",
-    "lib/fog/aws/models/ec2/flavors.rb",
-    "lib/fog/aws/models/ec2/image.rb",
-    "lib/fog/aws/models/ec2/images.rb",
-    "lib/fog/aws/models/ec2/key_pair.rb",
-    "lib/fog/aws/models/ec2/key_pairs.rb",
-    "lib/fog/aws/models/ec2/security_group.rb",
-    "lib/fog/aws/models/ec2/security_groups.rb",
-    "lib/fog/aws/models/ec2/server.rb",
-    "lib/fog/aws/models/ec2/servers.rb",
-    "lib/fog/aws/models/ec2/snapshot.rb",
-    "lib/fog/aws/models/ec2/snapshots.rb",
-    "lib/fog/aws/models/ec2/volume.rb",
-    "lib/fog/aws/models/ec2/volumes.rb",
-    "lib/fog/aws/models/s3/directories.rb",
-    "lib/fog/aws/models/s3/directory.rb",
-    "lib/fog/aws/models/s3/file.rb",
-    "lib/fog/aws/models/s3/files.rb",
-    "lib/fog/aws/parsers/ec2/allocate_address.rb",
-    "lib/fog/aws/parsers/ec2/attach_volume.rb",
-    "lib/fog/aws/parsers/ec2/basic.rb",
-    "lib/fog/aws/parsers/ec2/create_key_pair.rb",
-    "lib/fog/aws/parsers/ec2/create_snapshot.rb",
-    "lib/fog/aws/parsers/ec2/create_volume.rb",
-    "lib/fog/aws/parsers/ec2/describe_addresses.rb",
-    "lib/fog/aws/parsers/ec2/describe_availability_zones.rb",
-    "lib/fog/aws/parsers/ec2/describe_images.rb",
-    "lib/fog/aws/parsers/ec2/describe_instances.rb",
-    "lib/fog/aws/parsers/ec2/describe_key_pairs.rb",
-    "lib/fog/aws/parsers/ec2/describe_regions.rb",
-    "lib/fog/aws/parsers/ec2/describe_reserved_instances.rb",
-    "lib/fog/aws/parsers/ec2/describe_security_groups.rb",
-    "lib/fog/aws/parsers/ec2/describe_snapshots.rb",
-    "lib/fog/aws/parsers/ec2/describe_volumes.rb",
-    "lib/fog/aws/parsers/ec2/detach_volume.rb",
-    "lib/fog/aws/parsers/ec2/get_console_output.rb",
-    "lib/fog/aws/parsers/ec2/run_instances.rb",
-    "lib/fog/aws/parsers/ec2/terminate_instances.rb",
-    "lib/fog/aws/parsers/s3/copy_object.rb",
-    "lib/fog/aws/parsers/s3/get_bucket.rb",
-    "lib/fog/aws/parsers/s3/get_bucket_location.rb",
-    "lib/fog/aws/parsers/s3/get_request_payment.rb",
-    "lib/fog/aws/parsers/s3/get_service.rb",
-    "lib/fog/aws/parsers/simpledb/basic.rb",
-    "lib/fog/aws/parsers/simpledb/domain_metadata.rb",
-    "lib/fog/aws/parsers/simpledb/get_attributes.rb",
-    "lib/fog/aws/parsers/simpledb/list_domains.rb",
-    "lib/fog/aws/parsers/simpledb/select.rb",
-    "lib/fog/aws/requests/ec2/allocate_address.rb",
-    "lib/fog/aws/requests/ec2/associate_address.rb",
-    "lib/fog/aws/requests/ec2/attach_volume.rb",
-    "lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb",
-    "lib/fog/aws/requests/ec2/create_key_pair.rb",
-    "lib/fog/aws/requests/ec2/create_security_group.rb",
-    "lib/fog/aws/requests/ec2/create_snapshot.rb",
-    "lib/fog/aws/requests/ec2/create_volume.rb",
-    "lib/fog/aws/requests/ec2/delete_key_pair.rb",
-    "lib/fog/aws/requests/ec2/delete_security_group.rb",
-    "lib/fog/aws/requests/ec2/delete_snapshot.rb",
-    "lib/fog/aws/requests/ec2/delete_volume.rb",
-    "lib/fog/aws/requests/ec2/describe_addresses.rb",
-    "lib/fog/aws/requests/ec2/describe_availability_zones.rb",
-    "lib/fog/aws/requests/ec2/describe_images.rb",
-    "lib/fog/aws/requests/ec2/describe_instances.rb",
-    "lib/fog/aws/requests/ec2/describe_key_pairs.rb",
-    "lib/fog/aws/requests/ec2/describe_regions.rb",
-    "lib/fog/aws/requests/ec2/describe_reserved_instances.rb",
-    "lib/fog/aws/requests/ec2/describe_security_groups.rb",
-    "lib/fog/aws/requests/ec2/describe_snapshots.rb",
-    "lib/fog/aws/requests/ec2/describe_volumes.rb",
-    "lib/fog/aws/requests/ec2/detach_volume.rb",
-    "lib/fog/aws/requests/ec2/disassociate_address.rb",
-    "lib/fog/aws/requests/ec2/get_console_output.rb",
-    "lib/fog/aws/requests/ec2/reboot_instances.rb",
-    "lib/fog/aws/requests/ec2/release_address.rb",
-    "lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb",
-    "lib/fog/aws/requests/ec2/run_instances.rb",
-    "lib/fog/aws/requests/ec2/terminate_instances.rb",
-    "lib/fog/aws/requests/s3/copy_object.rb",
-    "lib/fog/aws/requests/s3/delete_bucket.rb",
-    "lib/fog/aws/requests/s3/delete_object.rb",
-    "lib/fog/aws/requests/s3/get_bucket.rb",
-    "lib/fog/aws/requests/s3/get_bucket_location.rb",
-    "lib/fog/aws/requests/s3/get_object.rb",
-    "lib/fog/aws/requests/s3/get_request_payment.rb",
-    "lib/fog/aws/requests/s3/get_service.rb",
-    "lib/fog/aws/requests/s3/head_object.rb",
-    "lib/fog/aws/requests/s3/put_bucket.rb",
-    "lib/fog/aws/requests/s3/put_object.rb",
-    "lib/fog/aws/requests/s3/put_request_payment.rb",
-    "lib/fog/aws/requests/simpledb/batch_put_attributes.rb",
-    "lib/fog/aws/requests/simpledb/create_domain.rb",
-    "lib/fog/aws/requests/simpledb/delete_attributes.rb",
-    "lib/fog/aws/requests/simpledb/delete_domain.rb",
-    "lib/fog/aws/requests/simpledb/domain_metadata.rb",
-    "lib/fog/aws/requests/simpledb/get_attributes.rb",
-    "lib/fog/aws/requests/simpledb/list_domains.rb",
-    "lib/fog/aws/requests/simpledb/put_attributes.rb",
-    "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/credentials.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/files/directories.rb",
-    "lib/fog/rackspace/models/files/directory.rb",
-    "lib/fog/rackspace/models/files/file.rb",
-    "lib/fog/rackspace/models/files/files.rb",
-    "lib/fog/rackspace/models/servers/flavor.rb",
-    "lib/fog/rackspace/models/servers/flavors.rb",
-    "lib/fog/rackspace/models/servers/image.rb",
-    "lib/fog/rackspace/models/servers/images.rb",
-    "lib/fog/rackspace/models/servers/server.rb",
-    "lib/fog/rackspace/models/servers/servers.rb",
-    "lib/fog/rackspace/requests/files/delete_container.rb",
-    "lib/fog/rackspace/requests/files/delete_object.rb",
-    "lib/fog/rackspace/requests/files/get_container.rb",
-    "lib/fog/rackspace/requests/files/get_containers.rb",
-    "lib/fog/rackspace/requests/files/get_object.rb",
-    "lib/fog/rackspace/requests/files/head_container.rb",
-    "lib/fog/rackspace/requests/files/head_containers.rb",
-    "lib/fog/rackspace/requests/files/head_object.rb",
-    "lib/fog/rackspace/requests/files/put_container.rb",
-    "lib/fog/rackspace/requests/files/put_object.rb",
-    "lib/fog/rackspace/requests/servers/create_image.rb",
-    "lib/fog/rackspace/requests/servers/create_server.rb",
-    "lib/fog/rackspace/requests/servers/delete_image.rb",
-    "lib/fog/rackspace/requests/servers/delete_server.rb",
-    "lib/fog/rackspace/requests/servers/get_flavor_details.rb",
-    "lib/fog/rackspace/requests/servers/get_image_details.rb",
-    "lib/fog/rackspace/requests/servers/get_server_details.rb",
-    "lib/fog/rackspace/requests/servers/list_addresses.rb",
-    "lib/fog/rackspace/requests/servers/list_flavors.rb",
-    "lib/fog/rackspace/requests/servers/list_flavors_detail.rb",
-    "lib/fog/rackspace/requests/servers/list_images.rb",
-    "lib/fog/rackspace/requests/servers/list_images_detail.rb",
-    "lib/fog/rackspace/requests/servers/list_private_addresses.rb",
-    "lib/fog/rackspace/requests/servers/list_public_addresses.rb",
-    "lib/fog/rackspace/requests/servers/list_servers.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/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_public_Ips.rb",
-    "lib/fog/terremark/parsers/get_tasks_list.rb",
-    "lib/fog/terremark/parsers/get_vapp_template.rb",
-    "lib/fog/terremark/parsers/get_vdc.rb",
-    "lib/fog/terremark/parsers/instantiate_vapp_template.rb",
-    "lib/fog/terremark/parsers/internet_service.rb",
-    "lib/fog/terremark/parsers/node_service.rb",
-    "lib/fog/terremark/parsers/task.rb",
-    "lib/fog/terremark/parsers/vapp.rb",
-    "lib/fog/terremark/requests/add_internet_service.rb",
-    "lib/fog/terremark/requests/add_node_service.rb",
-    "lib/fog/terremark/requests/create_internet_service.rb",
-    "lib/fog/terremark/requests/delete_internet_service.rb",
-    "lib/fog/terremark/requests/delete_node_service.rb",
-    "lib/fog/terremark/requests/delete_vapp.rb",
-    "lib/fog/terremark/requests/deploy_vapp.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_public_ips.rb",
-    "lib/fog/terremark/requests/get_task.rb",
-    "lib/fog/terremark/requests/get_tasks_list.rb",
-    "lib/fog/terremark/requests/get_vapp.rb",
-    "lib/fog/terremark/requests/get_vapp_template.rb",
-    "lib/fog/terremark/requests/get_vdc.rb",
-    "lib/fog/terremark/requests/instantiate_vapp_template.rb",
-    "lib/fog/terremark/requests/power_off.rb",
-    "lib/fog/terremark/requests/power_on.rb",
-    "lib/fog/terremark/requests/reset.rb",
-    "lib/fog/terremark/requests/shutdown.rb",
-    "spec/aws/models/ec2/address_spec.rb",
-    "spec/aws/models/ec2/addresses_spec.rb",
-    "spec/aws/models/ec2/flavors_spec.rb",
-    "spec/aws/models/ec2/key_pair_spec.rb",
-    "spec/aws/models/ec2/key_pairs_spec.rb",
-    "spec/aws/models/ec2/security_group_spec.rb",
-    "spec/aws/models/ec2/security_groups_spec.rb",
-    "spec/aws/models/ec2/server_spec.rb",
-    "spec/aws/models/ec2/servers_spec.rb",
-    "spec/aws/models/ec2/snapshot_spec.rb",
-    "spec/aws/models/ec2/snapshots_spec.rb",
-    "spec/aws/models/ec2/volume_spec.rb",
-    "spec/aws/models/ec2/volumes_spec.rb",
-    "spec/aws/models/s3/directories_spec.rb",
-    "spec/aws/models/s3/directory_spec.rb",
-    "spec/aws/models/s3/file_spec.rb",
-    "spec/aws/models/s3/files_spec.rb",
-    "spec/aws/requests/ec2/allocate_address_spec.rb",
-    "spec/aws/requests/ec2/associate_address_spec.rb",
-    "spec/aws/requests/ec2/attach_volume_spec.rb",
-    "spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb",
-    "spec/aws/requests/ec2/create_key_pair_spec.rb",
-    "spec/aws/requests/ec2/create_security_group_spec.rb",
-    "spec/aws/requests/ec2/create_snapshot_spec.rb",
-    "spec/aws/requests/ec2/create_volume_spec.rb",
-    "spec/aws/requests/ec2/delete_key_pair_spec.rb",
-    "spec/aws/requests/ec2/delete_security_group_spec.rb",
-    "spec/aws/requests/ec2/delete_snapshot_spec.rb",
-    "spec/aws/requests/ec2/delete_volume_spec.rb",
-    "spec/aws/requests/ec2/describe_addresses_spec.rb",
-    "spec/aws/requests/ec2/describe_availability_zones_spec.rb",
-    "spec/aws/requests/ec2/describe_images_spec.rb",
-    "spec/aws/requests/ec2/describe_instances_spec.rb",
-    "spec/aws/requests/ec2/describe_key_pairs_spec.rb",
-    "spec/aws/requests/ec2/describe_regions_spec.rb",
-    "spec/aws/requests/ec2/describe_security_groups_spec.rb",
-    "spec/aws/requests/ec2/describe_snapshots_spec.rb",
-    "spec/aws/requests/ec2/describe_volumes_spec.rb",
-    "spec/aws/requests/ec2/detach_volume_spec.rb",
-    "spec/aws/requests/ec2/disassociate_address_spec.rb",
-    "spec/aws/requests/ec2/get_console_output_spec.rb",
-    "spec/aws/requests/ec2/reboot_instances_spec.rb",
-    "spec/aws/requests/ec2/release_address_spec.rb",
-    "spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb",
-    "spec/aws/requests/ec2/run_instances_spec.rb",
-    "spec/aws/requests/ec2/terminate_instances_spec.rb",
-    "spec/aws/requests/s3/copy_object_spec.rb",
-    "spec/aws/requests/s3/delete_bucket_spec.rb",
-    "spec/aws/requests/s3/delete_object_spec.rb",
-    "spec/aws/requests/s3/get_bucket_location_spec.rb",
-    "spec/aws/requests/s3/get_bucket_spec.rb",
-    "spec/aws/requests/s3/get_object_spec.rb",
-    "spec/aws/requests/s3/get_request_payment_spec.rb",
-    "spec/aws/requests/s3/get_service_spec.rb",
-    "spec/aws/requests/s3/head_object_spec.rb",
-    "spec/aws/requests/s3/put_bucket_spec.rb",
-    "spec/aws/requests/s3/put_object_spec.rb",
-    "spec/aws/requests/s3/put_request_payment_spec.rb",
-    "spec/aws/requests/simpledb/batch_put_attributes_spec.rb",
-    "spec/aws/requests/simpledb/create_domain_spec.rb",
-    "spec/aws/requests/simpledb/delete_attributes_spec.rb",
-    "spec/aws/requests/simpledb/delete_domain_spec.rb",
-    "spec/aws/requests/simpledb/domain_metadata_spec.rb",
-    "spec/aws/requests/simpledb/get_attributes_spec.rb",
-    "spec/aws/requests/simpledb/list_domains_spec.rb",
-    "spec/aws/requests/simpledb/put_attributes_spec.rb",
-    "spec/aws/requests/simpledb/select_spec.rb",
-    "spec/compact_progress_bar_formatter.rb",
-    "spec/lorem.txt",
-    "spec/rackspace/models/servers/flavors_spec.rb",
-    "spec/rackspace/models/servers/server_spec.rb",
-    "spec/rackspace/models/servers/servers_spec.rb",
-    "spec/rackspace/requests/files/delete_container_spec.rb",
-    "spec/rackspace/requests/files/delete_object_spec.rb",
-    "spec/rackspace/requests/files/get_container_spec.rb",
-    "spec/rackspace/requests/files/get_containers_spec.rb",
-    "spec/rackspace/requests/files/get_object_spec.rb",
-    "spec/rackspace/requests/files/head_container_spec.rb",
-    "spec/rackspace/requests/files/head_containers_spec.rb",
-    "spec/rackspace/requests/files/head_object_spec.rb",
-    "spec/rackspace/requests/files/put_container_spec.rb",
-    "spec/rackspace/requests/files/put_object_spec.rb",
-    "spec/shared_examples/flavors_examples.rb",
-    "spec/shared_examples/server_examples.rb",
-    "spec/shared_examples/servers_examples.rb",
-    "spec/slicehost/models/flavors_spec.rb",
-    "spec/slicehost/models/server_spec.rb",
-    "spec/slicehost/models/servers_spec.rb",
-    "spec/spec_helper.rb",
-    "tests/helper.rb",
-    "tests/helper_tests.rb",
-    "tests/rackspace/helper.rb",
-    "tests/rackspace/requests/servers/create_image_tests.rb",
-    "tests/rackspace/requests/servers/create_server_tests.rb",
-    "tests/rackspace/requests/servers/delete_image_tests.rb",
-    "tests/rackspace/requests/servers/delete_server_tests.rb",
-    "tests/rackspace/requests/servers/get_flavor_details_tests.rb",
-    "tests/rackspace/requests/servers/get_image_details_tests.rb",
-    "tests/rackspace/requests/servers/get_server_details_tests.rb",
-    "tests/rackspace/requests/servers/list_addresses_tests.rb",
-    "tests/rackspace/requests/servers/list_flavors_detail_tests.rb",
-    "tests/rackspace/requests/servers/list_flavors_tests.rb",
-    "tests/rackspace/requests/servers/list_images_detail_tests.rb",
-    "tests/rackspace/requests/servers/list_images_tests.rb",
-    "tests/rackspace/requests/servers/list_private_addresses_tests.rb",
-    "tests/rackspace/requests/servers/list_public_addresses_tests.rb",
-    "tests/rackspace/requests/servers/list_servers_detail_tests.rb",
-    "tests/rackspace/requests/servers/list_servers_tests.rb",
-    "tests/rackspace/requests/servers/reboot_server_tests.rb",
-    "tests/rackspace/requests/servers/update_server_tests.rb",
-    "tests/slicehost/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"
-  ]
-  s.homepage = %q{http://github.com/geemus/fog}
+  s.default_executable = 'fog'
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{fog}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{brings clouds to you}
-  s.test_files = [
-    "spec/aws/models/ec2/address_spec.rb",
-    "spec/aws/models/ec2/addresses_spec.rb",
-    "spec/aws/models/ec2/flavors_spec.rb",
-    "spec/aws/models/ec2/key_pair_spec.rb",
-    "spec/aws/models/ec2/key_pairs_spec.rb",
-    "spec/aws/models/ec2/security_group_spec.rb",
-    "spec/aws/models/ec2/security_groups_spec.rb",
-    "spec/aws/models/ec2/server_spec.rb",
-    "spec/aws/models/ec2/servers_spec.rb",
-    "spec/aws/models/ec2/snapshot_spec.rb",
-    "spec/aws/models/ec2/snapshots_spec.rb",
-    "spec/aws/models/ec2/volume_spec.rb",
-    "spec/aws/models/ec2/volumes_spec.rb",
-    "spec/aws/models/s3/directories_spec.rb",
-    "spec/aws/models/s3/directory_spec.rb",
-    "spec/aws/models/s3/file_spec.rb",
-    "spec/aws/models/s3/files_spec.rb",
-    "spec/aws/requests/ec2/allocate_address_spec.rb",
-    "spec/aws/requests/ec2/associate_address_spec.rb",
-    "spec/aws/requests/ec2/attach_volume_spec.rb",
-    "spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb",
-    "spec/aws/requests/ec2/create_key_pair_spec.rb",
-    "spec/aws/requests/ec2/create_security_group_spec.rb",
-    "spec/aws/requests/ec2/create_snapshot_spec.rb",
-    "spec/aws/requests/ec2/create_volume_spec.rb",
-    "spec/aws/requests/ec2/delete_key_pair_spec.rb",
-    "spec/aws/requests/ec2/delete_security_group_spec.rb",
-    "spec/aws/requests/ec2/delete_snapshot_spec.rb",
-    "spec/aws/requests/ec2/delete_volume_spec.rb",
-    "spec/aws/requests/ec2/describe_addresses_spec.rb",
-    "spec/aws/requests/ec2/describe_availability_zones_spec.rb",
-    "spec/aws/requests/ec2/describe_images_spec.rb",
-    "spec/aws/requests/ec2/describe_instances_spec.rb",
-    "spec/aws/requests/ec2/describe_key_pairs_spec.rb",
-    "spec/aws/requests/ec2/describe_regions_spec.rb",
-    "spec/aws/requests/ec2/describe_security_groups_spec.rb",
-    "spec/aws/requests/ec2/describe_snapshots_spec.rb",
-    "spec/aws/requests/ec2/describe_volumes_spec.rb",
-    "spec/aws/requests/ec2/detach_volume_spec.rb",
-    "spec/aws/requests/ec2/disassociate_address_spec.rb",
-    "spec/aws/requests/ec2/get_console_output_spec.rb",
-    "spec/aws/requests/ec2/reboot_instances_spec.rb",
-    "spec/aws/requests/ec2/release_address_spec.rb",
-    "spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb",
-    "spec/aws/requests/ec2/run_instances_spec.rb",
-    "spec/aws/requests/ec2/terminate_instances_spec.rb",
-    "spec/aws/requests/s3/copy_object_spec.rb",
-    "spec/aws/requests/s3/delete_bucket_spec.rb",
-    "spec/aws/requests/s3/delete_object_spec.rb",
-    "spec/aws/requests/s3/get_bucket_location_spec.rb",
-    "spec/aws/requests/s3/get_bucket_spec.rb",
-    "spec/aws/requests/s3/get_object_spec.rb",
-    "spec/aws/requests/s3/get_request_payment_spec.rb",
-    "spec/aws/requests/s3/get_service_spec.rb",
-    "spec/aws/requests/s3/head_object_spec.rb",
-    "spec/aws/requests/s3/put_bucket_spec.rb",
-    "spec/aws/requests/s3/put_object_spec.rb",
-    "spec/aws/requests/s3/put_request_payment_spec.rb",
-    "spec/aws/requests/simpledb/batch_put_attributes_spec.rb",
-    "spec/aws/requests/simpledb/create_domain_spec.rb",
-    "spec/aws/requests/simpledb/delete_attributes_spec.rb",
-    "spec/aws/requests/simpledb/delete_domain_spec.rb",
-    "spec/aws/requests/simpledb/domain_metadata_spec.rb",
-    "spec/aws/requests/simpledb/get_attributes_spec.rb",
-    "spec/aws/requests/simpledb/list_domains_spec.rb",
-    "spec/aws/requests/simpledb/put_attributes_spec.rb",
-    "spec/aws/requests/simpledb/select_spec.rb",
-    "spec/compact_progress_bar_formatter.rb",
-    "spec/rackspace/models/servers/flavors_spec.rb",
-    "spec/rackspace/models/servers/server_spec.rb",
-    "spec/rackspace/models/servers/servers_spec.rb",
-    "spec/rackspace/requests/files/delete_container_spec.rb",
-    "spec/rackspace/requests/files/delete_object_spec.rb",
-    "spec/rackspace/requests/files/get_container_spec.rb",
-    "spec/rackspace/requests/files/get_containers_spec.rb",
-    "spec/rackspace/requests/files/get_object_spec.rb",
-    "spec/rackspace/requests/files/head_container_spec.rb",
-    "spec/rackspace/requests/files/head_containers_spec.rb",
-    "spec/rackspace/requests/files/head_object_spec.rb",
-    "spec/rackspace/requests/files/put_container_spec.rb",
-    "spec/rackspace/requests/files/put_object_spec.rb",
-    "spec/shared_examples/flavors_examples.rb",
-    "spec/shared_examples/server_examples.rb",
-    "spec/shared_examples/servers_examples.rb",
-    "spec/slicehost/models/flavors_spec.rb",
-    "spec/slicehost/models/server_spec.rb",
-    "spec/slicehost/models/servers_spec.rb",
-    "spec/spec_helper.rb"
+  s.extra_rdoc_files = %w[README.rdoc]
+
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  s.add_dependency('excon', '>=0.0.21')
+  s.add_dependency('formatador', '>=0.0.10')
+  s.add_dependency('json')
+  s.add_dependency('mime-types')
+  s.add_dependency('net-ssh')
+  s.add_dependency('nokogiri')
+  s.add_dependency('ruby-hmac')
+
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('shindo')
+
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    Gemfile.lock
+    README.rdoc
+    Rakefile
+    benchs/fog_vs.rb
+    benchs/params.rb
+    benchs/parse_vs_push.rb
+    bin/fog
+    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
+    lib/fog/aws/models/ec2/flavor.rb
+    lib/fog/aws/models/ec2/flavors.rb
+    lib/fog/aws/models/ec2/image.rb
+    lib/fog/aws/models/ec2/images.rb
+    lib/fog/aws/models/ec2/key_pair.rb
+    lib/fog/aws/models/ec2/key_pairs.rb
+    lib/fog/aws/models/ec2/security_group.rb
+    lib/fog/aws/models/ec2/security_groups.rb
+    lib/fog/aws/models/ec2/server.rb
+    lib/fog/aws/models/ec2/servers.rb
+    lib/fog/aws/models/ec2/snapshot.rb
+    lib/fog/aws/models/ec2/snapshots.rb
+    lib/fog/aws/models/ec2/volume.rb
+    lib/fog/aws/models/ec2/volumes.rb
+    lib/fog/aws/models/s3/directories.rb
+    lib/fog/aws/models/s3/directory.rb
+    lib/fog/aws/models/s3/file.rb
+    lib/fog/aws/models/s3/files.rb
+    lib/fog/aws/parsers/ec2/allocate_address.rb
+    lib/fog/aws/parsers/ec2/attach_volume.rb
+    lib/fog/aws/parsers/ec2/basic.rb
+    lib/fog/aws/parsers/ec2/create_key_pair.rb
+    lib/fog/aws/parsers/ec2/create_snapshot.rb
+    lib/fog/aws/parsers/ec2/create_volume.rb
+    lib/fog/aws/parsers/ec2/describe_addresses.rb
+    lib/fog/aws/parsers/ec2/describe_availability_zones.rb
+    lib/fog/aws/parsers/ec2/describe_images.rb
+    lib/fog/aws/parsers/ec2/describe_instances.rb
+    lib/fog/aws/parsers/ec2/describe_key_pairs.rb
+    lib/fog/aws/parsers/ec2/describe_regions.rb
+    lib/fog/aws/parsers/ec2/describe_reserved_instances.rb
+    lib/fog/aws/parsers/ec2/describe_security_groups.rb
+    lib/fog/aws/parsers/ec2/describe_snapshots.rb
+    lib/fog/aws/parsers/ec2/describe_volumes.rb
+    lib/fog/aws/parsers/ec2/detach_volume.rb
+    lib/fog/aws/parsers/ec2/get_console_output.rb
+    lib/fog/aws/parsers/ec2/run_instances.rb
+    lib/fog/aws/parsers/ec2/terminate_instances.rb
+    lib/fog/aws/parsers/s3/copy_object.rb
+    lib/fog/aws/parsers/s3/get_bucket.rb
+    lib/fog/aws/parsers/s3/get_bucket_location.rb
+    lib/fog/aws/parsers/s3/get_request_payment.rb
+    lib/fog/aws/parsers/s3/get_service.rb
+    lib/fog/aws/parsers/simpledb/basic.rb
+    lib/fog/aws/parsers/simpledb/domain_metadata.rb
+    lib/fog/aws/parsers/simpledb/get_attributes.rb
+    lib/fog/aws/parsers/simpledb/list_domains.rb
+    lib/fog/aws/parsers/simpledb/select.rb
+    lib/fog/aws/requests/ec2/allocate_address.rb
+    lib/fog/aws/requests/ec2/associate_address.rb
+    lib/fog/aws/requests/ec2/attach_volume.rb
+    lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb
+    lib/fog/aws/requests/ec2/create_key_pair.rb
+    lib/fog/aws/requests/ec2/create_security_group.rb
+    lib/fog/aws/requests/ec2/create_snapshot.rb
+    lib/fog/aws/requests/ec2/create_volume.rb
+    lib/fog/aws/requests/ec2/delete_key_pair.rb
+    lib/fog/aws/requests/ec2/delete_security_group.rb
+    lib/fog/aws/requests/ec2/delete_snapshot.rb
+    lib/fog/aws/requests/ec2/delete_volume.rb
+    lib/fog/aws/requests/ec2/describe_addresses.rb
+    lib/fog/aws/requests/ec2/describe_availability_zones.rb
+    lib/fog/aws/requests/ec2/describe_images.rb
+    lib/fog/aws/requests/ec2/describe_instances.rb
+    lib/fog/aws/requests/ec2/describe_key_pairs.rb
+    lib/fog/aws/requests/ec2/describe_regions.rb
+    lib/fog/aws/requests/ec2/describe_reserved_instances.rb
+    lib/fog/aws/requests/ec2/describe_security_groups.rb
+    lib/fog/aws/requests/ec2/describe_snapshots.rb
+    lib/fog/aws/requests/ec2/describe_volumes.rb
+    lib/fog/aws/requests/ec2/detach_volume.rb
+    lib/fog/aws/requests/ec2/disassociate_address.rb
+    lib/fog/aws/requests/ec2/get_console_output.rb
+    lib/fog/aws/requests/ec2/reboot_instances.rb
+    lib/fog/aws/requests/ec2/release_address.rb
+    lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
+    lib/fog/aws/requests/ec2/run_instances.rb
+    lib/fog/aws/requests/ec2/terminate_instances.rb
+    lib/fog/aws/requests/s3/copy_object.rb
+    lib/fog/aws/requests/s3/delete_bucket.rb
+    lib/fog/aws/requests/s3/delete_object.rb
+    lib/fog/aws/requests/s3/get_bucket.rb
+    lib/fog/aws/requests/s3/get_bucket_location.rb
+    lib/fog/aws/requests/s3/get_object.rb
+    lib/fog/aws/requests/s3/get_request_payment.rb
+    lib/fog/aws/requests/s3/get_service.rb
+    lib/fog/aws/requests/s3/head_object.rb
+    lib/fog/aws/requests/s3/put_bucket.rb
+    lib/fog/aws/requests/s3/put_object.rb
+    lib/fog/aws/requests/s3/put_request_payment.rb
+    lib/fog/aws/requests/simpledb/batch_put_attributes.rb
+    lib/fog/aws/requests/simpledb/create_domain.rb
+    lib/fog/aws/requests/simpledb/delete_attributes.rb
+    lib/fog/aws/requests/simpledb/delete_domain.rb
+    lib/fog/aws/requests/simpledb/domain_metadata.rb
+    lib/fog/aws/requests/simpledb/get_attributes.rb
+    lib/fog/aws/requests/simpledb/list_domains.rb
+    lib/fog/aws/requests/simpledb/put_attributes.rb
+    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/credentials.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/files/directories.rb
+    lib/fog/rackspace/models/files/directory.rb
+    lib/fog/rackspace/models/files/file.rb
+    lib/fog/rackspace/models/files/files.rb
+    lib/fog/rackspace/models/servers/flavor.rb
+    lib/fog/rackspace/models/servers/flavors.rb
+    lib/fog/rackspace/models/servers/image.rb
+    lib/fog/rackspace/models/servers/images.rb
+    lib/fog/rackspace/models/servers/server.rb
+    lib/fog/rackspace/models/servers/servers.rb
+    lib/fog/rackspace/requests/files/delete_container.rb
+    lib/fog/rackspace/requests/files/delete_object.rb
+    lib/fog/rackspace/requests/files/get_container.rb
+    lib/fog/rackspace/requests/files/get_containers.rb
+    lib/fog/rackspace/requests/files/get_object.rb
+    lib/fog/rackspace/requests/files/head_container.rb
+    lib/fog/rackspace/requests/files/head_containers.rb
+    lib/fog/rackspace/requests/files/head_object.rb
+    lib/fog/rackspace/requests/files/put_container.rb
+    lib/fog/rackspace/requests/files/put_object.rb
+    lib/fog/rackspace/requests/servers/create_image.rb
+    lib/fog/rackspace/requests/servers/create_server.rb
+    lib/fog/rackspace/requests/servers/delete_image.rb
+    lib/fog/rackspace/requests/servers/delete_server.rb
+    lib/fog/rackspace/requests/servers/get_flavor_details.rb
+    lib/fog/rackspace/requests/servers/get_image_details.rb
+    lib/fog/rackspace/requests/servers/get_server_details.rb
+    lib/fog/rackspace/requests/servers/list_addresses.rb
+    lib/fog/rackspace/requests/servers/list_flavors.rb
+    lib/fog/rackspace/requests/servers/list_flavors_detail.rb
+    lib/fog/rackspace/requests/servers/list_images.rb
+    lib/fog/rackspace/requests/servers/list_images_detail.rb
+    lib/fog/rackspace/requests/servers/list_private_addresses.rb
+    lib/fog/rackspace/requests/servers/list_public_addresses.rb
+    lib/fog/rackspace/requests/servers/list_servers.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/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/ssh.rb
+    lib/fog/terremark.rb
+    lib/fog/terremark/bin.rb
+    lib/fog/terremark/models/server.rb
+    lib/fog/terremark/models/servers.rb
+    lib/fog/terremark/models/task.rb
+    lib/fog/terremark/models/tasks.rb
+    lib/fog/terremark/parsers/get_catalog.rb
+    lib/fog/terremark/parsers/get_catalog_item.rb
+    lib/fog/terremark/parsers/get_internet_services.rb
+    lib/fog/terremark/parsers/get_node_services.rb
+    lib/fog/terremark/parsers/get_organization.rb
+    lib/fog/terremark/parsers/get_organizations.rb
+    lib/fog/terremark/parsers/get_public_ips.rb
+    lib/fog/terremark/parsers/get_tasks_list.rb
+    lib/fog/terremark/parsers/get_vapp_template.rb
+    lib/fog/terremark/parsers/get_vdc.rb
+    lib/fog/terremark/parsers/instantiate_vapp_template.rb
+    lib/fog/terremark/parsers/internet_service.rb
+    lib/fog/terremark/parsers/node_service.rb
+    lib/fog/terremark/parsers/public_ip.rb
+    lib/fog/terremark/parsers/task.rb
+    lib/fog/terremark/parsers/vapp.rb
+    lib/fog/terremark/requests/add_internet_service.rb
+    lib/fog/terremark/requests/add_node_service.rb
+    lib/fog/terremark/requests/create_internet_service.rb
+    lib/fog/terremark/requests/delete_internet_service.rb
+    lib/fog/terremark/requests/delete_node_service.rb
+    lib/fog/terremark/requests/delete_vapp.rb
+    lib/fog/terremark/requests/deploy_vapp.rb
+    lib/fog/terremark/requests/get_catalog.rb
+    lib/fog/terremark/requests/get_catalog_item.rb
+    lib/fog/terremark/requests/get_internet_services.rb
+    lib/fog/terremark/requests/get_node_services.rb
+    lib/fog/terremark/requests/get_organization.rb
+    lib/fog/terremark/requests/get_organizations.rb
+    lib/fog/terremark/requests/get_public_ip.rb
+    lib/fog/terremark/requests/get_public_ips.rb
+    lib/fog/terremark/requests/get_task.rb
+    lib/fog/terremark/requests/get_tasks_list.rb
+    lib/fog/terremark/requests/get_vapp.rb
+    lib/fog/terremark/requests/get_vapp_template.rb
+    lib/fog/terremark/requests/get_vdc.rb
+    lib/fog/terremark/requests/instantiate_vapp_template.rb
+    lib/fog/terremark/requests/power_off.rb
+    lib/fog/terremark/requests/power_on.rb
+    lib/fog/terremark/requests/reset.rb
+    lib/fog/terremark/requests/shutdown.rb
+    spec/aws/models/ec2/address_spec.rb
+    spec/aws/models/ec2/addresses_spec.rb
+    spec/aws/models/ec2/flavors_spec.rb
+    spec/aws/models/ec2/key_pair_spec.rb
+    spec/aws/models/ec2/key_pairs_spec.rb
+    spec/aws/models/ec2/security_group_spec.rb
+    spec/aws/models/ec2/security_groups_spec.rb
+    spec/aws/models/ec2/server_spec.rb
+    spec/aws/models/ec2/servers_spec.rb
+    spec/aws/models/ec2/snapshot_spec.rb
+    spec/aws/models/ec2/snapshots_spec.rb
+    spec/aws/models/ec2/volume_spec.rb
+    spec/aws/models/ec2/volumes_spec.rb
+    spec/aws/models/s3/directories_spec.rb
+    spec/aws/models/s3/directory_spec.rb
+    spec/aws/models/s3/file_spec.rb
+    spec/aws/models/s3/files_spec.rb
+    spec/aws/requests/ec2/allocate_address_spec.rb
+    spec/aws/requests/ec2/associate_address_spec.rb
+    spec/aws/requests/ec2/attach_volume_spec.rb
+    spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb
+    spec/aws/requests/ec2/create_key_pair_spec.rb
+    spec/aws/requests/ec2/create_security_group_spec.rb
+    spec/aws/requests/ec2/create_snapshot_spec.rb
+    spec/aws/requests/ec2/create_volume_spec.rb
+    spec/aws/requests/ec2/delete_key_pair_spec.rb
+    spec/aws/requests/ec2/delete_security_group_spec.rb
+    spec/aws/requests/ec2/delete_snapshot_spec.rb
+    spec/aws/requests/ec2/delete_volume_spec.rb
+    spec/aws/requests/ec2/describe_addresses_spec.rb
+    spec/aws/requests/ec2/describe_availability_zones_spec.rb
+    spec/aws/requests/ec2/describe_images_spec.rb
+    spec/aws/requests/ec2/describe_instances_spec.rb
+    spec/aws/requests/ec2/describe_key_pairs_spec.rb
+    spec/aws/requests/ec2/describe_regions_spec.rb
+    spec/aws/requests/ec2/describe_security_groups_spec.rb
+    spec/aws/requests/ec2/describe_snapshots_spec.rb
+    spec/aws/requests/ec2/describe_volumes_spec.rb
+    spec/aws/requests/ec2/detach_volume_spec.rb
+    spec/aws/requests/ec2/disassociate_address_spec.rb
+    spec/aws/requests/ec2/get_console_output_spec.rb
+    spec/aws/requests/ec2/reboot_instances_spec.rb
+    spec/aws/requests/ec2/release_address_spec.rb
+    spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb
+    spec/aws/requests/ec2/run_instances_spec.rb
+    spec/aws/requests/ec2/terminate_instances_spec.rb
+    spec/aws/requests/s3/copy_object_spec.rb
+    spec/aws/requests/s3/delete_bucket_spec.rb
+    spec/aws/requests/s3/delete_object_spec.rb
+    spec/aws/requests/s3/get_bucket_location_spec.rb
+    spec/aws/requests/s3/get_bucket_spec.rb
+    spec/aws/requests/s3/get_object_spec.rb
+    spec/aws/requests/s3/get_request_payment_spec.rb
+    spec/aws/requests/s3/get_service_spec.rb
+    spec/aws/requests/s3/head_object_spec.rb
+    spec/aws/requests/s3/put_bucket_spec.rb
+    spec/aws/requests/s3/put_object_spec.rb
+    spec/aws/requests/s3/put_request_payment_spec.rb
+    spec/aws/requests/simpledb/batch_put_attributes_spec.rb
+    spec/aws/requests/simpledb/create_domain_spec.rb
+    spec/aws/requests/simpledb/delete_attributes_spec.rb
+    spec/aws/requests/simpledb/delete_domain_spec.rb
+    spec/aws/requests/simpledb/domain_metadata_spec.rb
+    spec/aws/requests/simpledb/get_attributes_spec.rb
+    spec/aws/requests/simpledb/list_domains_spec.rb
+    spec/aws/requests/simpledb/put_attributes_spec.rb
+    spec/aws/requests/simpledb/select_spec.rb
+    spec/compact_progress_bar_formatter.rb
+    spec/lorem.txt
+    spec/rackspace/models/servers/flavors_spec.rb
+    spec/rackspace/models/servers/server_spec.rb
+    spec/rackspace/models/servers/servers_spec.rb
+    spec/rackspace/requests/files/delete_container_spec.rb
+    spec/rackspace/requests/files/delete_object_spec.rb
+    spec/rackspace/requests/files/get_container_spec.rb
+    spec/rackspace/requests/files/get_containers_spec.rb
+    spec/rackspace/requests/files/get_object_spec.rb
+    spec/rackspace/requests/files/head_container_spec.rb
+    spec/rackspace/requests/files/head_containers_spec.rb
+    spec/rackspace/requests/files/head_object_spec.rb
+    spec/rackspace/requests/files/put_container_spec.rb
+    spec/rackspace/requests/files/put_object_spec.rb
+    spec/shared_examples/flavors_examples.rb
+    spec/shared_examples/server_examples.rb
+    spec/shared_examples/servers_examples.rb
+    spec/slicehost/models/flavors_spec.rb
+    spec/slicehost/models/server_spec.rb
+    spec/slicehost/models/servers_spec.rb
+    spec/spec_helper.rb
+    tests/helper.rb
+    tests/helper_tests.rb
+    tests/rackspace/helper.rb
+    tests/rackspace/requests/servers/create_image_tests.rb
+    tests/rackspace/requests/servers/create_server_tests.rb
+    tests/rackspace/requests/servers/delete_image_tests.rb
+    tests/rackspace/requests/servers/delete_server_tests.rb
+    tests/rackspace/requests/servers/get_flavor_details_tests.rb
+    tests/rackspace/requests/servers/get_image_details_tests.rb
+    tests/rackspace/requests/servers/get_server_details_tests.rb
+    tests/rackspace/requests/servers/list_addresses_tests.rb
+    tests/rackspace/requests/servers/list_flavors_detail_tests.rb
+    tests/rackspace/requests/servers/list_flavors_tests.rb
+    tests/rackspace/requests/servers/list_images_detail_tests.rb
+    tests/rackspace/requests/servers/list_images_tests.rb
+    tests/rackspace/requests/servers/list_private_addresses_tests.rb
+    tests/rackspace/requests/servers/list_public_addresses_tests.rb
+    tests/rackspace/requests/servers/list_servers_detail_tests.rb
+    tests/rackspace/requests/servers/list_servers_tests.rb
+    tests/rackspace/requests/servers/reboot_server_tests.rb
+    tests/rackspace/requests/servers/update_server_tests.rb
+    tests/slicehost/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
   ]
+  # = MANIFEST =
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<excon>, [">= 0.0.21"])
-      s.add_runtime_dependency(%q<formatador>, [">= 0.0.10"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
-    else
-      s.add_dependency(%q<excon>, [">= 0.0.21"])
-      s.add_dependency(%q<formatador>, [">= 0.0.10"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<excon>, [">= 0.0.21"])
-    s.add_dependency(%q<formatador>, [">= 0.0.10"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
-  end
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  s.test_files = s.files.select { |path| path =~ /^[spec|tests]\/.*_[spec|tests]\.rb/ }
 end
-
diff --git a/lib/fog.rb b/lib/fog.rb
index d9ed387d8..0ee0291f2 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -30,6 +30,8 @@ require 'fog/terremark'
 
 module Fog
 
+  VERSION = '0.0.73'
+
   module Mock
     @delay = 1
     def self.delay