Merge branch 'dev/pr_labels' of https://github.com/raphink/github-changelog-generator into raphink-dev/pr_labels

.gitignore

@@ -1 +0,0 @@
-coverage/

.travis.yml

@@ -1,8 +1,6 @@
 sudo: false
+cache: bundler
 language: ruby
-before_install: 
-- gem update --system
-- gem install bundler
 rvm:
 - 2.1.0
 script:

CHANGELOG.md

@@ -2,69 +2,7 @@
 
 ## [Unreleased](https://github.com/skywinder/github-changelog-generator/tree/HEAD)
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.9.0...HEAD)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.0...HEAD)
-
-**Implemented enhancements:**
-
-- Rubocop: less complex methods in parser.rb [\#297](https://github.com/skywinder/github-changelog-generator/pull/297) ([olleolleolle](https://github.com/olleolleolle))
-- Introduce ParserError exception class [\#296](https://github.com/skywinder/github-changelog-generator/pull/296) ([olleolleolle](https://github.com/olleolleolle))
-- ParserFile: support values with equals signs [\#285](https://github.com/skywinder/github-changelog-generator/pull/285) ([olleolleolle](https://github.com/olleolleolle))
-
-**Merged pull requests:**
-
-- Update bundler [\#306](https://github.com/skywinder/github-changelog-generator/pull/306) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Add options to def self.user\_and\_project\_from\_git to fix parser.rb:19… [\#303](https://github.com/skywinder/github-changelog-generator/pull/303) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Git ignore coverage/ [\#300](https://github.com/skywinder/github-changelog-generator/pull/300) ([olleolleolle](https://github.com/olleolleolle))
-- \[refactor\] Fix docblock datatype, use \#map [\#299](https://github.com/skywinder/github-changelog-generator/pull/299) ([olleolleolle](https://github.com/olleolleolle))
-- \[refactor\] Reader: positive Boolean; unused \#map [\#298](https://github.com/skywinder/github-changelog-generator/pull/298) ([olleolleolle](https://github.com/olleolleolle))
-- Add base option to RakeTask [\#287](https://github.com/skywinder/github-changelog-generator/pull/287) ([jkeiser](https://github.com/jkeiser))
-
-## [1.9.0](https://github.com/skywinder/github-changelog-generator/tree/1.9.0) (2015-09-17)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.5...1.9.0)
-
-**Implemented enhancements:**
-
-- Feature: exclude\_tags using regular expression [\#281](https://github.com/skywinder/github-changelog-generator/pull/281) ([olleolleolle](https://github.com/olleolleolle))
-- Auto parse options from file .github\_changelog\_generator [\#278](https://github.com/skywinder/github-changelog-generator/pull/278) ([dlanileonardo](https://github.com/dlanileonardo))
-
-## [1.8.5](https://github.com/skywinder/github-changelog-generator/tree/1.8.5) (2015-09-15)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.4...1.8.5)
-
-**Merged pull requests:**
-
-- Rake task: Be able to set false value in config [\#279](https://github.com/skywinder/github-changelog-generator/pull/279) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.8.4](https://github.com/skywinder/github-changelog-generator/tree/1.8.4) (2015-09-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.3...1.8.4)
-
-**Fixed bugs:**
-
-- Sending OATH through -t fails [\#274](https://github.com/skywinder/github-changelog-generator/issues/274)
-
-## [1.8.3](https://github.com/skywinder/github-changelog-generator/tree/1.8.3) (2015-08-31)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.2...1.8.3)
-
-**Merged pull requests:**
-
-- Do not alter pull\_requests while iterating on it [\#271](https://github.com/skywinder/github-changelog-generator/pull/271) ([raphink](https://github.com/raphink))
-
-## [1.8.2](https://github.com/skywinder/github-changelog-generator/tree/1.8.2) (2015-08-26)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.1...1.8.2)
-
-**Closed issues:**
-
-- Output should not include security information [\#270](https://github.com/skywinder/github-changelog-generator/issues/270)
-
-**Merged pull requests:**
-
-- This PRi will fix \#274. [\#275](https://github.com/skywinder/github-changelog-generator/pull/275) ([skywinder](https://github.com/skywinder))
-
-## [1.8.1](https://github.com/skywinder/github-changelog-generator/tree/1.8.1) (2015-08-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.8.0...1.8.1)
-
-**Implemented enhancements:**
-
-- Honor labels for Pull Requests [\#266](https://github.com/skywinder/github-changelog-generator/pull/266) ([raphink](https://github.com/raphink))
 
 **Merged pull requests:**
 
@@ -77,7 +15,6 @@
 **Implemented enhancements:**
 
 - Generate change log since/due specific tag [\#254](https://github.com/skywinder/github-changelog-generator/issues/254)
-- Add --base option [\#258](https://github.com/skywinder/github-changelog-generator/pull/258) ([raphink](https://github.com/raphink))
 
 **Merged pull requests:**
 
@@ -85,6 +22,7 @@
 - Add release\_url to rake task options [\#264](https://github.com/skywinder/github-changelog-generator/pull/264) ([raphink](https://github.com/raphink))
 - Add a rake task [\#260](https://github.com/skywinder/github-changelog-generator/pull/260) ([raphink](https://github.com/raphink))
 - Add release\_url option [\#259](https://github.com/skywinder/github-changelog-generator/pull/259) ([raphink](https://github.com/raphink))
+- Add --base option [\#258](https://github.com/skywinder/github-changelog-generator/pull/258) ([raphink](https://github.com/raphink))
 - Add --since-tag [\#257](https://github.com/skywinder/github-changelog-generator/pull/257) ([raphink](https://github.com/raphink))
 
 ## [1.7.0](https://github.com/skywinder/github-changelog-generator/tree/1.7.0) (2015-07-16)
@@ -166,7 +104,6 @@
 
 - Parsing of existing Change Log file [\#212](https://github.com/skywinder/github-changelog-generator/issues/212)
 - Warn users about 0 tags in repo. [\#208](https://github.com/skywinder/github-changelog-generator/issues/208)
-- Cleanup [\#220](https://github.com/skywinder/github-changelog-generator/pull/220) ([tuexss](https://github.com/tuexss))
 
 **Closed issues:**
 
@@ -176,6 +113,7 @@
 
 - Implement fetcher class [\#227](https://github.com/skywinder/github-changelog-generator/pull/227) ([skywinder](https://github.com/skywinder))
 - Add coveralls integration [\#223](https://github.com/skywinder/github-changelog-generator/pull/223) ([skywinder](https://github.com/skywinder))
+- Cleanup [\#220](https://github.com/skywinder/github-changelog-generator/pull/220) ([tuexss](https://github.com/tuexss))
 - Rspec & rubocop integration [\#217](https://github.com/skywinder/github-changelog-generator/pull/217) ([skywinder](https://github.com/skywinder))
 - Implement Reader class to parse ChangeLog.md [\#216](https://github.com/skywinder/github-changelog-generator/pull/216) ([estahn](https://github.com/estahn))
 - Relatively require github\_changelog\_generator library [\#207](https://github.com/skywinder/github-changelog-generator/pull/207) ([sneal](https://github.com/sneal))
@@ -191,7 +129,7 @@
 ## [1.3.10](https://github.com/skywinder/github-changelog-generator/tree/1.3.10) (2015-03-18)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.9...1.3.10)
 
-**Fixed bugs:**
+**Merged pull requests:**
 
 - Fix termination in case of empty unreleased section with `--unreleased-only` option. [\#70](https://github.com/skywinder/github-changelog-generator/pull/70) ([skywinder](https://github.com/skywinder))
 
@@ -202,7 +140,7 @@
 
 - Improve method of detecting owner and repository [\#63](https://github.com/skywinder/github-changelog-generator/issues/63)
 
-**Fixed bugs:**
+**Merged pull requests:**
 
 - Resolved concurrency problem in case of issues \> 2048 [\#65](https://github.com/skywinder/github-changelog-generator/pull/65) ([skywinder](https://github.com/skywinder))
 
@@ -276,7 +214,7 @@
 ## [1.2.7](https://github.com/skywinder/github-changelog-generator/tree/1.2.7) (2015-01-26)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.6...1.2.7)
 
-**Implemented enhancements:**
+**Merged pull requests:**
 
 - Add compare link between older version and newer version [\#46](https://github.com/skywinder/github-changelog-generator/pull/46) ([sue445](https://github.com/sue445))
 
@@ -293,12 +231,15 @@
 **Implemented enhancements:**
 
 - Use milestone to specify in which version bug was fixed [\#22](https://github.com/skywinder/github-changelog-generator/issues/22)
-- support enterprise github via command line options [\#42](https://github.com/skywinder/github-changelog-generator/pull/42) ([glenlovett](https://github.com/glenlovett))
 
 **Fixed bugs:**
 
 - Error when trying to generate log for repo without tags [\#32](https://github.com/skywinder/github-changelog-generator/issues/32)
+
+**Merged pull requests:**
+
 - PrettyPrint class is included using lowercase 'pp' [\#43](https://github.com/skywinder/github-changelog-generator/pull/43) ([schwing](https://github.com/schwing))
+- support enterprise github via command line options [\#42](https://github.com/skywinder/github-changelog-generator/pull/42) ([glenlovett](https://github.com/glenlovett))
 
 ## [1.2.4](https://github.com/skywinder/github-changelog-generator/tree/1.2.4) (2014-12-16)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.3...1.2.4)
@@ -407,7 +348,6 @@
 
 - Add support for fixed issues and implemented enchanments. [\#6](https://github.com/skywinder/github-changelog-generator/issues/6)
 - Implement option to specify output filename [\#4](https://github.com/skywinder/github-changelog-generator/issues/4)
-- Implement support of different tags. [\#8](https://github.com/skywinder/github-changelog-generator/pull/8) ([skywinder](https://github.com/skywinder))
 
 **Fixed bugs:**
 
@@ -415,6 +355,7 @@
 
 **Merged pull requests:**
 
+- Implement support of different tags. [\#8](https://github.com/skywinder/github-changelog-generator/pull/8) ([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)

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_changelog_generator (1.9.0)
+    github_changelog_generator (1.8.0)
       colorize (~> 0.7)
       github_api (~> 0.12)
 

README.md

@@ -32,7 +32,7 @@ To make it easier for users and contributors to see precisely what notable chang
 ### *Why should I care?*
 Because software tools are for people. If you don’t care, why are you contributing to open source? Surely, there must be a kernel (ha!) of care somewhere in that lovely little brain of yours.
 
-> :arrow_right: *[http://keepachangelog.com](http://keepachangelog.com/)*
+> :copyright: *[http://keepachangelog.com](http://keepachangelog.com/)*
 
 ## Installation
 
@@ -84,16 +84,6 @@ Type `github_changelog_generator --help` for details.
 
 More detailed info about params you can find in Wiki page: [**Advanced change log generation examples**](https://github.com/skywinder/github-changelog-generator/wiki/Advanced-change-log-generation-examples)
 
-### Params File
-You can put Params in a .github_changelog_generator file in Project Root to override default params:
-
-Example:
-```
-unreleased=false
-future-release=5.0.0
-since-tag=1.0.0
-```
-
 ### GitHub token
 
 Since GitHub allows you to make only 50 requests without authentication it's recommended to run this script with a token (`-t, --token` option)
@@ -117,7 +107,7 @@ It's time to create this token or wait for 1 hour before GitHub reset the counte
 ## Migrating from a manual changelog
 
 Knowing how dedicated you are to your project, you probably haven't been waiting for github-changelog-generator to keep a changelog,
-but you most likely wouldn't like to have to open issues and PRs for all past features listed in your historic changelog.
+but you most likely wouln't like to have to open issues and PRs for all past features listed in your historic changelog.
 
 That's where `--base` comes handy. This option lets you pass a static changelog to be appended at the end of the generated entries.
 
@@ -221,8 +211,6 @@ If you're seeing this warning:
 6. Create a new Pull Request
 7. Profit! :white_check_mark:
 
-*To test change log workflow you can use [test repo](https://github.com/skywinder/changelog_test/)*
-
 ## License
 
 Github Changelog Generator is released under the [MIT License](http://www.opensource.org/licenses/MIT).

lib/CHANGELOG.md

@@ -7,7 +7,6 @@
 **Implemented enhancements:**
 
 - Enchancment [\#9](https://github.com/skywinder/changelog_test/issues/9)
-- PR with enhancement label [\#16](https://github.com/skywinder/changelog_test/pull/16) ([skywinder](https://github.com/skywinder))
 
 **Fixed bugs:**
 
@@ -22,8 +21,8 @@
 
 **Merged pull requests:**
 
-- Merged br \(should appear in change log also\) [\#21](https://github.com/skywinder/changelog_test/pull/21) ([skywinder](https://github.com/skywinder))
 - This a PR with a lot of comments and events [\#17](https://github.com/skywinder/changelog_test/pull/17) ([skywinder](https://github.com/skywinder))
+- PR [\#16](https://github.com/skywinder/changelog_test/pull/16) ([skywinder](https://github.com/skywinder))
 - This PR closes 14 from commit [\#15](https://github.com/skywinder/changelog_test/pull/15) ([skywinder](https://github.com/skywinder))
 - This PR to close \#12 from body [\#13](https://github.com/skywinder/changelog_test/pull/13) ([skywinder](https://github.com/skywinder))
 

lib/github_changelog_generator.rb

@@ -7,7 +7,6 @@ require "benchmark"
 
 require_relative "github_changelog_generator/helper"
 require_relative "github_changelog_generator/parser"
-require_relative "github_changelog_generator/parser_file"
 require_relative "github_changelog_generator/generator/generator"
 require_relative "github_changelog_generator/version"
 require_relative "github_changelog_generator/reader"

lib/github_changelog_generator/fetcher.rb

@@ -18,12 +18,12 @@ module GitHubChangelogGenerator
       @user = @options[:user]
       @project = @options[:project]
       @github_token = fetch_github_token
-      @github_options = { per_page: PER_PAGE_NUMBER }
+      github_options = { per_page: PER_PAGE_NUMBER }
-      @github_options[:oauth_token] = @github_token unless @github_token.nil?
+      github_options[:oauth_token] = @github_token unless @github_token.nil?
-      @github_options[:endpoint] = @options[:github_endpoint] unless @options[:github_endpoint].nil?
+      github_options[:endpoint] = @options[:github_endpoint] unless @options[:github_endpoint].nil?
-      @github_options[:site] = @options[:github_endpoint] unless @options[:github_site].nil?
+      github_options[:site] = @options[:github_endpoint] unless @options[:github_site].nil?
 
-      @github = check_github_response { Github.new @github_options }
+      @github = check_github_response { Github.new github_options }
     end
 
     # Returns GitHub token. First try to use variable, provided by --token option,
@@ -123,16 +123,7 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
     def fetch_closed_pull_requests
       pull_requests = []
       begin
-        if @options[:release_branch].nil?
+        response = @github.pull_requests.list @options[:user], @options[:project], state: "closed"
-          response = @github.pull_requests.list @options[:user],
-                                                @options[:project],
-                                                state: "closed"
-        else
-          response = @github.pull_requests.list @options[:user],
-                                                @options[:project],
-                                                state: "closed",
-                                                base: @options[:release_branch]
-        end
         page_i = 0
         count_pages = response.count_pages
         response.each_page do |page|

lib/github_changelog_generator/generator/generator.rb

@@ -120,22 +120,22 @@ module GitHubChangelogGenerator
         issues_a.push dict unless added
       end
 
-      added_pull_requests = []
       pull_requests.each do |dict|
+        added = false
         dict.labels.each do |label|
           if @options[:bug_labels].include? label.name
             bugs_a.push dict
-            added_pull_requests.push dict
+            added = true
             next
           end
           if @options[:enhancement_labels].include? label.name
             enhancement_a.push dict
-            added_pull_requests.push dict
+            added = true
             next
           end
         end
+        pull_requests.delete(dict) if added
       end
-      added_pull_requests.each { |p| pull_requests.delete(p) }
 
       [bugs_a, enhancement_a, issues_a]
     end

lib/github_changelog_generator/generator/generator_generation.rb

@@ -51,8 +51,9 @@ module GitHubChangelogGenerator
     def generate_sub_section(issues, prefix)
       log = ""
 
+      log += "#{prefix}\n\n" if options[:simple_list] != true && issues.any?
+
       if issues.any?
-        log += "#{prefix}\n\n" unless options[:simple_list]
         issues.each do |issue|
           merge_string = get_string_for_issue(issue)
           log += "- #{merge_string}\n"

lib/github_changelog_generator/generator/generator_processor.rb

@@ -178,11 +178,9 @@ module GitHubChangelogGenerator
         fetched_pr = closed_pull_requests.find do |fpr|
           fpr.number == pr.number
         end
-        if fetched_pr
         pr[:merged_at] = fetched_pr[:merged_at]
         closed_pull_requests.delete(fetched_pr)
       end
-      end
 
       pull_requests.select! do |pr|
         !pr[:merged_at].nil?

lib/github_changelog_generator/generator/generator_tags.rb

@@ -131,45 +131,16 @@ module GitHubChangelogGenerator
     # @param [Array] all_tags all tags
     # @return [Array] filtered tags according :exclude_tags option
     def filter_excluded_tags(all_tags)
-      return all_tags unless @options[:exclude_tags]
+      filtered_tags = all_tags
-
+      if @options[:exclude_tags]
-      apply_exclude_tags(all_tags)
-    end
-
-    private
-
-    def apply_exclude_tags(all_tags)
-      if @options[:exclude_tags].is_a?(Regexp)
-        filter_tags_with_regex(all_tags)
-      else
-        filter_exact_tags(all_tags)
-      end
-    end
-
-    def filter_tags_with_regex(all_tags)
-      warn_if_nonmatching_regex(all_tags)
-      all_tags.reject { |tag| @options[:exclude_tags] =~ tag.name }
-    end
-
-    def filter_exact_tags(all_tags)
         @options[:exclude_tags].each do |tag|
-        warn_if_tag_not_found(all_tags, tag)
-      end
-      all_tags.reject { |tag| @options[:exclude_tags].include? tag.name }
-    end
-
-    def warn_if_nonmatching_regex(all_tags)
-      unless all_tags.map(&:name).any? { |t| @options[:exclude_tags] =~ t }
-        Helper.log.warn "Warning: unable to reject any tag, using regex "\
-                        "#{@options[:exclude_tags].inspect} in --exclude-tags "\
-                        "option."
-      end
-    end
-
-    def warn_if_tag_not_found(all_tags, tag)
           unless all_tags.map(&:name).include? tag
             Helper.log.warn "Warning: can't find tag #{tag}, specified with --exclude-tags option."
           end
         end
+        filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag.name }
+      end
+      filtered_tags
+    end
   end
 end

lib/github_changelog_generator/parser.rb

@@ -7,31 +7,28 @@ module GitHubChangelogGenerator
   class Parser
     # parse options with optparse
     def self.parse_options
-      options = default_options
+      options = get_default_options
-
-      ParserFile.new(options).parse!
 
       parser = setup_parser(options)
+
       parser.parse!
 
-      user_and_project_from_git(options)
+      if options[:user].nil? || options[:project].nil?
-
+        detect_user_and_project(options, ARGV[0], ARGV[1])
-      abort(parser.banner) unless options[:user] && options[:project]
+      end
-
+
-      print_options(options)
+      if !options[:user] || !options[:project]
-
+        puts parser.banner
-      options
+        exit
       end
 
-    # @param [Hash] options to display
-    def self.print_options(options)
       if options[:verbose]
         Helper.log.info "Performing task with options:"
-        options_to_display = options.clone
+        pp options
-        options_to_display[:token] = options_to_display[:token].nil? ? nil : "hidden value"
-        pp options_to_display
         puts ""
       end
+
+      options
     end
 
     # setup parsing options
@@ -143,9 +140,6 @@ module GitHubChangelogGenerator
         opts.on("--future-release [RELEASE-VERSION]", "Put the unreleased changes in the specified release number.") do |future_release|
           options[:future_release] = future_release
         end
-        opts.on("--release-branch [RELEASE-BRANCH]", "Limit pull requests to the release branch, such as master or release") do |release_branch|
-          options[:release_branch] = release_branch
-        end
         opts.on("--[no-]verbose", "Run verbosely. Default is true") do |v|
           options[:verbose] = v
         end
@@ -162,8 +156,8 @@ module GitHubChangelogGenerator
     end
 
     # just get default options
-    def self.default_options
+    def self.get_default_options
-      {
+      options = {
         tag1: nil,
         tag2: nil,
         date_format: "%Y-%m-%d",
@@ -191,19 +185,14 @@ module GitHubChangelogGenerator
         enhancement_prefix: "**Implemented enhancements:**",
         git_remote: "origin"
       }
-    end
 
-    def self.user_and_project_from_git(options)
+      options
-      if options[:user].nil? || options[:project].nil?
-        detect_user_and_project(options, ARGV[0], ARGV[1])
-      end
     end
 
     # Detects user and project from git
     def self.detect_user_and_project(options, arg0 = nil, arg1 = nil)
       options[:user], options[:project] = user_project_from_option(arg0, arg1, options[:github_site])
-      return if options[:user] && options[:project]
+      if !options[:user] || !options[:project]
-
         if ENV["RUBYLIB"] =~ /ruby-debug-ide/
           options[:user] = "skywinder"
           options[:project] = "changelog_test"
@@ -212,6 +201,7 @@ module GitHubChangelogGenerator
           options[:user], options[:project] = user_project_from_remote(remote)
         end
       end
+    end
 
     # Try to find user and project name from git remote output
     #

lib/github_changelog_generator/parser_file.rb

@@ -1,39 +0,0 @@
-module GitHubChangelogGenerator
-  ParserError = Class.new(StandardError)
-
-  class ParserFile
-    def initialize(options)
-      @options = options
-    end
-
-    def parse!
-      return unless File.exist?(file)
-
-      File.readlines(file).each { |line| parse_line!(line) }
-    end
-
-    private
-
-    def file
-      @file ||= File.expand_path(@options[:params_file] || ".github_changelog_generator")
-    end
-
-    def parse_line!(line)
-      key_sym, value = extract_pair(line)
-      value = true if value =~ (/^(true|t|yes|y|1)$/i)
-      value = false if value =~ (/^(false|f|no|n|0)$/i)
-      @options[key_sym] = value
-    rescue
-      raise ParserError, "Config file #{file} is incorrect in line \"#{line.gsub(/[\n\r]+/, '')}\""
-    end
-
-    # Returns a the setting as a symbol and its string value sans newlines.
-    #
-    # @param line [String] unparsed line from config file
-    # @return [Array<Symbol, String>]
-    def extract_pair(line)
-      key, value = line.split("=", 2)
-      [key.sub("-", "_").to_sym, value.gsub(/[\n\r]+/, "")]
-    end
-  end
-end

lib/github_changelog_generator/reader.rb

@@ -53,28 +53,31 @@ module GitHubChangelogGenerator
 
       @heading_structures.each do |regexp|
         matches = Regexp.new(regexp).match(heading)
-        if matches
+        captures.merge!(Hash[matches.names.map.zip(matches.captures)]) unless matches.nil?
-          captures.merge!(Hash[matches.names.zip(matches.captures)])
+
-          break
+        # Try Regular Expressions until you find one that delivers results
-        end
+        break unless matches.nil?
       end
 
       captures
     end
 
-    # Parse the given ChangeLog data into a list of Hashes
+    # Parse the given ChangeLog data into a Hash
     #
     # @param [String] data File data from the ChangeLog.md
-    # @return [Array<Hash>] Parsed data, e.g. [{ 'version' => ..., 'url' => ..., 'date' => ..., 'content' => ...}, ...]
+    # @return [Hash] Parsed data, e.g. [{ 'version' => ..., 'url' => ..., 'date' => ..., 'content' => ...}, ...]
     def parse(data)
       sections = data.split(/^## .+?$/)
       headings = data.scan(/^## .+?$/)
+      changelog = []
 
-      headings.each_with_index.map do |heading, index|
+      headings.each_with_index do |heading, index|
-        section = parse_heading(heading)
+        captures = parse_heading(heading)
-        section["content"] = sections.at(index + 1)
+        captures["content"] = sections.at(index + 1)
-        section
+        changelog.push captures
       end
+
+      changelog
     end
 
     def read(file_path)

lib/github_changelog_generator/task.rb

@@ -16,8 +16,7 @@ module GitHubChangelogGenerator
                   bug_labels enhancement_labels
                   between_tags exclude_tags since_tag max_issues
                   github_site github_endpoint simple_list
-                  future_release release_branch verbose release_url
+                  future_release verbose release_url )
-                  base )
 
     OPTIONS.each do |o|
       attr_accessor o.to_sym
@@ -44,13 +43,15 @@ module GitHubChangelogGenerator
 
       task @name do
         # mimick parse_options
-        options = Parser.default_options
+        options = Parser.get_default_options
 
-        Parser.user_and_project_from_git(options)
+        if options[:user].nil? || options[:project].nil?
+          Parser.detect_user_and_project(options)
+        end
 
         OPTIONS.each do |o|
           v = instance_variable_get("@#{o}")
-          options[o.to_sym] = v unless v.nil?
+          options[o.to_sym] = v if v
         end
 
         generator = Generator.new options

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = "1.10.0"
+  VERSION = "1.8.0"
 end

spec/files/github_changelog_params_incorrect

@@ -1,2 +0,0 @@
-unreleased_label: staging
-unreleased: false

spec/files/github_changelog_params_override

@@ -1,3 +0,0 @@
-unreleased_label=staging
-unreleased=false
-header==== Changelog ===

spec/spec_helper.rb

@@ -31,25 +31,91 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start
 
 require "github_changelog_generator"
-require "github_changelog_generator/task"
 
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
   config.warnings = true
 
-  config.default_formatter = "doc" if config.files_to_run.one?
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
 
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  # config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
   config.order = :random
 
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
   Kernel.srand config.seed
 end

spec/unit/generator/generator_tags_spec.rb

@@ -87,18 +87,6 @@ describe GitHubChangelogGenerator::Generator do
       it { is_expected.to be_a Array }
       it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
     end
-
-    context "with regex exclude_tags" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[23]/) }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1))) }
-    end
-
-    context "with non-matching regex in exclude_tags" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[abc]/) }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
-    end
   end
 
   describe "#filter_since_tag" do

spec/unit/parse_file_spec.rb

@@ -1,41 +0,0 @@
-describe GitHubChangelogGenerator::ParserFile do
-  describe ".github_changelog_generator" do
-    context "when no has file" do
-      let(:options) { {} }
-      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-      subject { parse.parse! }
-      it { is_expected.to be_nil }
-    end
-
-    context "when file is empty" do
-      let(:options) { { params_file: "spec/files/github_changelog_params_empty" } }
-      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-
-      it "does not change the options" do
-        expect { parse.parse! }.to_not change { options }
-      end
-    end
-
-    context "when file is incorrect" do
-      let(:options) { { params_file: "spec/files/github_changelog_params_incorrect" } }
-      let(:options_before_change) { options.dup }
-      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-      it { expect { parse.parse! }.to raise_error(GitHubChangelogGenerator::ParserError) }
-    end
-
-    context "when override default values" do
-      let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
-      let(:options) { { params_file: "spec/files/github_changelog_params_override" }.merge(default_options) }
-      let(:options_before_change) { options.dup }
-      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-
-      it "changes the options" do
-        expect { parse.parse! }.to change { options }
-          .from(options_before_change)
-          .to(options_before_change.merge(unreleased_label: "staging",
-                                          unreleased: false,
-                                          header: "=== Changelog ==="))
-      end
-    end
-  end
-end