gitlab-fog-google 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab595e7918307d4a0a878511249810e27fedb6085917efe7f66968cfa799dfa4
-  data.tar.gz: 6391e8ab7b30a6f696c6374808f414e686a0176c2515319ab9682659e6be43fa
+  metadata.gz: eec3026a74ac22db51ced6d640ba895888f9d0aa6f4039d02d5e6aa4c114e577
+  data.tar.gz: f8473ed87013e57d3ea33ae6986c74b9052640e1d8df0df049598174e37b28fb
 SHA512:
-  metadata.gz: fdb61e087e3a4bdbed38e564889c6e7f402ecf2322d7a39c0338a8383640dc0c401af59a494470bb75db2f6eb9a0a1ed5b9c17cda9d55923ebbb3708bad317fe
-  data.tar.gz: 51384abc641d3f77c48539d1a321351eb7eadf78f591ce7f7f3314efb916de3de15b3629cae181f10bb8b7edc47e8f52927fa71762fca64b3d93832d3c10c032
+  metadata.gz: 5c0616a0c85c5dde28ef58b0207da4b2a1ae0d3447ca6edf8d891abfdc8ae83635e21887a28d5b1df09ef175e5fc511217499e91a7b92345ed2f6861c2eec7dc
+  data.tar.gz: 737f381fd4c8abc61648cceb93b0ff10a7796ca9949b1bbd36612da9164be3b6ee86eb4917cf0254836dc79908a262e5358a0b96cb2cf3c672504f18b9ef98a2

data/CHANGELOG.md

@@ -6,6 +6,14 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+## 1.14.0
+
+### Development changes
+
+#### Added
+
+- Add support for Ruby 3.0 !5
+
 ## 1.13.0
 
 ### User-facing

data/gitlab-fog-google.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["nat@natwelch.com", "temikus@google.com"]
   spec.summary       = "Module for the 'fog' gem to support Google."
   spec.description   = "This library can be used as a module for `fog` or as standalone provider to use the Google Cloud in applications."
-  spec.homepage      = "https://github.com/fog/fog-google"
+  spec.homepage      = "https://gitlab.com/gitlab-org/gitlab-fog-google"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # As of 0.1.1
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2.0"
 
   # Locked until https://github.com/fog/fog-google/issues/417 is resolved
   spec.add_dependency "fog-core", "<= 2.1.0"

data/lib/fog/google/shared.rb

@@ -87,10 +87,10 @@ module Fog
       # Applies given options to the client instance
       #
       # @param [Google::Apis::Core::BaseService] service API service client instance
-      # @param [Hash] google_client_options Service client options to apply
-      # @param [Hash] _ignored Rest of the options (for convenience, ignored)
+      # @param [Hash] options (all ignored a.t.m., except :google_client_options)
       # @return [void]
-      def apply_client_options(service, google_client_options: nil, **_ignored)
+      def apply_client_options(service, options = {})
+        google_client_options = options[:google_client_options]
         return if google_client_options.nil? || google_client_options.empty?
         (service.client_options.members & google_client_options.keys).each do |option|
           service.client_options[option] = google_client_options[option]

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.13.0".freeze
+    VERSION = "1.14.0".freeze
   end
 end

data/lib/fog/storage/google_json/models/directories.rb

@@ -5,7 +5,7 @@ module Fog
         model Fog::Storage::GoogleJSON::Directory
 
         def all(opts = {})
-          data = service.list_buckets(opts).to_h[:items] || []
+          data = service.list_buckets(**opts).to_h[:items] || []
           load(data)
         end
 

data/lib/fog/storage/google_json/models/directory.rb

@@ -52,7 +52,7 @@ module Fog
 
         def save
           requires :key
-          service.put_bucket(key, attributes)
+          service.put_bucket(key, **attributes)
           true
         end
       end

data/lib/fog/storage/google_json/models/file.rb

@@ -105,7 +105,7 @@ module Fog
           
           options[:predefined_acl] ||= @predefined_acl
 
-          service.put_object(directory.key, key, body, options)
+          service.put_object(directory.key, key, body, **options)
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true

data/lib/fog/storage/google_json/models/files.rb

@@ -33,7 +33,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = service.get_object(directory.key, key, options, &block).to_h
+          data = service.get_object(directory.key, key, **options, &block).to_h
           new(data)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

data/lib/fog/storage/google_json/requests/get_object.rb

@@ -53,11 +53,11 @@ module Fog
             :options => request_options
           }
 
-          object = @storage_json.get_object(bucket_name, object_name, all_opts).to_h
+          object = @storage_json.get_object(bucket_name, object_name, **all_opts).to_h
           @storage_json.get_object(
             bucket_name,
             object_name,
-            all_opts.merge(:download_dest => buf.path)
+            **all_opts.merge(:download_dest => buf.path)
           )
 
           if block_given?

data/lib/fog/storage/google_json/requests/list_buckets.rb

@@ -11,10 +11,12 @@ module Fog
                          prefix: nil, projection: nil)
           @storage_json.list_buckets(
             @project,
-            :max_results => max_results,
-            :page_token => page_token,
-            :prefix => prefix,
-            :projection => projection
+            **{
+              :max_results => max_results,
+              :page_token => page_token,
+              :prefix => prefix,
+              :projection => projection
+            }
           )
         end
       end

data/lib/fog/storage/google_json/requests/list_objects.rb

@@ -31,7 +31,7 @@ module Fog
 
           @storage_json.list_objects(
             bucket,
-            options.select { |k, _| allowed_opts.include? k }
+            **options.select { |k, _| allowed_opts.include? k }
           )
         end
       end

data/lib/fog/storage/google_json/requests/put_bucket.rb

@@ -19,7 +19,7 @@ module Fog
                        predefined_default_object_acl: nil,
                        **options)
           bucket = ::Google::Apis::StorageV1::Bucket.new(
-            options.merge(:name => bucket_name)
+            **options.merge(:name => bucket_name)
           )
 
           @storage_json.insert_bucket(

data/lib/fog/storage/google_json/requests/put_bucket_acl.rb

@@ -12,7 +12,7 @@ module Fog
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(acl)
+          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(**acl)
           @storage_json.insert_bucket_access_control(bucket_name, acl_update)
         end
       end

data/lib/fog/storage/google_json/requests/put_object.rb

@@ -51,7 +51,7 @@ module Fog
           data, options = normalize_data(data, options)
 
           object_config = ::Google::Apis::StorageV1::Object.new(
-            options.merge(:name => object_name)
+            **options.merge(:name => object_name)
           )
 
           @storage_json.insert_object(

data/lib/fog/storage/google_json/requests/put_object_acl.rb

@@ -15,7 +15,7 @@ module Fog
           raise ArgumentError.new("object_name is required") unless object_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(acl)
+          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(**acl)
 
           @storage_json.insert_object_access_control(
             bucket_name, object_name, acl_object

data/lib/fog/storage/google_xml/models/file.rb

@@ -109,7 +109,7 @@ module Fog
           options["Expires"] = expires if expires
           options.merge!(metadata)
 
-          data = service.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, **options)
           merge_attributes(data.headers.reject { |key, _value| ["Content-Length", "Content-Type"].include?(key) })
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)

data/test/helpers/integration_test_helper.rb

@@ -1,6 +1,8 @@
 require "helpers/test_helper"
 require "helpers/test_collection"
 require "retriable"
+require 'google/apis/options'
+require 'google/apis/errors'
 
 # Use :test credentials in ~/.fog for live integration testing
 # XXX not sure if this will work on Travis CI or not

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-google
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Nat Welch
 - Artem Yakimenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -776,17 +776,17 @@ files:
 - test/unit/storage/test_common_xml_collections.rb
 - test/unit/storage/test_json_requests.rb
 - test/unit/storage/test_xml_requests.rb
-homepage: https://github.com/fog/fog-google
+homepage: https://gitlab.com/gitlab-org/gitlab-fog-google
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -795,8 +795,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files: