fog-core 2.1.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c847bc564020b5055a150c17bb795291f30a47d49dce0b6f10d7f1e1614890
-  data.tar.gz: 8afc26f283b6bac00119d6691da155ae036ec9f6460f934a03914a246d353dca
+  metadata.gz: bf5282b4a064dccd00331a96b041d338ca5dc5da63536e3531809fecb0d73377
+  data.tar.gz: df4d83502273c8645ba207081f4e6099f68157c2eac464c294f16bd2195dd2f5
 SHA512:
-  metadata.gz: 6a3def76d1bd1def16905844c05066048a6272ce2be692c7730e574684ac7af8036bdbea333898541539eda8c87b2c2ee90ba99c109f98ecea23735509fa0782
-  data.tar.gz: 1a8cb41c7e3896b84cd1790471747bb02ab72da460a2b39c9364d1374bdd8a89983318ff44424f4e9b0df24fa706646cb47e56110c12cbb1ce54343d99de3846
+  metadata.gz: b9e19b1e44512d4ac2c6b3cb01ec78fd9b9027fdfc5dbab5d8d65c4a9c54aee4f86eb939692910018af856dbc84f5025be1e1f5093414127e320758271888627
+  data.tar.gz: eb0c9cb1e6c55ff2f53d5b10c01dee467ac685257d5da1a071a85fbfea3e32a73f5403d14e4ffe412a09925584830be422f9b8d8db374ae35ea2e5041ec19487

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Rakefile

@@ -1,4 +1,4 @@
-require 'bundler/setup'
+require 'bundler/gem_tasks'
 
 task :default => [:test]
 
@@ -20,4 +20,4 @@ task :travis do
     Coveralls::RakeTask.new
     Rake::Task["coveralls:push"].invoke
   end
-end
+end

data/changelog.md

@@ -1,3 +1,43 @@
+2.2.3 09/16/2020
+==========================================================
+
+Fix provider lookup to properly symbolize newly underscored names
+
+2.2.2 09/15/2020
+==========================================================
+
+Fix #underscore name to be class method (instead of instance method)
+
+2.2.1 09/15/2020
+==========================================================
+
+- Change to verify_host_key never in ssh/scp if supported
+- Allow either downcased and underscored provider names for broader compatability
+
+2.2.0 12/17/2019
+==========================================================
+
+- Add explanation for service/provider format deprecation.
+- Fix formatting of changelog
+- Better logging around required providers for easier debugging.
+- bump excon version
+- add bundler gem tasks
+
+2.1.2 09/04/2018
+==========================================================
+
+- fix typo in ssh options handling
+
+2.1.1 09/04/2018
+==========================================================
+
+- deprecate attributes not defined by DSL
+- fix path_prefix warnings
+- update to enforce best practices
+- extract parts of ssh to private methods
+- deprecate wrong provider names
+
+
 2.1.0 03/10/2018
 ==========================================================
 

data/fog-core.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("builder")
   spec.add_dependency("mime-types")
-  spec.add_dependency("excon", "~> 0.58")
+  spec.add_dependency("excon", "~> 0.71")
   spec.add_dependency("formatador", "~> 0.2")
 
   # https://github.com/fog/fog-core/issues/206

data/lib/fog/core/provider.rb

@@ -8,9 +8,22 @@ module Fog
   end
 
   module Provider
-    def self.extended(base)
-      provider = base.to_s.split("::").last
-      Fog.providers[provider.downcase.to_sym] = provider
+    class << self
+      def extended(base)
+        provider = base.to_s.split("::").last
+        Fog.providers[provider.downcase.to_sym] = provider
+        Fog.providers[underscore_name(provider).to_sym] = provider
+      end
+    
+      private
+
+      def underscore_name(string)
+        string.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+      end
     end
 
     def [](service_key)
@@ -28,13 +41,22 @@ module Fog
       @services_registry.keys
     end
 
+    # Returns service constant path, with provider, as string. If
+    # "provider::service" is defined (the preferred format) then it returns that
+    # string, otherwise it returns the deprecated string "service::provider".
     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::Logger.deprecation(
+        format(
+          Fog::ServicesMixin::E_SERVICE_PROVIDER_CONSTANT,
+          service: constant_string,
+          provider: provider
+        )
+      )
       ['Fog', constant_string, provider].join("::")
     end
   end

data/lib/fog/core/scp.rb

@@ -64,8 +64,9 @@ module Fog
 
         @address  = address
         @username = username
-        @options  = { :paranoid => false, :verify_host_key => false }.merge(options)
+        @options  = { :paranoid => false, :verify_host_key => :never }.merge(options)
         @options.delete(:paranoid) if Net::SSH::VALID_OPTIONS.include? :verify_host_key
+        @options[:verify_host_key] = false unless Net::SSH::Verifiers.const_defined?(:Never)
       end
 
       def upload(local_path, remote_path, upload_options = {}, &block)

data/lib/fog/core/services_mixin.rb

@@ -1,21 +1,37 @@
 module Fog
   module ServicesMixin
+    E_SERVICE_PROVIDER_CONSTANT = <<-EOS.gsub(/\s+/, ' ').strip.freeze
+      Falling back to deprecated constant Fog::%<service>s::%<provider>s. The
+      preferred format of service provider constants has changed from
+      service::provider to provider::service. Please update this service
+      provider to use the preferred format.
+    EOS
+    E_SERVICE_PROVIDER_PATH = <<-EOS.gsub(/\s+/, ' ').strip.freeze
+      Falling back to deprecated path fog/%<service>s/%<provider>s. The
+      preferred file path format has changed from service/provider to
+      provider/service. Please update this service provider to use the preferred
+      format.
+    EOS
+
     def [](provider)
       new(:provider => provider)
     end
 
     def new(attributes)
-      attributes    = attributes.dup # Prevent delete from having side effects
-      provider      = check_provider_alias(attributes.delete(:provider).to_s.downcase.to_sym)
-      provider_name = Fog.providers[provider]
+      attributes     = attributes.dup # Prevent delete from having side effects
+      provider       = attributes.delete(:provider).to_s.downcase.to_sym
+      provider_alias = check_provider_alias(provider)
+      provider_name  = Fog.providers[provider_alias]
 
-      raise ArgumentError, "#{provider} is not a recognized provider" unless providers.include?(provider)
+      raise ArgumentError, "#{provider_alias} is not a recognized provider" unless providers.include?(provider) || providers.include?(provider_alias)
 
-      require_service_provider_library(service_name.downcase, provider)
+      require_service_provider_library(service_name.downcase, provider_alias)
       spc = service_provider_constant(service_name, provider_name)
       spc.new(attributes)
-    rescue LoadError, NameError  # Only rescue errors in finding the libraries, allow connection errors through to the caller
-      raise Fog::Service::NotFound, "#{provider} has no #{service_name.downcase} service"
+    rescue LoadError, NameError => e  # Only rescue errors in finding the libraries, allow connection errors through to the caller
+      Fog::Logger.warning("Error while loading provider #{provider_alias}: #{e.message}")
+      Fog::Logger.debug("backtrace: #{e.backtrace.join("\n")}")
+      raise Fog::Service::NotFound, "#{provider_alias} has no #{service_name.downcase} service"
     end
 
     def providers
@@ -32,7 +48,9 @@ module Fog
       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")
+      Fog::Logger.deprecation(
+        format(E_SERVICE_PROVIDER_PATH, service: service, provider: provider)
+      )
       require "fog/#{service}/#{provider}"
     end
 
@@ -40,7 +58,9 @@ module Fog
       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::Logger.deprecation(
+        format(E_SERVICE_PROVIDER_CONSTANT, service: service_name, provider: provider_name)
+      )
       Fog.const_get(service_name).const_get(*const_get_args(provider_name))
     end
 

data/lib/fog/core/ssh.rb

@@ -116,10 +116,11 @@ module Fog
 
         # 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)
+        opts = { :paranoid => false, :verify_host_key => :never }.merge(options)
         if Net::SSH::VALID_OPTIONS.include? :verify_host_key
-          otps.delete(:paranoid)
+          opts.delete(:paranoid)
         end
+        opts[:verify_host_key] = false unless Net::SSH::Verifiers.const_defined?(:Never)
         opts
       end
 

data/lib/fog/core/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Evan Light
 - Wesley Beary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/stale.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -320,7 +321,7 @@ homepage: https://github.com/fog/fog-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -335,9 +336,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.
 test_files: