gitlab 4.16.1 → 4.18.0

data/lib/gitlab/help.rb

@@ -45,14 +45,13 @@ module Gitlab::Help
     #
     # @return [Hash<Array>]
     def help_map
-      @help_map ||= begin
+      @help_map ||=
         actions.each_with_object({}) do |action, hsh|
           key = client.method(action)
                       .owner.to_s.gsub(/Gitlab::(?:Client::)?/, '')
           hsh[key] ||= []
           hsh[key] << action.to_s
         end
-      end
     end
 
     # Table with available commands.
@@ -74,22 +73,22 @@ module Gitlab::Help
     # Returns full namespace of a command (e.g. Gitlab::Client::Branches.cmd)
     def namespace(cmd)
       method_owners.select { |method| method[:name] == cmd }
-                   .map { |method| method[:owner] + '.' + method[:name] }
+                   .map { |method| "#{method[:owner]}.#{method[:name]}" }
                    .shift
     end
 
     # Massage output from 'ri'.
     def change_help_output!(cmd, output_str)
       output_str = +output_str
-      output_str.gsub!(/#{cmd}\((.*?)\)/m, cmd + ' \1')
-      output_str.gsub!(/,\s*/, ' ')
+      output_str.gsub!(/#{cmd}(\(.*?\))/m, "#{cmd}\\1")
+      output_str.gsub!(/,\s*/, ', ')
 
       # Ensure @option descriptions are on a single line
       output_str.gsub!(/\n\[/, " \[")
       output_str.gsub!(/\s(@)/, "\n@")
-      output_str.gsub!(/(\])\n(:)/, '\1 \2')
-      output_str.gsub!(/(:.*)(\n)(.*\.)/, '\1 \3')
-      output_str.gsub!(/\{(.+)\}/, '"{\1}"')
+      output_str.gsub!(/(\])\n(:)/, '\\1 \\2')
+      output_str.gsub!(/(:.*)(\n)(.*\.)/, '\\1 \\3')
+      output_str.gsub!(/\{(.+)\}/, '"{\\1}"')
     end
   end
 end

data/lib/gitlab/paginated_response.rb

@@ -47,13 +47,13 @@ module Gitlab
     end
 
     def auto_paginate(&block)
-      return lazy_paginate.to_a unless block_given?
+      return lazy_paginate.to_a unless block
 
       lazy_paginate.each(&block)
     end
 
     def paginate_with_limit(limit, &block)
-      return lazy_paginate.take(limit).to_a unless block_given?
+      return lazy_paginate.take(limit).to_a unless block
 
       lazy_paginate.take(limit).each(&block)
     end

data/lib/gitlab/request.rb

@@ -8,6 +8,7 @@ module Gitlab
   class Request
     include HTTParty
     format :json
+    maintain_method_across_redirects true
     headers 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded'
     parser(proc { |body, _| parse(body) })
 
@@ -25,8 +26,6 @@ module Gitlab
         true
       elsif !body
         false
-      elsif body.nil?
-        false
       else
         raise Error::Parsing, "Couldn't parse a response body"
       end
@@ -50,7 +49,18 @@ module Gitlab
           params[:headers].merge!(authorization_header)
         end
 
-        validate self.class.send(method, @endpoint + path, params)
+        retries_left = params[:ratelimit_retries] || 3
+        begin
+          response = self.class.send(method, endpoint + path, params)
+          validate response
+        rescue Gitlab::Error::TooManyRequests => e
+          retries_left -= 1
+          raise e if retries_left.zero?
+
+          wait_time = response.headers['Retry-After'] || 2
+          sleep(wait_time.to_i)
+          retry
+        end
       end
     end
 
@@ -69,7 +79,7 @@ module Gitlab
     # Sets a base_uri and default_params for requests.
     # @raise [Error::MissingCredentials] if endpoint not set.
     def request_defaults(sudo = nil)
-      raise Error::MissingCredentials, 'Please set an endpoint to API' unless @endpoint
+      raise Error::MissingCredentials, 'Please set an endpoint to API' unless endpoint
 
       self.class.default_params sudo: sudo
       self.class.default_params.delete(:sudo) if sudo.nil?
@@ -81,12 +91,12 @@ module Gitlab
     #
     # @raise [Error::MissingCredentials] if private_token and auth_token are not set.
     def authorization_header
-      raise Error::MissingCredentials, 'Please provide a private_token or auth_token for user' unless @private_token
+      raise Error::MissingCredentials, 'Please provide a private_token or auth_token for user' unless private_token
 
-      if @private_token.size < 21
-        { 'PRIVATE-TOKEN' => @private_token }
+      if private_token.size < 21
+        { 'PRIVATE-TOKEN' => private_token }
       else
-        { 'Authorization' => "Bearer #{@private_token}" }
+        { 'Authorization' => "Bearer #{private_token}" }
       end
     end
 

data/lib/gitlab/shell_history.rb

@@ -42,10 +42,10 @@ class Gitlab::Shell
       File.expand_path(@file_path)
     end
 
-    def read_from_file
+    def read_from_file(&block)
       path = history_file_path
 
-      File.foreach(path) { |line| yield(line) } if File.exist?(path)
+      File.foreach(path, &block) if File.exist?(path)
     rescue StandardError => e
       warn "History file not loaded: #{e.message}"
     end

data/lib/gitlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gitlab
-  VERSION = '4.16.1'
+  VERSION = '4.18.0'
 end

data/lib/gitlab.rb

@@ -21,11 +21,18 @@ module Gitlab
     Gitlab::Client.new(options)
   end
 
-  # Delegate to Gitlab::Client
-  def self.method_missing(method, *args, &block)
-    return super unless client.respond_to?(method)
-
-    client.send(method, *args, &block)
+  if Gem::Version.new(RUBY_VERSION).release >= Gem::Version.new('3.0.0')
+    def self.method_missing(method, *args, **keywargs, &block)
+      return super unless client.respond_to?(method)
+
+      client.send(method, *args, **keywargs, &block)
+    end
+  else
+    def self.method_missing(method, *args, &block)
+      return super unless client.respond_to?(method)
+
+      client.send(method, *args, &block)
+    end
   end
 
   # Delegate to Gitlab::Client

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab
 version: !ruby/object:Gem::Version
-  version: 4.16.1
+  version: 4.18.0
 platform: ruby
 authors:
 - Nihad Abbasov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -17,27 +17,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
@@ -45,9 +36,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
@@ -128,6 +116,7 @@ files:
 - lib/gitlab/client/epics.rb
 - lib/gitlab/client/events.rb
 - lib/gitlab/client/features.rb
+- lib/gitlab/client/group_badges.rb
 - lib/gitlab/client/group_boards.rb
 - lib/gitlab/client/group_labels.rb
 - lib/gitlab/client/group_milestones.rb
@@ -153,10 +142,12 @@ files:
 - lib/gitlab/client/project_releases.rb
 - lib/gitlab/client/projects.rb
 - lib/gitlab/client/protected_tags.rb
+- lib/gitlab/client/remote_mirrors.rb
 - lib/gitlab/client/repositories.rb
 - lib/gitlab/client/repository_files.rb
 - lib/gitlab/client/repository_submodules.rb
 - lib/gitlab/client/resource_label_events.rb
+- lib/gitlab/client/resource_state_events.rb
 - lib/gitlab/client/runners.rb
 - lib/gitlab/client/search.rb
 - lib/gitlab/client/services.rb
@@ -200,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper and CLI for the GitLab API