From acd2daada3c52dcca132fd7fe7f3efe59a0de1ac Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Fri, 7 Nov 2014 17:52:07 +0200 Subject: [PATCH] Remove delimeter and fix parser. This final commit should close #6 enchantment! Yay! --- lib/github_changelog_generator.rb | 6 +----- lib/github_changelog_generator/parser.rb | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/github_changelog_generator.rb b/lib/github_changelog_generator.rb index 978d658..358a959 100755 --- a/lib/github_changelog_generator.rb +++ b/lib/github_changelog_generator.rb @@ -231,11 +231,7 @@ class ChangelogGenerator if @options[:issues] # Generate issues: - if issues && issues.any? - if pull_requests && pull_requests.any? && @options[:pulls] - log += "\n\n-\n\n" - end - + if issues issues.each { |dict| merge = "*Fixed issue:* #{dict[:title]} [\\##{dict[:number]}](https://github.com/#{@options[:user]}/#{@options[:project]}/issues/#{dict[:number]})\n\n" log += "- #{merge}" diff --git a/lib/github_changelog_generator/parser.rb b/lib/github_changelog_generator/parser.rb index c856caf..8a6fa20 100644 --- a/lib/github_changelog_generator/parser.rb +++ b/lib/github_changelog_generator/parser.rb @@ -23,7 +23,7 @@ class Parser opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| options[:verbose] = v end - opts.on('-i', '--[no-]issues', 'Include closed issues to changelog') do |v| + opts.on('--[no-]issues', 'Include closed issues to changelog. Default is true') do |v| options[:issues] = v end opts.on('--[no-]pull-requests', 'Include pull-requests to changelog. Default is true') do |v|