Sort issues by tags

lib/github_changelog_generator.rb

@@ -228,7 +228,7 @@ class ChangelogGenerator
       # Generate pull requests:
       if pull_requests
         pull_requests.each { |dict|
-          merge = "#{dict[:title]} [\\##{dict[:number]}](https://github.com/#{@options[:user]}/#{@options[:project]}/pull/#{dict[:number]})\n\n"
+          merge = "#{@options[:merge_prefix]}#{dict[:title]} [\\##{dict[:number]}](#{dict.html_url})\n\n"
           log += "- #{merge}"
         }
       end
@@ -237,6 +237,22 @@ class ChangelogGenerator
     if @options[:issues]
       # Generate issues:
       if issues
+        issues.sort! { |x, y|
+          if x.labels.any? && y.labels.any?
+            x.labels[0].name <=> y.labels[0].name
+          else
+            if x.labels.any?
+              1
+            else
+              if y.labels.any?
+                -1
+              else
+                0
+              end
+            end
+          end
+        }.reverse!
+      end
       issues.each { |dict|
         is_bug = false
         is_enhancement = false
@@ -258,13 +274,10 @@ class ChangelogGenerator
           intro = 'Implemented enhancement'
         end
 
-          merge = "*#{intro}:* #{dict[:title]} [\\##{dict[:number]}](https://github.com/#{@options[:user]}/#{@options[:project]}/issues/#{dict[:number]})\n\n"
+        merge = "*#{intro}:* #{dict[:title]} [\\##{dict[:number]}](#{dict.html_url})\n\n"
         log += "- #{merge}"
       }
     end
-
-    end
-
     log
   end
 

lib/github_changelog_generator/parser.rb

@@ -3,7 +3,7 @@ require 'optparse'
 
 class Parser
   def self.parse_options
-    options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y', :output => 'CHANGELOG.md', :labels => %w(bug enhancement), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true }
+    options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y', :output => 'CHANGELOG.md', :labels => %w(bug enhancement), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true, :merge_prefix => '*Merged pull-request:* ' }
 
     parser = OptionParser.new { |opts|
       opts.banner = 'Usage: changelog_generator [options]'