labclient 0.3.1 → 0.4.0

data/lib/labclient/generator/template_helper.rb

@@ -16,6 +16,7 @@ module LabClient
     # Common Helper Class
     class TemplateHelper
       include TemplateMethods
+      include LabClient::Logger
 
       attr_reader :client
       attr_accessor :opts
@@ -46,16 +47,16 @@ module LabClient
       attr_accessor :group_name, :group_path, :group_suffix, :project_name
 
       def run!
-        puts "Running: #{group_suffix}"
+        logger.info "Running: #{group_suffix}"
         generate_group
 
         # Run `setup_` prefixed classes
         self.class.instance_methods.grep(/setup_/).each { |x| send(x) }
 
         # Print Created Groups/Project
-        puts "#{@group.name} - #{@group.web_url}"
+        logger.info 'Group', name: @group.name, web_url: @group.web_url
         @projects.each do |project|
-          puts " - #{project.name} - #{project.web_url}"
+          logger.info 'Project', name: project.name, web_url: project.web_url
         end
 
         {

data/lib/labclient/generator/wizard.rb

@@ -4,6 +4,7 @@ module LabClient
     # Helper to Generate Data / Populate GitLab
     class Wizard
       include Generator::Names # Name Generator
+      include LabClient::Logger
       attr_reader :client
       attr_accessor :count, :random, :password, :templates, :domain, :skip_confirmation
 
@@ -26,7 +27,7 @@ module LabClient
         self.random = true # Populate Random or use only Templates
         self.count = default_count
         self.password = SecureRandom.uuid
-        puts "Default Password: #{password}"
+        logger.info('Wizard Default Password', password: password) unless client.quiet?
 
         self.skip_confirmation = true
         self.domain = URI.parse(client.settings[:url]).hostname
@@ -54,11 +55,11 @@ module LabClient
       end
 
       def generate_users
-        puts 'Generating Users'
+        logger.info 'Generating Users' unless client.quiet?
         @users = @user_names.map do |name|
           username = name.downcase.gsub(/[^0-9A-Za-z]/, '')
           email = "#{username}@#{domain}"
-          puts "User -- Name: #{name}, UserName: #{username}, Email: #{email}"
+          logger.info('User', name: name, username: username, email: email) unless client.quiet?
 
           client.users.create(
             name: name,
@@ -71,25 +72,25 @@ module LabClient
       end
 
       def generate_groups
-        puts 'Generating Groups'
+        logger.info 'Generating Groups' unless client.quiet?
         @groups = @group_names.map do |name|
           path = name.downcase.gsub(/[^0-9A-Za-z]/, '')
-          puts "Group -- #{name}/#{path}"
+          logger.info "Group -- #{name}/#{path}" unless client.quiet?
           client.groups.create(name: name, path: path)
         end
       end
 
       def generate_group_membership
-        puts 'Adding Group members'
+        logger.info 'Adding Group members' unless client.quiet?
         ## Group Access Level
         @groups.each do |group|
           @users.sample(rand(1..@users.count)).each do |user|
             level = group.valid_group_project_levels.sample
-            puts "Group Add: #{group.name}: #{user.name} - #{level}"
+            logger.info('Group Add', name: group.name, user: user.name, level: level) unless client.quiet?
             group.member_add(user, access_level: level)
             # :nocov:
           rescue StandardError => e
-            puts e.message
+            logger.fatal e.message unless client.quiet?
             next
             # :nocov:
           end
@@ -97,13 +98,13 @@ module LabClient
       end
 
       def generate_projects(group)
-        puts 'Generating Projects'
+        logger.info 'Generating Projects' unless client.quiet?
         # Collect Group Members
         members = group.members
 
         # Loop through project names, create project add issues
         @project_names.uniq.map do |project_name|
-          puts "Project: #{project_name}"
+          logger.info "Project: #{project_name}" unless client.quiet?
           project = group.project_create(name: project_name, description: gen_description)
 
           rand(count[:issues]).times do

data/lib/labclient/groups/group.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Metrics/ClassLength
 # Top namespace
 module LabClient
   # Inspect Helper
@@ -344,4 +343,3 @@ module LabClient
     # rubocop:enable Metrics/BlockLength
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/labclient/groups/search.rb

@@ -70,20 +70,16 @@ module LabClient
 
     private
 
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # TODO - Finish Classes
+    # TODO: - Finish Classes
     def klass_type(scope)
       case scope
       when :projects then Project
       when :issues then Issue
       when :merge_requests then MergeRequest
-      when :wiki_blobs then nil # wiki_blobs
-      when :milestones then nil # ::Project::MileStone
-      when :blobs then nil # blobs
+      when :milestones, :wiki_blobs, :blobs then nil
       when :commits then Commit
       when :users then User
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
   end
 end

data/lib/labclient/groups/stub.rb

@@ -3,6 +3,7 @@ module LabClient
   # Ugly Hack, but Makes Docs Easy
   class Groups < Common
     doc '' do
+      # Do Nothing!
     end
   end
 end

data/lib/labclient/http.rb

@@ -42,13 +42,19 @@ module LabClient
     def headers(dump_json)
       default_headers = {
 
-        'Private-Token' => settings[:token],
-
         'Accept' => 'application/json',
         'User-Agent' => "LabClient #{LabClient::VERSION}"
       }
 
+      token_type = settings[:token_type]
+      default_headers[token_type] = if token_type == 'Authorization'
+                                      "Bearer #{settings[:token]}"
+                                    else
+                                      settings[:token]
+                                    end
+
       default_headers['Content-Type'] = 'application/json' if dump_json
+
       default_headers
     end
   end
@@ -58,16 +64,22 @@ end
 module Typhoeus
   # Add Data :  OJ Parsing
   class Response
+    include CurlHelper
     def inspect
       "#<TyphoeusResponse code: #{code}>"
     end
 
-    attr_reader :path
+    attr_reader :path, :client
 
     def data
-      return @data if @data
+      @data ||= process_body
+
+      @data
+    end
 
-      @data = process_body
+    # Shim for CurlHelper
+    def response
+      self
     end
 
     def process_body
@@ -76,17 +88,37 @@ module Typhoeus
       elsif headers['content-type']&.include? 'text/plain'
         body
       else
-        Oj.load(body, mode: :compat, object_class: LabClient::LabStruct)
+        result = Oj.load(body, mode: :compat, object_class: LabClient::LabStruct)
+        result.instance_variable_set(:@response, self) if result.instance_of?(LabClient::LabStruct)
+        result
+      end
+    end
+
+    # Retry Helper Accessor
+    def retry?
+      code == 429
+    end
+
+    # Print Error information
+    # 1. Use Typheous `return_message` if there isn't any return body
+    # For network/uri/dns related issues
+    # 2. Use body for parsed responses
+    # For Bad Request, invalid params
+    # 3. Return raw data
+    # For non body responses
+    def find_friendly_error
+      case data
+      when nil
+        return_message
+      when LabClient::LabStruct
+        data[:message] || data[:error]
+      else # Handle String as well
+        data
       end
     end
 
     def friendly_error
-      message = if data
-                  data[:message] || data[:error] || data
-                else
-                  return_message
-                end
-      "#{code} - #{message}"
+      "#{code} - #{find_friendly_error}"
     end
   end
 end

data/lib/labclient/issues/issue.rb

@@ -12,7 +12,7 @@ module LabClient
     date_time_attrs %i[closed_at created_at updated_at]
 
     # User Fields
-    user_attrs %i[closed_by author assignee]
+    user_attrs %i[author assignee]
 
     # Via State Events
     def close