fog-core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0aee45dc29f92c62460bf1f6890e64520140a18b
-  data.tar.gz: c3be3faff02a6fc5ad8abce9d5a35a6f31813130
+SHA256:
+  metadata.gz: 05c847bc564020b5055a150c17bb795291f30a47d49dce0b6f10d7f1e1614890
+  data.tar.gz: 8afc26f283b6bac00119d6691da155ae036ec9f6460f934a03914a246d353dca
 SHA512:
-  metadata.gz: f92b4ccd509d68170148a500bbe0d75e251328dcf9a2bf23032ca8eb443603e0fcae54055df491f05fa9dd936b54add5280c7a85fa2791832b54e0e97d441fe6
-  data.tar.gz: ddc135fde954a4cd3fd64e803fb44a6b890172738fa8f476b10c9e974d11dda53254157f8160b86b49aac16617ec02f3304c36a34823eb212d2f6a2d21ef1d76
+  metadata.gz: 6a3def76d1bd1def16905844c05066048a6272ce2be692c7730e574684ac7af8036bdbea333898541539eda8c87b2c2ee90ba99c109f98ecea23735509fa0782
+  data.tar.gz: 1a8cb41c7e3896b84cd1790471747bb02ab72da460a2b39c9364d1374bdd8a89983318ff44424f4e9b0df24fa706646cb47e56110c12cbb1ce54343d99de3846

data/.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked stale due to inactivity.
+  It will be closed if no further activity occurs.
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/CONTRIBUTING.md

@@ -8,7 +8,11 @@ New contributors are always welcome, when it doubt please ask questions. We stri
   * Offer feedback on open [pull requests](https://github.com/fog/fog-core/pulls).
   * Review open [issues](https://github.com/fog/fog-core/issues) for things to help on.
   * [Create an issue](https://github.com/fog/fog-core/issues/new) to start a discussion on additions or features.
-* Fork the project, add your changes and tests to cover them in a topic branch.
+* Fork the project
+* Setup
+  * bundle install
+  * bundle exec rake
+* Add your changes and tests to cover them in a topic branch.
 * Commit your changes and rebase against `fog/fog-core` to ensure everything is up to date.
 * [Submit a pull request](https://github.com/fog/fog-core/compare/)
 

data/changelog.md

@@ -1,295 +1,301 @@
 2.1.0 03/10/2018
 ==========================================================
 
-remove libvirt_uri duplication
-fix dnsimple auth variables
-add kubevirt provider
-fix net-ssh paranoid deprecation
-fix nil fetch on object reload
+- remove libvirt_uri duplication
+- fix dnsimple auth variables
+- add kubevirt provider
+- fix net-ssh paranoid deprecation
+- fix nil fetch on object reload
 
 2.0.0 01/03/2018
 ==========================================================
 
-fix association reload
-drop ruby <2 support
-fix net-ssh usage
-add mime-type dependency
+- Breaking Changes
+  - Association reload - model#reload now resets the model
+    to the current remote state. See discussion in
+    https://github.com/fog/fog-aws/pull/433,
+    particularly 24ea4675bfd28c93d1344bf666ebafd0f4826b8f
+  - drop ruby <2 support
+- Added
+  - add mime-type dependency
+- Fixed
+  - fix deprecation warning from net-ssh
 
 1.45.0 08/01/2017
 ==========================================================
 
-remove xmlrpc requirement/usage
-fix for nested const across ruby versions
-remove array#sample usage for legacy ruby compatibility
-simplify uniq for cache and fix for legacy ruby
-remove debugging puts from cache
-tweak tins version for 1.9
-loosen 2.1.x travis config to 2.1
-add 1.9 compatible term-ansicolor
-fix rubocop for 1.9.3
-enable metadata for cache
-add specs for server#sshable
-add exponential backoff for server#sshable?
-add server#ready? to base server for clarity
-bump excon dependency
+- remove xmlrpc requirement/usage
+- fix for nested const across ruby versions
+- remove array#sample usage for legacy ruby compatibility
+- simplify uniq for cache and fix for legacy ruby
+- remove debugging puts from cache
+- tweak tins version for 1.9
+- loosen 2.1.x travis config to 2.1
+- add 1.9 compatible term-ansicolor
+- fix rubocop for 1.9.3
+- enable metadata for cache
+- add specs for server#sshable
+- add exponential backoff for server#sshable?
+- add server#ready? to base server for clarity
+- bump excon dependency
 
 1.44.3 05/25/2017
 ==========================================================
 
-fix cache when no home directory defined
+- fix cache when no home directory defined
 
 1.44.2 05/18/2017
 ==========================================================
 
-fix homedirectory usage for caching
+- fix homedirectory usage for caching
 
 1.44.1 05/01/2017
 ==========================================================
 
-remove xml-rpc dependency (as it is causing issues)
+- remove xml-rpc dependency (as it is causing issues)
 
 1.44.0 04/28/2017
 ==========================================================
 
-add basic caching support
+- add basic caching support
 
 1.43.0 09/28/2016
 ==========================================================
 
-fix digitalocean compatibility
-update README badges
+- fix digitalocean compatibility
+- update README badges
 
 1.42.0 07/05/2016
 ==========================================================
 
-make namespace detection fix 1.8.x compatible
+- make namespace detection fix 1.8.x compatible
 
 1.41.0 07/01/2016
 ==========================================================
 
-bump as 1.40.1 is not showing up in some cases
+- bump as 1.40.1 is not showing up in some cases
 
 1.40.1 06/28/2016
 ==========================================================
 
-fix namespace constant detection
+- fix namespace constant detection
 
 1.40.0 05/19/2016
 ==========================================================
 
-add minitest helpers for schema (parity to shindo)
+- add minitest helpers for schema (parity to shindo)
 
 1.39.0 05/11/2016
 ==========================================================
 
-cleanup warnings
-add NFV module
-only dup frozen strings
+- cleanup warnings
+- add NFV module
+- only dup frozen strings
 
 1.38.0 04/20/2016
 ==========================================================
 
-more specific service not found error
-fix string freeze issue for ruby 2.3
-bump excon dep
+- more specific service not found error
+- fix string freeze issue for ruby 2.3
+- bump excon dep
 
 1.37.0 03/31/2016
 ==========================================================
 
-remove hp from providers
-re-raise mime-type error, rather than exiting
-fix tests
-add introspection module
+- remove hp from providers
+- re-raise mime-type error, rather than exiting
+- fix tests
+- add introspection module
 
 1.36.0 02/23/2016
 ==========================================================
 
-default digitalocean to v2
-fix eager/auto-loading
-add cloud-at-cost
+- default digitalocean to v2
+- fix eager/auto-loading
+- add cloud-at-cost
 
 1.35.0 11/24/2015
 ==========================================================
 
-make mime/types require optional
-fix warnings about net-ssh vs net-cp
+- make mime/types require optional
+- fix warnings about net-ssh vs net-cp
 
 1.34.0 11/16/2015
 ==========================================================
 
-make net/ssh and net/scp requires optional
+- make net/ssh and net/scp requires optional
 
 1.33.0 11/15/2015
 ==========================================================
 
-relax net/ssh and net/scp requirement
+- relax net/ssh and net/scp requirement
 
 1.32.1 08/12/2015
 ==========================================================
 
-expose identities in models
+- expose identities in models
 
 1.32.0 07/02/2015
 ==========================================================
 
-fix/refactor service initializers
+- fix/refactor service initializers
 
 1.31.1 06/17/2015
 ==========================================================
 
-fixes around unknown providers/services
+- fixes around unknown providers/services
 
 1.31.0 06/17/2015
 ==========================================================
 
-use relative paths
-add digital ocean examples
-reinstate baremetal
-add softlayer examples
-add digital ocean v2 support
-setup fog model equality to check identities (if available)
-use Fog.interval in wait_for
-reduce memory footprint
-fix account handling
+- use relative paths
+- add digital ocean examples
+- reinstate baremetal
+- add softlayer examples
+- add digital ocean v2 support
+- setup fog model equality to check identities (if available)
+- use Fog.interval in wait_for
+- reduce memory footprint
+- fix account handling
 
 1.30.0 04/02/2015
 ==========================================================
 
-bump excon dep
-use float times, instead of integers for Fog::Time
-don't raise if final wait_for yield true
-fix bug around formatador and #map on models
-fix around `to_time` to avoid conflicts with Rails monkey patches
-update specs
-update style
-fix `WhitelistKeys` for 1.8.7
-remove unreachable code
-convert hash helpers to minispec
-fix require order for coverage
-fix ruby 2.2 warning
-bump excon dependency
-fix readme link
+- bump excon dep
+- use float times, instead of integers for Fog::Time
+- don't raise if final wait_for yield true
+- fix bug around formatador and #map on models
+- fix around `to_time` to avoid conflicts with Rails monkey patches
+- update specs
+- update style
+- fix `WhitelistKeys` for 1.8.7
+- remove unreachable code
+- convert hash helpers to minispec
+- fix require order for coverage
+- fix ruby 2.2 warning
+- bump excon dependency
+- fix readme link
 
 1.29.0 02/19/2015
 ==========================================================
 
-minor refactoring
-add ability to add additional user agent info to requests
+- minor refactoring
+- add ability to add additional user agent info to requests
 
 1.28.0 01/30/2015
 ==========================================================
 
-add Fog::Baremetal
+- add Fog::Baremetal
 
 1.27.4 01/26/2015
 ==========================================================
 
-model fix for new formatador usage
-fixes around formatador delegation
+- model fix for new formatador usage
+- fixes around formatador delegation
 
 1.27.3 12/01/2014
 ==========================================================
 
-rubocop fixes for fog collection
-simpler ruby version checking/skipping
-fix requires_one
+- rubocop fixes for fog collection
+- simpler ruby version checking/skipping
+- fix requires_one
 
 1.27.2 18/12/2014
 ==========================================================
 
-fix several requires in service abstraction code
+- fix several requires in service abstraction code
 
 1.27.1 12/12/2014
 ==========================================================
 
-fix typo in model load paths fix
+- fix typo in model load paths fix
 
 1.27.0 12/12/2014
 ==========================================================
 
-return fog/bin stuff to fog/fog
-add support for multiple request/model load paths
+- return fog/bin stuff to fog/fog
+- add support for multiple request/model load paths
 
 
 1.26.0 12/02/2014
 ==========================================================
 
-remove rackspace logic
-use new travis builds
-fix error handling around credential fetch
-move fog/bin stuff to fog-core
-fix circular reference in collection.rb
+- remove rackspace logic
+- use new travis builds
+- fix error handling around credential fetch
+- move fog/bin stuff to fog-core
+- fix circular reference in collection.rb
 
 
 1.25.0 11/18/2014
 ==========================================================
 
-add alias options for associations
-improve spec message
-add feature to overwrite keys on hash of attributes generation
-remove method_missing from model
-add rubocop
-fix rubocop warnings
-return collections on association getters
-fix require bug in service
-put fog and fog-core versions in user agent
-don't mutate/destroy encoding in get_body_size
-fix error output in from const_get usage
-separate to have distinct version from fog
+- add alias options for associations
+- improve spec message
+- add feature to overwrite keys on hash of attributes generation
+- remove method_missing from model
+- add rubocop
+- fix rubocop warnings
+- return collections on association getters
+- fix require bug in service
+- put fog and fog-core versions in user agent
+- don't mutate/destroy encoding in get_body_size
+- fix error output in from const_get usage
+- separate to have distinct version from fog
 
 
 1.24.0 08/26/2014
 ==========================================================
 
-fixes for defaulting attributes
-add method for getting all attributes
-add methods for associations
-add all_attributes, all_associations and all_associations_and_attributes helper methods
-remove no-longer-needed gem update on travis
-add all_values
-fixes to avoid path conflicts with fog/fog
+- fixes for defaulting attributes
+- add method for getting all attributes
+- add methods for associations
+- add all_attributes, all_associations and all_associations_and_attributes helper methods
+- remove no-longer-needed gem update on travis
+- add all_values
+- fixes to avoid path conflicts with fog/fog
 
 1.23.0 07/16/2014
 ==========================================================
 
-attribute whitelisting
-abstract out stringify for possible reuse
-more specific naming
-reorg
-add path_prefix
-fix time conversion to work with XMLRPC
-add more specific per-type attribute tests
-lock down rest-client for 1.8.7
-allow namespace flipflop for dns
-fix identity lookup
-better default attribute value setting
-bump excon
+- attribute whitelisting
+- abstract out stringify for possible reuse
+- more specific naming
+- reorg
+- add path_prefix
+- fix time conversion to work with XMLRPC
+- add more specific per-type attribute tests
+- lock down rest-client for 1.8.7
+- allow namespace flipflop for dns
+- fix identity lookup
+- better default attribute value setting
+- bump excon
 
 1.22.0 04/17/2014 1c086852e40e4c1ad7ed138834e4a1505ddb1416
 ==========================================================
 
-attribute whitelisting
-abstract out stringify for possible reuse
-more specific naming
-reorg
-add path_prefix
-fix time conversion to work with XMLRPC
-add more specific per-type attribute tests
-lock down rest-client for 1.8.7
-allow namespace flipflop for dns
-fix identity lookup
-better default attribute value setting
-bump excon
+- attribute whitelisting
+- abstract out stringify for possible reuse
+- more specific naming
+- reorg
+- add path_prefix
+- fix time conversion to work with XMLRPC
+- add more specific per-type attribute tests
+- lock down rest-client for 1.8.7
+- allow namespace flipflop for dns
+- fix identity lookup
+- better default attribute value setting
+- bump excon
 
 1.22.0 04/17/2014 1c086852e40e4c1ad7ed138834e4a1505ddb1416
 ==========================================================
 
-tests/cleanup/fixes
+- tests/cleanup/fixes
 
 1.21.1 03/18/2014 3a803405ba60ded421f4bd14677cd3c76cb7e6ab
 ==========================================================
 
-remove json/xml modules and code
-add travis/coveralls
-update from upstream
-bump/loosen excon dependency
+- remove json/xml modules and code
+- add travis/coveralls
+- update from upstream
+- bump/loosen excon dependency

data/lib/fog/account.rb

@@ -1,21 +1,5 @@
 module Fog
   module Account
     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/account/storm_on_demand"
-        Fog::Account::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
-
-    def self.providers
-      Fog.services[:account] || []
-    end
   end
 end

data/lib/fog/billing.rb

@@ -1,16 +1,5 @@
 module Fog
   module Billing
     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/billing/storm_on_demand"
-        Fog::Billing::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
   end
 end

data/lib/fog/compute.rb

@@ -7,16 +7,6 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       case provider
-      when :gogrid
-        require "fog/go_grid/compute"
-        Fog::Compute::GoGrid.new(attributes)
-      when :new_servers
-        require "fog/bare_metal_cloud/compute"
-        Fog::Logger.deprecation "`new_servers` is deprecated. Please use `bare_metal_cloud` instead."
-        Fog::Compute::BareMetalCloud.new(attributes)
-      when :baremetalcloud
-        require "fog/bare_metal_cloud/compute"
-        Fog::Compute::BareMetalCloud.new(attributes)
       when :rackspace
         version = attributes.delete(:version)
         version = version.to_s.downcase.to_sym unless version.nil?
@@ -38,18 +28,6 @@ module Fog
           require 'fog/digitalocean/compute'
           Fog::Compute::DigitalOcean.new(attributes)
         end
-      when :stormondemand
-        require "fog/compute/storm_on_demand"
-        Fog::Compute::StormOnDemand.new(attributes)
-      when :vcloud
-        require "fog/vcloud/compute"
-        Fog::Vcloud::Compute.new(attributes)
-      when :vclouddirector
-        require "fog/vcloud_director/compute"
-        Fog::Compute::VcloudDirector.new(attributes)
-      when :cloudatcost
-        require "fog/cloudatcost/compute"
-        Fog::Compute::CloudAtCost.new(attributes)
       else
         super(orig_attributes)
       end

data/lib/fog/core/attributes.rb

@@ -79,14 +79,26 @@ module Fog
 
       def all_attributes
         self.class.attributes.reduce({}) do |hash, attribute|
-          hash[masks[attribute]] = send(attribute)
+          if masks[attribute].nil?
+            Fog::Logger.deprecation("Please define #{attribute} using the Fog DSL")
+            hash[attribute] = send(attribute)
+          else
+            hash[masks[attribute]] = send(attribute)
+          end
+
           hash
         end
       end
 
       def all_associations
         self.class.associations.keys.reduce({}) do |hash, association|
-          hash[masks[association]] = associations[association] || send(association)
+          if masks[association].nil?
+            Fog::Logger.deprecation("Please define #{association} using the Fog DSL")
+            hash[association] = associations[association] || send(association)
+          else
+            hash[masks[association]] = associations[association] || send(association)
+          end
+
           hash
         end
       end

data/lib/fog/core/connection.rb

@@ -44,12 +44,10 @@ module Fog
       # @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
       # @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
       def initialize(url, persistent = false, params = {})
-        if params[:path_prefix]
-          if params[:path]
-            raise ArgumentError, "optional arg 'path' is invalid when 'path_prefix' is provided"
-          end
+        @path_prefix = params.delete(:path_prefix)
 
-          @path_prefix = params.delete(:path_prefix)
+        if @path_prefix && params[:path]
+          raise ArgumentError, "optional arg 'path' is invalid when 'path_prefix' is provided"
         end
 
         params[:debug_response] = true unless params.key?(:debug_response)

data/lib/fog/core/provider.rb

@@ -21,11 +21,21 @@ module Fog
       Fog.services[new_service] ||= []
       Fog.services[new_service] |= [to_s.split("::").last.downcase.to_sym]
       @services_registry ||= {}
-      @services_registry[new_service] = [to_s, constant_string].join("::")
+      @services_registry[new_service] = service_klass(constant_string)
     end
 
     def services
       @services_registry.keys
     end
+
+    def service_klass(constant_string)
+      eval([to_s, constant_string].join("::"))
+      [to_s, constant_string].join("::")
+    rescue NameError
+      provider = to_s.split("::").last
+      Fog::Logger.deprecation("Unable to load #{[to_s, constant_string].join("::")}")
+      Fog::Logger.deprecation("The format #{['Fog', constant_string, provider].join("::")} is deprecated")
+      ['Fog', constant_string, provider].join("::")
+    end
   end
 end

data/lib/fog/core/services_mixin.rb

@@ -6,7 +6,7 @@ module Fog
 
     def new(attributes)
       attributes    = attributes.dup # Prevent delete from having side effects
-      provider      = attributes.delete(:provider).to_s.downcase.to_sym
+      provider      = check_provider_alias(attributes.delete(:provider).to_s.downcase.to_sym)
       provider_name = Fog.providers[provider]
 
       raise ArgumentError, "#{provider} is not a recognized provider" unless providers.include?(provider)
@@ -24,16 +24,24 @@ module Fog
 
     private
 
+    # This method should be removed once all providers are extracted.
+    # Bundler will correctly require all dependencies automatically and thus
+    # fog-core wont need to know any specifics providers. Each provider will
+    # have to load its dependencies.
     def require_service_provider_library(service, provider)
       require "fog/#{provider}/#{service}"
     rescue LoadError  # Try to require the service provider in an alternate location
+      Fog::Logger.deprecation("Unable to require fog/#{provider}/#{service}")
+      Fog::Logger.deprecation("The format fog/#{service}/#{provider} is deprecated")
       require "fog/#{service}/#{provider}"
     end
 
     def service_provider_constant(service_name, provider_name)
-      Fog.const_get(service_name).const_get(*const_get_args(provider_name))
-    rescue NameError  # Try to find the constant from in an alternate location
       Fog.const_get(provider_name).const_get(*const_get_args(service_name))
+    rescue NameError  # Try to find the constant from in an alternate location
+      Fog::Logger.deprecation("Unable to load Fog::#{provider_name}::#{service_name}")
+      Fog::Logger.deprecation("The format Fog::#{service_name}::#{provider_name} is deprecated")
+      Fog.const_get(service_name).const_get(*const_get_args(provider_name))
     end
 
     def const_get_args(*args)
@@ -43,5 +51,29 @@ module Fog
     def service_name
       name.split("Fog::").last
     end
+
+    def check_provider_alias(provider)
+      case provider
+      when :baremetalcloud
+        Fog::Logger.deprecation(':baremetalcloud is deprecated. Use :bare_metal_cloud instead!')
+        :bare_metal_cloud
+      when :gogrid
+        Fog::Logger.deprecation(':gogrid is deprecated. Use :go_grid instead!')
+        :go_grid
+      when :internetarchive
+        Fog::Logger.deprecation(':internetarchive is deprecated. Use :internet_archive instead!')
+        :internet_archive
+      when :new_servers
+        Fog::Logger.deprecation(':new_servers is deprecated. Use :bare_metal_cloud instead!')
+        :bare_metal_cloud
+      when :stormondemand
+        Fog::Logger.deprecation(':stormondemand is deprecated. Use :storm_on_demand instead!')
+        :storm_on_demand
+      when :vclouddirector
+        Fog::Logger.deprecation(':vclouddirector is deprecated. Use :vcloud_director instead!')
+        :vcloud_director
+      else provider
+      end
+    end
   end
 end

data/lib/fog/core/ssh.rb

@@ -34,32 +34,10 @@ module Fog
 
     class Real
       def initialize(address, username, options)
-        begin
-          require "net/ssh"
-        rescue LoadError
-          Fog::Logger.warning("'net/ssh' missing, please install and try again.")
-          exit(1)
-        end
-
-        key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
-
-        unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent
-          raise ArgumentError, ":key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH"
-        end
-
-        options[:timeout] ||= 30
-        if options[:key_data] || options[:keys]
-          options[:keys_only] = true
-          # Explicitly set these so net-ssh doesn"t add the default keys
-          # as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
-          options[:keys] = [] unless options[:keys]
-          options[:key_data] = [] unless options[:key_data]
-        end
-
+        assert_net_ssh_loaded
         @address  = address
         @username = username
-        @options  = { :paranoid => false, :verify_host_key => false }.merge(options)
-        @options.delete(:paranoid) if Net::SSH::VALID_OPTIONS.include? :verify_host_key
+        @options = build_options(options)
       end
 
       def run(commands, &blk)
@@ -107,6 +85,50 @@ module Fog
         end
         results
       end
+
+      private
+
+      def assert_net_ssh_loaded
+        begin
+          require "net/ssh"
+        rescue LoadError
+          Fog::Logger.warning("'net/ssh' missing, please install and try again.")
+          exit(1)
+        end
+      end
+
+      # Modifies the given `options` hash AND returns a new hash.
+      # TODO: Probably shouldn't modify the given hash.
+      def build_options(options)
+        validate_options(options)
+        merge_default_options_into(options)
+      end
+
+      def merge_default_options_into(options)
+        options[:timeout] ||= 30
+        if options[:key_data] || options[:keys]
+          options[:keys_only] = true
+          # Explicitly set these so net-ssh doesn"t add the default keys
+          # as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
+          options[:keys] = [] unless options[:keys]
+          options[:key_data] = [] unless options[:key_data]
+        end
+
+        # net-ssh has deprecated :paranoid in favor of :verify_host_key
+        # https://github.com/net-ssh/net-ssh/pull/524
+        opts = { :paranoid => false, :verify_host_key => false }.merge(options)
+        if Net::SSH::VALID_OPTIONS.include? :verify_host_key
+          otps.delete(:paranoid)
+        end
+        opts
+      end
+
+      def validate_options(options)
+        key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
+        unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent
+          raise ArgumentError, ":key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH"
+        end
+      end
     end
 
     class Result

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/lib/fog/dns.rb

@@ -2,17 +2,6 @@ module Fog
   module DNS
     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 :stormondemand
-        require "fog/dns/storm_on_demand"
-        Fog::DNS::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
-
     def self.zones
       zones = []
       providers.each do |provider|

data/lib/fog/monitoring.rb

@@ -1,16 +1,5 @@
 module Fog
   module Monitoring
     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/monitoring/storm_on_demand"
-        Fog::Monitoring::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
   end
 end

data/lib/fog/network.rb

@@ -1,17 +1,5 @@
 module Fog
   module Network
     extend Fog::ServicesMixin
-
-    def self.new(orig_attributes)
-      attributes = orig_attributes.dup # Prevent delete from having side effects
-      provider = attributes.delete(:provider).to_s.downcase.to_sym
-
-      if provider == :stormondemand
-        require "fog/network/storm_on_demand"
-        return Fog::Network::StormOnDemand.new(attributes)
-      else
-        super(orig_attributes)
-      end
-    end
   end
 end

data/lib/fog/storage.rb

@@ -9,20 +9,6 @@ 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|

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/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/spec/compute_spec.rb

@@ -16,8 +16,8 @@ describe "Fog::Compute" do
     end
 
     module Fog
-      module Compute
-        class TheRightWay
+      module TheRightWay
+        class Compute
           def initialize(_args); end
         end
       end
@@ -25,7 +25,7 @@ describe "Fog::Compute" do
 
     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)
+      assert_instance_of(Fog::TheRightWay::Compute, compute)
     end
 
     module Fog
@@ -36,8 +36,8 @@ describe "Fog::Compute" do
     end
 
     module Fog
-      module TheWrongWay
-        class Compute
+      module Compute
+        class TheWrongWay
           def initialize(_args); end
         end
       end
@@ -45,7 +45,7 @@ describe "Fog::Compute" do
 
     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)
+      assert_instance_of(Fog::Compute::TheWrongWay, compute)
     end
 
     module Fog
@@ -58,7 +58,10 @@ describe "Fog::Compute" do
     module Fog
       module BothWays
         class Compute
-          def initialize(_args); end
+          attr_reader :args
+          def initialize(args)
+            @args = args
+          end
         end
       end
     end
@@ -66,18 +69,15 @@ 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
 
     describe "when both Fog::Compute::<Provider> and Fog::<Provider>::Compute exist" do
-      it "prefers Fog::Compute::<Provider>" do
+      it "prefers Fog::<Provider>::Compute" do
         compute = Fog::Compute.new(:provider => :bothways)
-        assert_instance_of(Fog::Compute::BothWays, compute)
+        assert_instance_of(Fog::BothWays::Compute, compute)
       end
     end
 

data/spec/identity_spec.rb

@@ -16,8 +16,8 @@ describe "Fog::Identity" do
     end
 
     module Fog
-      module Identity
-        class TheRightWay
+      module TheRightWay
+        class Identity
           def initialize(_args); end
         end
       end
@@ -25,27 +25,27 @@ describe "Fog::Identity" do
 
     it "instantiates an instance of Fog::Identity::<Provider> from the :provider keyword arg" do
       identity = Fog::Identity.new(:provider => :therightway)
-      assert_instance_of(Fog::Identity::TheRightWay, identity)
+      assert_instance_of(Fog::TheRightWay::Identity, identity)
     end
 
     module Fog
-      module Rackspace
+      module TheWrongWay
         extend Provider
         service(:identity, "Identity")
       end
     end
 
     module Fog
-      module Rackspace
-        class Identity
+      module Identity
+        class TheWrongWay
           def initialize(_args); end
         end
       end
     end
 
     it "instantiates an instance of Fog::<Provider>::Identity from the :provider keyword arg" do
-      identity = Fog::Identity.new(:provider => :rackspace)
-      assert_instance_of(Fog::Rackspace::Identity, identity)
+      identity = Fog::Identity.new(:provider => :thewrongway)
+      assert_instance_of(Fog::Identity::TheWrongWay, identity)
     end
 
     module Fog
@@ -58,7 +58,10 @@ describe "Fog::Identity" do
     module Fog
       module BothWays
         class Identity
-          def initialize(_args); end
+          attr_reader :args
+          def initialize(args)
+            @args = args
+          end
         end
       end
     end
@@ -66,10 +69,7 @@ describe "Fog::Identity" do
     module Fog
       module Identity
         class BothWays
-          attr_reader :args
-          def initialize(args)
-            @args = args
-          end
+          def initialize(_args); end
         end
       end
     end
@@ -77,7 +77,7 @@ describe "Fog::Identity" do
     describe "when both Fog::Identity::<Provider> and Fog::<Provider>::Identity exist" do
       it "prefers Fog::Identity::<Provider>" do
         identity = Fog::Identity.new(:provider => :bothways)
-        assert_instance_of(Fog::Identity::BothWays, identity)
+        assert_instance_of(Fog::BothWays::Identity, identity)
       end
     end
 

data/spec/storage_spec.rb

@@ -16,16 +16,16 @@ describe "Fog::Storage" do
     end
 
     module Fog
-      module Storage
-        class TheRightWay
+      module TheRightWay
+        class Storage
           def initialize(_args); end
         end
       end
     end
 
-    it "instantiates an instance of Fog::Storage::<Provider> from the :provider keyword arg" do
+    it "instantiates an instance of Fog::<Provider>::Storage from the :provider keyword arg" do
       compute = Fog::Storage.new(:provider => :therightway)
-      assert_instance_of(Fog::Storage::TheRightWay, compute)
+      assert_instance_of(Fog::TheRightWay::Storage, compute)
     end
 
     module Fog
@@ -33,19 +33,17 @@ describe "Fog::Storage" do
         extend Provider
         service(:storage, "Storage")
       end
-    end
 
-    module Fog
-      module TheWrongWay
-        class Storage
+      module Storage
+        class TheWrongWay
           def initialize(_args); end
         end
       end
     end
 
-    it "instantiates an instance of Fog::<Provider>::Storage from the :provider keyword arg" do
+    it "instantiates an instance of Fog::Storage::<Provider> from the :provider keyword arg" do
       compute = Fog::Storage.new(:provider => :thewrongway)
-      assert_instance_of(Fog::TheWrongWay::Storage, compute)
+      assert_instance_of(Fog::Storage::TheWrongWay, compute)
     end
 
     module Fog
@@ -58,7 +56,11 @@ describe "Fog::Storage" do
     module Fog
       module BothWays
         class Storage
-          def initialize(_args); end
+          attr_reader :args
+
+          def initialize(args)
+            @args = args
+          end
         end
       end
     end
@@ -66,11 +68,7 @@ describe "Fog::Storage" do
     module Fog
       module Storage
         class BothWays
-          attr_reader :args
-
-          def initialize(args)
-            @args = args
-          end
+          def initialize(_args); end
         end
       end
     end
@@ -78,7 +76,7 @@ describe "Fog::Storage" do
     describe "when both Fog::Storage::<Provider> and Fog::<Provider>::Storage exist" do
       it "prefers Fog::Storage::<Provider>" do
         compute = Fog::Storage.new(:provider => :bothways)
-        assert_instance_of(Fog::Storage::BothWays, compute)
+        assert_instance_of(Fog::BothWays::Storage, compute)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -201,6 +201,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/stale.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.