labclient 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1d2daf2bc113e0a5e74d3b2888dc20278bb18e5aab063a21919f9ab7ef4ca9
-  data.tar.gz: 40f0b1e58ba394663e4ab90f1ac9fd6e4734e718d6f1aac9f1394bc7c067afd3
+  metadata.gz: 105ec572236cc556ebab18031557136d5bb1e78a33d39ad00ba9032e831627b2
+  data.tar.gz: 49b836de0a75f9e1ca38cf1620754d824116047c9b944b3c8f81949d07f60162
 SHA512:
-  metadata.gz: 9d6e0a96ecd9eba62f3a38c89b621b6379cb1e63bb67a212acc7333dc0dc3ae6d3b58011bdbbb8b2b13c08959d144540e46698112dd1d91a6c613208abe541f3
-  data.tar.gz: 317e9e1290ccad1878af5f838842ab893879ed2306fcbcf0509ba9fa4372717a94b98ba37f038db86b01945dc7d2a95b18d8f158b1db64fc6884aa310bd14001
+  metadata.gz: 1504185ca949dc3dc77eb8266965e2f70d3023a954dcd01eb8194e47086c26a731438310f902f014fd5e63f982ce2a141fda0e37ab55f3a772e46905fb27d46c
+  data.tar.gz: 45c22d9129316bd4dd25558c9184d7a1eb79ed2ddd0dab153f60b39fd7838b4e95388465a617002c787b3f32f4dc62eb9924c3624d4f3ac5e6aab63770012946

data/lib/labclient/client/helpers.rb

@@ -101,6 +101,10 @@ module LabClient
       resp.headers['retry-after']&.to_i
     end
 
+    def retry_debug_headers
+      resp.headers.select { |k, _v| k.include? 'ratelimit' }
+    end
+
     # Handle Retry Logic
     # 1. If response merits a retry
     # 2. Retry is enabled

data/lib/labclient/client.rb

@@ -37,7 +37,6 @@ module LabClient
       debug_handler if debug?
 
       post_request_handlers
-
       process resp
     rescue LabClient::Error => e
       logger.fatal('Request Failed', e.error_details) unless quiet?
@@ -46,7 +45,7 @@ module LabClient
       self.retries += 1
 
       # Assume Retry After by Default
-      logger.debug('Retry After', value: retry_after, retry_header: retry_header) if debug?
+      logger.debug('Retry After', value: retry_after, retry_debug_headers: retry_debug_headers) if debug?
       self.delay = retry_after if resp.headers.key? 'retry-after'
 
       self.delay += delay_factor

data/lib/labclient/feature_flags/list.rb

@@ -20,7 +20,7 @@ module LabClient
                             :name => "create_eks_clusters",
                             :state => "on",
                             :gates => [
-                              [0] OpenStruct {
+                              [0] LabStruct {
                                     :key => "boolean",
                                     :value => true
                               }

data/lib/labclient/files/show.rb

@@ -3,11 +3,11 @@ module LabClient
   # Specifics
   class Files < Common
     doc 'Show' do
-      desc 'Allows you to receive information about file in repository like name, size, content [Project ID, File Path, Ref (master default), kind]'
+      desc 'Allows you to receive information about file in repository like name, size, content [Project ID, File Path, Ref (main default), kind]'
       example 'client.files.show(264, "README.md")'
 
       markdown <<~DOC
-        Ref will default to `master`
+        Ref will default to `main`
 
         Kind can be left empty or set to either :raw or :blame
       DOC
@@ -15,12 +15,12 @@ module LabClient
 
     doc 'Show' do
       desc 'Raw Content'
-      example 'client.files.show(264, "README.md", :master, :raw)'
+      example 'client.files.show(264, "README.md", :main, :raw)'
     end
 
     doc 'Show' do
       desc 'Blame'
-      example 'client.files.show(264, "README.md", :master, :blame)'
+      example 'client.files.show(264, "README.md", :main, :blame)'
     end
 
     doc 'Show' do
@@ -31,7 +31,7 @@ module LabClient
       DOC
     end
 
-    def show(project_id, file_path, ref = :master, kind = nil)
+    def show(project_id, file_path, ref = :main, kind = nil)
       kind = case kind
              when :raw
                '/raw'

data/lib/labclient/http.rb

@@ -88,7 +88,7 @@ module Typhoeus
       elsif headers['content-type']&.include? 'text/plain'
         body
       else
-        result = Oj.load(body, mode: :compat, object_class: LabClient::LabStruct)
+        result = Oj.load(body, mode: :compat, symbol_keys: true, object_class: LabClient::LabStruct)
         result.instance_variable_set(:@response, self) if result.instance_of?(LabClient::LabStruct)
         result
       end

data/lib/labclient/klass.rb

@@ -5,7 +5,7 @@ module LabClient
     include LabClient::Logger
     include CurlHelper
 
-    attr_reader :client, :response
+    attr_reader :client
 
     extend Docs
 
@@ -105,18 +105,13 @@ module LabClient
       client.quiet?
     end
 
-    # rubocop:disable Lint/MissingSuper
-    def initialize(hash = nil, response = nil, client = nil)
+    def initialize(table = nil, response = nil, client = nil)
+      # @table = table unless table.nil?
       @client = client
       @response = response
 
-      @table = {}
-      hash&.each_pair do |k, v|
-        k = k.to_sym
-        @table[k] = v
-      end
+      super(table)
     end
-    # rubocop:enable Lint/MissingSuper
 
     # Forward response success
     def success?

data/lib/labclient/lab_struct.rb

@@ -1,16 +1,28 @@
-# Extensions for OpenStruct specific to LabClient
+# Extensions for LabStruct specific to LabClient
 module LabClient
-  # Unique inherited class to not override top level openstruct
-  class LabStruct < OpenStruct
+  # Unique inherited class to not override top level LabStruct
+  class LabStruct
     include CurlHelper
-    attr_reader :response
+    attr_reader :response, :table
+
+    def initialize(hash = {})
+      @table = if hash.instance_of?(LabClient::LabStruct)
+                 hash.to_h
+               else
+                 hash
+               end
+    end
+
+    def to_h
+      @table
+    end
 
     def keys
-      to_h.keys.sort
+      @table.keys.sort
     end
 
     def inspect
-      to_h.inspect
+      @table.inspect
     end
 
     def as_json(*args)
@@ -18,7 +30,7 @@ module LabClient
     end
 
     def slice(*opts)
-      to_h.slice(*opts)
+      @table.slice(*opts)
     end
 
     def client
@@ -29,5 +41,25 @@ module LabClient
     def success?
       @response.success?
     end
+
+    def method_missing(method, *_args)
+      @table[method] if @table.keys.include?(method)
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      @table.keys.include?(method_name) || super
+    end
+
+    def key?(idx)
+      @table.key? idx
+    end
+
+    def []=(name, value)
+      @table[name] = value
+    end
+
+    def [](name)
+      @table[name.to_sym]
+    end
   end
 end

data/lib/labclient/merge_requests/delete.rb

@@ -13,13 +13,21 @@ module LabClient
     end
 
     doc 'Delete' do
-      desc 'Delete through MergeRequest'
+      desc 'Delete via MergeRequest'
       example <<~DOC
-        mr = client.merge_requests.show(343,2)
+        mr = client.merge_requests.delete(343,2)
         mr.delete
       DOC
     end
 
+    doc 'Delete' do
+      desc 'Via Project'
+      example <<~DOC
+        project = client.projects.show(1)
+        project.merge_requests_delete(12)
+      DOC
+    end
+
     # Delete
     def delete(project_id, merge_request_id)
       project_id = format_id(project_id)

data/lib/labclient/notifications/update.rb

@@ -31,7 +31,7 @@ module LabClient
       example 'client.notifications.update_project(16, level: :custom)'
 
       result <<~DOC
-           OpenStruct {
+           LabStruct {
              :level => "custom",
             :events => LabStruct {
                            :new_release => nil,

data/lib/labclient/projects/methods.rb

@@ -321,7 +321,7 @@ module LabClient
     end
 
     # Files
-    def file(file_path, ref = :master, kind = nil)
+    def file(file_path, ref = :main, kind = nil)
       client.files.show(id, file_path, ref, kind)
     end
 
@@ -647,6 +647,10 @@ module LabClient
       client.merge_requests.create(id, query)
     end
 
+    def merge_request_delete(merge_request_iid)
+      client.merge_requests.delete(id, merge_request_iid)
+    end
+
     # Access Requests
     def request_access
       client.projects.access_requests.create(id)

data/lib/labclient/version.rb

@@ -1,6 +1,6 @@
 # Overall version
 module LabClient
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 
   # Make it easy to print version
   def self.version

data/lib/labclient.rb

@@ -876,7 +876,7 @@ require 'labclient/generator/generator'
 require 'labclient/generator/wizard'
 
 # Dynamically Require Templates (Simplify new template creation)
-Dir["#{File.dirname(__FILE__)}/labclient/generator/templates/*.rb"].sort.each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/labclient/generator/templates/*.rb"].each { |file| require file }
 
 # Load Client Files - I am Very Last!
 require 'labclient/client/setup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: labclient
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,16 +224,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -943,7 +943,8 @@ files:
 homepage: https://gitlab.com/labclient/labclient
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -959,7 +960,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Gitlab API Client