fog-core 1.24.0 → 1.25.0

data/lib/fog/storage.rb

@@ -1,38 +1,37 @@
-require 'mime/types'
+require "mime/types"
 
 module Fog
   module Storage
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :internetarchive
-        require 'fog/internet_archive/storage'
+        require "fog/internet_archive/storage"
         Fog::Storage::InternetArchive.new(attributes)
       when :stormondemand
-        require 'fog/storm_on_demand/storage'
+        require "fog/storm_on_demand/storage"
         Fog::Storage::StormOnDemand.new(attributes)
       else
-        if self.providers.include?(provider)
+        if providers.include?(provider)
           require "fog/#{provider}/storage"
           begin
             Fog::Storage.const_get(Fog.providers[provider])
           rescue
-            Fog::const_get(Fog.providers[provider])::Storage
+            Fog.const_get(Fog.providers[provider])::Storage
           end.new(attributes)
         else
-          raise ArgumentError.new("#{provider} is not a recognized storage provider")
+          raise ArgumentError, "#{provider} is not a recognized storage provider"
         end
       end
     end
 
     def self.directories
       directories = []
-      for provider in self.providers
+      providers.each do |provider|
         begin
           directories.concat(self[provider].directories)
         rescue # ignore any missing credentials/etc
@@ -42,10 +41,12 @@ module Fog
     end
 
     def self.get_body_size(body)
-      if body.respond_to?(:force_encoding)
+      if body.respond_to?(:encoding)
+        original_encoding = body.encoding
         body.force_encoding('BINARY')
       end
-      if body.respond_to?(:bytesize)
+
+      size = if body.respond_to?(:bytesize)
         body.bytesize
       elsif body.respond_to?(:size)
         body.size
@@ -54,10 +55,16 @@ module Fog
       else
         0
       end
+
+      if body.respond_to?(:encoding)
+        body.force_encoding(original_encoding)
+      end
+
+      size
     end
 
     def self.get_content_type(data)
-      if data.respond_to?(:path) and !data.path.nil?
+      if data.respond_to?(:path) && !data.path.nil?
         filename = ::File.basename(data.path)
         unless (mime_types = MIME::Types.of(filename)).empty?
           mime_types.first.content_type
@@ -69,9 +76,9 @@ module Fog
       {
         :body     => data,
         :headers  => {
-          'Content-Length'  => get_body_size(data),
-          'Content-Type'    => get_content_type(data)
-          #'Content-MD5' => Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
+          "Content-Length"  => get_body_size(data),
+          "Content-Type"    => get_content_type(data)
+          # "Content-MD5" => Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
         }
       }
     end
@@ -79,6 +86,5 @@ module Fog
     def self.providers
       Fog.services[:storage]
     end
-
   end
 end

data/lib/fog/support.rb

@@ -1,8 +1,7 @@
 module Fog
   module Support
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
@@ -10,17 +9,15 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require 'fog/storm_on_demand/support'
+        require "fog/storm_on_demand/support"
         Fog::Support::StormOnDemand.new(attributes)
       else
-        raise ArgumentError.new("#{provider} has no support service")
+        raise ArgumentError, "#{provider} has no support service"
       end
-
     end
 
     def self.providers
       Fog.services[:support]
     end
-
   end
 end

data/lib/fog/test_helpers.rb

@@ -1,12 +1,12 @@
 # So downstream users can use the test_helpers
 
-require 'fog/test_helpers/helper'
-require 'fog/test_helpers/collection_helper'
-require 'fog/test_helpers/formats_helper'
-require 'fog/test_helpers/mock_helper'
-require 'fog/test_helpers/model_helper'
-require 'fog/test_helpers/responds_to_helper'
-require 'fog/test_helpers/succeeds_helper'
-require 'fog/test_helpers/compute/flavors_helper'
-require 'fog/test_helpers/compute/server_helper'
-require 'fog/test_helpers/compute/servers_helper'
+require "fog/test_helpers/helper"
+require "fog/test_helpers/collection_helper"
+require "fog/test_helpers/formats_helper"
+require "fog/test_helpers/mock_helper"
+require "fog/test_helpers/model_helper"
+require "fog/test_helpers/responds_to_helper"
+require "fog/test_helpers/succeeds_helper"
+require "fog/test_helpers/compute/flavors_helper"
+require "fog/test_helpers/compute/server_helper"
+require "fog/test_helpers/compute/servers_helper"

data/lib/fog/test_helpers/collection_helper.rb

@@ -1,7 +1,5 @@
 def collection_tests(collection, params = {}, mocks_implemented = true)
-
-  tests('success') do
-
+  tests("success") do
     tests("#new(#{params.inspect})").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       collection.new(params)
@@ -22,69 +20,53 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       collection.all
     end
 
-
-
-    if !Fog.mocking? || mocks_implemented
-      @identity = @instance.identity
-    end
+    @identity = @instance.identity if !Fog.mocking? || mocks_implemented
 
     tests("#get(#{@identity})").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       collection.get(@identity)
     end
 
-    tests('Enumerable') do
+    tests("Enumerable") do
       pending if Fog.mocking? && !mocks_implemented
 
-      methods = [
-        'all?', 'any?', 'find',  'detect', 'collect', 'map',
-        'find_index', 'flat_map', 'collect_concat', 'group_by',
-        'none?', 'one?'
-      ]
+      methods = %w(all any? find detect collect map find_index flat_map
+                   collect_concat group_by none? one?)
 
       # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
       # https://github.com/jruby/jruby/issues/1265
-      if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
-        methods.delete('all?')
+      if RUBY_PLATFORM == "java" && JRUBY_VERSION =~ /1\.7\.[5-8]/
+        methods.delete("all?")
       end
 
       methods.each do |enum_method|
-        if collection.respond_to?(enum_method)
-          tests("##{enum_method}").succeeds do
-            block_called = false
-            collection.send(enum_method) {|x| block_called = true }
-            block_called
-          end
+        next unless collection.respond_to?(enum_method)
+        tests("##{enum_method}").succeeds do
+          block_called = false
+          collection.send(enum_method) { block_called = true }
+          block_called
         end
       end
 
-      [
-        'max_by','min_by'
-      ].each do |enum_method|
-        if collection.respond_to?(enum_method)
-          tests("##{enum_method}").succeeds do
-            block_called = false
-            collection.send(enum_method) {|x| block_called = true; 0 }
-            block_called
+      %w(max_by min_by).each do |enum_method|
+        next unless collection.respond_to?(enum_method)
+        tests("##{enum_method}").succeeds do
+          block_called = false
+          collection.send(enum_method) do
+            block_called = true
+            0
           end
+          block_called
         end
-
       end
-
     end
 
+    yield if block_given?
 
-    if block_given?
-      yield
-    end
-
-    if !Fog.mocking? || mocks_implemented
-      @instance.destroy
-    end
+    @instance.destroy if !Fog.mocking? || mocks_implemented
   end
 
-  tests('failure') do
-
+  tests("failure") do
     if !Fog.mocking? || mocks_implemented
       @identity = @identity.to_s
       @identity = @identity.gsub(/[a-zA-Z]/) { Fog::Mock.random_letters(1) }
@@ -96,7 +78,5 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
       collection.get(@identity)
     end
-
   end
-
 end

data/lib/fog/test_helpers/compute/flavors_helper.rb

@@ -1,7 +1,5 @@
-def flavors_tests(connection, params = {}, mocks_implemented = true)
-
-  tests('success') do
-
+def flavors_tests(connection, _params = {}, mocks_implemented = true)
+  tests("success") do
     tests("#all").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.all
@@ -15,20 +13,16 @@ def flavors_tests(connection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.get(@identity)
     end
-
   end
 
-  tests('failure') do
-
+  tests("failure") do
     if !Fog.mocking? || mocks_implemented
-      invalid_flavor_identity = connection.flavors.first.identity.to_s.gsub(/\w/, '0')
+      invalid_flavor_identity = connection.flavors.first.identity.to_s.gsub(/\w/, "0")
     end
 
     tests("#get('#{invalid_flavor_identity}')").returns(nil) do
       pending if Fog.mocking? && !mocks_implemented
       connection.flavors.get(invalid_flavor_identity)
     end
-
   end
-
 end

data/lib/fog/test_helpers/compute/server_helper.rb

@@ -1,8 +1,6 @@
 def server_tests(connection, params = {}, mocks_implemented = true)
-
   model_tests(connection.servers, params, mocks_implemented) do
-
-    tests('#reload').returns(true) do
+    tests("#reload").returns(true) do
       pending if Fog.mocking? && !mocks_implemented
       @instance.wait_for { ready? }
       identity = @instance.identity
@@ -12,16 +10,12 @@ def server_tests(connection, params = {}, mocks_implemented = true)
     responds_to([:ready?, :state])
     yield if block_given?
 
-    tests('#reboot').succeeds do
+    tests("#reboot").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       @instance.wait_for { ready? }
       @instance.reboot
     end
 
-    if !Fog.mocking? || mocks_implemented
-      @instance.wait_for { ready? }
-    end
-
+    @instance.wait_for { ready? } if !Fog.mocking? || mocks_implemented
   end
-
 end

data/lib/fog/test_helpers/compute/servers_helper.rb

@@ -1,12 +1,8 @@
 def servers_tests(connection, params = {}, mocks_implemented = true)
-
   collection_tests(connection.servers, params, mocks_implemented) do
-
     if !Fog.mocking? || mocks_implemented
       @instance.wait_for { ready? }
       yield if block_given?
     end
-
   end
-
 end

data/lib/fog/test_helpers/formats_helper.rb

@@ -2,7 +2,7 @@ require "fog/schema/data_validator"
 
 # format related hackery
 # allows both true.is_a?(Fog::Boolean) and false.is_a?(Fog::Boolean)
-# allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
+# allows both nil.is_a?(Fog::Nullable::String) and "".is_a?(Fog::Nullable::String)
 module Fog
   module Boolean; end
   module Nullable
@@ -15,18 +15,17 @@ module Fog
     module Array; end
   end
 end
-[FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
-[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
-[NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
-[NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
-[Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
-[Float, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Float)}
-[Hash, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Hash)}
-[Array, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Array)}
+[FalseClass, TrueClass].each { |klass| klass.send(:include, Fog::Boolean) }
+[FalseClass, TrueClass, NilClass, Fog::Boolean].each { |klass| klass.send(:include, Fog::Nullable::Boolean) }
+[NilClass, String].each { |klass| klass.send(:include, Fog::Nullable::String) }
+[NilClass, Time].each { |klass| klass.send(:include, Fog::Nullable::Time) }
+[Integer, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Integer) }
+[Float, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Float) }
+[Hash, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Hash) }
+[Array, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Array) }
 
 module Shindo
   class Tests
-
     # Generates a Shindo test that compares a hash schema to the result
     # of the passed in block returning true if they match.
     #
@@ -73,7 +72,7 @@ module Shindo
     #
     # @return [Boolean]
     def data_matches_schema(schema, options = {})
-      test('data matches schema') do
+      test("data matches schema") do
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, schema, options)
         @message = validator.message unless valid
@@ -83,11 +82,11 @@ module Shindo
 
     # @deprecated #formats is deprecated. Use #data_matches_schema instead
     def formats(format, strict = true)
-      test('has proper format') do
+      test("has proper format") do
         if strict
-          options = {:allow_extra_keys => false, :allow_optional_rules => true}
+          options = { :allow_extra_keys => false, :allow_optional_rules => true }
         else
-          options = {:allow_extra_keys => true, :allow_optional_rules => true}
+          options = { :allow_extra_keys => true, :allow_optional_rules => true }
         end
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, format, options)

data/lib/fog/test_helpers/helper.rb

@@ -1,12 +1,17 @@
-require 'excon'
+require "excon"
 
-ENV['FOG_RC']         = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
-ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
+ENV["FOG_RC"]         = ENV["FOG_RC"] || File.expand_path("../.fog", __FILE__)
+ENV["FOG_CREDENTIAL"] = ENV["FOG_CREDENTIAL"] || "default"
 
 Excon.defaults.merge!(:debug_request => true, :debug_response => true)
 
 LOREM = <<HERE
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
+nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore
+eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident,
+sunt in culpa qui officia deserunt mollit anim id est laborum.
 HERE
 
 require "tempfile"

data/lib/fog/test_helpers/mock_helper.rb

@@ -1,107 +1,105 @@
-require 'fog/core'
+require "fog/core"
 
 # Use so you can run in mock mode from the command line
 #
 # FOG_MOCK=true fog
 
-if ENV["FOG_MOCK"] == "true"
-  Fog.mock!
-end
+Fog.mock! if ENV["FOG_MOCK"] == "true"
 
 # if in mocked mode, fill in some fake credentials for us
 if Fog.mock?
   Fog.credentials = {
-    :aws_access_key_id                => 'aws_access_key_id',
-    :aws_secret_access_key            => 'aws_secret_access_key',
-    :ia_access_key_id                 => 'aws_access_key_id',
-    :ia_secret_access_key             => 'aws_secret_access_key',
-    :atmos_storage_token              => 'atmos_token',
-    :atmos_storage_secret             => 'atmos_secret',
-    :atmos_storage_endpoint           => 'http://atmos.is.cool:1000/test1.0',
-    :bluebox_api_key                  => 'bluebox_api_key',
-    :bluebox_customer_id              => 'bluebox_customer_id',
-    :brightbox_client_id              => 'brightbox_client_id',
-    :brightbox_secret                 => 'brightbox_secret',
-    :cloudstack_disk_offering_id      => '',
-    :cloudstack_host                  => 'http://cloudstack.example.org',
-    :cloudstack_network_ids           => '',
-    :cloudstack_service_offering_id   => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
-    :cloudstack_template_id           => '8a31cf9c-f248-0588-256e-9dbf58785216',
-    :cloudstack_zone_id               => 'c554c592-e09c-9df5-7688-4a32754a4305',
-    :clodo_api_key                    => 'clodo_api_key',
-    :clodo_username                   => 'clodo_username',
-    :digitalocean_api_key             => 'digitalocean_api_key',
-    :digitalocean_client_id           => 'digitalocean_client_id',
-    :dnsimple_email                   => 'dnsimple_email',
-    :dnsimple_password                => 'dnsimple_password',
-    :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
-    :dnsmadeeasy_secret_key           => 'dnsmadeeasy_secret_key',
-    :ecloud_username                  => 'ecloud_username',
-    :ecloud_password                  => 'ecloud_password',
-    :ecloud_versions_uri              => 'http://ecloud.versions.uri',
-    :glesys_username                  => 'glesys_username',
-    :glesys_api_key                   => 'glesys_api_key',
-    :go_grid_api_key                  => 'go_grid_api_key',
-    :go_grid_shared_secret            => 'go_grid_shared_secret',
-    :google_storage_access_key_id     => 'google_storage_access_key_id',
-    :google_storage_secret_access_key => 'google_storage_secret_access_key',
-    :google_project                   => 'google_project_name',
-    :google_client_email              => 'fake@developer.gserviceaccount.com',
-    :google_key_location              => '~/fake.p12',
-    :hp_access_key                    => 'hp_access_key',
-    :hp_secret_key                    => 'hp_secret_key',
-    :hp_tenant_id                     => 'hp_tenant_id',
-    :hp_avl_zone                      => 'hp_avl_zone',
-    :os_account_meta_temp_url_key     => 'os_account_meta_temp_url_key',
-    :ibm_username                     => 'ibm_username',
-    :ibm_password                     => 'ibm_password',
+    :aws_access_key_id                => "aws_access_key_id",
+    :aws_secret_access_key            => "aws_secret_access_key",
+    :ia_access_key_id                 => "aws_access_key_id",
+    :ia_secret_access_key             => "aws_secret_access_key",
+    :atmos_storage_token              => "atmos_token",
+    :atmos_storage_secret             => "atmos_secret",
+    :atmos_storage_endpoint           => "http://atmos.is.cool:1000/test1.0",
+    :bluebox_api_key                  => "bluebox_api_key",
+    :bluebox_customer_id              => "bluebox_customer_id",
+    :brightbox_client_id              => "brightbox_client_id",
+    :brightbox_secret                 => "brightbox_secret",
+    :cloudstack_disk_offering_id      => "",
+    :cloudstack_host                  => "http://cloudstack.example.org",
+    :cloudstack_network_ids           => "",
+    :cloudstack_service_offering_id   => "4437ac6c-9fe3-477a-57ec-60a5a45896a4",
+    :cloudstack_template_id           => "8a31cf9c-f248-0588-256e-9dbf58785216",
+    :cloudstack_zone_id               => "c554c592-e09c-9df5-7688-4a32754a4305",
+    :clodo_api_key                    => "clodo_api_key",
+    :clodo_username                   => "clodo_username",
+    :digitalocean_api_key             => "digitalocean_api_key",
+    :digitalocean_client_id           => "digitalocean_client_id",
+    :dnsimple_email                   => "dnsimple_email",
+    :dnsimple_password                => "dnsimple_password",
+    :dnsmadeeasy_api_key              => "dnsmadeeasy_api_key",
+    :dnsmadeeasy_secret_key           => "dnsmadeeasy_secret_key",
+    :ecloud_username                  => "ecloud_username",
+    :ecloud_password                  => "ecloud_password",
+    :ecloud_versions_uri              => "http://ecloud.versions.uri",
+    :glesys_username                  => "glesys_username",
+    :glesys_api_key                   => "glesys_api_key",
+    :go_grid_api_key                  => "go_grid_api_key",
+    :go_grid_shared_secret            => "go_grid_shared_secret",
+    :google_storage_access_key_id     => "google_storage_access_key_id",
+    :google_storage_secret_access_key => "google_storage_secret_access_key",
+    :google_project                   => "google_project_name",
+    :google_client_email              => "fake@developer.gserviceaccount.com",
+    :google_key_location              => "~/fake.p12",
+    :hp_access_key                    => "hp_access_key",
+    :hp_secret_key                    => "hp_secret_key",
+    :hp_tenant_id                     => "hp_tenant_id",
+    :hp_avl_zone                      => "hp_avl_zone",
+    :os_account_meta_temp_url_key     => "os_account_meta_temp_url_key",
+    :ibm_username                     => "ibm_username",
+    :ibm_password                     => "ibm_password",
     :joyent_username                  => "joyentuser",
     :joyent_password                  => "joyentpass",
-    :linode_api_key                   => 'linode_api_key',
-    :local_root                       => '~/.fog',
-    :bare_metal_cloud_password        => 'bare_metal_cloud_password',
-    :bare_metal_cloud_username        => 'bare_metal_cloud_username',
-    :ninefold_compute_key             => 'ninefold_compute_key',
-    :ninefold_compute_secret          => 'ninefold_compute_secret',
-    :ninefold_storage_secret          => 'ninefold_storage_secret',
-    :ninefold_storage_token           => 'ninefold_storage_token',
-#    :public_key_path                  => '~/.ssh/id_rsa.pub',
-#    :private_key_path                 => '~/.ssh/id_rsa',
-    :openstack_api_key                => 'openstack_api_key',
-    :openstack_username               => 'openstack_username',
-    :openstack_tenant                 => 'openstack_tenant',
-    :openstack_auth_url               => 'http://openstack:35357/v2.0/tokens',
-    :ovirt_url                        => 'http://ovirt:8080/api',
-    :ovirt_username                   => 'admin@internal',
-    :ovirt_password                   => '123123',
-    :libvirt_uri                      => 'qemu://libvirt/system',
-    :rackspace_api_key                => 'rackspace_api_key',
-    :rackspace_username               => 'rackspace_username',
-    :riakcs_access_key_id             => 'riakcs_access_key_id',
-    :riakcs_secret_access_key         => 'riakcs_secret_access_key',
-    :storm_on_demand_username         => 'storm_on_demand_username',
-    :storm_on_demand_password         => 'storm_on_demand_password',
-    :vcloud_host                      => 'vcloud_host',
-    :vcloud_password                  => 'vcloud_password',
-    :vcloud_username                  => 'vcloud_username',
-    :vcloud_director_host             => 'vcloud-director-host',
-    :vcloud_director_password         => 'vcloud_director_password',
-    :vcloud_director_username         => 'vcd_user@vcd_org_name',
-    :voxel_api_key                    => 'voxel_api_key',
-    :voxel_api_secret                 => 'voxel_api_secret',
-    :zerigo_email                     => 'zerigo_email',
-    :zerigo_token                     => 'zerigo_token',
-    :dynect_customer                  => 'dynect_customer',
-    :dynect_username                  => 'dynect_username',
-    :dynect_password                  => 'dynect_password',
-    :vsphere_server                   => 'virtualcenter.lan',
-    :vsphere_username                 => 'apiuser',
-    :vsphere_password                 => 'apipassword',
-    :vsphere_expected_pubkey_hash     => 'abcdef1234567890',
-    :libvirt_uri                      => 'qemu:///system',
-    :libvirt_username                 => 'root',
-    :libvirt_password                 => 'password',
-    :cloudsigma_username              => 'csuname',
-    :cloudsigma_password              => 'cspass'
+    :linode_api_key                   => "linode_api_key",
+    :local_root                       => "~/.fog",
+    :bare_metal_cloud_password        => "bare_metal_cloud_password",
+    :bare_metal_cloud_username        => "bare_metal_cloud_username",
+    :ninefold_compute_key             => "ninefold_compute_key",
+    :ninefold_compute_secret          => "ninefold_compute_secret",
+    :ninefold_storage_secret          => "ninefold_storage_secret",
+    :ninefold_storage_token           => "ninefold_storage_token",
+    # :public_key_path                  => "~/.ssh/id_rsa.pub",
+    # :private_key_path                 => "~/.ssh/id_rsa",
+    :openstack_api_key                => "openstack_api_key",
+    :openstack_username               => "openstack_username",
+    :openstack_tenant                 => "openstack_tenant",
+    :openstack_auth_url               => "http://openstack:35357/v2.0/tokens",
+    :ovirt_url                        => "http://ovirt:8080/api",
+    :ovirt_username                   => "admin@internal",
+    :ovirt_password                   => "123123",
+    :libvirt_uri                      => "qemu://libvirt/system",
+    :rackspace_api_key                => "rackspace_api_key",
+    :rackspace_username               => "rackspace_username",
+    :riakcs_access_key_id             => "riakcs_access_key_id",
+    :riakcs_secret_access_key         => "riakcs_secret_access_key",
+    :storm_on_demand_username         => "storm_on_demand_username",
+    :storm_on_demand_password         => "storm_on_demand_password",
+    :vcloud_host                      => "vcloud_host",
+    :vcloud_password                  => "vcloud_password",
+    :vcloud_username                  => "vcloud_username",
+    :vcloud_director_host             => "vcloud-director-host",
+    :vcloud_director_password         => "vcloud_director_password",
+    :vcloud_director_username         => "vcd_user@vcd_org_name",
+    :voxel_api_key                    => "voxel_api_key",
+    :voxel_api_secret                 => "voxel_api_secret",
+    :zerigo_email                     => "zerigo_email",
+    :zerigo_token                     => "zerigo_token",
+    :dynect_customer                  => "dynect_customer",
+    :dynect_username                  => "dynect_username",
+    :dynect_password                  => "dynect_password",
+    :vsphere_server                   => "virtualcenter.lan",
+    :vsphere_username                 => "apiuser",
+    :vsphere_password                 => "apipassword",
+    :vsphere_expected_pubkey_hash     => "abcdef1234567890",
+    :libvirt_uri                      => "qemu:///system",
+    :libvirt_username                 => "root",
+    :libvirt_password                 => "password",
+    :cloudsigma_username              => "csuname",
+    :cloudsigma_password              => "cspass"
   }.merge(Fog.credentials)
 end