fog-core 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e12788f1604380c50ec19c246cacdd74d769a04d71ee56660bc3c5bc62238ae
-  data.tar.gz: d0bfdca7690d42db8771d84dd1fdb8b7d013b2d719071ee4165be900f14ae788
+  metadata.gz: 1ed45403ed1ae262f4cb11edb925bf9b46e54129c33c1aae9e75ea040aca788a
+  data.tar.gz: 8ff9db0cad760c871089ff3c2176b9e6f630daf6d57870a99782b78141cfe350
 SHA512:
-  metadata.gz: 9f1e44a5714c271433bc108ba068006b98ab2acbb88319db688a63ef0ed0cb1d567fcb6c254fb96a6df527a4ff3e0e7f0f1d8e258f2eb6a8d43b05552e905c7f
-  data.tar.gz: afcb84b9410a1361aa87a019bdf6934a428780d50713edd5da98c32104d4d3a3c813aef048f2368888b74da2718f6fea6a0c0cdade6ced7b29837ebc515db2a3
+  metadata.gz: 6b6a2fde1441edb56b5ebd703f8d3c4044a2eea7ee77a7f597d121ab33bc7af5e9d97d89ec1dcf0e713a80b3fd2ae377084eda4685edc59b02cf17c6c160d487
+  data.tar.gz: f743f73356f7bc34c63790061a5d255193a72946fafeec5250c0987786d2cff1815eae1ca016fe0c9b41952aea2ffe05c515a98bef3e1e9a4a9b1b434b3b5056

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,18 @@
+# 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:
+    uses: fog/.github/.github/workflows/ruby.yml@v1.1.0

data/.github/workflows/stale.yml

@@ -0,0 +1,9 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    uses: fog/.github/.github/workflows/stale.yml@v1.1.0

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/changelog.md

@@ -1,3 +1,31 @@
+2.3.0 03/08/2022
+==========================================================
+
+- fix v2.2.4 changelog
+- bump actions/stale
+- bump actions/checkout
+- avoid loading unnecessary service via autoload
+- update ruby.yml
+- continue tests dispite head errors
+- bump actions/checkout
+- bump formatador requirement
+- utilize reusable actions workflows
+- bump reusable actions
+- fix cache test for ruby 3.1+
+- tweak format of reusable workflows
+
+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
 ==========================================================
 

data/fog-core.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("builder")
   spec.add_dependency("mime-types")
   spec.add_dependency("excon", "~> 0.71")
-  spec.add_dependency("formatador", "~> 0.2")
+  spec.add_dependency("formatador", ">= 0.2", "< 2.0")
 
   # https://github.com/fog/fog-core/issues/206
   # spec.add_dependency("xmlrpc") if RUBY_VERSION.to_s >= "2.4"

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

@@ -12,7 +12,7 @@ module Fog
       def extended(base)
         provider = base.to_s.split("::").last
         Fog.providers[provider.downcase.to_sym] = provider
-        Fog.providers[underscore_name(provider)] = provider
+        Fog.providers[underscore_name(provider).to_sym] = provider
       end
     
       private
@@ -45,19 +45,20 @@ module Fog
     # "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(
-        format(
-          Fog::ServicesMixin::E_SERVICE_PROVIDER_CONSTANT,
-          service: constant_string,
-          provider: provider
+      if const_defined?([to_s, constant_string].join("::"))
+        [to_s, constant_string].join("::")
+      else
+        provider = to_s.split("::").last
+        Fog::Logger.deprecation("Unable to load #{[to_s, constant_string].join("::")}")
+        Fog::Logger.deprecation(
+          format(
+            Fog::ServicesMixin::E_SERVICE_PROVIDER_CONSTANT,
+            service: constant_string,
+            provider: provider
+          )
         )
-      )
-      ['Fog', constant_string, provider].join("::")
+        ['Fog', constant_string, provider].join("::")
+      end
     end
   end
 end

data/lib/fog/core/services_mixin.rb

@@ -18,19 +18,20 @@ module Fog
     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 => e  # Only rescue errors in finding the libraries, allow connection errors through to the caller
-      Fog::Logger.warning("Error while loading provider #{provider}: #{e.message}")
+      Fog::Logger.warning("Error while loading provider #{provider_alias}: #{e.message}")
       Fog::Logger.debug("backtrace: #{e.backtrace.join("\n")}")
-      raise Fog::Service::NotFound, "#{provider} has no #{service_name.downcase} service"
+      raise Fog::Service::NotFound, "#{provider_alias} has no #{service_name.downcase} service"
     end
 
     def providers

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "2.2.2"
+    VERSION = "2.3.0"
   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

data/spec/compute_spec.rb

@@ -10,16 +10,16 @@ describe "Fog::Compute" do
   describe "#new" do
     module Fog
       module TheRightWay
-        extend Provider
-        service(:compute, "Compute")
+        class Compute
+          def initialize(_args); end
+        end
       end
     end
 
     module Fog
       module TheRightWay
-        class Compute
-          def initialize(_args); end
-        end
+        extend Provider
+        service(:compute, "Compute")
       end
     end
 
@@ -28,13 +28,6 @@ describe "Fog::Compute" do
       assert_instance_of(Fog::TheRightWay::Compute, compute)
     end
 
-    module Fog
-      module TheWrongWay
-        extend Provider
-        service(:compute, "Compute")
-      end
-    end
-
     module Fog
       module Compute
         class TheWrongWay
@@ -43,18 +36,18 @@ describe "Fog::Compute" do
       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
+      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
@@ -74,6 +67,13 @@ describe "Fog::Compute" do
       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::<Provider>::Compute" do
         compute = Fog::Compute.new(:provider => :bothways)

data/spec/core/cache_spec.rb

@@ -87,7 +87,7 @@ describe Fog::Cache do
       f.write(data)
     }
 
-    assert_equal false, Fog::Cache.load_cache(path)
+    assert !Fog::Cache.load_cache(path)
   end
 
   it "must have a namespace_prefix configurable" do

data/spec/identity_spec.rb

@@ -10,16 +10,16 @@ describe "Fog::Identity" do
   describe "#new" do
     module Fog
       module TheRightWay
-        extend Provider
-        service(:identity, "Identity")
+        class Identity
+          def initialize(_args); end
+        end
       end
     end
 
     module Fog
       module TheRightWay
-        class Identity
-          def initialize(_args); end
-        end
+        extend Provider
+        service(:identity, "Identity")
       end
     end
 
@@ -28,13 +28,6 @@ describe "Fog::Identity" do
       assert_instance_of(Fog::TheRightWay::Identity, identity)
     end
 
-    module Fog
-      module TheWrongWay
-        extend Provider
-        service(:identity, "Identity")
-      end
-    end
-
     module Fog
       module Identity
         class TheWrongWay
@@ -43,18 +36,18 @@ describe "Fog::Identity" do
       end
     end
 
-    it "instantiates an instance of Fog::<Provider>::Identity from the :provider keyword arg" do
-      identity = Fog::Identity.new(:provider => :thewrongway)
-      assert_instance_of(Fog::Identity::TheWrongWay, identity)
-    end
-
     module Fog
-      module BothWays
+      module TheWrongWay
         extend Provider
         service(:identity, "Identity")
       end
     end
 
+    it "instantiates an instance of Fog::<Provider>::Identity from the :provider keyword arg" do
+      identity = Fog::Identity.new(:provider => :thewrongway)
+      assert_instance_of(Fog::Identity::TheWrongWay, identity)
+    end
+
     module Fog
       module BothWays
         class Identity
@@ -74,6 +67,13 @@ describe "Fog::Identity" do
       end
     end
 
+    module Fog
+      module BothWays
+        extend Provider
+        service(:identity, "Identity")
+      end
+    end
+
     describe "when both Fog::Identity::<Provider> and Fog::<Provider>::Identity exist" do
       it "prefers Fog::Identity::<Provider>" do
         identity = Fog::Identity.new(:provider => :bothways)

data/spec/storage_spec.rb

@@ -10,16 +10,16 @@ describe "Fog::Storage" do
   describe "#new" do
     module Fog
       module TheRightWay
-        extend Provider
-        service(:storage, "Storage")
+        class Storage
+          def initialize(_args); end
+        end
       end
     end
 
     module Fog
       module TheRightWay
-        class Storage
-          def initialize(_args); end
-        end
+        extend Provider
+        service(:storage, "Storage")
       end
     end
 
@@ -29,16 +29,16 @@ describe "Fog::Storage" do
     end
 
     module Fog
-      module TheWrongWay
-        extend Provider
-        service(:storage, "Storage")
-      end
-
       module Storage
         class TheWrongWay
           def initialize(_args); end
         end
       end
+
+      module TheWrongWay
+        extend Provider
+        service(:storage, "Storage")
+      end
     end
 
     it "instantiates an instance of Fog::Storage::<Provider> from the :provider keyword arg" do
@@ -46,13 +46,6 @@ describe "Fog::Storage" do
       assert_instance_of(Fog::Storage::TheWrongWay, compute)
     end
 
-    module Fog
-      module BothWays
-        extend Provider
-        service(:storage, "Storage")
-      end
-    end
-
     module Fog
       module BothWays
         class Storage
@@ -73,6 +66,13 @@ describe "Fog::Storage" do
       end
     end
 
+    module Fog
+      module BothWays
+        extend Provider
+        service(:storage, "Storage")
+      end
+    end
+
     describe "when both Fog::Storage::<Provider> and Fog::<Provider>::Storage exist" do
       it "prefers Fog::Storage::<Provider>" do
         compute = Fog::Storage.new(:provider => :bothways)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -57,16 +57,22 @@ dependencies:
   name: formatador
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -201,10 +207,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
@@ -335,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: Shared classes and tests for fog providers and services.

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