github_changelog_generator 1.15.2 → 1.16.4

data/lib/github_changelog_generator/generator/generator_processor.rb

@@ -69,6 +69,9 @@ module GitHubChangelogGenerator
         # leave issues without milestones
         if issue["milestone"].nil?
           true
+        # remove issues of open milestones if option is set
+        elsif issue["milestone"]["state"] == "open"
+          @options[:issues_of_open_milestones]
         else
           # check, that this milestone in tag list:
           @filtered_tags.find { |tag| tag["name"] == issue["milestone"]["title"] }.nil?
@@ -130,21 +133,19 @@ module GitHubChangelogGenerator
     end
 
     def tag_older_new_tag?(newer_tag_time, time)
-      tag_in_range_new = if newer_tag_time.nil?
-                           true
-                         else
-                           time <= newer_tag_time
-                         end
-      tag_in_range_new
+      if newer_tag_time.nil?
+        true
+      else
+        time <= newer_tag_time
+      end
     end
 
     def tag_newer_old_tag?(older_tag_time, time)
-      tag_in_range_old = if older_tag_time.nil?
-                           true
-                         else
-                           time > older_tag_time
-                         end
-      tag_in_range_old
+      if older_tag_time.nil?
+        true
+      else
+        time > older_tag_time
+      end
     end
 
     # Include issues with labels, specified in :include_labels
@@ -152,22 +153,24 @@ module GitHubChangelogGenerator
     # @return [Array] filtered array of issues
     def include_issues_by_labels(issues)
       filtered_issues = filter_by_include_labels(issues)
-      filtered_issues = filter_wo_labels(filtered_issues)
-      filtered_issues
+      filter_wo_labels(filtered_issues)
     end
 
-    # @param [Array] issues Issues & PRs to filter when without labels
+    # @param [Array] items Issues & PRs to filter when without labels
     # @return [Array] Issues & PRs without labels or empty array if
     #                 add_issues_wo_labels or add_pr_wo_labels are false
-    def filter_wo_labels(issues)
-      if (!issues.empty? && issues.first.key?("pull_requests") && options[:add_pr_wo_labels]) || options[:add_issues_wo_labels]
-        issues
-      else
-        issues.select { |issue| issue["labels"].map { |l| l["name"] }.any? }
+    def filter_wo_labels(items)
+      if items.any? && items.first.key?("pull_request")
+        return items if options[:add_pr_wo_labels]
+      elsif options[:add_issues_wo_labels]
+        return items
       end
+      # The default is to filter items without labels
+      items.select { |item| item["labels"].map { |l| l["name"] }.any? }
     end
 
     # @todo Document this
+    # @param [Object] issues
     def filter_by_include_labels(issues)
       if options[:include_labels].nil?
         issues

data/lib/github_changelog_generator/generator/generator_tags.rb

@@ -11,15 +11,10 @@ module GitHubChangelogGenerator
       fetch_tags_dates(all_tags) # Creates a Hash @tag_times_hash
       all_sorted_tags = sort_tags_by_date(all_tags)
 
-      @sorted_tags   = filter_excluded_tags(all_sorted_tags)
+      @sorted_tags   = filter_included_tags(all_sorted_tags)
+      @sorted_tags   = filter_excluded_tags(@sorted_tags)
       @filtered_tags = get_filtered_tags(@sorted_tags)
-
-      # Because we need to properly create compare links, we need a sorted list
-      # of all filtered tags (including the excluded ones). We'll exclude those
-      # tags from section headers inside the mapping function.
-      section_tags = get_filtered_tags(all_sorted_tags)
-
-      @tag_section_mapping = build_tag_section_mapping(section_tags, @filtered_tags)
+      @tag_section_mapping = build_tag_section_mapping(@filtered_tags, @filtered_tags)
 
       @filtered_tags
     end
@@ -83,7 +78,7 @@ module GitHubChangelogGenerator
     # @return [Array] link, name and time of the tag
     def detect_link_tag_time(newer_tag)
       # if tag is nil - set current time
-      newer_tag_time = newer_tag.nil? ? Time.new : get_time_of_tag(newer_tag)
+      newer_tag_time = newer_tag.nil? ? Time.new.getutc : get_time_of_tag(newer_tag)
 
       # if it's future release tag - set this value
       if newer_tag.nil? && options[:future_release]
@@ -161,6 +156,17 @@ module GitHubChangelogGenerator
       filtered_tags
     end
 
+    # @param [Array] all_tags all tags
+    # @return [Array] filtered tags according to :include_tags_regex option
+    def filter_included_tags(all_tags)
+      if options[:include_tags_regex]
+        regex = Regexp.new(options[:include_tags_regex])
+        all_tags.select { |tag| regex =~ tag["name"] }
+      else
+        all_tags
+      end
+    end
+
     # @param [Array] all_tags all tags
     # @return [Array] filtered tags according :exclude_tags or :exclude_tags_regex option
     def filter_excluded_tags(all_tags)

data/lib/github_changelog_generator/generator/section.rb

@@ -7,7 +7,23 @@ module GitHubChangelogGenerator
   #
   # @see GitHubChangelogGenerator::Entry
   class Section
-    attr_accessor :name, :prefix, :issues, :labels, :body_only
+    # @return [String]
+    attr_accessor :name
+
+    # @return [String] a merge prefix, or an issue prefix
+    attr_reader :prefix
+
+    # @return [Array<Hash>]
+    attr_reader :issues
+
+    # @return [Array<String>]
+    attr_reader :labels
+
+    # @return [Boolean]
+    attr_reader :body_only
+
+    # @return [Options]
+    attr_reader :options
 
     def initialize(opts = {})
       @name = opts[:name]
@@ -16,11 +32,12 @@ module GitHubChangelogGenerator
       @issues = opts[:issues] || []
       @options = opts[:options] || Options.new({})
       @body_only = opts[:body_only] || false
+      @entry = Entry.new(options)
     end
 
     # Returns the content of a section.
     #
-    # @return [String] Generate section content
+    # @return [String] Generated section content
     def generate_content
       content = ""
 
@@ -49,7 +66,7 @@ module GitHubChangelogGenerator
       encapsulated_title = encapsulate_string issue["title"]
 
       title_with_number = "#{encapsulated_title} [\\##{issue['number']}](#{issue['html_url']})"
-      title_with_number = "#{title_with_number}#{line_labels_for(issue)}" if @options[:issue_line_labels].present?
+      title_with_number = "#{title_with_number}#{@entry.line_labels_for(issue)}" if @options[:issue_line_labels].present?
       line = issue_line_with_user(title_with_number, issue)
       issue_line_with_body(line, issue)
     end
@@ -60,16 +77,16 @@ module GitHubChangelogGenerator
 
       # get issue body till first line break
       body_paragraph = body_till_first_break(issue["body"])
-      # remove spaces from begining and end of the string
+      # remove spaces from beginning of the string
       body_paragraph.rstrip!
       # encapsulate to md
-      encapsulated_body = "\s\s\n" + encapsulate_string(body_paragraph)
+      encapsulated_body = "  \n#{encapsulate_string(body_paragraph)}"
 
       "**#{line}** #{encapsulated_body}"
     end
 
     def body_till_first_break(body)
-      body.split(/\n/).first
+      body.split(/\n/, 2).first
     end
 
     def issue_line_with_user(line, issue)
@@ -95,7 +112,10 @@ module GitHubChangelogGenerator
       string = string.gsub('\\', '\\\\')
 
       ENCAPSULATED_CHARACTERS.each do |char|
-        string = string.gsub(char, "\\#{char}")
+        # Only replace char with escaped version if it isn't inside backticks (markdown inline code).
+        # This relies on each opening '`' being closed (ie an even number in total).
+        # A char is *outside* backticks if there is an even number of backticks following it.
+        string = string.gsub(%r{#{Regexp.escape(char)}(?=([^`]*`[^`]*`)*[^`]*$)}, "\\#{char}")
       end
 
       string

data/lib/github_changelog_generator/helper.rb

@@ -14,7 +14,7 @@ module GitHubChangelogGenerator
     @log ||= if test?
                Logger.new(nil) # don't show any logs when running tests
              else
-               Logger.new(STDOUT)
+               Logger.new($stdout)
              end
     @log.formatter = proc do |severity, _datetime, _progname, msg|
       string = "#{msg}\n"

data/lib/github_changelog_generator/octo_fetcher.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 require "tmpdir"
-require "retriable"
+require "set"
+require "async"
+require "async/barrier"
+require "async/semaphore"
+require "async/http/faraday"
+
 module GitHubChangelogGenerator
   # A Fetcher responsible for all requests to GitHub and all basic manipulation with related data
   # (such as filtering, validating, e.t.c)
@@ -9,8 +14,8 @@ module GitHubChangelogGenerator
   # Example:
   # fetcher = GitHubChangelogGenerator::OctoFetcher.new(options)
   class OctoFetcher
-    PER_PAGE_NUMBER   = 100
-    MAX_THREAD_NUMBER = 10
+    PER_PAGE_NUMBER = 100
+    MAXIMUM_CONNECTIONS = 50
     MAX_FORBIDDEN_RETRIES = 100
     CHANGELOG_GITHUB_TOKEN = "CHANGELOG_GITHUB_TOKEN"
     GH_RATE_LIMIT_EXCEEDED_MSG = "Warning: Can't finish operation: GitHub API rate limit exceeded, changelog may be " \
@@ -31,47 +36,58 @@ module GitHubChangelogGenerator
       @project      = @options[:project]
       @since        = @options[:since]
       @http_cache   = @options[:http_cache]
-      @cache_file   = nil
-      @cache_log    = nil
       @commits      = []
-      @compares     = {}
-      prepare_cache
-      configure_octokit_ssl
-      @client = Octokit::Client.new(github_options)
+      @branches     = nil
+      @graph        = nil
+      @client = nil
+      @commits_in_tag_cache = {}
+    end
+
+    def middleware
+      Faraday::RackBuilder.new do |builder|
+        if @http_cache
+          cache_file = @options.fetch(:cache_file) { File.join(Dir.tmpdir, "github-changelog-http-cache") }
+          cache_log  = @options.fetch(:cache_log) { File.join(Dir.tmpdir, "github-changelog-logger.log") }
+
+          builder.use(
+            Faraday::HttpCache,
+            serializer: Marshal,
+            store: ActiveSupport::Cache::FileStore.new(cache_file),
+            logger: Logger.new(cache_log),
+            shared_cache: false
+          )
+        end
+
+        builder.use Octokit::Response::RaiseError
+        builder.adapter :async_http
+      end
     end
 
-    def prepare_cache
-      return unless @http_cache
+    def connection_options
+      ca_file = @options[:ssl_ca_file] || ENV["SSL_CA_FILE"] || File.expand_path("ssl_certs/cacert.pem", __dir__)
 
-      @cache_file = @options.fetch(:cache_file) { File.join(Dir.tmpdir, "github-changelog-http-cache") }
-      @cache_log  = @options.fetch(:cache_log) { File.join(Dir.tmpdir, "github-changelog-logger.log") }
-      init_cache
+      Octokit.connection_options.merge({ ssl: { ca_file: ca_file } })
     end
 
-    def github_options
-      result = {}
-      github_token = fetch_github_token
-      result[:access_token] = github_token if github_token
-      endpoint = @options[:github_endpoint]
-      result[:api_endpoint] = endpoint if endpoint
-      result
-    end
+    def client_options
+      options = {
+        middleware: middleware,
+        connection_options: connection_options
+      }
 
-    def configure_octokit_ssl
-      ca_file = @options[:ssl_ca_file] || ENV["SSL_CA_FILE"] || File.expand_path("ssl_certs/cacert.pem", __dir__)
-      Octokit.connection_options = { ssl: { ca_file: ca_file } }
-    end
+      if (github_token = fetch_github_token)
+        options[:access_token] = github_token
+      end
 
-    def init_cache
-      Octokit.middleware = Faraday::RackBuilder.new do |builder|
-        builder.use(Faraday::HttpCache, serializer: Marshal,
-                                        store: ActiveSupport::Cache::FileStore.new(@cache_file),
-                                        logger: Logger.new(@cache_log),
-                                        shared_cache: false)
-        builder.use Octokit::Response::RaiseError
-        builder.adapter Faraday.default_adapter
-        # builder.response :logger
+      if (endpoint = @options[:github_endpoint])
+        options[:api_endpoint] = endpoint
       end
+
+      options
+    end
+
+    def client
+      @client ||= Octokit::Client.new(client_options)
     end
 
     DEFAULT_REQUEST_OPTIONS = { per_page: PER_PAGE_NUMBER }
@@ -88,6 +104,9 @@ module GitHubChangelogGenerator
     # Returns the number of pages for a API call
     #
     # @return [Integer] number of pages for this API call in total
+    # @param [Object] request_options
+    # @param [Object] method
+    # @param [Object] client
     def calculate_pages(client, method, request_options)
       # Makes the first API call so that we can call last_response
       check_github_response do
@@ -107,11 +126,11 @@ module GitHubChangelogGenerator
     #
     # @return [Array <Hash>] array of tags in repo
     def github_fetch_tags
-      tags        = []
-      page_i      = 0
-      count_pages = calculate_pages(@client, "tags", {})
+      tags = []
+      page_i = 0
+      count_pages = calculate_pages(client, "tags", {})
 
-      iterate_pages(@client, "tags") do |new_tags|
+      iterate_pages(client, "tags") do |new_tags|
         page_i += PER_PAGE_NUMBER
         print_in_same_line("Fetching tags... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
         tags.concat(new_tags)
@@ -142,9 +161,9 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       print "Fetching closed issues...\r" if @options[:verbose]
       issues = []
       page_i = 0
-      count_pages = calculate_pages(@client, "issues", closed_pr_options)
+      count_pages = calculate_pages(client, "issues", closed_pr_options)
 
-      iterate_pages(@client, "issues", closed_pr_options) do |new_issues|
+      iterate_pages(client, "issues", **closed_pr_options) do |new_issues|
         page_i += PER_PAGE_NUMBER
         print_in_same_line("Fetching issues... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
         issues.concat(new_issues)
@@ -165,10 +184,10 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       pull_requests = []
       options = { state: "closed" }
 
-      page_i      = 0
-      count_pages = calculate_pages(@client, "pull_requests", options)
+      page_i = 0
+      count_pages = calculate_pages(client, "pull_requests", options)
 
-      iterate_pages(@client, "pull_requests", options) do |new_pr|
+      iterate_pages(client, "pull_requests", **options) do |new_pr|
         page_i += PER_PAGE_NUMBER
         log_string = "Fetching merged dates... #{page_i}/#{count_pages * PER_PAGE_NUMBER}"
         print_in_same_line(log_string)
@@ -185,16 +204,20 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     # @param [Array] issues
     # @return [Void]
     def fetch_events_async(issues)
-      i       = 0
-      threads = []
+      i = 0
       # Add accept option explicitly for disabling the warning of preview API.
       preview = { accept: Octokit::Preview::PREVIEW_TYPES[:project_card_events] }
 
-      issues.each_slice(MAX_THREAD_NUMBER) do |issues_slice|
-        issues_slice.each do |issue|
-          threads << Thread.new do
+      barrier = Async::Barrier.new
+      semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
+
+      Sync do
+        client = self.client
+
+        issues.each do |issue|
+          semaphore.async do
             issue["events"] = []
-            iterate_pages(@client, "issue_events", issue["number"], preview) do |new_event|
+            iterate_pages(client, "issue_events", issue["number"], **preview) do |new_event|
               issue["events"].concat(new_event)
             end
             issue["events"] = issue["events"].map { |event| stringify_keys_deep(event.to_hash) }
@@ -202,12 +225,12 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
             i += 1
           end
         end
-        threads.each(&:join)
-        threads = []
-      end
 
-      # to clear line from prev print
-      print_empty_line
+        barrier.wait
+
+        # to clear line from prev print
+        print_empty_line
+      end
 
       Helper.log.info "Fetching events for issues and PR: #{i}"
     end
@@ -217,21 +240,25 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     # @param [Array] prs The array of PRs.
     # @return [Void] No return; PRs are updated in-place.
     def fetch_comments_async(prs)
-      threads = []
+      barrier = Async::Barrier.new
+      semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
 
-      prs.each_slice(MAX_THREAD_NUMBER) do |prs_slice|
-        prs_slice.each do |pr|
-          threads << Thread.new do
+      Sync do
+        client = self.client
+
+        prs.each do |pr|
+          semaphore.async do
             pr["comments"] = []
-            iterate_pages(@client, "issue_comments", pr["number"]) do |new_comment|
+            iterate_pages(client, "issue_comments", pr["number"]) do |new_comment|
               pr["comments"].concat(new_comment)
             end
             pr["comments"] = pr["comments"].map { |comment| stringify_keys_deep(comment.to_hash) }
           end
         end
-        threads.each(&:join)
-        threads = []
+
+        barrier.wait
       end
+
       nil
     end
 
@@ -247,21 +274,6 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       commit_data["commit"]["committer"]["date"]
     end
 
-    # Fetch and cache comparison between two github refs
-    #
-    # @param [String] older The older sha/tag/branch.
-    # @param [String] newer The newer sha/tag/branch.
-    # @return [Hash] Github api response for comparison.
-    def fetch_compare(older, newer)
-      unless @compares["#{older}...#{newer}"]
-        compare_data = check_github_response { @client.compare(user_project, older, newer || "HEAD") }
-        raise StandardError, "Sha #{older} and sha #{newer} are not related; please file a github-changelog-generator issues and describe how to replicate this issue." if compare_data["status"] == "diverged"
-
-        @compares["#{older}...#{newer}"] = stringify_keys_deep(compare_data.to_hash)
-      end
-      @compares["#{older}...#{newer}"]
-    end
-
     # Fetch commit for specified event
     #
     # @param [String] commit_id the SHA of a commit to fetch
@@ -273,9 +285,11 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
       if found
         stringify_keys_deep(found.to_hash)
       else
+        client = self.client
+
         # cache miss; don't add to @commits because unsure of order.
         check_github_response do
-          commit = @client.commit(user_project, commit_id)
+          commit = client.commit(user_project, commit_id)
           commit = stringify_keys_deep(commit.to_hash)
           commit
         end
@@ -287,8 +301,25 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     # @return [Array] Commits in a repo.
     def commits
       if @commits.empty?
-        iterate_pages(@client, "commits") do |new_commits|
-          @commits.concat(new_commits)
+        Sync do
+          barrier = Async::Barrier.new
+          semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
+
+          if (since_commit = @options[:since_commit])
+            iterate_pages(client, "commits_since", since_commit, parent: semaphore) do |new_commits|
+              @commits.concat(new_commits)
+            end
+          else
+            iterate_pages(client, "commits", parent: semaphore) do |new_commits|
+              @commits.concat(new_commits)
+            end
+          end
+
+          barrier.wait
+
+          @commits.sort! do |b, a|
+            a[:commit][:author][:date] <=> b[:commit][:author][:date]
+          end
         end
       end
       @commits
@@ -303,42 +334,63 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
 
     # @return [String] Default branch of the repo
     def default_branch
-      @default_branch ||= @client.repository(user_project)[:default_branch]
+      @default_branch ||= client.repository(user_project)[:default_branch]
+    end
+
+    # @param [String] name
+    # @return [Array<String>]
+    def commits_in_branch(name)
+      @branches ||= client.branches(user_project).map { |branch| [branch[:name], branch] }.to_h
+
+      if (branch = @branches[name])
+        commits_in_tag(branch[:commit][:sha])
+      else
+        []
+      end
     end
 
     # Fetch all SHAs occurring in or before a given tag and add them to
     # "shas_in_tag"
     #
     # @param [Array] tags The array of tags.
-    # @return [Nil] No return; tags are updated in-place.
-    def fetch_tag_shas_async(tags)
-      i = 0
-      threads = []
-      print_in_same_line("Fetching SHAs for tags: #{i}/#{tags.count}\r") if @options[:verbose]
-
-      tags.each_slice(MAX_THREAD_NUMBER) do |tags_slice|
-        tags_slice.each do |tag|
-          threads << Thread.new do
-            # Use oldest commit because comparing two arbitrary tags may be diverged
-            commits_in_tag = fetch_compare(oldest_commit["sha"], tag["name"])
-            tag["shas_in_tag"] = commits_in_tag["commits"].collect { |commit| commit["sha"] }
-            print_in_same_line("Fetching SHAs for tags: #{i + 1}/#{tags.count}") if @options[:verbose]
-            i += 1
+    # @return void
+    def fetch_tag_shas(tags)
+      # Reverse the tags array to gain max benefit from the @commits_in_tag_cache
+      tags.reverse_each do |tag|
+        tag["shas_in_tag"] = commits_in_tag(tag["commit"]["sha"])
+      end
+    end
+
+    private
+
+    # @param [Set] shas
+    # @param [Object] sha
+    def commits_in_tag(sha, shas = Set.new)
+      # Reduce multiple runs for the same tag
+      return @commits_in_tag_cache[sha] if @commits_in_tag_cache.key?(sha)
+
+      @graph ||= commits.map { |commit| [commit[:sha], commit] }.to_h
+      return shas unless (current = @graph[sha])
+
+      queue = [current]
+      while queue.any?
+        commit = queue.shift
+        # If we've already processed this sha, just grab it's parents from the cache
+        if @commits_in_tag_cache.key?(commit[:sha])
+          shas.merge(@commits_in_tag_cache[commit[:sha]])
+        else
+          shas.add(commit[:sha])
+          commit[:parents].each do |p|
+            queue.push(@graph[p[:sha]]) unless shas.include?(p[:sha])
           end
         end
-        threads.each(&:join)
-        threads = []
       end
 
-      # to clear line from prev print
-      print_empty_line
-
-      Helper.log.info "Fetching SHAs for tags: #{i}"
-      nil
+      @commits_in_tag_cache[sha] = shas
+      shas
     end
 
-    private
-
+    # @param [Object] indata
     def stringify_keys_deep(indata)
       case indata
       when Array
@@ -362,45 +414,62 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     #
     # @param [Octokit::Client] client
     # @param [String] method (eg. 'tags')
+    # @param [Array] arguments
+    # @param [Async::Semaphore] parent
     #
     # @yield [Sawyer::Resource] An OctoKit-provided response (which can be empty)
     #
     # @return [void]
-    def iterate_pages(client, method, *args)
-      args << DEFAULT_REQUEST_OPTIONS.merge(extract_request_args(args))
+    # @param [Hash] options
+    def iterate_pages(client, method, *arguments, parent: nil, **options)
+      options = DEFAULT_REQUEST_OPTIONS.merge(options)
 
-      check_github_response { client.send(method, user_project, *args) }
+      check_github_response { client.send(method, user_project, *arguments, **options) }
       last_response = client.last_response.tap do |response|
         raise(MovedPermanentlyError, response.data[:url]) if response.status == 301
       end
 
       yield(last_response.data)
 
-      until (next_one = last_response.rels[:next]).nil?
-        last_response = check_github_response { next_one.get }
-        yield(last_response.data)
-      end
-    end
-
-    def extract_request_args(args)
-      if args.size == 1 && args.first.is_a?(Hash)
-        args.delete_at(0)
-      elsif args.size > 1 && args.last.is_a?(Hash)
-        args.delete_at(args.length - 1)
-      else
-        {}
+      if parent.nil?
+        # The snail visits one leaf at a time:
+        until (next_one = last_response.rels[:next]).nil?
+          last_response = check_github_response { next_one.get }
+          yield(last_response.data)
+        end
+      elsif (last = last_response.rels[:last])
+        # OR we bring out the gatling gun:
+        parameters = querystring_as_hash(last.href)
+        last_page = Integer(parameters["page"])
+
+        (2..last_page).each do |page|
+          parent.async do
+            data = check_github_response { client.send(method, user_project, *arguments, page: page, **options) }
+            yield data
+          end
+        end
       end
     end
 
     # This is wrapper with rescue block
     #
     # @return [Object] returns exactly the same, what you put in the block, but wrap it with begin-rescue block
+    # @param [Proc] block
     def check_github_response
-      Retriable.retriable(retry_options) do
-        yield
-      end
+      yield
     rescue MovedPermanentlyError => e
       fail_with_message(e, "The repository has moved, update your configuration")
+    rescue Octokit::TooManyRequests => e
+      resets_in = client.rate_limit.resets_in
+      Helper.log.error("#{e.class} #{e.message}; sleeping for #{resets_in}s...")
+
+      if (task = Async::Task.current?)
+        task.sleep(resets_in)
+      else
+        sleep(resets_in)
+      end
+
+      retry
     rescue Octokit::Forbidden => e
       fail_with_message(e, "Exceeded retry limit")
     rescue Octokit::Unauthorized => e
@@ -408,36 +477,14 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     end
 
     # Presents the exception, and the aborts with the message.
+    # @param [Object] message
+    # @param [Object] error
     def fail_with_message(error, message)
       Helper.log.error("#{error.class}: #{error.message}")
       sys_abort(message)
     end
 
-    # Exponential backoff
-    def retry_options
-      {
-        on: [Octokit::Forbidden],
-        tries: MAX_FORBIDDEN_RETRIES,
-        base_interval: sleep_base_interval,
-        multiplier: 1.0,
-        rand_factor: 0.0,
-        on_retry: retry_callback
-      }
-    end
-
-    def sleep_base_interval
-      1.0
-    end
-
-    def retry_callback
-      proc do |exception, try, elapsed_time, next_interval|
-        Helper.log.warn("RETRY - #{exception.class}: '#{exception.message}'")
-        Helper.log.warn("#{try} tries in #{elapsed_time} seconds and #{next_interval} seconds until the next try")
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG
-        Helper.log.warn @client.rate_limit
-      end
-    end
-
+    # @param [Object] msg
     def sys_abort(msg)
       abort(msg)
     end
@@ -446,7 +493,7 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
     #
     # @param [String] log_string
     def print_in_same_line(log_string)
-      print log_string + "\r"
+      print "#{log_string}\r"
     end
 
     # Print long line with spaces on same line to clear prev message