labclient 0.7.0 → 0.8.0

data/lib/labclient/http.rb

@@ -9,15 +9,17 @@ module LabClient
     end
 
     # Pagination Helper, Raw/Full HTTP Requests
-    def url(path)
-      if path.include? 'http'
+    def url(path, api_prefix: true)
+      if path.starts_with?('http://') || path.starts_with?('https://')
         path
-      else
+      elsif api_prefix
         "#{settings[:url]}/api/v4/#{path}"
+      else
+        "#{settings[:url]}#{path}"
       end
     end
 
-    def request(method, path, body = {}, dump_json = true)
+    def request(method, path, body: {}, dump_json: true, api_prefix: true)
       options = { method: method, headers: headers(dump_json) }
 
       if body && !body.empty?
@@ -32,7 +34,7 @@ module LabClient
 
       options.merge!(disable_ssl) unless settings[:ssl_verify]
 
-      Typhoeus::Request.new(url(path), options).run
+      Typhoeus::Request.new(url(path, api_prefix: api_prefix), options).run
     end
 
     def disable_ssl
@@ -65,6 +67,7 @@ module Typhoeus
   # Add Data :  OJ Parsing
   class Response
     include CurlHelper
+
     def inspect
       "#<TyphoeusResponse code: #{code}>"
     end

data/lib/labclient/impersonation_tokens/create.rb

@@ -31,7 +31,7 @@ module LabClient
       user_id = format_id(user_id)
       query_format_time(query, :expires_at)
 
-      client.request(:post, "users/#{user_id}/impersonation_tokens", ImpersonationToken, query)
+      client.request(:post, "users/#{user_id}/impersonation_tokens", klass: ImpersonationToken, body: query)
     end
   end
 end

data/lib/labclient/impersonation_tokens/list.rb

@@ -23,7 +23,7 @@ module LabClient
 
     def list(user_id, filter = :all)
       user_id = format_id(user_id)
-      client.request(:get, "users/#{user_id}/impersonation_tokens", ImpersonationToken, { filter: filter })
+      client.request(:get, "users/#{user_id}/impersonation_tokens", klass: ImpersonationToken, body: { filter: filter })
     end
   end
 end

data/lib/labclient/impersonation_tokens/show.rb

@@ -12,7 +12,7 @@ module LabClient
       token_id = format_id(token_id)
       user_id = format_id(user_id)
 
-      client.request(:get, "users/#{user_id}/impersonation_tokens/#{token_id}", ImpersonationToken)
+      client.request(:get, "users/#{user_id}/impersonation_tokens/#{token_id}", klass: ImpersonationToken)
     end
   end
 end

data/lib/labclient/issues/closed_by.rb

@@ -21,7 +21,7 @@ module LabClient
 
     def closed_by(project_id, issue_id)
       project_id = format_id(project_id)
-      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/closed_by", MergeRequest)
+      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/closed_by", klass: MergeRequest)
     end
   end
 end

data/lib/labclient/issues/create.rb

@@ -35,7 +35,7 @@ module LabClient
       project_id = format_id(project_id)
       format_query_id(:assignee_id, query)
 
-      client.request(:post, "projects/#{project_id}/issues", Issue, query)
+      client.request(:post, "projects/#{project_id}/issues", klass: Issue, body: query)
     end
   end
 end

data/lib/labclient/issues/group_issues.rb

@@ -23,7 +23,7 @@ module LabClient
       query[:created_after] = query[:created_after].to_time.iso8601 if format_time?(query[:created_after])
       query[:created_before] = query[:created_before].to_time.iso8601 if format_time?(query[:created_before])
 
-      client.request(:get, "groups/#{group_id}/issues", Issue, query)
+      client.request(:get, "groups/#{group_id}/issues", klass: Issue, body: query)
     end
   end
 end

data/lib/labclient/issues/list.rb

@@ -52,7 +52,7 @@ module LabClient
       query[:created_after] = query[:created_after].to_time.iso8601 if format_time?(query[:created_after])
       query[:created_before] = query[:created_before].to_time.iso8601 if format_time?(query[:created_before])
 
-      client.request(:get, 'issues', Issue, query)
+      client.request(:get, 'issues', klass: Issue, body: query)
     end
   end
 end

data/lib/labclient/issues/move.rb

@@ -22,7 +22,7 @@ module LabClient
       project_id = format_id(project_id)
       target_id = format_id(target_id)
 
-      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/move", Issue, to_project_id: target_id)
+      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/move", klass: Issue, body: { to_project_id: target_id })
     end
   end
 end

data/lib/labclient/issues/participants.rb

@@ -29,7 +29,7 @@ module LabClient
     def participants(project_id, issue_id = nil)
       project_id = format_id(project_id)
 
-      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/participants", User)
+      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/participants", klass: User)
     end
   end
 end

data/lib/labclient/issues/project_issues.rb

@@ -25,7 +25,7 @@ module LabClient
       query[:created_after] = query[:created_after].to_time.iso8601 if format_time?(query[:created_after])
       query[:created_before] = query[:created_before].to_time.iso8601 if format_time?(query[:created_before])
 
-      client.request(:get, "projects/#{project_id}/issues", Issue, query)
+      client.request(:get, "projects/#{project_id}/issues", klass: Issue, body: query)
     end
   end
 end

data/lib/labclient/issues/related_merge_requests.rb

@@ -24,7 +24,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/related_merge_requests", MergeRequest)
+      client.request(:get, "projects/#{project_id}/issues/#{issue_id}/related_merge_requests", klass: MergeRequest)
     end
   end
 end

data/lib/labclient/issues/show.rb

@@ -15,7 +15,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:get, "projects/#{project_id}/issues/#{issue_id}", Issue)
+      client.request(:get, "projects/#{project_id}/issues/#{issue_id}", klass: Issue)
     end
   end
 end

data/lib/labclient/issues/subscribe.rb

@@ -25,7 +25,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/subscribe", Issue)
+      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/subscribe", klass: Issue)
     end
   end
 end

data/lib/labclient/issues/time_stats.rb

@@ -62,7 +62,7 @@ module LabClient
       mr_id = format_id(mr_id)
 
       duration = ChronicDuration.output(ChronicDuration.parse(duration.to_s), format: :short)
-      client.request(:post, "projects/#{project_id}/issues/#{mr_id}/add_spent_time", nil, duration: duration)
+      client.request(:post, "projects/#{project_id}/issues/#{mr_id}/add_spent_time", body: { duration: duration })
     end
 
     doc 'Time Stats' do
@@ -101,7 +101,7 @@ module LabClient
       mr_id = format_id(mr_id)
 
       duration = ChronicDuration.output(ChronicDuration.parse(duration.to_s), format: :short)
-      client.request(:post, "projects/#{project_id}/issues/#{mr_id}/time_estimate", nil, duration: duration)
+      client.request(:post, "projects/#{project_id}/issues/#{mr_id}/time_estimate", body: { duration: duration })
     end
 
     # Resets

data/lib/labclient/issues/todo.rb

@@ -25,7 +25,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/todo", Todo)
+      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/todo", klass: Todo)
     end
   end
 end

data/lib/labclient/issues/unsubscribe.rb

@@ -25,7 +25,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/unsubscribe", Issue)
+      client.request(:post, "projects/#{project_id}/issues/#{issue_id}/unsubscribe", klass: Issue)
     end
   end
 end

data/lib/labclient/issues/update.rb

@@ -56,7 +56,7 @@ module LabClient
       project_id = format_id(project_id)
       issue_id = format_id(issue_id)
 
-      client.request(:put, "projects/#{project_id}/issues/#{issue_id}", Issue, query)
+      client.request(:put, "projects/#{project_id}/issues/#{issue_id}", klass: Issue, body: query)
     end
   end
 end

data/lib/labclient/jobs/artifacts.rb

@@ -48,7 +48,7 @@ module LabClient
       query = { job_token: job_token } if job_token
 
       # Don't try to process output
-      client.request(:get, "projects/#{project_id}/jobs/#{job_id}/artifacts", LabFile, query)
+      client.request(:get, "projects/#{project_id}/jobs/#{job_id}/artifacts", klass: LabFile, body: query)
     end
 
     # Helper to write immediately to a file

data/lib/labclient/jobs/artifacts_latest.rb

@@ -31,7 +31,7 @@ module LabClient
       file_path ||= "#{Dir.pwd}/#{job_name}.zip"
 
       project_id = format_id(project_id)
-      output = client.request(:get, "projects/#{project_id}/jobs/artifacts/#{branch_name}/download", nil, query)
+      output = client.request(:get, "projects/#{project_id}/jobs/artifacts/#{branch_name}/download", body: query)
 
       File.write(file_path, output)
     end

data/lib/labclient/jobs/artifacts_path.rb

@@ -42,7 +42,7 @@ module LabClient
       project_id = format_id(project_id)
       file_path ||= "#{Dir.pwd}/#{artifact_path}"
 
-      output = client.request(:get, "projects/#{project_id}/jobs/#{job_id}/artifacts/#{artifact_path}", nil)
+      output = client.request(:get, "projects/#{project_id}/jobs/#{job_id}/artifacts/#{artifact_path}")
 
       File.write(file_path, output)
     end

data/lib/labclient/jobs/cancel.rb

@@ -27,7 +27,7 @@ module LabClient
     def cancel(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/cancel", Job)
+      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/cancel", klass: Job)
     end
   end
 end

data/lib/labclient/jobs/erase.rb

@@ -27,7 +27,7 @@ module LabClient
     def erase(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/erase", Job)
+      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/erase", klass: Job)
     end
   end
 end

data/lib/labclient/jobs/keep.rb

@@ -27,7 +27,7 @@ module LabClient
     def keep(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/keep", Job)
+      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/keep", klass: Job)
     end
   end
 end

data/lib/labclient/jobs/pipeline_list.rb

@@ -27,7 +27,7 @@ module LabClient
 
       query = { scope: scope } if scope
 
-      client.request(:get, "projects/#{project_id}/pipelines/#{pipeline_id}/jobs", Job, query)
+      client.request(:get, "projects/#{project_id}/pipelines/#{pipeline_id}/jobs", klass: Job, body: query)
     end
   end
 end

data/lib/labclient/jobs/play.rb

@@ -27,7 +27,7 @@ module LabClient
     def play(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/play", Job)
+      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/play", klass: Job)
     end
   end
 end

data/lib/labclient/jobs/project_list.rb

@@ -24,7 +24,7 @@ module LabClient
     def project(project_id, scope = nil)
       project_id = format_id(project_id)
       query = { scope: scope } if scope
-      client.request(:get, "projects/#{project_id}/jobs", Job, query)
+      client.request(:get, "projects/#{project_id}/jobs", klass: Job, body: query)
     end
   end
 end

data/lib/labclient/jobs/retry.rb

@@ -27,7 +27,7 @@ module LabClient
     def retry(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/retry", Job)
+      client.request(:post, "projects/#{project_id}/jobs/#{job_id}/retry", klass: Job)
     end
   end
 end

data/lib/labclient/jobs/show.rb

@@ -19,7 +19,7 @@ module LabClient
     def show(project_id, job_id)
       job_id = format_id(job_id)
       project_id = format_id(project_id)
-      client.request(:get, "projects/#{project_id}/jobs/#{job_id}", Job)
+      client.request(:get, "projects/#{project_id}/jobs/#{job_id}", klass: Job)
     end
   end
 end

data/lib/labclient/keys/fingerprint.rb

@@ -21,7 +21,7 @@ module LabClient
     def fingerprint(key_id)
       query = { fingerprint: key_id }
 
-      client.request(:get, 'keys', Key, query)
+      client.request(:get, 'keys', klass: Key, body: query)
     end
   end
 end

data/lib/labclient/keys/project.rb

@@ -62,7 +62,7 @@ module LabClient
       query[:before] = query[:before].to_time.iso8601 if format_time?(query[:before])
       query[:after] = query[:after].to_time.iso8601 if format_time?(query[:after])
 
-      client.request(:get, "projects/#{project_id}/events", Event, query)
+      client.request(:get, "projects/#{project_id}/events", klass: Event, body: query)
     end
   end
 end

data/lib/labclient/keys/show.rb

@@ -9,7 +9,7 @@ module LabClient
     end
 
     def show(key_id)
-      client.request(:get, "keys/#{key_id}", Key)
+      client.request(:get, "keys/#{key_id}", klass: Key)
     end
   end
 end

data/lib/labclient/keys/user.rb

@@ -60,7 +60,7 @@ module LabClient
       query[:before] = query[:before].to_time.iso8601 if format_time?(query[:before])
       query[:after] = query[:after].to_time.iso8601 if format_time?(query[:after])
 
-      client.request(:get, "users/#{user_id}/events", Event, query)
+      client.request(:get, "users/#{user_id}/events", klass: Event, body: query)
     end
   end
 end

data/lib/labclient/lab_struct.rb

@@ -3,6 +3,7 @@ module LabClient
   # Unique inherited class to not override top level LabStruct
   class LabStruct
     include CurlHelper
+
     attr_reader :response, :table
 
     def initialize(hash = {})

data/lib/labclient/license/add.rb

@@ -15,7 +15,7 @@ module LabClient
 
     # Get current license
     def add(obj)
-      client.request(:post, 'license', License, license: obj)
+      client.request(:post, 'license', klass: License, body: { license: obj })
     end
   end
 end

data/lib/labclient/license/list.rb

@@ -61,11 +61,11 @@ module LabClient
 
     # Get current license
     def current
-      client.request(:get, 'license', License)
+      client.request(:get, 'license', klass: License)
     end
 
     def list
-      client.request(:get, 'licenses', License)
+      client.request(:get, 'licenses', klass: License)
     end
   end
 end

data/lib/labclient/markdown/markdown.rb

@@ -6,7 +6,7 @@ module LabClient
       desc 'Render an arbitrary Markdown document.'
       example 'client.markdown.render(text: "# Oh Hi!")'
       result <<~DOC
-        =>  { :html=>"<h1 data-sourcepos=\"1:1-1:8\">Oh Hi!</h1>"}
+        =>  { :html=>"<h1 data-sourcepos="1:1-1:8">Oh Hi!</h1>"}
       DOC
     end
 
@@ -22,7 +22,7 @@ module LabClient
     end
 
     def render(query)
-      client.request(:post, 'markdown', nil, query)
+      client.request(:post, 'markdown', body: query)
     end
   end
 end

data/lib/labclient/members/groups/add.rb

@@ -31,7 +31,7 @@ module LabClient
       user_id = format_id(user_id)
       query[:user_id] = user_id
 
-      client.request(:post, "groups/#{group_id}/members", Member, query)
+      client.request(:post, "groups/#{group_id}/members", klass: Member, body: query)
     end
   end
 end

data/lib/labclient/members/groups/list.rb

@@ -53,10 +53,10 @@ module LabClient
     def list(group_id, query = nil, all = nil)
       all = '/all' if all # Reset and Use
 
-      format_query_ids(:user_ids, query) if query
+      format_query_ids(:user_ids, body: query) if query
 
       group_id = format_id(group_id)
-      client.request(:get, "groups/#{group_id}/members#{all}", Member, query)
+      client.request(:get, "groups/#{group_id}/members#{all}", klass: Member, body: query)
     end
 
     # Default to True

data/lib/labclient/members/groups/show.rb

@@ -38,7 +38,7 @@ module LabClient
 
       user_id = format_id(user_id)
       group_id = format_id(group_id)
-      client.request(:get, "groups/#{group_id}/members#{all}/#{user_id}", Member)
+      client.request(:get, "groups/#{group_id}/members#{all}/#{user_id}", klass: Member)
     end
 
     # Default to True

data/lib/labclient/members/groups/update.rb

@@ -30,7 +30,7 @@ module LabClient
       group_id = format_id(group_id)
       user_id = format_id(user_id)
 
-      client.request(:put, "groups/#{group_id}/members/#{user_id}", Member, query)
+      client.request(:put, "groups/#{group_id}/members/#{user_id}", klass: Member, body: query)
     end
   end
 end

data/lib/labclient/members/projects/add.rb

@@ -31,7 +31,7 @@ module LabClient
       user_id = format_id(user_id)
       query[:user_id] = user_id
 
-      client.request(:post, "projects/#{project_id}/members", Member, query)
+      client.request(:post, "projects/#{project_id}/members", klass: Member, body: query)
     end
   end
 end

data/lib/labclient/members/projects/list.rb

@@ -52,10 +52,10 @@ module LabClient
     def list(project_id, query = nil, all = nil)
       all = '/all' if all # Reset and Use
 
-      format_query_ids(:user_ids, query) if query
+      format_query_ids(:user_ids, body: query) if query
 
       project_id = format_id(project_id)
-      client.request(:get, "projects/#{project_id}/members#{all}", Member, query)
+      client.request(:get, "projects/#{project_id}/members#{all}", klass: Member, body: query)
     end
 
     # Default to True

data/lib/labclient/members/projects/show.rb

@@ -38,7 +38,7 @@ module LabClient
 
       user_id = format_id(user_id)
       project_id = format_id(project_id)
-      client.request(:get, "projects/#{project_id}/members#{all}/#{user_id}", Member)
+      client.request(:get, "projects/#{project_id}/members#{all}/#{user_id}", klass: Member)
     end
 
     # Default to True

data/lib/labclient/members/projects/update.rb

@@ -30,7 +30,7 @@ module LabClient
       project_id = format_id(project_id)
       user_id = format_id(user_id)
 
-      client.request(:put, "projects/#{project_id}/members/#{user_id}", Member, query)
+      client.request(:put, "projects/#{project_id}/members/#{user_id}", klass: Member, body: query)
     end
   end
 end

data/lib/labclient/merge_requests/accept.rb

@@ -42,7 +42,7 @@ module LabClient
       project_id = format_id(project_id)
       merge_request_id = format_id(merge_request_id)
 
-      client.request(:put, "projects/#{project_id}/merge_requests/#{merge_request_id}/merge", MergeRequest, query)
+      client.request(:put, "projects/#{project_id}/merge_requests/#{merge_request_id}/merge", klass: MergeRequest, body: query)
     end
   end
 end

data/lib/labclient/merge_requests/cancel_auto_merge.rb

@@ -32,7 +32,7 @@ module LabClient
       project_id = format_id(project_id)
       merge_request_id = format_id(merge_request_id)
 
-      client.request(:post, "projects/#{project_id}/merge_requests/#{merge_request_id}/cancel_merge_when_pipeline_succeeds", MergeRequest)
+      client.request(:post, "projects/#{project_id}/merge_requests/#{merge_request_id}/cancel_merge_when_pipeline_succeeds", klass: MergeRequest)
     end
   end
 end

data/lib/labclient/merge_requests/change.rb

@@ -3,6 +3,7 @@ module LabClient
   # Inspect Helper, 'Changes' result for MR
   class Changes < Klass
     include ClassHelpers
+
     # extend Docs
 
     def inspect

data/lib/labclient/merge_requests/changes.rb

@@ -28,7 +28,7 @@ module LabClient
       project_id = format_id(project_id)
       merge_request_id = format_id(merge_request_id)
 
-      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/changes", Changes)
+      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/changes", klass: Changes)
     end
   end
 end

data/lib/labclient/merge_requests/closes_issues.rb

@@ -29,7 +29,7 @@ module LabClient
       project_id = format_id(project_id)
       merge_request_id = format_id(merge_request_id)
 
-      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/closes_issues", Issue)
+      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/closes_issues", klass: Issue)
     end
   end
 end

data/lib/labclient/merge_requests/commits.rb

@@ -16,7 +16,7 @@ module LabClient
       project_id = format_id(project_id)
       merge_request_id = format_id(merge_request_id)
 
-      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/commits", Commit)
+      client.request(:get, "projects/#{project_id}/merge_requests/#{merge_request_id}/commits", klass: Commit)
     end
   end
 end

data/lib/labclient/merge_requests/create.rb

@@ -57,7 +57,7 @@ module LabClient
     def create(project_id, query)
       project_id = format_id(project_id)
 
-      client.request(:post, "projects/#{project_id}/merge_requests", MergeRequest, query)
+      client.request(:post, "projects/#{project_id}/merge_requests", klass: MergeRequest, body: query)
     end
   end
 end

data/lib/labclient/merge_requests/diff.rb

@@ -3,6 +3,7 @@ module LabClient
   # Inspect Helper
   class MergeRequestDiff < Klass
     include ClassHelpers
+
     # extend Docs
 
     def inspect

data/lib/labclient/merge_requests/diff_versions.rb

@@ -61,9 +61,9 @@ module LabClient
       diff_id = format_id(diff_id)
 
       if diff_id
-        client.request(:get, "projects/#{project_id}/merge_requests/#{mr_id}/versions/#{diff_id}", MergeRequestDiff)
+        client.request(:get, "projects/#{project_id}/merge_requests/#{mr_id}/versions/#{diff_id}", klass: MergeRequestDiff)
       else
-        client.request(:get, "projects/#{project_id}/merge_requests/#{mr_id}/versions", MergeRequestDiff)
+        client.request(:get, "projects/#{project_id}/merge_requests/#{mr_id}/versions", klass: MergeRequestDiff)
       end
     end
   end