ci_toolkit 1.3.20 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2096ce820b686ee44a17e3576dc90aa18fd4f1531dd9f10ca2b511dd65ec6121
-  data.tar.gz: 879e014ce2774ed78a47ac07b6779237b0dcae70880acbf031a73d4ea5760987
+  metadata.gz: 9ec84e9df5ccdb8c5973654799832cb3493a1e4272ca999c8c8460cfb6c1f966
+  data.tar.gz: be840d3a2552a05e63898f965d6060f7d569aa7a44a8ee585dc40396f3758547
 SHA512:
-  metadata.gz: 7bb137b59486325c1cde56d1995ade924069ed12e8f6ab5ce21eabf2eb938cf9be74fb318737fbb3d5db33b87c863e7485fb880dc7dab9fb458f1df88ac5045f
-  data.tar.gz: a090967762827cd57762cbc4984b6bb18026ffb2ae5612e9d10735b0815bf153f4a8a7653a5b28b43b2711be8592b2d7f315de8a3a676b8e6ae1f49e08289f44
+  metadata.gz: cf9a592e77fba9afc269c827e77c41145c94b983f8bc522afb526a15a5a30b27881cdc9e176275152251e16ae591c62e16028fc7659545726ebcf1e4a451886a
+  data.tar.gz: 401b12e3068c5a23b35d020ebd0c8a810b9c0e642b9593ed94bae512931dd2dc3a5a1fae5c8d4d734d54535b651f694a5b7ab87aad260754c942bab14e97b412

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.3.20)
+    ci_toolkit (1.4.2)
       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,64 @@
+# 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
+        return if @private_key.nil?
+
+        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.20
+  version: 1.4.2
 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