Merge branch 'new-features'

CHANGELOG.md

@@ -2,12 +2,12 @@
 
 ## [1.1.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.0)
 #### 10/11/14
-- *Fixed bug:* Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/Github-Changelog-Generator/issues/12)
-
 - *Implemented enhancement:* Detect username and project form origin [\#11](https://github.com/skywinder/Github-Changelog-Generator/issues/11)
 
 - *Fixed bug:* Markdown formating in the last line wrong [\#9](https://github.com/skywinder/Github-Changelog-Generator/issues/9)
 
+- *Fixed bug:* Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/Github-Changelog-Generator/issues/12)
+
 ## [1.0.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.0.1)
 #### 10/11/14
 - *Merged pull-request:* Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8)
@@ -22,10 +22,10 @@
 
 - *Implemented enhancement:* Add support for fixed issues and implemented enchanments. [\#6](https://github.com/skywinder/Github-Changelog-Generator/issues/6)
 
-- *Fixed bug:* Last tag not appeared in changelog [\#5](https://github.com/skywinder/Github-Changelog-Generator/issues/5)
-
 - *Implemented enhancement:* Implement option to specify output filename [\#4](https://github.com/skywinder/Github-Changelog-Generator/issues/4)
 
+- *Fixed bug:* Last tag not appeared in changelog [\#5](https://github.com/skywinder/Github-Changelog-Generator/issues/5)
+
 - *Closed issue:* Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7)
 
 - *Closed issue:* Fix parsing date of pull request [\#3](https://github.com/skywinder/Github-Changelog-Generator/pull/3)
@@ -36,10 +36,10 @@
 
 - *Merged pull-request:* Add option (-o --output) to specify name of the output file. [\#1](https://github.com/skywinder/Github-Changelog-Generator/pull/1)
 
-- *Closed issue:* Add changelog generation for last tag [\#2](https://github.com/skywinder/Github-Changelog-Generator/pull/2)
-
 - *Closed issue:* Add option (-o --output) to specify name of the output file. [\#1](https://github.com/skywinder/Github-Changelog-Generator/pull/1)
 
+- *Closed issue:* Add changelog generation for last tag [\#2](https://github.com/skywinder/Github-Changelog-Generator/pull/2)
+
 ## [0.0.2] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.2)
 #### 06/11/14
 ## [0.0.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.1)

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,34 +237,47 @@ class ChangelogGenerator
     if @options[:issues]
       # Generate issues:
       if issues
-        issues.each { |dict|
+        issues.sort! { |x, y|
-          is_bug = false
+          if x.labels.any? && y.labels.any?
-          is_enhancement = false
+            x.labels[0].name <=> y.labels[0].name
-          dict.labels.each { |label|
+          else
-            if label.name == 'bug'
+            if x.labels.any?
-              is_bug = true
+              1
+            else
+              if y.labels.any?
+                -1
+              else
+                0
+              end
             end
-            if label.name == 'enhancement'
-              is_enhancement = true
-            end
-          }
-
-          intro = 'Closed issue'
-          if is_bug
-            intro = 'Fixed bug'
           end
-
+        }.reverse!
-          if is_enhancement
-            intro = 'Implemented enhancement'
-          end
-
-          merge = "*#{intro}:* #{dict[:title]} [\\##{dict[:number]}](https://github.com/#{@options[:user]}/#{@options[:project]}/issues/#{dict[:number]})\n\n"
-          log += "- #{merge}"
-        }
       end
+      issues.each { |dict|
+        is_bug = false
+        is_enhancement = false
+        dict.labels.each { |label|
+          if label.name == 'bug'
+            is_bug = true
+          end
+          if label.name == 'enhancement'
+            is_enhancement = true
+          end
+        }
 
+        intro = 'Closed issue'
+        if is_bug
+          intro = 'Fixed bug'
+        end
+
+        if is_enhancement
+          intro = 'Implemented enhancement'
+        end
+
+        merge = "*#{intro}:* #{dict[:title]} [\\##{dict[:number]}](#{dict.html_url})\n\n"
+        log += "- #{merge}"
+      }
     end
-
     log
   end
 
@@ -290,12 +303,12 @@ class ChangelogGenerator
     issues_req = @github.issues.list user: @options[:user], repo: @options[:project], state: 'closed', filter: 'all', labels: nil
 
     filtered_issues = issues_req.body.select { |issues|
-      (issues.labels.map { |issue| issue.name} & @options[:labels]).any?
+      (issues.labels.map { |issue| issue.name } & @options[:labels]).any?
-      }
+    }
 
     if @options[:add_issues_wo_labels]
       issues_wo_labels = issues_req.body.select {
-          |issues| !issues.labels.map { |issue| issue.name}.any?
+          |issues| !issues.labels.map { |issue| issue.name }.any?
       }
       filtered_issues.concat(issues_wo_labels)
     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]'