Merge branch 'release/1.3.10'

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## [1.3.9](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.9) (2015-03-06)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.8...1.3.9)
+
+**Implemented enhancements:**
+
+- Improve method of detecting owner and repository [\#63](https://github.com/skywinder/Github-Changelog-Generator/issues/63)
+
+**Merged pull requests:**
+
+- Concurrency problem in case of issues \> 2048 [\#65](https://github.com/skywinder/Github-Changelog-Generator/pull/65) ([skywinder](https://github.com/skywinder))
+
+## [1.3.8](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.8) (2015-03-05)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.6...1.3.8)
+
+**Merged pull requests:**
+
+- Fix `git remote` parsing in case, when script running without parameters inside destination directory [\#61](https://github.com/skywinder/Github-Changelog-Generator/pull/61) ([skywinder](https://github.com/skywinder))
+
+## [1.3.6](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.6) (2015-03-05)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.5...1.3.6)
+
+## [1.3.5](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.5) (2015-03-04)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.4...1.3.5)
+
+**Fixed bugs:**
+
+- Pull Requests in Wrong Tag [\#60](https://github.com/skywinder/Github-Changelog-Generator/issues/60)
+
 ## [1.3.4](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.4) (2015-03-03)
 
 [Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.3...1.3.4)

README.md

@@ -62,8 +62,8 @@ Changelog generation has never been so easy.
 		github_changelog_generator
 
 -  or from anywhere:
-
+    - `github_changelog_generator -u github_username -p github_project`
-		github_changelog_generator -u github_username -p github_project
+    - `github_changelog_generator  github_username/github_project`
      
 As output you will get `CHANGELOG.md` file with pretty *Markdown-formatted* changelog.
 
@@ -116,19 +116,19 @@ It's time to create this token or wait for 1 hour before GitHub reset the counte
 
 ##Features and advantages of this project
 - Generate canonical change log file, followed by [keepachangelog.com guidlines](http://keepachangelog.com/)
-- Simply add links for all closed issues and merged pull requests
 - Possible to generate **Unreleased** changes (closed issues that have not released yet)
-- Flexible format customisation:
+- **GitHub Enterprise support** via command line options!
-    - Customize issues, that should be added to changelog
+- Flexible format **customisation**:
-    - Custom date format supported 
+    - **Customize** issues, that **should be added** to changelog
+    - **Custom date format** supported 
     - Ability to manually specify in which version issue was fixed (in case, when closed date is not match) by setting `milestone` of issue the same name as tag of  required version
-    - Ability to exclude specific issues from change log (by labels)
+    - Ability to **exclude specific issues** from change log (by labels)
-        - Automatically exclude "questions" - issues marked as `question` labels (and other issues, that shouldn't be in change log file: with `duplicate invalid wontfix` labels)
+    - **Automatically exclude "questions"** - issues marked as `question` labels (and other issues, that shouldn't be in change log file: with `duplicate invalid wontfix` labels)
-- Distinguish bug fixes, enchantments, and closed issues according labels.
+- **Distinguish** bug fixes, enchantments, and closed issues **according labels**.
-    - 	**Issues** (closed issues w/o any labels)
+    - 	Issues (closed issues w/o any labels)
-    - **Merged pull-requests** (all merged pull-requests)
+    - Merged pull-requests (all merged pull-requests)
-    - **Bug-fixes** (by label `bug` in issue)
+    - Bug-fixes (by label `bug` in issue)
-    - **Enhancements** (by label `enhancement` in issue)
+    - Enhancements (by label `enhancement` in issue)
 
 ###Alternatives
 Here is a [wikipage list of alternatives](https://github.com/skywinder/Github-Changelog-Generator/wiki/Alternatives), that I found. But no one was satisfy my requirements.
@@ -139,7 +139,7 @@ Here is a [wikipage list of alternatives](https://github.com/skywinder/Github-Ch
 ### Projects using this library
 [Wikipage with list of projects](https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) 
 
-*If you are using `github_changelog_generator` for generation change log in your project or know of project that uses it, please add it to [this] (https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) list.*
+*If you are using `github_changelog_generator` for generation change log in your project or know another project that uses it, please add it to [this] (https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) list.*
 
 ## Am I missed some essential feature?
 

github_changelog_generator.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.email = %q{sky4winder+github_changelog_generator@gmail.com}
   spec.date = `date +"%Y-%m-%d"`.strip!
   spec.summary = %q{Script, that automatically generate changelog from your tags, issues, labels and pull requests.}
-  spec.description = %q{Script, that automatically generate changelog from your tags, issues, labels and pull requests.}
+  spec.description = %q{Changelog generation has never been so easy. Fully automate changelog generation - this gem generate change log file based on tags, issues and merged pull requests from Github issue tracker.}
   spec.homepage = %q{https://github.com/skywinder/Github-Changelog-Generator}
   spec.license       = "MIT"
 

lib/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [Unreleased](https://github.com/skywinder/changelog_test/tree/HEAD)
+
+[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.3...HEAD)
+
+**Merged pull requests:**
+
+- Add automatically generated change log file. [\#5](https://github.com/skywinder/changelog_test/pull/5) ([skywinder](https://github.com/skywinder))
+
 ## [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...v0.0.3)

lib/github_changelog_generator.rb

@@ -20,13 +20,7 @@ module GitHubChangelogGenerator
 
       @options = Parser.parse_options
 
-      if options[:verbose]
+      fetch_github_token
-        puts 'Input options:'
-        pp options
-        puts ''
-      end
-
-      github_token
 
       github_options = {per_page: PER_PAGE_NUMBER}
       github_options[:oauth_token] = @github_token unless @github_token.nil?
@@ -42,7 +36,6 @@ module GitHubChangelogGenerator
 
       if @options[:pulls]
         @pull_requests = self.get_filtered_pull_requests
-        self.fetch_merged_at_pull_requests
       else
         @pull_requests = []
       end
@@ -113,11 +106,6 @@ module GitHubChangelogGenerator
       puts JSON.pretty_generate(json)
     end
 
-    def exec_command(cmd)
-      exec_cmd = "cd #{$project_path} and #{cmd}"
-      %x[#{exec_cmd}]
-    end
-
     def fetch_merged_at_pull_requests
       if @options[:verbose]
         print "Fetching merged dates...\r"
@@ -149,12 +137,12 @@ module GitHubChangelogGenerator
 
     def get_filtered_pull_requests
 
-      pull_requests = @pull_requests
+      self.fetch_merged_at_pull_requests
-      filtered_pull_requests = pull_requests
 
+      filtered_pull_requests = @pull_requests.select {|pr| pr[:merged_at] != nil }
 
       unless @options[:include_labels].nil?
-        filtered_pull_requests = pull_requests.select { |issue|
+        filtered_pull_requests = @pull_requests.select { |issue|
           #add all labels from @options[:incluse_labels] array
           (issue.labels.map { |label| label.name } & @options[:include_labels]).any?
         }
@@ -168,7 +156,7 @@ module GitHubChangelogGenerator
       end
 
       if @options[:add_issues_wo_labels]
-        issues_wo_labels = pull_requests.select {
+        issues_wo_labels = @pull_requests.select {
           # add issues without any labels
             |issue| !issue.labels.map { |label| label.name }.any?
         }
@@ -240,7 +228,7 @@ module GitHubChangelogGenerator
 
       log = ''
 
-      if @options[:unreleased]
+      if @options[:unreleased] && @all_tags.count != 0
         unreleased_log = self.generate_log_between_tags(self.all_tags[0], nil)
         if unreleased_log
           log += unreleased_log
@@ -250,8 +238,9 @@ module GitHubChangelogGenerator
       (1 ... self.all_tags.size).each { |index|
         log += self.generate_log_between_tags(self.all_tags[index], self.all_tags[index-1])
       }
-
+      if @all_tags.count != 0
         log += generate_log_between_tags(nil, self.all_tags.last)
+      end
 
       log
     end
@@ -314,12 +303,8 @@ module GitHubChangelogGenerator
       tags
     end
 
-    def github_token
+    def fetch_github_token
-      if @options[:token]
+      env_var = @options[:token] ? @options[:token] : (ENV.fetch 'CHANGELOG_GITHUB_TOKEN', nil)
-        return @github_token ||= @options[:token]
-      end
-
-      env_var = ENV.fetch 'CHANGELOG_GITHUB_TOKEN', nil
 
       unless env_var
         puts "Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found.".yellow
@@ -346,7 +331,7 @@ module GitHubChangelogGenerator
 
       if filtered_issues.empty? && filtered_pull_requests.empty? && newer_tag.nil?
         # do not generate empty unreleased section
-        return nil
+        return ''
       end
 
       self.create_log(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)
@@ -389,7 +374,7 @@ module GitHubChangelogGenerator
 
     def delete_by_time(array, hash_key, older_tag = nil, newer_tag = nil)
 
-      raise 'At least on of the tags should be not nil!' if (older_tag.nil? && newer_tag.nil?)
+      raise 'At least one of the tags should be not nil!' if (older_tag.nil? && newer_tag.nil?)
 
       newer_tag_time = self.get_time_of_tag(newer_tag)
       older_tag_time = self.get_time_of_tag(older_tag)
@@ -607,11 +592,23 @@ module GitHubChangelogGenerator
       end
 
       # Async fetching events:
-      threads = []
 
+      fetch_events_async(@issues + @pull_requests)
+
+      #to clear line from prev print
+      print "                                                            \r"
+
+      if @options[:verbose]
+        puts 'Fetching events for issues and PR: Done!'
+      end
+    end
+
+    def fetch_events_async(issues)
       i = 0
-
+      max_thread_number = 50
-      @issues.each { |issue|
+      threads = []
+      issues.each_slice(max_thread_number) { |issues_slice|
+        issues_slice.each { |issue|
           threads << Thread.new {
             obj = @github.issues.events.list user: @options[:user], repo: @options[:project], issue_number: issue['number']
             issue[:events] = obj.body
@@ -619,24 +616,9 @@ module GitHubChangelogGenerator
             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 }
-
+        threads = []
-      #to clear line from prev print
+      }
-      print "                                                            \r"
-
-      if @options[:verbose]
-        puts "Fetching events for issues and PR: Done! #{i}/#{@issues.count + @pull_requests.count}"
-      end
     end
 
   end

lib/github_changelog_generator/parser.rb

@@ -6,8 +6,8 @@ require_relative 'version'
 module GitHubChangelogGenerator
   class Parser
     def self.parse_options
-      # :include_labels => %w(bug enhancement),
+
-      hash = {
+      options = {
           :tag1 => nil,
           :tag2 => nil,
           :format => '%Y-%m-%d',
@@ -26,9 +26,9 @@ module GitHubChangelogGenerator
           :filter_issues_by_milestone => true,
           :compare_link => true,
           :unreleased => true,
-          :unreleased_label => 'Unreleased'
+          :unreleased_label => 'Unreleased',
+          :branch => 'origin'
       }
-      options = hash
 
       parser = OptionParser.new { |opts|
         opts.banner = 'Usage: github_changelog_generator [options]'
@@ -129,12 +129,24 @@ module GitHubChangelogGenerator
       end
 
       if !options[:user] && !options[:project]
-        remote = `git remote -vv`.split("\n")
+        remote = `git config --get remote.#{options[:branch]}.url`
-        match = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)?(?:\.git).*/.match(remote[0])
+        # try to find repo in format:
+        # origin	git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
+        # git@github.com:skywinder/Github-Changelog-Generator.git
+        match = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/.match(remote)
 
         if match && match[1] && match[2]
           puts "Detected user:#{match[1]}, project:#{match[2]}"
           options[:user], options[:project] = match[1], match[2]
+        else
+        # try to find repo in format:
+        # origin	https://github.com/skywinder/ChangelogMerger (fetch)
+        # https://github.com/skywinder/ChangelogMerger
+          match = /.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/.match(remote)
+          if match && match[1] && match[2]
+            puts "Detected user:#{match[1]}, project:#{match[2]}"
+            options[:user], options[:project] = match[1], match[2]
+          end
         end
       end
 
@@ -149,6 +161,12 @@ module GitHubChangelogGenerator
         options[:tag2] = ARGV[1]
       end
 
+      if options[:verbose]
+        puts 'Performing task with options:'
+        pp options
+        puts ''
+      end
+
       options
     end
   end

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = '1.3.5'
+  VERSION = '1.3.10'
 end