May 29, 2018 · May 29, 2018 · May 30, 2018 · May 30, 2018 · May 30, 2018 · May 30, 2018
diff --git a/.gitignore b/.gitignore
 bin/
 bin/*
 !bin/git-generate-changelog
 !bin/github_changelog_generator
 !bin/gitlab_changelog_generator
 pkg/
 coverage/
 .bundle
diff --git a/bin/gitlab_changelog_generator b/bin/gitlab_changelog_generator
 #! /usr/bin/env ruby
 # frozen_string_literal: true

 require_relative "../lib/gitlab_changelog_generator"
 GitLabChangelogGenerator::ChangelogGenerator.new.run
diff --git a/lib/github_changelog_generator/generator/generator.rb b/lib/github_changelog_generator/generator/generator.rb
 # frozen_string_literal: true

 require "github_changelog_generator/octo_fetcher"
 require "github_changelog_generator/gitlab_fetcher"
 require "github_changelog_generator/generator/generator_fetcher"
 require "github_changelog_generator/generator/generator_processor"
 require "github_changelog_generator/generator/generator_tags"
    def initialize(options = {})
      @options        = options
      @tag_times_hash = {}
      @fetcher        = GitHubChangelogGenerator::OctoFetcher.new(options)
      @fetcher        =options[:gitlab] ? GitLabChangelogGenerator::GitlabFetcher.new(options) :GitHubChangelogGenerator::OctoFetcher.new(options)
      @sections       = []
    end

diff --git a/lib/github_changelog_generator/generator/generator_fetcher.rb b/lib/github_changelog_generator/generator/generator_fetcher.rb
      print "Fetching events for issues and PR: 0/#{@issues.count + @pull_requests.count}\r" if options[:verbose]

      # Async fetching events:
      @fetcher.fetch_events_async(@issues + @pull_requests)
      @fetcher.fetch_events_async(@issues)
      @fetcher.fetch_events_async(@pull_requests)
    end

    # Async fetching of all tags dates
        # fetch that. See
        # https://developer.github.com/v3/pulls/#get-a-single-pull-request vs.
        # https://developer.github.com/v3/pulls/#list-pull-requests
        if pr["events"] && (event = pr["events"].find { |e| e["event"] == "merged" })
        # gitlab API has this
        merge_commit_sha = try_merge_commit_sha_from_gitlab(pr)
        if merge_commit_sha
          # Iterate tags.reverse (oldest to newest) to find first tag of each PR.
          if (oldest_tag = tags.reverse.find { |tag| tag["shas_in_tag"].include?(event["commit_id"]) })
          if (oldest_tag = tags.reverse.find { |tag| tag["shas_in_tag"].include?(merge_commit_sha) })
            pr["first_occurring_tag"] = oldest_tag["name"]
            found = true
            i += 1
      end
    end

    def try_merge_commit_sha_from_gitlab(merge_request)
      merge_commit_sha = nil
      if merge_request.key?("merge_commit_sha")
        merge_commit_sha = merge_request["merge_commit_sha"]
      elsif merge_request["events"] && (event = merge_request["events"].find { |e| e["event"] == "merged" })
        merge_commit_sha = event["commit_id"]
      end
      merge_commit_sha
    end

    # Associate merged PRs by the HEAD of the release branch. If no
    # --release-branch was specified, then the github default branch is used.
    #
    # @param [Hash] issue
    def find_closed_date_by_commit(issue)
      unless issue["events"].nil?
        # if it's PR -> then find "merged event", in case of usual issue ->fond closed date
        # if it's PR -> then find "merged event", in case of usual issue ->find closed date
        compare_string = issue["merged_at"].nil? ? "closed" : "merged"
        # reverse! - to find latest closed event. (event goes in date order)
        issue["events"].reverse!.each do |event|
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,7 @@
		bin/
		bin/*
		!bin/git-generate-changelog
		!bin/github_changelog_generator
		!bin/gitlab_changelog_generator
		pkg/
		coverage/
		.bundle
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		#! /usr/bin/env ruby
olleolleolle marked this conversation as resolved. Show resolvedHide resolved
		# frozen_string_literal: true

		require_relative "../lib/gitlab_changelog_generator"
		GitLabChangelogGenerator::ChangelogGenerator.new.run
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,7 @@
		# frozen_string_literal: true

		require "github_changelog_generator/octo_fetcher"
		require "github_changelog_generator/gitlab_fetcher"
		require "github_changelog_generator/generator/generator_fetcher"
		require "github_changelog_generator/generator/generator_processor"
		require "github_changelog_generator/generator/generator_tags"
Expand DownExpand Up		@@ -34,7 +35,7 @@ class Generator
		def initialize(options = {})
		@options = options
		@tag_times_hash = {}
		@fetcher = GitHubChangelogGenerator::OctoFetcher.new(options)
		@fetcher =options[:gitlab] ? GitLabChangelogGenerator::GitlabFetcher.new(options) :GitHubChangelogGenerator::OctoFetcher.new(options)
		@sections = []
		end

Expand Down