ci_toolkit 1.3.21 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0124c3d60b383332f7aa285351873653428e1ec3733404ab7ebd8d1e6ea9a058
-  data.tar.gz: 615f164f0e831cd758fa340e402c730899c3d613ef8bd3c99c52ff068c463026
+  metadata.gz: 7c3a2dc78e17b33a1f5cec89d973abd60bc9c972ec8d5d99c7547fd1ec0591f1
+  data.tar.gz: 1ac3f0583f2e9acb470dde9ecc5154003350c444a9e86e5a113722df38cfdc50
 SHA512:
-  metadata.gz: 46f7e082fedb803174eecf7ce8b71ca8d0ac30f2dbfa07effda70160fed50a1709e8c9e1b5e1d37a3bdb9e7d6de924b9c22ab31a06d809877884638661a7180b
-  data.tar.gz: 308b312331374fb1a271bbb8c835c2aff89849c5624e8743f3e3de0e4bbe2dea9a3e4fffa8d4a77ab155e539049a0030d3e3f351697b32e2e00208f296212c45
+  metadata.gz: 37dfe3cb4c7f72b0489f0dbdc792ba6f7b5cc79af67b45d8b3256c1ed83dbef1cb3eb7597304015738e33cb80ee5a1138a501d46872640a7013088c5c6c04320
+  data.tar.gz: 7e6cd2c35898d510f419c6b915d29fdf0a6fcfd252b6bd34dd3d17f74dc411241a7547a839c809b9c8d1d2a1a8c20dbbe0dbc757b3aeff85a5a75a6b8254e3be

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.3.21)
+    ci_toolkit (1.4.0)
       faraday
       faraday_middleware
       jwt

data/lib/ci_toolkit/github_bot.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "octokit"
+require "jwt"
+
+module CiToolkit
+  # Utility class that provides an access token that can be used with the Github API
+  class GithubBot
+    # Provides a jwt token for authentication. Sores the private key and app id for the bot
+    class Credentials
+      attr_reader :app_id
+
+      def initialize(app_id = ENV["CRVSH_BOT_GITHUB_APP_ID"], private_key = ENV["CRVSH_BOT_GITHUB_APP_PRIVATE_KEY"])
+        @app_id = app_id.to_i
+        @private_key = private_key
+      end
+
+      def jwt_token
+        JWT.encode(
+          {
+            iat: Time.now.to_i,
+            exp: Time.now.to_i + (9 * 60),
+            iss: @app_id
+          },
+          OpenSSL::PKey::RSA.new(@private_key),
+          "RS256"
+        )
+      end
+    end
+    # stack = Faraday::RackBuilder.new do |builder|
+    #   builder.response :logger
+    #   builder.use Octokit::Response::RaiseError
+    #   builder.adapter Faraday.default_adapter
+    # end
+    # Octokit.middleware = stack
+
+    def initialize(
+      credentials = CiToolkit::GithubBot::Credentials.new,
+      client = Octokit::Client.new(bearer_token: credentials.jwt_token, auto_paginate: true)
+    )
+      @app_id = credentials.app_id
+      @client = client
+    end
+
+    def create_token
+      return unless (installation_id = find_app_installation)
+
+      @client.create_app_installation_access_token(
+        installation_id,
+        { accept: Octokit::Preview::PREVIEW_TYPES[:integrations] }
+      )[:token]
+    end
+
+    private
+
+    def find_app_installation
+      @client.find_app_installations(
+        { accept: Octokit::Preview::PREVIEW_TYPES[:integrations] }
+      ).select { |installation| @app_id.equal?(installation[:app_id]) }.first[:id]
+    end
+  end
+end

data/lib/ci_toolkit/github_pr.rb

@@ -16,7 +16,7 @@ module CiToolkit
       @commit_sha = env.git_commit
       @_client = client
       @build_types = build_types
-      @access = CiToolkit::GithubAccess.new
+      @bot = CiToolkit::GithubBot.new
     end
 
     def title
@@ -110,7 +110,7 @@ module CiToolkit
 
     def client
       @_client = Octokit::Client.new if @_client.nil?
-      @_client.access_token = @access.create_token if @_client.access_token.nil?
+      @_client.access_token = @bot.create_token if @_client.access_token.nil?
 
       @_client
     end

data/lib/ci_toolkit.rb

@@ -4,7 +4,7 @@ require "ci_toolkit/bitrise_env"
 require "ci_toolkit/build"
 require "ci_toolkit/build_status"
 require "ci_toolkit/duplicate_files_finder"
-require "ci_toolkit/github_access"
+require "ci_toolkit/github_bot"
 require "ci_toolkit/github_pr"
 require "ci_toolkit/git"
 require "ci_toolkit/jira"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.4.0
 platform: ruby
 authors:
 - Gero Keller
@@ -209,7 +209,7 @@ files:
 - lib/ci_toolkit/build_status.rb
 - lib/ci_toolkit/duplicate_files_finder.rb
 - lib/ci_toolkit/git.rb
-- lib/ci_toolkit/github_access.rb
+- lib/ci_toolkit/github_bot.rb
 - lib/ci_toolkit/github_pr.rb
 - lib/ci_toolkit/jira.rb
 - lib/ci_toolkit/pr_messenger.rb

data/lib/ci_toolkit/github_access.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require "octokit"
-require "jwt"
-
-module CiToolkit
-  # Utility class that provides an access token that can be used with the Github API
-  class GithubAccess
-    # stack = Faraday::RackBuilder.new do |builder|
-    #   builder.response :logger
-    #   builder.use Octokit::Response::RaiseError
-    #   builder.adapter Faraday.default_adapter
-    # end
-    # Octokit.middleware = stack
-
-    def initialize(app_id = ENV["CRVSH_BOT_GITHUB_APP_ID"], private_key = ENV["CRVSH_BOT_GITHUB_APP_PRIVATE_KEY"])
-      @app_id = app_id.to_i
-      @private_key = private_key
-      @client = Octokit::Client.new(bearer_token: jwt_token, auto_paginate: true)
-    end
-
-    def create_token
-      return unless (installation_id = find_app_installation)
-
-      @client.create_app_installation_access_token(
-        installation_id,
-        { accept: Octokit::Preview::PREVIEW_TYPES[:integrations] }
-      )[:token]
-    end
-
-    private
-
-    def find_app_installation
-      @client.find_app_installations(
-        { accept: Octokit::Preview::PREVIEW_TYPES[:integrations] }
-      ).select { |installation| installation[:app_id] == @app_id }.first[:id]
-    end
-
-    def jwt_token
-      JWT.encode(
-        {
-          iat: Time.now.to_i,
-          exp: Time.now.to_i + (9 * 60),
-          iss: @app_id
-        },
-        OpenSSL::PKey::RSA.new(@private_key),
-        "RS256"
-      )
-    end
-  end
-end