ci_toolkit 1.5.13 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c6cb094c0636a1550e143903d23435cd41f5824bf9eaa6d1623c10aebb82944
-  data.tar.gz: 139787c313009523efc6aa645dbd1b0f403e3ffb8570f74834c283a480303a68
+  metadata.gz: 8bd3020f481c44b5a3aa5338f2642db5ad6616ed580be930532182e83ef4f434
+  data.tar.gz: 5bddb92459c6e5e9219e5fb2ddaf5d9c07a62674396b776d37e6b0e3769ceb85
 SHA512:
-  metadata.gz: c786f7af35ade2e8b64c44df34b13f3f0f0699308f58bb525d1b424da0c6e21d75a8e32b0e5100a9991eee28755ba89c19109ab330791b57875c561453bf10e1
-  data.tar.gz: ce3681caee0f33a5bf3d40c5c1819b02f25d95e355588618ab3c4c53bad6d4316235111d8d3bd23435bb20789c8f49eb1c5fc69c594d4816bae5c9ef26a207ba
+  metadata.gz: d45f01faa0ecd50030c092e9bbe373bdbf78c22c74c7f95d2f54ddc9448839683598b0445654d491e48a469dd73712b4898fdc9771d7f3da4d38d97a9d88b298
+  data.tar.gz: 3b75f18b57b521e91f235e4efe280c9c5ca77cbe968b08984eca33d16eb3d21a098495f4eef688b2806d1999eec0abe603f57700ca6178687f88400486bd08cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.5.13)
+    ci_toolkit (1.5.16)
       faraday
       faraday_middleware
       gitlab

data/lib/ci_toolkit/dvcs_pr_factory.rb

@@ -2,7 +2,7 @@
 
 module CiToolkit
   # Use this to create an instance of Dvcs implementation based on the service type
-  # set in an environment value called DVCS_SERVICW with value of gitlab or github
+  # set in an environment value called DVCS_SERVICW with value of either gitlab or github
   class DvcsPrFactory
     SERVICES = {
       "gitlab" => CiToolkit::GitlabPr,

data/lib/ci_toolkit/gitlab_bot.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "gitlab"
+
+module CiToolkit
+  # Utility class that provides an instance of a Gitlab Client
+  class GitlabBot
+    attr_reader :client
+
+    # Provides an endpoint and a private access token that can be used with the Gitlab client
+    class Credentials
+      attr_reader :endpoint, :project_access_token
+
+      def initialize(
+        endpoint = ENV["GITLAB_API_URL"],
+        project_access_token = ENV["GITLAB_PROJECT_ACCESS_TOKEN"]
+      )
+        @endpoint = endpoint
+        @project_access_token = project_access_token
+      end
+    end
+
+    def initialize(
+      credentials = CiToolkit::GitlabBot::Credentials.new,
+      client = Gitlab.client(endpoint: credentials.endpoint, private_token: credentials.project_access_token)
+    )
+      @client = client
+    end
+  end
+end

data/lib/ci_toolkit/gitlab_pr.rb

@@ -10,16 +10,15 @@ module CiToolkit
       build_types = ENV["BUILD_TYPES"]&.split(/,/) || ["BluetoothDemo", "Acceptance PreProd", "Acceptance Prod",
                                                        "Latest Prod", "Latest PreProd", "Mock", "Design System"],
 
-      client = Gitlab.client(endpoint: ENV["GITLAB_API_URL"] || "",
-                             private_token: ENV["GITLAB_USER_PRIVATE_TOKEN"] || "")
+      bot = CiToolkit::GitlabBot.new
     )
       super()
       @pr_number = env.pull_request_number
       @repo_slug = env.repository_path
       @commit_sha = env.git_commit
-      @_client = client
+      @_client = bot.client
       @build_types = build_types
-      @bot = CiToolkit::GithubBot.new
+      @bot = bot
     end
 
     def title
@@ -123,7 +122,7 @@ module CiToolkit
     private
 
     def client
-      @_client = GitLab::Client.new if @_client.nil?
+      @_client = @bot.client if @_client.nil?
       @_client
     end
   end

data/lib/ci_toolkit/gitlab_release.rb

@@ -7,31 +7,32 @@ module CiToolkit
   class GitlabRelease
     def initialize(
       env = CiToolkit::BitriseEnv.new,
-      client = Gitlab.client(endpoint: "https://git.smartlife.vodafo.ne/api/v4",
-                             private_token: "glpat-YcYDycpz-PJe7QxLSA22")
+      bot = CiToolkit::GitlabBot.new
     )
       @repo_slug = env.repository_slug
-      @commit_sha = env.git_commit
-      @client = client
+      @client = bot.client
     end
 
+    # rubocop:disable Metrics/ParameterLists
     def create_release(
       project_id:,
       name:,
       description:,
+      last_git_commit:,
       tag_name:,
       file_name:
     )
       release_details = {
         name: name,
         tag_name: tag_name,
-        ref: @commit_sha,
+        ref: last_git_commit,
         description: description,
         assets: { links: [get_assets_details(project_id, tag_name, file_name)] }
       }
 
       @client.create_project_release(project_id, release_details)
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # rubocop:disable Metrics/MethodLength
     def upload_file(project_id:, tag_name:, full_path_to_file:)

data/lib/ci_toolkit.rb

@@ -7,6 +7,7 @@ require "ci_toolkit/duplicate_files_finder"
 require "ci_toolkit/dvcs_pr"
 require "ci_toolkit/github_bot"
 require "ci_toolkit/github_pr"
+require "ci_toolkit/gitlab_bot"
 require "ci_toolkit/gitlab_pr"
 require "ci_toolkit/gitlab_release"
 require "ci_toolkit/dvcs_pr_factory"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.16
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -227,6 +227,7 @@ files:
 - lib/ci_toolkit/git.rb
 - lib/ci_toolkit/github_bot.rb
 - lib/ci_toolkit/github_pr.rb
+- lib/ci_toolkit/gitlab_bot.rb
 - lib/ci_toolkit/gitlab_pr.rb
 - lib/ci_toolkit/gitlab_release.rb
 - lib/ci_toolkit/jira.rb