From 63bf4a59d46fb114a384d6a00031dcaaedbfd355 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Wed, 4 Mar 2015 16:45:18 +0200 Subject: [PATCH 1/4] fix help message --- lib/github_changelog_generator/parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/parser.rb b/lib/github_changelog_generator/parser.rb index 0a4e034..3c8b5cd 100644 --- a/lib/github_changelog_generator/parser.rb +++ b/lib/github_changelog_generator/parser.rb @@ -31,7 +31,7 @@ module GitHubChangelogGenerator options = hash parser = OptionParser.new { |opts| - opts.banner = 'Usage: changelog_generator [options]' + opts.banner = 'Usage: github_changelog_generator [options]' opts.on('-u', '--user [USER]', 'Username of the owner of target GitHub repo') do |last| options[:user] = last end From f8f887093a87136e4eed6fa49035e84959b4ed72 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Wed, 4 Mar 2015 19:40:15 +0200 Subject: [PATCH 2/4] update changelog test repo --- lib/CHANGELOG.md | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/CHANGELOG.md b/lib/CHANGELOG.md index 12da622..e4c072b 100644 --- a/lib/CHANGELOG.md +++ b/lib/CHANGELOG.md @@ -1,24 +1,18 @@ # Change Log -## [Unreleased](https://github.com/nantas/changelog_test/tree/HEAD) (2015-03-03) +## [Unreleased](https://github.com/skywinder/changelog_test/tree/HEAD) -[Full Changelog](https://github.com/nantas/changelog_test/compare/v0.0.1...HEAD) +[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.2...HEAD) -**Fixed bugs:** +**Merged pull requests:** -- test issue closed by a commit that will be gone [\#3](https://github.com/nantas/changelog_test/issues/3) +- Here is a test hotfix should appear in v.0.0.2 [\#2](https://github.com/skywinder/changelog_test/pull/2) ([skywinder](https://github.com/skywinder)) -**Closed issues:** +## [v0.0.2](https://github.com/skywinder/changelog_test/tree/v0.0.2) (2015-03-04) -- test issue that will be closed in another repo [\#4](https://github.com/nantas/changelog_test/issues/4) +[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.1...v0.0.2) -## [v0.0.1](https://github.com/nantas/changelog_test/tree/v0.0.1) (2015-03-02) - -**Fixed bugs:** - -- test issue that will be closed by a commit [\#2](https://github.com/nantas/changelog_test/issues/2) - -- test issue that will close normally [\#1](https://github.com/nantas/changelog_test/issues/1) +## [v0.0.1](https://github.com/skywinder/changelog_test/tree/v0.0.1) (2015-03-02) From 26c393c2cc64949edd8cafe1456430fcbb5e17e8 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Wed, 4 Mar 2015 21:25:21 +0200 Subject: [PATCH 3/4] Fix #60. Thanks, @GeekOnCoffee! --- CHANGELOG.md | 18 +++--- lib/CHANGELOG.md | 10 +++- lib/github_changelog_generator.rb | 91 +++++++++++++------------------ 3 files changed, 53 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6539bc..f6ea338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ **Closed issues:** -- Add \# character to wrapping list. [\#58](https://github.com/skywinder/Github-Changelog-Generator/issues/58) +- Add \# character to encapsulate list. [\#58](https://github.com/skywinder/Github-Changelog-Generator/issues/58) ## [1.3.2](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.2) (2015-03-03) @@ -108,10 +108,6 @@ - Crash when try generate log for rails [\#35](https://github.com/skywinder/Github-Changelog-Generator/issues/35) -**Merged pull requests:** - -- Implement async fetching [\#39](https://github.com/skywinder/Github-Changelog-Generator/pull/39) ([skywinder](https://github.com/skywinder)) - ## [1.2.3](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.3) (2014-12-16) [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.2...1.2.3) @@ -128,6 +124,8 @@ **Merged pull requests:** +- Implement async fetching [\#39](https://github.com/skywinder/Github-Changelog-Generator/pull/39) ([skywinder](https://github.com/skywinder)) + - Fix crash when user is NULL [\#40](https://github.com/skywinder/Github-Changelog-Generator/pull/40) ([skywinder](https://github.com/skywinder)) ## [1.2.2](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.2) (2014-12-10) @@ -220,10 +218,6 @@ [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.0.0...1.0.1) -**Merged pull requests:** - -- Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8) ([skywinder](https://github.com/skywinder)) - ## [1.0.0](https://github.com/skywinder/Github-Changelog-Generator/tree/1.0.0) (2014-11-07) [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/0.1.0...1.0.0) @@ -240,9 +234,9 @@ **Merged pull requests:** -- Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7) ([skywinder](https://github.com/skywinder)) +- Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8) ([skywinder](https://github.com/skywinder)) -- Fix parsing date of pull request [\#3](https://github.com/skywinder/Github-Changelog-Generator/pull/3) ([skywinder](https://github.com/skywinder)) +- Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7) ([skywinder](https://github.com/skywinder)) ## [0.1.0](https://github.com/skywinder/Github-Changelog-Generator/tree/0.1.0) (2014-11-07) @@ -250,6 +244,8 @@ **Merged pull requests:** +- Fix parsing date of pull request [\#3](https://github.com/skywinder/Github-Changelog-Generator/pull/3) ([skywinder](https://github.com/skywinder)) + - Add changelog generation for last tag [\#2](https://github.com/skywinder/Github-Changelog-Generator/pull/2) ([skywinder](https://github.com/skywinder)) - Add option \(-o --output\) to specify name of the output file. [\#1](https://github.com/skywinder/Github-Changelog-Generator/pull/1) ([skywinder](https://github.com/skywinder)) diff --git a/lib/CHANGELOG.md b/lib/CHANGELOG.md index e4c072b..e1e78b3 100644 --- a/lib/CHANGELOG.md +++ b/lib/CHANGELOG.md @@ -1,17 +1,21 @@ # Change Log -## [Unreleased](https://github.com/skywinder/changelog_test/tree/HEAD) +## [v0.0.3](https://github.com/skywinder/changelog_test/tree/v0.0.3) (2015-03-04) -[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.2...HEAD) +[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.2...v0.0.3) **Merged pull requests:** -- Here is a test hotfix should appear in v.0.0.2 [\#2](https://github.com/skywinder/changelog_test/pull/2) ([skywinder](https://github.com/skywinder)) +- fix \#3. hotfix. Should appear in v0.0.3 [\#4](https://github.com/skywinder/changelog_test/pull/4) ([skywinder](https://github.com/skywinder)) ## [v0.0.2](https://github.com/skywinder/changelog_test/tree/v0.0.2) (2015-03-04) [Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.1...v0.0.2) +**Merged pull requests:** + +- Here is a test hotfix should appear in v.0.0.2 [\#2](https://github.com/skywinder/changelog_test/pull/2) ([skywinder](https://github.com/skywinder)) + ## [v0.0.1](https://github.com/skywinder/changelog_test/tree/v0.0.1) (2015-03-02) diff --git a/lib/github_changelog_generator.rb b/lib/github_changelog_generator.rb index 785a81f..4ff4a1b 100755 --- a/lib/github_changelog_generator.rb +++ b/lib/github_changelog_generator.rb @@ -49,12 +49,12 @@ module GitHubChangelogGenerator if @options[:issues] @issues = self.get_filtered_issues - fetch_event_for_issues(@issues) - detect_actual_closed_dates else @issues = [] end + fetch_event_for_issues_and_pr + detect_actual_closed_dates @tag_times_hash = {} end @@ -65,11 +65,18 @@ module GitHubChangelogGenerator end threads = [] + @issues.each { |issue| threads << Thread.new { find_closed_date_by_commit(issue) } } + + @pull_requests.each { |pull_request| + threads << Thread.new { + find_closed_date_by_commit(pull_request) + } + } threads.each { |thr| thr.join } if @options[:verbose] @@ -79,9 +86,11 @@ module GitHubChangelogGenerator 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 + compare_string = issue[:merged_at].nil? ? 'closed' : 'merged' # reverse! - to find latest closed event. (event goes in date order) issue['events'].reverse!.each { |event| - if event[:event].eql? 'closed' + if event[:event].eql? compare_string if event[:commit_id].nil? issue[:actual_date] = issue[:closed_at] else @@ -111,7 +120,7 @@ module GitHubChangelogGenerator def fetch_merged_at_pull_requests if @options[:verbose] - print "Fetching pull requests...\r" + print "Fetching merged dates...\r" end response = @github.pull_requests.list @options[:user], @options[:project], :state => 'closed' @@ -120,21 +129,22 @@ module GitHubChangelogGenerator response.each_page do |page| page_i += PER_PAGE_NUMBER count_pages = response.count_pages - print "Fetching pull requests... #{page_i}/#{count_pages * PER_PAGE_NUMBER}\r" + print "Fetching merged dates... #{page_i}/#{count_pages * PER_PAGE_NUMBER}\r" pull_requests.concat(page) end print " \r" - if @options[:verbose] - puts "Received pull requests: #{pull_requests.count}" - end - @pull_requests.each { |pr| fetched_pr = pull_requests.find { |fpr| fpr.number == pr.number } pr[:merged_at] = fetched_pr[:merged_at] pull_requests.delete(fetched_pr) } + + if @options[:verbose] + puts 'Fetching merged dates... Done!' + end + end def get_filtered_pull_requests @@ -171,43 +181,6 @@ module GitHubChangelogGenerator end filtered_pull_requests - # - # # - # - # - # unless @options[:pull_request_labels].nil? - # - # if @options[:verbose] - # puts 'Filter all pull requests by labels.' - # end - # - # filtered_pull_requests = filtered_pull_requests.select { |pull_request| - # #fetch this issue to get labels array - # issue = @github.issues.get @options[:user], @options[:project], pull_request.number - # - # #compare is there any labels from @options[:labels] array - # issue_without_labels = !issue.labels.map { |label| label.name }.any? - # - # if @options[:verbose] - # puts "Filter request \##{issue.number}." - # end - # - # if @options[:pull_request_labels].any? - # select_by_label = (issue.labels.map { |label| label.name } & @options[:pull_request_labels]).any? - # else - # select_by_label = false - # end - # - # select_by_label | issue_without_labels - # } - # - # if @options[:verbose] - # puts "Filtered pull requests with specified labels and w/o labels: #{filtered_pull_requests.count}" - # end - # return filtered_pull_requests - # end - # - # filtered_pull_requests end def compund_changelog @@ -359,7 +332,7 @@ module GitHubChangelogGenerator def generate_log_between_tags(older_tag, newer_tag) # older_tag nil - means it's first tag, newer_tag nil - means it unreleased section - filtered_pull_requests = delete_by_time(@pull_requests, :merged_at, older_tag, newer_tag) + filtered_pull_requests = delete_by_time(@pull_requests, :actual_date, older_tag, newer_tag) filtered_issues = delete_by_time(@issues, :actual_date, older_tag, newer_tag) newer_tag_name = newer_tag.nil? ? nil : newer_tag['name'] @@ -628,27 +601,41 @@ module GitHubChangelogGenerator return issues_wo_pr, pull_requests end - def fetch_event_for_issues(filtered_issues) + def fetch_event_for_issues_and_pr if @options[:verbose] - print "Fetching events for issues: 0/#{filtered_issues.count}\r" + print "Fetching events for issues and PR: 0/#{@issues.count + @pull_requests.count}\r" end # Async fetching events: threads = [] i = 0 - filtered_issues.each { |issue| + + @issues.each { |issue| threads << Thread.new { obj = @github.issues.events.list user: @options[:user], repo: @options[:project], issue_number: issue['number'] issue[:events] = obj.body - print "Fetching events for issues: #{i+1}/#{filtered_issues.count}\r" + print "Fetching events for issues and PR: #{i+1}/#{@issues.count + @pull_requests.count}\r" i +=1 } } + + @pull_requests.each { |pull_request| + threads << Thread.new { + obj = @github.issues.events.list user: @options[:user], repo: @options[:project], issue_number: pull_request['number'] + pull_request[:events] = obj.body + print "Fetching events for issues and PR: #{i+1}/#{@issues.count + @pull_requests.count}\r" + i +=1 + } + } + threads.each { |thr| thr.join } + #to clear line from prev print + print " \r" + if @options[:verbose] - puts "Fetching events for issues: Done!" + puts "Fetching events for issues and PR: Done! #{i}/#{@issues.count + @pull_requests.count}" end end From c20529bf3220185e47c20dd2db4e4dee94074ddb Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Wed, 4 Mar 2015 21:27:03 +0200 Subject: [PATCH 4/4] Update gemspec to version 1.3.5 --- lib/github_changelog_generator/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/version.rb b/lib/github_changelog_generator/version.rb index 9a7c47e..bce6426 100644 --- a/lib/github_changelog_generator/version.rb +++ b/lib/github_changelog_generator/version.rb @@ -1,3 +1,3 @@ module GitHubChangelogGenerator - VERSION = '1.3.4' + VERSION = '1.3.5' end