ci_toolkit 1.3.18 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d3a1de5ba6aaf5c71c8153119c5aeda2c244b07d189ef6b1ac9db6973724bb
-  data.tar.gz: 529150b48e6a0aeb274c0fd85de9b2e1f1635799763bdbc4b55152b755f1d9ad
+  metadata.gz: baef3c4ae66f411e08cc2950c0a30f4240d70e142b331117f3cb199dade452cf
+  data.tar.gz: 22cc1ce81ca78b081278b7d0195f5a3de0937e8bf01c5f5729ab4fbd3bc48fb9
 SHA512:
-  metadata.gz: 1f9f6fbbc2466dbbb1285cf31fad8524301778de80d7c9d80323e06430d6b4642b9a55648664a320c6bf9d94537b78d95ac9de1aa2db8f2bb49efb8fa910a6cd
-  data.tar.gz: 55b5a9610c787fac085b1603680c1e813460673cc2b740a3095dd99aa16d55f467dfa9a4a5f2464cbbdbb86ae93971f8e01a4c918ef88fafeedca69e4ede9990
+  metadata.gz: 9a7322a172ef762ea4f2505605b58b3705b24e60e0f0236244f44e2b59fbcb4b7227075d3136d17187e18fc8e4c7dabafffa52313c9cc40816159b3aa8f349dd
+  data.tar.gz: 94d084df1fd80592530c93848ec9c93aba74a171e53e258166c4e7e5dfa21bb70bdd6e32bcbe6132225548b8ae104c9ff35c755733bf02b683304067a6f232bb

data/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "ruby.useLanguageServer": true,
+    "ruby.useBundler": true,
+    "ruby.lint": {
+        "rubocop": {
+          "useBundler": true // enable rubocop via bundler
+        }
+    },
+    "ruby.intellisense": "rubyLocate",
+    "ruby.codeCompletion": "rcodetools"
+}

data/Gemfile.lock

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

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec/test/test-unit` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version in `ci_toolkit.gemspec`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

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.18
+  version: 1.4.1
 platform: ruby
 authors:
 - Gero Keller
@@ -191,6 +191,7 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".vscode/settings.json"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -208,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