fog-core 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db8a9288ea6ab96cad44beb5929626aa0a46471f97eb59847b28959e6da86c24
-  data.tar.gz: c3511cc0aa13da61f238f973aea137942c59c6b7965153e179d3b3f5929720cc
+  metadata.gz: 4b81d32f406966d1e603bd7da20eb75a74bc8761f7187177a03d863b20585c7b
+  data.tar.gz: df024a0491295236bbde204c8d2b17c776c185d6c6ec8276fe4244b442a2329b
 SHA512:
-  metadata.gz: 9b283a4a4236e3bc1fd9d42322d8fa30992f3f3fc76bd5d117d7dc04b22caa3c835e39bc236e8160d860a373e7f370660f6f3e13cbb34caf1d1767e56346c3cf
-  data.tar.gz: db4ed981ea6177822599954a389865959d56e5aab1421c4161f9f33b090e73d28966b6c2a16f56ba724d99cb9216460ce0fd0d4a72a48d5f2cbb7df4fd8fd6a5
+  metadata.gz: 7fba41ef8c39b0832c6371df52e9827a77094cf66976d97043f0a6d5bff38b337033eef7d7dcbdb330633c156d7ab58d67b1b15c9995d7a113f16169b7a4944a
+  data.tar.gz: e6770dccfca56f1ff303340d1160453bcb3b87b0b330a52e74361c8b0cf7410ceed5c663cdf56bb94a35134bec3229128abcc29f51b7526592b6c933f687c6b9

data/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: geemus
+tidelift: rubygems/fog-core

data/.github/dependabot.yml

@@ -3,10 +3,8 @@ updates:
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:
-      interval: "daily"
-    allow:
-      - dependency-type: "all" # update both gemspec and lock
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: '0 0 * * 1' # At 00:00 on Monday.
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', 'head']
+    continue-on-error: ${{ matrix.ruby-version == 'head' }}
+
+    steps:
+    - uses: actions/checkout@v4
+    - 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: Run tests
+      run: bundle exec rake RUBYOPT="--enable-frozen-string-literal"

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 require:

data/README.md

@@ -2,7 +2,8 @@
 
 Shared classes and tests for fog providers and services.
 
-[![Build Status](https://github.com/fog/fog-core/actions/workflows/ruby.yml/badge.svg)](https://github.com/fog/fog-core/actions/workflows/ruby.yml)
+[![Build Status](https://github.com/fog/fog-core/actions/workflows/ci.yml/badge.svg)](https://github.com/fog/fog-core/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/fog-core.svg)](https://rubygems.org/gems/fog-core)
 
 ## Ruby version
 

data/SECURITY.md

@@ -0,0 +1,6 @@
+## Security contact information
+
+To report a security vulnerability, please contact
+[Tidelift security](https://tidelift.com/security).
+
+Tidelift will coordinate the fix and disclosure.

data/changelog.md

@@ -1,3 +1,15 @@
+2.5.0 08/02/2024
+==========================================================
+
+- drop spec files from gem package
+- fix 3.4+ ruby issues (string literals and base64)
+- bump rubocop target
+- remove stale actions
+- fixes to ci
+- add security policy
+- add gem version badge
+- add funding info
+
 2.4.0 01/03/2024
 ==========================================================
 

data/fog-core.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fog/fog-core"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR).reject {|f| f.start_with? ('spec/') }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 

data/lib/fog/compute.rb

@@ -29,7 +29,7 @@ module Fog
           Fog::Compute::DigitalOcean.new(attributes)
         end
       else
-        super(orig_attributes)
+        super
       end
     end
 

data/lib/fog/core/mock.rb

@@ -81,7 +81,7 @@ module Fog
     end
 
     def self.random_selection(characters, length)
-      selection = ""
+      selection = +""
       length.times do
         position = rand(characters.length)
         selection << characters[position..position]

data/lib/fog/core/provider.rb

@@ -18,7 +18,7 @@ module Fog
       private
 
       def underscore_name(string)
-        string.gsub(/::/, "/")
+        string.gsub("::", "/")
               .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
               .gsub(/([a-z\d])([A-Z])/,'\1_\2')
               .tr("-", "_")

data/lib/fog/core/service.rb

@@ -212,7 +212,7 @@ module Fog
           @secrets ||= []
         else
           args.reduce(secrets) do |secrets, secret|
-            secrets << "@#{secret}".to_sym
+            secrets << :"@#{secret}"
           end
         end
       end

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "2.4.0".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/lib/fog/core.rb

@@ -1,5 +1,4 @@
 # external core dependencies
-require "base64"
 require "cgi"
 require "uri"
 require "excon"

data/lib/fog/formatador.rb

@@ -10,7 +10,7 @@ module Fog
     end
 
     def self.format(object, opts = { include_nested: true })
-      string = init_string(object)
+      string = +init_string(object)
       indent { string << object_string(object, opts) }
       string << "#{indentation}>"
     end
@@ -48,7 +48,7 @@ module Fog
     end
 
     def self.object_string(object, opts)
-      string = attribute_string(object).to_s
+      string = +attribute_string(object).to_s
       string << nested_objects_string(object).to_s if opts[:include_nested]
       string
     end
@@ -68,7 +68,7 @@ module Fog
       return nested if object.respond_to?(:empty) and object.empty?
       return nested unless object.is_a?(Enumerable)
 
-      nested = "#{indentation}[\n"
+      nested = +"#{indentation}[\n"
       indent { nested << indentation + inspect_object(object) }
       nested << "#{indentation}\n#{indentation}]\n"
     end

data/lib/fog/storage.rb

@@ -59,7 +59,6 @@ module Fog
         headers: {
           "Content-Length" => get_body_size(data),
           "Content-Type" => get_content_type(data)
-          # "Content-MD5" => Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
         }
       }
     end

data/lib/tasks/test_task.rb

@@ -22,10 +22,9 @@ module Fog
       def tests(mocked)
         Fog::Formatador.display_line
         start = Time.now.to_i
-        threads = []
         Thread.main[:results] = []
-        Fog.providers.each do |key, value|
-          threads << Thread.new do
+        threads = Fog.providers.map do |key, value|
+          Thread.new do
             Thread.main[:results] << {
               provider: value,
               success: sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -221,9 +221,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/dependabot.yml"
-- ".github/workflows/ruby.yml"
-- ".github/workflows/stale.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -233,6 +233,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- SECURITY.md
 - changelog.md
 - fog-core.gemspec
 - lib/fog/account.rb
@@ -312,33 +313,6 @@ files:
 - lib/fog/volume.rb
 - lib/fog/vpn.rb
 - lib/tasks/test_task.rb
-- spec/compute/models/server_spec.rb
-- spec/compute_spec.rb
-- spec/connection_spec.rb
-- spec/core/cache_spec.rb
-- spec/core/collection_spec.rb
-- spec/core/model_spec.rb
-- spec/core/stringify_keys_spec.rb
-- spec/core/whitelist_keys_spec.rb
-- spec/credentials_spec.rb
-- spec/current_machine_spec.rb
-- spec/fake_app/fake_service.rb
-- spec/fake_app/models/collection.rb
-- spec/fake_app/models/model.rb
-- spec/fake_app/requests/request.rb
-- spec/fog_attribute_spec.rb
-- spec/formatador_spec.rb
-- spec/identity_spec.rb
-- spec/mocking_spec.rb
-- spec/service_spec.rb
-- spec/spec_helper.rb
-- spec/storage_spec.rb
-- spec/test_helpers/formats_helper_spec.rb
-- spec/test_helpers/schema_validator_spec.rb
-- spec/timeout_spec.rb
-- spec/utils_spec.rb
-- spec/uuid_spec.rb
-- spec/wait_for_spec.rb
 homepage: https://github.com/fog/fog-core
 licenses:
 - MIT

data/.github/workflows/ruby.yml

@@ -1,18 +0,0 @@
-# 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.3.0

data/.github/workflows/stale.yml

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

data/spec/compute/models/server_spec.rb

@@ -1,229 +0,0 @@
-require "spec_helper"
-require "fog/compute/models/server"
-
-describe Fog::Compute::Server do
-  before do
-    @server = Fog::Compute::Server.new
-  end
-
-  describe "#sshable?" do
-    describe "when the server is not ready" do
-      it "is false" do
-        @server.stub(:ready?, false) do
-          refute @server.sshable?
-        end
-      end
-    end
-
-    describe "when the server is ready" do
-      describe "when the ssh_ip_address is nil" do
-        it "is false" do
-          @server.stub(:ready?, true) do
-            @server.stub(:ssh_ip_address, nil) do
-              refute @server.sshable?
-            end
-          end
-        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
-        end
-
-        describe "and ssh times out" do
-          it "is false" do
-            @server.stub(:ready?, true) do
-              @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raises_timeout = lambda { |_time| raise Timeout::Error.new }
-                Timeout.stub(:timeout, raises_timeout) do
-                  refute @server.sshable?
-                end
-              end
-            end
-          end
-        end
-
-        describe "and it raises Net::SSH::AuthenticationFailed" 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 }
-                @server.stub(:ssh, raise_error) do
-                  refute @server.sshable?
-                end
-              end
-            end
-          end
-
-          it "resets SSH timeout" 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 }
-                @server.stub(:ssh, raise_error) do
-                  @server.sshable?
-                  assert_nil @server.instance_variable_get(:@sshable_timeout), nil
-                end
-              end
-            end
-          end
-        end
-
-        describe "and it raises Net::SSH::Disconnect" 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 }
-                @server.stub(:ssh, raise_error) do
-                  refute @server.sshable?
-                end
-              end
-            end
-          end
-
-          it "resets SSH timeout" 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 }
-                @server.stub(:ssh, raise_error) do
-                  @server.sshable?
-                  assert_nil @server.instance_variable_get(:@sshable_timeout), nil
-                end
-              end
-            end
-          end
-        end
-
-        describe "and it raises SystemCallError" 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") }
-                @server.stub(:ssh, raise_error) do
-                  refute @server.sshable?
-                end
-              end
-            end
-          end
-
-          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") }
-                @server.stub(:ssh, raise_error) do
-                  @server.sshable?
-                  assert_equal @server.instance_variable_get(:@sshable_timeout), 8
-                end
-              end
-            end
-          end
-        end
-
-        describe "and ssh completes within the designated timeout" do
-          it "is true" do
-            @server.stub(:ready?, true) do
-              @server.stub(:ssh_ip_address, "10.0.0.1") do
-                @server.stub(:ssh, "datum") do
-                  assert @server.sshable?
-                end
-              end
-            end
-          end
-        end
-
-        describe "when called successively" do
-          describe "and ssh times out" do
-            it "increases the timeout factor by 1.5" do
-              @server.stub(:ready?, true) do
-                @server.stub(:ssh_ip_address, "10.0.0.1") do
-                  raises_timeout = lambda do |time|
-                    assert(time == 8)
-                    raise Timeout::Error.new
-                  end
-                  Timeout.stub(:timeout, raises_timeout) do
-                    refute @server.sshable?
-                  end
-
-                  raises_timeout = lambda do |time|
-                    assert_equal(12, time)
-                    raise Timeout::Error.new
-                  end
-                  Timeout.stub(:timeout, raises_timeout) do
-                    refute @server.sshable?
-                  end
-                end
-              end
-            end
-
-            it "does not increase timeout beyond 60s" do
-              @server.stub(:ready?, true) do
-                @server.stub(:ssh_ip_address, "10.0.0.1") do
-                  raises_timeout = lambda { |_time| raise Timeout::Error.new }
-                  Timeout.stub(:timeout, raises_timeout) do
-                    5.times { refute @server.sshable? }
-                  end
-
-                  raises_timeout = lambda do |time|
-                    assert_equal(60, time)
-                    raise Timeout::Error.new
-                  end
-                  Timeout.stub(:timeout, raises_timeout) do
-                    refute @server.sshable?
-                  end
-
-                  raises_timeout = lambda do |time|
-                    assert_equal(60, time)
-                    raise Timeout::Error.new
-                  end
-                  Timeout.stub(:timeout, raises_timeout) do
-                    refute @server.sshable?
-                  end
-                end
-              end
-            end
-
-            describe "when ssh eventually succeeds" do
-              it "resets the timeout to the initial value" do
-                @server.stub(:ready?, true) do
-                  @server.stub(:ssh_ip_address, "10.0.0.1") do
-                    raises_timeout = lambda do |time|
-                      assert(time == 8)
-                      raise Timeout::Error.new
-                    end
-                    Timeout.stub(:timeout, raises_timeout) do
-                      refute @server.sshable?
-                    end
-
-                    @server.stub(:ssh, "datum") do
-                      assert @server.sshable?
-                    end
-
-                    raises_timeout = lambda do |time|
-                      assert_equal(8, time)
-                      raise Timeout::Error.new
-                    end
-                    Timeout.stub(:timeout, raises_timeout) do
-                      refute @server.sshable?
-                    end
-                  end
-                end
-              end
-            end
-
-          end
-        end
-
-      end
-    end
-
-  end
-end

data/spec/compute_spec.rb

@@ -1,95 +0,0 @@
-require "spec_helper"
-
-module Fog
-  module Compute
-    def self.require(*_args); end
-  end
-end
-
-describe "Fog::Compute" do
-  describe "#new" do
-    module Fog
-      module TheRightWay
-        class Compute
-          def initialize(_args); end
-        end
-      end
-    end
-
-    module Fog
-      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 Compute
-        class TheWrongWay
-          def initialize(_args); end
-        end
-      end
-    end
-
-    module Fog
-      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
-          attr_reader :args
-          def initialize(args)
-            @args = args
-          end
-        end
-      end
-    end
-
-    module Fog
-      module Compute
-        class BothWays
-          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::<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)
-    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)
-      end
-    end
-  end
-end