fog-core 2.1.0 → 2.4.0

data/lib/fog/schema/data_validator.rb

@@ -106,6 +106,7 @@ module Fog
         case validator
         when Array
           return false if value.is_a?(Hash)
+
           value.respond_to?(:all?) && value.all? { |x| validate_value(validator[0], x, options) }
         when Symbol
           value.respond_to? validator

data/lib/fog/storage.rb

@@ -1,28 +1,14 @@
 begin
   # Use mime/types/columnar if available, for reduced memory usage
-  require 'mime/types/columnar'
+  require "mime/types/columnar"
 rescue LoadError
-  require 'mime/types'
+  require "mime/types"
 end
 
 module Fog
   module Storage
     extend Fog::ServicesMixin
 
-    def self.new(orig_attributes)
-      attributes = orig_attributes.dup # prevent delete from having side effects
-      case attributes.delete(:provider).to_s.downcase.to_sym
-      when :internetarchive
-        require "fog/internet_archive/storage"
-        Fog::Storage::InternetArchive.new(attributes)
-      when :stormondemand
-        require "fog/storage/storm_on_demand"
-        Fog::Storage::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
-
     def self.directories
       directories = []
       providers.each do |provider|
@@ -38,18 +24,18 @@ module Fog
       if body.respond_to?(:encoding)
         original_encoding = body.encoding
         body = body.dup if body.frozen?
-        body = body.force_encoding('BINARY')
+        body = body.force_encoding("BINARY")
       end
 
       size = if body.respond_to?(:bytesize)
-        body.bytesize
-      elsif body.respond_to?(:size)
-        body.size
-      elsif body.respond_to?(:stat)
-        body.stat.size
-      else
-        0
-      end
+               body.bytesize
+             elsif body.respond_to?(:size)
+               body.size
+             elsif body.respond_to?(:stat)
+               body.stat.size
+             else
+               0
+             end
 
       if body.respond_to?(:encoding)
         body.force_encoding(original_encoding)
@@ -69,10 +55,10 @@ module Fog
 
     def self.parse_data(data)
       {
-        :body     => data,
-        :headers  => {
-          "Content-Length"  => get_body_size(data),
-          "Content-Type"    => get_content_type(data)
+        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
         }
       }

data/lib/fog/support.rb

@@ -1,17 +1,5 @@
 module Fog
   module Support
     extend Fog::ServicesMixin
-
-    def self.new(orig_attributes)
-      attributes = orig_attributes.dup
-      provider = attributes.delete(:provider).to_s.downcase.to_sym
-
-      if provider == :stormondemand
-        require "fog/support/storm_on_demand"
-        Fog::Support::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
   end
 end

data/lib/fog/test_helpers/collection_helper.rb

@@ -35,6 +35,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
 
       methods.each do |enum_method|
         next unless collection.respond_to?(enum_method)
+
         tests("##{enum_method}").succeeds do
           block_called = false
           collection.send(enum_method) { block_called = true }
@@ -44,6 +45,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
 
       %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

data/lib/fog/test_helpers/formats_helper.rb

@@ -60,9 +60,9 @@ module Shindo
     def formats(format, strict = true)
       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,11 +1,11 @@
 require "excon"
 
-ENV["FOG_RC"]         = ENV["FOG_RC"] || File.expand_path("../.fog", __FILE__)
+ENV["FOG_RC"]         = ENV["FOG_RC"] || File.expand_path(".fog", __dir__)
 ENV["FOG_CREDENTIAL"] = ENV["FOG_CREDENTIAL"] || "default"
 
-Excon.defaults.merge!(:debug_request => true, :debug_response => true)
+Excon.defaults.merge!(debug_request: true, debug_response: true)
 
-LOREM = <<HERE
+LOREM = <<HERE.freeze
 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.

data/lib/fog/test_helpers/minitest/assertions.rb

@@ -1,6 +1,6 @@
 require "fog/schema/data_validator"
 
-module MiniTest::Assertions
+module Minitest::Assertions
   # Compares a hash's structure against a reference schema hash and returns true
   # when they match. Fog::Schema::Datavalidator is used for the validation.
   def assert_match_schema(actual, schema, message = nil, options = {})

data/lib/fog/test_helpers/minitest/expectations.rb

@@ -1,3 +1,3 @@
-module MiniTest::Expectations
+module Minitest::Expectations
   infect_an_assertion :assert_match_schema, :must_match_schema, :reverse
 end

data/lib/fog/test_helpers/mock_helper.rb

@@ -9,91 +9,91 @@ 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",
-    :clodo_api_key                    => "clodo_api_key",
-    :clodo_username                   => "clodo_username",
-    :digitalocean_api_key             => "digitalocean_api_key",
-    :digitalocean_client_id           => "digitalocean_client_id",
-    :dnsimple_token                   => "dnsimple_token",
-    :dnsimple_account                 => "dnsimple_account",
-    :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",
-    :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",
+    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",
+    clodo_api_key: "clodo_api_key",
+    clodo_username: "clodo_username",
+    digitalocean_api_key: "digitalocean_api_key",
+    digitalocean_client_id: "digitalocean_client_id",
+    dnsimple_token: "dnsimple_token",
+    dnsimple_account: "dnsimple_account",
+    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",
+    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",
-    :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",
-    :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",
-    :kubevirt_token                   => "[TOKEN]",
-    :kubevirt_hostname                => "localhost",
-    :kubevirt_port                    => "6443"
+    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",
+    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",
+    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",
+    kubevirt_token: "[TOKEN]",
+    kubevirt_hostname: "localhost",
+    kubevirt_port: "6443"
   }.merge(Fog.credentials)
 end

data/lib/fog/test_helpers/succeeds_helper.rb

@@ -1,8 +1,8 @@
 module Shindo
   class Tests
-    def succeeds
+    def succeeds(&block)
       test("succeeds") do
-        !!instance_eval(&Proc.new)
+        !!instance_eval(&block)
       end
     end
   end

data/lib/fog/test_helpers/types_helper.rb

@@ -3,6 +3,7 @@
 # allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
 module Fog
   module Boolean; end
+
   module Nullable
     module Boolean; end
     module Integer; end

data/lib/fog/vpn.rb

@@ -1,17 +1,5 @@
 module Fog
   module VPN
     extend Fog::ServicesMixin
-
-    def self.new(orig_attributes)
-      attributes = orig_attributes.dup
-      provider = attributes.delete(:provider).to_s.downcase.to_sym
-
-      if provider == :stormondemand
-        require "fog/vpn/storm_on_demand"
-        Fog::VPN::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
   end
 end

data/lib/tasks/test_task.rb

@@ -27,8 +27,8 @@ module Fog
         Fog.providers.each do |key, value|
           threads << Thread.new do
             Thread.main[:results] << {
-              :provider => value,
-              :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
+              provider: value,
+              success: sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
             }
           end
         end

data/spec/compute/models/server_spec.rb

@@ -26,13 +26,13 @@ describe Fog::Compute::Server do
         end
       end
 
-
       describe "when the ssh_ip_address exists" do
         # Define these constants which would be imported by net-ssh once loaded
         module Net
           module SSH
             class AuthenticationFailed  < RuntimeError
             end
+
             class Disconnect < RuntimeError
             end
           end
@@ -55,7 +55,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::AuthenticationFailed.new }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -67,7 +67,7 @@ describe Fog::Compute::Server do
             @server.instance_variable_set(:@sshable_timeout, 8)
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::AuthenticationFailed.new }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_nil @server.instance_variable_get(:@sshable_timeout), nil
@@ -81,7 +81,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::Disconnect.new }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -93,7 +93,7 @@ describe Fog::Compute::Server do
             @server.instance_variable_set(:@sshable_timeout, 8)
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::Disconnect.new }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_nil @server.instance_variable_get(:@sshable_timeout), nil
@@ -107,7 +107,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                raise_error = lambda { |_cmd, _options={}| raise SystemCallError.new("message, 0") }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -118,7 +118,7 @@ describe Fog::Compute::Server do
           it "does not increase SSH timeout" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                raise_error = lambda { |_cmd, _options={}| raise SystemCallError.new("message, 0") }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_equal @server.instance_variable_get(:@sshable_timeout), 8

data/spec/compute_spec.rb

@@ -10,55 +10,51 @@ describe "Fog::Compute" do
   describe "#new" do
     module Fog
       module TheRightWay
-        extend Provider
-        service(:compute, "Compute")
-      end
-    end
-
-    module Fog
-      module Compute
-        class TheRightWay
+        class Compute
           def initialize(_args); end
         end
       end
     end
 
-    it "instantiates an instance of Fog::Compute::<Provider> from the :provider keyword arg" do
-      compute = Fog::Compute.new(:provider => :therightway)
-      assert_instance_of(Fog::Compute::TheRightWay, compute)
-    end
-
     module Fog
-      module TheWrongWay
+      module TheRightWay
         extend Provider
         service(:compute, "Compute")
       end
     end
 
+    it "instantiates an instance of Fog::Compute::<Provider> from the :provider keyword arg" do
+      compute = Fog::Compute.new(provider: :therightway)
+      assert_instance_of(Fog::TheRightWay::Compute, compute)
+    end
+
     module Fog
-      module TheWrongWay
-        class Compute
+      module Compute
+        class TheWrongWay
           def initialize(_args); end
         end
       end
     end
 
-    it "instantiates an instance of Fog::<Provider>::Compute from the :provider keyword arg" do
-      compute = Fog::Compute.new(:provider => :thewrongway)
-      assert_instance_of(Fog::TheWrongWay::Compute, compute)
-    end
-
     module Fog
-      module BothWays
+      module TheWrongWay
         extend Provider
         service(:compute, "Compute")
       end
     end
 
+    it "instantiates an instance of Fog::<Provider>::Compute from the :provider keyword arg" do
+      compute = Fog::Compute.new(provider: :thewrongway)
+      assert_instance_of(Fog::Compute::TheWrongWay, compute)
+    end
+
     module Fog
       module BothWays
         class Compute
-          def initialize(_args); end
+          attr_reader :args
+          def initialize(args)
+            @args = args
+          end
         end
       end
     end
@@ -66,29 +62,33 @@ describe "Fog::Compute" do
     module Fog
       module Compute
         class BothWays
-          attr_reader :args
-          def initialize(args)
-            @args = args
-          end
+          def initialize(_args); end
         end
       end
     end
 
+    module Fog
+      module BothWays
+        extend Provider
+        service(:compute, "Compute")
+      end
+    end
+
     describe "when both Fog::Compute::<Provider> and Fog::<Provider>::Compute exist" do
-      it "prefers Fog::Compute::<Provider>" do
-        compute = Fog::Compute.new(:provider => :bothways)
-        assert_instance_of(Fog::Compute::BothWays, compute)
+      it "prefers Fog::<Provider>::Compute" do
+        compute = Fog::Compute.new(provider: :bothways)
+        assert_instance_of(Fog::BothWays::Compute, compute)
       end
     end
 
     it "passes the supplied keyword args less :provider to Fog::Compute::<Provider>#new" do
-      compute = Fog::Compute.new(:provider => :bothways, :extra => :stuff)
-      assert_equal({ :extra => :stuff }, compute.args)
+      compute = Fog::Compute.new(provider: :bothways, extra: :stuff)
+      assert_equal({ extra: :stuff }, compute.args)
     end
 
     it "raises ArgumentError when given a :provider where a Fog::Compute::Provider that does not exist" do
       assert_raises(ArgumentError) do
-        Fog::Compute.new(:provider => :wat)
+        Fog::Compute.new(provider: :wat)
       end
     end
   end