diff --git a/lib/github_changelog_generator.rb b/lib/github_changelog_generator.rb index 4e9bb83..8017f8b 100755 --- a/lib/github_changelog_generator.rb +++ b/lib/github_changelog_generator.rb @@ -30,7 +30,7 @@ module GitHubChangelogGenerator @github = Github.new oauth_token: @github_token end - generator = Generator.new(@options) + @generator = Generator.new(@options) @all_tags = self.get_all_tags @pull_requests = self.get_all_closed_pull_requests @@ -142,7 +142,7 @@ module GitHubChangelogGenerator output_filename = "#{@options[:output]}" File.open(output_filename, 'w') { |file| file.write(log) } - puts "Done! Generated log placed in #{output_filename}" + puts "Done! Generated log placed in #{`pwd`.strip!}/#{output_filename}" end @@ -268,7 +268,7 @@ module GitHubChangelogGenerator if @options[:pulls] # Generate pull requests: pull_requests.each { |pull_request| - merge = generator.get_string_for_pull_request(pull_request) + merge = @generator.get_string_for_pull_request(pull_request) log += "- #{merge}" } if pull_requests @@ -314,6 +314,9 @@ module GitHubChangelogGenerator intro = 'Implemented enhancement' end + dict[:title].gsub! '>', '\>' + dict[:title].gsub! '*', '\*' + dict[:title].gsub! '_', '\_' merge = "*#{intro}:* #{dict[:title]} [\\##{dict[:number]}](#{dict.html_url})\n\n" log += "- #{merge}" } diff --git a/lib/github_changelog_generator/generator.rb b/lib/github_changelog_generator/generator.rb index 68c314f..1fa7cda 100644 --- a/lib/github_changelog_generator/generator.rb +++ b/lib/github_changelog_generator/generator.rb @@ -6,8 +6,11 @@ module GitHubChangelogGenerator end def get_string_for_pull_request(pull_request) - trimmed_title = pull_request[:title].gsub '>', '/>' - merge = "#{@options[:merge_prefix]}#{trimmed_title} [\\##{pull_request[:number]}](#{pull_request.html_url})" + pull_request[:title].gsub! '>', '\>' + pull_request[:title].gsub! '*', '\*' + pull_request[:title].gsub! '_', '\_' + + merge = "#{@options[:merge_prefix]}#{pull_request[:title]} [\\##{pull_request[:number]}](#{pull_request.html_url})" if @options[:author] merge += " ([#{pull_request.user.login}](#{pull_request.user.html_url}))\n\n" else