fog-core 2.1.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a78082a2b5880cfb9cd072a6a4cb2b3fbd93241e3ccdfc7b7af4441ef297a9
-  data.tar.gz: 1623121246d01f7e9f4b046dfff2c7ed9d3704a21fdd9a2c6beba97f042a7c29
+  metadata.gz: 67cb461f9cadd8561112c31a7f506c4ff8b31a0ec3311e7e54ba824ac5e035d4
+  data.tar.gz: 9260f5a75cccc538be855890049577bf277a071b5df1135bdf1b5e881fc03c97
 SHA512:
-  metadata.gz: b33e459698577f22440d749e8c14390c08caedea72b48ef222dc2941cb549ec4a916e5b198ac77b4b8a85c38852bf37c8152f4d3f42c677334a8334758a0a7bd
-  data.tar.gz: 392d7f5b448dca96a1793d8624f01165c998ccb10ab37a1779a2caff91284dabc6ac1a8cf5a837cd41a47f6833f8db590f6952551b02d009f704e17575f0b5ac
+  metadata.gz: 7a84c4f82cd5da914c2dcc561b21d2a57b21806ea663b9a51f9f97f83e6897cc2052d902946ebcea51bea2502383bc8d1cd6092106fbdae5219113b680896b68
+  data.tar.gz: 073d12e4f17329540b9b00ea8308408acc8e04c6c094162833e3af459c63f523108331782e51e127bfe8f2ad5eb563e819be69bb1ca3ba113dffb6dfdb6bcd8d

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+# 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
+    strategy:
+      matrix:
+        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0', 'head']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 60
+        days-before-close: 7
+        exempt-issue-labels: 'pinned,security'
+        exempt-pr-labels: 'pinned,security'
+        stale-issue-message: 'This issue has been marked inactive and will be closed if no further activity occurs.'
+        stale-pr-message: 'This pr has been marked inactive and will be closed if no further activity occurs.'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

data/README.md

@@ -2,7 +2,7 @@
 
 Shared classes and tests for fog providers and services.
 
-[![Build Status](https://travis-ci.org/fog/fog-core.svg?branch=master)](https://travis-ci.org/fog/fog-core)
+[![Build Status](https://github.com/fog/fog-core/actions/workflows/ruby.yml/badge.svg)](https://github.com/fog/fog-core/actions/workflows/ruby.yml)
 
 ## Ruby version
 

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,16 +1,48 @@
+2.2.4 04/28/2020
+==========================================================
+
+Add FOG_DEBUG in addition to DEBUG to allow avoiding namespace collisions
+Add github actions configuration
+Update succeeds helper to expected syntax for ruby 3+
+
+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
+- 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
+- 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/logger.rb

@@ -7,6 +7,9 @@ module Fog
 
     @channels[:debug] = ::STDERR if ENV["DEBUG"]
 
+    # provide an env var with narrower scope in case of namespace conflicts
+    @channels[:debug] = ::STDERR if ENV["FOG_DEBUG"]
+
     def self.[](channel)
       @channels[channel]
     end

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
           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.2"
+    VERSION = "2.2.4"
   end
 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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Evan Light
 - Wesley Beary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2021-04-28 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
@@ -201,10 +201,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/stale.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -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.2.15
+signing_key:
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.
 test_files:

data/.github/stale.yml

@@ -1,17 +0,0 @@
-# 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/.travis.yml

@@ -1,39 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - jruby-head
-
-sudo: false
-dist: trusty
-
-script: bundle exec rake travis
-
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.1
-      gemfile: Gemfile
-      env: COVERAGE=true
-    - rvm: jruby-head
-      gemfile: Gemfile
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby9k
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - "irc.freenode.org#ruby-fog"
-    template:
-    - "[#%{build_number}] %{message} %{build_url}"
-    - "[#%{build_number}] %{commit} on %{branch} by %{author}"
-    - "[#%{build_number}] %{compare_url}"
-    on_success: always
-    on_failure: always
-    use_notice: false