fog-brightbox 1.10.0 → 1.12.0

data/tests/brightbox/requests/compute/server_tests.rb

@@ -7,9 +7,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
 
     tests("#create_server(:image => '#{image_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].create_server(:image => image_id)
+      result = Fog::Compute[:brightbox].create_server(image: image_id)
       server_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
@@ -19,25 +19,25 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
     tests("#list_servers") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_servers
-      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVERS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVERS, allow_extra_keys: true) { result }
     end
 
     tests("#get_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     tests("#update_server('#{server_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}")
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      result = Fog::Compute[:brightbox].update_server(server_id, name: "Fog@#{Time.now.iso8601}")
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     tests("#activate_console_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].activate_console_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
       test("has set 'console_url'") { !result["console_url"].empty? }
       test("has set 'console_token'") { !result["console_token"].empty? }
       test("has set 'console_token_expires'") { !result["console_token_expires"].empty? }
@@ -46,13 +46,13 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
     tests("#stop_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].stop_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     tests("#start_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].start_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
@@ -62,13 +62,13 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
     tests("#shutdown_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].shutdown_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
 
     tests("#snapshot_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].snapshot_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
       # Server should be exclusively for our test so assume we can delete the snapshot
       snapshot_id = result["snapshots"].first["id"]
       @snapshot = Fog::Compute[:brightbox].images.get(snapshot_id)
@@ -79,7 +79,7 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
     tests("#delete_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_server(server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, allow_extra_keys: true) { result }
     end
   end
 

data/tests/brightbox/requests/compute/server_type_tests.rb

@@ -4,13 +4,13 @@ Shindo.tests("Fog::Compute[:brightbox] | server type requests", ["brightbox"]) d
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_types
       @server_type_id = result.first["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_TYPES, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_TYPES, allow_extra_keys: true) { result }
     end
 
     tests("#get_server_type('#{@server_type_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_type(@server_type_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_TYPE, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_TYPE, allow_extra_keys: true) { result }
     end
   end
 

data/tests/brightbox/requests/compute/user_tests.rb

@@ -4,22 +4,22 @@ Shindo.tests("Fog::Compute[:brightbox] | user requests", ["brightbox"]) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_users
       @user_id = result.first["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Collection::USERS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::USERS, allow_extra_keys: true) { result }
     end
 
     tests("#get_user('#{@user_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_user(@user_id)
       @current_name = result["name"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::USER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::USER, allow_extra_keys: true) { result }
     end
 
     # Rather than setting the name to something useless we set it to the original value
-    update_options = { :name => @current_name }
+    update_options = { name: @current_name }
     tests("#update_user('#{@user_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_user(@user_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::USER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::USER, allow_extra_keys: true) { result }
     end
   end
 

data/tests/brightbox/requests/compute/volume_tests.rb

@@ -8,12 +8,12 @@ Shindo.tests("Fog::Compute[:brightbox] | volume requests", ["brightbox"]) do
     tests("#create_volume(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_volume(create_options)
       @volume_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, allow_extra_keys: true) { result }
     end
 
     tests("#list_volumes") do
       result = Fog::Compute[:brightbox].list_volumes
-      data_matches_schema(Brightbox::Compute::Formats::Collection::VOLUMES, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::VOLUMES, allow_extra_keys: true) { result }
 
       test("#{@volume_id} is listed") do
         result.any? do |volume|
@@ -24,7 +24,7 @@ Shindo.tests("Fog::Compute[:brightbox] | volume requests", ["brightbox"]) do
 
     tests("#get_volume('#{@volume_id}')") do
       result = Fog::Compute[:brightbox].get_volume(@volume_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, allow_extra_keys: true) { result }
     end
 
     update_options = {
@@ -32,7 +32,7 @@ Shindo.tests("Fog::Compute[:brightbox] | volume requests", ["brightbox"]) do
     }
     tests("#update_volume('#{@volume_id}', ...)") do
       result = Fog::Compute[:brightbox].update_volume(@volume_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, allow_extra_keys: true) { result }
 
       test("name has updated") { result["name"] == "New name" }
     end
@@ -41,7 +41,7 @@ Shindo.tests("Fog::Compute[:brightbox] | volume requests", ["brightbox"]) do
 
     tests("#delete_volume('#{@volume_id}')") do
       result = Fog::Compute[:brightbox].delete_volume(@volume_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, allow_extra_keys: true) { result }
     end
   end
 

data/tests/brightbox/requests/compute/zone_tests.rb

@@ -4,13 +4,13 @@ Shindo.tests("Fog::Compute[:brightbox] | zone requests", ["brightbox"]) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_zones
       @zone_id = result.first["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Collection::ZONES, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::ZONES, allow_extra_keys: true) { result }
     end
 
     tests("#get_zone('#{@zone_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_zone(@zone_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::ZONE, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ZONE, allow_extra_keys: true) { result }
     end
   end
 

data/tests/helper.rb

@@ -3,6 +3,6 @@ ENV["FOG_CREDENTIAL"] = ENV["FOG_CREDENTIAL"] || "default"
 
 require "fog/brightbox"
 
-Excon.defaults.merge!(:debug_request => true, :debug_response => true)
+Excon.defaults.merge!(debug_request: true, debug_response: true)
 
 require File.expand_path(File.join(File.dirname(__FILE__), "helpers", "mock_helper"))

data/tests/helpers/collection_helper.rb

@@ -20,9 +20,7 @@ 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
@@ -45,34 +43,29 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       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) { |_x| block_called = true }
+          block_called
         end
       end
 
-      %w(
-        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
-          end
+      %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) { |_x| block_called = true; 0 }
+          block_called
         end
       end
     end
 
-    if block_given?
-      yield(@instance)
-    end
+    yield(@instance) if block_given?
 
-    if !Fog.mocking? || mocks_implemented
-      @instance.destroy
-    end
+    @instance.destroy if !Fog.mocking? || mocks_implemented
   end
 
   tests("failure") do

data/tests/helpers/compute/server_helper.rb

@@ -1,23 +1,21 @@
 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
       !identity.nil? && identity == @instance.reload.identity
     end
 
-    responds_to([:ready?, :state])
+    responds_to(%i[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/tests/helpers/formats_helper.rb

@@ -83,11 +83,11 @@ module Shindo
     # @deprecated #formats is deprecated. Use #data_matches_schema instead
     def formats(format, strict = true)
       test("has proper format") do
-        if strict
-          options = { :allow_extra_keys => false, :allow_optional_rules => true }
-        else
-          options = { :allow_extra_keys => true, :allow_optional_rules => true }
-        end
+        options = if strict
+                    { allow_extra_keys: false, allow_optional_rules: true }
+                  else
+                    { allow_extra_keys: true, allow_optional_rules: true }
+                  end
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, format, options)
         @message = validator.message unless valid

data/tests/helpers/formats_helper_tests.rb

@@ -1,20 +1,20 @@
 Shindo.tests("test_helper", "meta") do
   tests("comparing welcome data against schema") do
-    data = { :welcome => "Hello" }
-    data_matches_schema(:welcome => String) { data }
+    data = { welcome: "Hello" }
+    data_matches_schema(welcome: String) { data }
   end
 
-  tests('#data_matches_schema') do
+  tests("#data_matches_schema") do
     tests("when value matches schema expectation") do
       data_matches_schema("key" => String) { { "key" => "Value" } }
     end
 
     tests("when values within an array all match schema expectation") do
-      data_matches_schema({ "key" => [Integer] }) { { "key" => [1, 2] } }
+      data_matches_schema("key" => [Integer]) { { "key" => [1, 2] } }
     end
 
     tests("when nested values match schema expectation") do
-      data_matches_schema("key" => { :nested_key => String }) { { "key" => { :nested_key => "Value" } } }
+      data_matches_schema("key" => { nested_key: String }) { { "key" => { nested_key: "Value" } } }
     end
 
     tests("when collection of values all match schema expectation") do
@@ -22,11 +22,11 @@ Shindo.tests("test_helper", "meta") do
     end
 
     tests("when collection is empty although schema covers optional members") do
-      data_matches_schema([{ "key" => String }], :allow_optional_rules => true) { [] }
+      data_matches_schema([{ "key" => String }], allow_optional_rules: true) { [] }
     end
 
     tests("when additional keys are passed and not strict") do
-      data_matches_schema({ "key" => String }, :allow_extra_keys => true) { { "key" => "Value", :extra => "Bonus" } }
+      data_matches_schema({ "key" => String }, allow_extra_keys: true) { { "key" => "Value", :extra => "Bonus" } }
     end
 
     tests("when value is nil and schema expects NilClass") do
@@ -45,16 +45,16 @@ Shindo.tests("test_helper", "meta") do
       data_matches_schema("time" => Time) { { "time" => Time.now } }
     end
 
-    tests('when key is missing but value should be NilClass (#1477)') do
-      data_matches_schema({ "key" => NilClass }, :allow_optional_rules => true) { {} }
+    tests("when key is missing but value should be NilClass (#1477)") do
+      data_matches_schema({ "key" => NilClass }, allow_optional_rules: true) { {} }
     end
 
-    tests('when key is missing but value is nullable (#1477)') do
-      data_matches_schema({ "key" => Fog::Nullable::String }, :allow_optional_rules => true) { {} }
+    tests("when key is missing but value is nullable (#1477)") do
+      data_matches_schema({ "key" => Fog::Nullable::String }, allow_optional_rules: true) { {} }
     end
   end
 
-  tests('#formats backwards compatible changes') do
+  tests("#formats backwards compatible changes") do
     tests("when value matches schema expectation") do
       formats("key" => String) { { "key" => "Value" } }
     end
@@ -64,7 +64,7 @@ Shindo.tests("test_helper", "meta") do
     end
 
     tests("when nested values match schema expectation") do
-      formats("key" => { :nested_key => String }) { { "key" => { :nested_key => "Value" } } }
+      formats("key" => { nested_key: String }) { { "key" => { nested_key: "Value" } } }
     end
 
     tests("when collection of values all match schema expectation") do
@@ -95,12 +95,12 @@ Shindo.tests("test_helper", "meta") do
       formats("time" => Time) { { "time" => Time.now } }
     end
 
-    tests('when key is missing but value should be NilClass (#1477)') do
+    tests("when key is missing but value should be NilClass (#1477)") do
       formats("key" => NilClass) { {} }
     end
 
-    tests('when key is missing but value is nullable (#1477)') do
-      formats({ "key" => Fog::Nullable::String }) { {} }
+    tests("when key is missing but value is nullable (#1477)") do
+      formats("key" => Fog::Nullable::String) { {} }
     end
   end
 end

data/tests/helpers/mock_helper.rb

@@ -2,97 +2,95 @@
 #
 # 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",
-    :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",
-    :cloudstack_project_id            => "f1f1f1f1-f1f1-f1f1-f1f1-f1f1f1f1f1f1",
-    :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",
-    :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",
-    :hp_access_key                    => "hp_access_key",
-    :hp_secret_key                    => "hp_secret_key",
-    :hp_tenant_id                     => "hp_tenant_id",
-    :hp_avl_zone                      => "hp_avl_zone",
-    :hp_auth_uri                      => "http://hp/v2.0/tokens",
-    :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",
+    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",
+    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",
+    cloudstack_project_id: "f1f1f1f1-f1f1-f1f1-f1f1-f1f1f1f1f1f1",
+    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",
+    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",
+    hp_access_key: "hp_access_key",
+    hp_secret_key: "hp_secret_key",
+    hp_tenant_id: "hp_tenant_id",
+    hp_avl_zone: "hp_avl_zone",
+    hp_auth_uri: "http://hp/v2.0/tokens",
+    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',
-    :opennebula_endpoint              => "http://opennebula:2633/RPC2",
-    :opennebula_username              => "oneadmin",
-    :opennebula_password              => "oneadmin",
-    :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",
-    :profitbricks_username            => "profitbricks_username",
-    :profitbricks_password            => "profitbricks_password",
-    :rackspace_api_key                => "rackspace_api_key",
-    :rackspace_region                 => "dfw",
-    :rackspace_username               => "rackspace_username",
-    :sakuracloud_api_token            => "sakuracloud_api_token",
-    :sakuracloud_api_token_secret     => "sakuracloud_api_token_secret",
-    :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",
-    :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",
-    :cloudsigma_username              => "csuname",
-    :cloudsigma_password              => "cspass",
-    :docker_username                  => "docker-fan",
-    :docker_password                  => "i<3docker",
-    :docker_email                     => "dockerfan@gmail.com",
-    :docker_url                       => "unix://var/run/docker.sock"
+    opennebula_endpoint: "http://opennebula:2633/RPC2",
+    opennebula_username: "oneadmin",
+    opennebula_password: "oneadmin",
+    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",
+    profitbricks_username: "profitbricks_username",
+    profitbricks_password: "profitbricks_password",
+    rackspace_api_key: "rackspace_api_key",
+    rackspace_region: "dfw",
+    rackspace_username: "rackspace_username",
+    sakuracloud_api_token: "sakuracloud_api_token",
+    sakuracloud_api_token_secret: "sakuracloud_api_token_secret",
+    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",
+    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",
+    cloudsigma_username: "csuname",
+    cloudsigma_password: "cspass",
+    docker_username: "docker-fan",
+    docker_password: "i<3docker",
+    docker_email: "dockerfan@gmail.com",
+    docker_url: "unix://var/run/docker.sock"
   }.merge(Fog.credentials)
 end

data/tests/helpers/model_helper.rb

@@ -7,9 +7,7 @@ def model_tests(collection, params = {}, mocks_implemented = true)
       @instance.save
     end
 
-    if block_given?
-      yield(@instance)
-    end
+    yield(@instance) if block_given?
 
     tests("#destroy").succeeds do
       pending if Fog.mocking? && !mocks_implemented