v1.15.0-alpha

Use closed_at and merged_at when filtering issues/prs (#504 )
* use closed_at and merged_at when filtering issues/prs * document use of closed_at and merged_at
2017-10-01 15:28:09 +02:00 · 2017-09-30 20:45:31 +02:00 · 2017-09-18 22:04:22 +02:00 · 2017-09-18 22:02:18 +02:00 · 2017-09-18 21:33:46 +02:00 · 2017-09-18 21:14:47 +02:00
44 changed files with 4708 additions and 404 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -0,0 +1,12 @@
+engines:
+ duplication:
+   enabled: true
+   config:
+     languages:
+     - ruby
+ rubocop:
+   enabled: true
+ratings:
+ paths:
+ - "**.rb"
+exclude_paths:
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml

 AllCops:
+  TargetRubyVersion: 2.2
  DisplayCopNames: true
  DisplayStyleGuide: true
  Exclude:
@@ -10,6 +11,9 @@ AllCops:
 Metrics/LineLength:
  Enabled: false

+Performance/RegexpMatch:
+  Enabled: false
+
 #http://viget.com/extend/just-use-double-quoted-ruby-strings
 Style/StringLiterals:
  EnforcedStyle: double_quotes
@@ -22,7 +26,7 @@ Metrics/ClassLength:
 Metrics/MethodLength:
    Enabled: false

-Style/FileName:
+Naming/FileName:
    Exclude:
      - 'bin/git-generate-changelog'

@@ -32,7 +36,7 @@ Metrics/AbcSize:
  Enabled: false

 # Offense count: 1
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
  Enabled: false

 # Offense count: 10
@@ -67,3 +71,12 @@ Style/NumericPredicate:

 Style/SafeNavigation:
  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+# Re-enable when merged; https://github.com/bbatsov/rubocop/pull/4756
+Lint/InterpolationCheck:
+  Enabled: false
+
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
+2.4.0
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,35 @@
 language: ruby
 cache:
-  - bundler
+  bundler: true
 before_install:
-  - gem update --system
  - gem install bundler
 matrix:
  include:
-    - rvm: 2.2.2
+    - rvm: 2.2.8
      install: true # This skips 'bundle install'
      script: gem build github_changelog_generator && gem install *.gem
-    - rvm: 2.2.2
+    - rvm: 2.2.8
      install: true # This skips 'bundle install'
      script: gem build github_changelog_generator && bundle install
      gemfile: spec/install-gem-in-bundler.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/Gemfile.2_1
-    - rvm: 2.3.1
-      gemfile: gemfiles/Gemfile.2_3_1
-    - rvm: 2.4.0-preview2
-      gemfile: gemfiles/Gemfile.2_4_0
-    - rvm: jruby-9.1.5.0
+    - rvm: 2.3.5
+    - rvm: 2.4.2
+    - rvm: jruby-9.1.13.0
      jdk: oraclejdk8
-      gemfile: gemfiles/Gemfile.jruby-9.1.5.0
      env:
        - JRUBY_OPTS=--debug
+    - rvm: jruby-head
+      jdk: oraclejdk8
+      env:
+        - JRUBY_OPTS=--debug
+        - DEBUG=1
+  allow_failures:
+    - rvm: jruby-head
+  fast_finish: true

-notifications:
-  email:
-    recipients:
-      - sky4winder+githubchangeloggenerator@gmail.com
-    on_success: never
-    on_failure: change
 addons:
  code_climate:
    repo_token:
      secure: iMpV5IAvH+/EVGZrpWnt2BnmNFzSbsRcIumsr4ZyLC8N5nrCSXyjCSy0g48btL3Sj0bSgK9hcrJsmrFd2bkqFleyAcPAzNyUQzBuIRZx47O8yFmbZ+Pj+l3+KOlmcbzJNHfDfxkxuWTmTAcSDfsiyApin721T/ey3SUuwKpZNUc=
+after_success:
+  - bundle exec codeclimate-test-reporter
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,88 @@
 # Change Log

+## [v1.14.3](https://github.com/skywinder/github-changelog-generator/tree/v1.14.3) (2016-12-31)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.14.2...v1.14.3)
+
+**Fixed bugs:**
+
+- Use Octokit::Client for both .com and Enterprise [\#455](https://github.com/skywinder/github-changelog-generator/pull/455) ([eliperkins](https://github.com/eliperkins))
+
+**Closed issues:**
+
+- Last tag contains too many PRs [\#291](https://github.com/skywinder/github-changelog-generator/issues/291)
+
+**Merged pull requests:**
+
+- CodeClimate configuration file [\#465](https://github.com/skywinder/github-changelog-generator/pull/465) ([olleolleolle](https://github.com/olleolleolle))
+- Travis: Build against 2.4.0 [\#464](https://github.com/skywinder/github-changelog-generator/pull/464) ([olleolleolle](https://github.com/olleolleolle))
+- Travis: add jruby-head, 2.4.0-rc1 [\#463](https://github.com/skywinder/github-changelog-generator/pull/463) ([olleolleolle](https://github.com/olleolleolle))
+- Gemfiles for building versions separately dropped [\#461](https://github.com/skywinder/github-changelog-generator/pull/461) ([olleolleolle](https://github.com/olleolleolle))
+- Order Gemfile gems A-Z; add ruby version marker [\#460](https://github.com/skywinder/github-changelog-generator/pull/460) ([olleolleolle](https://github.com/olleolleolle))
+- README: Documentation update about RakeTask params and how to translate labels [\#454](https://github.com/skywinder/github-changelog-generator/pull/454) ([edusantana](https://github.com/edusantana))
+- Travis: Use ruby 2.3.3 and 2.2.6 [\#452](https://github.com/skywinder/github-changelog-generator/pull/452) ([olleolleolle](https://github.com/olleolleolle))
+
+## [v1.14.2](https://github.com/skywinder/github-changelog-generator/tree/v1.14.2) (2016-11-12)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.14.1...v1.14.2)
+
+**Implemented enhancements:**
+
+- OctoFetcher: Moved repositories fail explicitly [\#449](https://github.com/skywinder/github-changelog-generator/pull/449) ([olleolleolle](https://github.com/olleolleolle))
+
+**Closed issues:**
+
+- Error: can't convert Sawyer::Resource to Array when iterating over a 301 Moved Permanently [\#448](https://github.com/skywinder/github-changelog-generator/issues/448)
+
+## [v1.14.1](https://github.com/skywinder/github-changelog-generator/tree/v1.14.1) (2016-11-06)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.14.0...v1.14.1)
+
+**Closed issues:**
+
+- multi\_json is required but is listed as a test dependency [\#444](https://github.com/skywinder/github-changelog-generator/issues/444)
+
+**Merged pull requests:**
+
+- Add multi\_json as a runtime dependency [\#445](https://github.com/skywinder/github-changelog-generator/pull/445) ([rnelson0](https://github.com/rnelson0))
+
+## [v1.14.0](https://github.com/skywinder/github-changelog-generator/tree/v1.14.0) (2016-11-05)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.13.2...v1.14.0)
+
+**Implemented enhancements:**
+
+- On OctoKit::Forbidden error: retry with exponential backoff [\#434](https://github.com/skywinder/github-changelog-generator/pull/434) ([awaage](https://github.com/awaage))
+- Use octokit, carrying awaage commits [\#422](https://github.com/skywinder/github-changelog-generator/pull/422) ([olleolleolle](https://github.com/olleolleolle))
+- Add option to show selected labels in the issue line [\#418](https://github.com/skywinder/github-changelog-generator/pull/418) ([aih](https://github.com/aih))
+
+**Fixed bugs:**
+
+- unreleased and unreleased-label [\#374](https://github.com/skywinder/github-changelog-generator/issues/374)
+- Problems installing 1.11.7 on Windows when git absent [\#349](https://github.com/skywinder/github-changelog-generator/issues/349)
+
+**Closed issues:**
+
+- broken issue-line-labels in log [\#442](https://github.com/skywinder/github-changelog-generator/issues/442)
+- Broken multi hyphen options in param file [\#440](https://github.com/skywinder/github-changelog-generator/issues/440)
+- Install error on Mac: "rack requires Ruby version \>= 2.2.2" [\#425](https://github.com/skywinder/github-changelog-generator/issues/425)
+- Changelog includes issues going back months too far [\#394](https://github.com/skywinder/github-changelog-generator/issues/394)
+
+**Merged pull requests:**
+
+- Fixed issue \#442 - broken issue-line-labels in log. [\#443](https://github.com/skywinder/github-changelog-generator/pull/443) ([thorsteneckel](https://github.com/thorsteneckel))
+- Fixed issue \#440 - broken multi hyphen options in param file. [\#441](https://github.com/skywinder/github-changelog-generator/pull/441) ([thorsteneckel](https://github.com/thorsteneckel))
+- Option --unreleased-label explained [\#439](https://github.com/skywinder/github-changelog-generator/pull/439) ([olleolleolle](https://github.com/olleolleolle))
+- Fixed issue \#304 - entries of previous tags are included. [\#438](https://github.com/skywinder/github-changelog-generator/pull/438) ([thorsteneckel](https://github.com/thorsteneckel))
+- man page: Add undescribed options [\#437](https://github.com/skywinder/github-changelog-generator/pull/437) ([olleolleolle](https://github.com/olleolleolle))
+- On GitHub MAX\_THREAD\_NUMBER is 25 [\#433](https://github.com/skywinder/github-changelog-generator/pull/433) ([olleolleolle](https://github.com/olleolleolle))
+- OctoFetcher, Options: Refactoring [\#432](https://github.com/skywinder/github-changelog-generator/pull/432) ([olleolleolle](https://github.com/olleolleolle))
+- Fix typo in Readme [\#431](https://github.com/skywinder/github-changelog-generator/pull/431) ([rmtheis](https://github.com/rmtheis))
+- Fix: Turn Sawyer method into String-keyed hash access [\#429](https://github.com/skywinder/github-changelog-generator/pull/429) ([olleolleolle](https://github.com/olleolleolle))
+- Spec: Test a url helper function [\#428](https://github.com/skywinder/github-changelog-generator/pull/428) ([olleolleolle](https://github.com/olleolleolle))
+- Rubocop TODO file regenerated [\#427](https://github.com/skywinder/github-changelog-generator/pull/427) ([olleolleolle](https://github.com/olleolleolle))
+- Drop a stray Markdown file [\#426](https://github.com/skywinder/github-changelog-generator/pull/426) ([olleolleolle](https://github.com/olleolleolle))
+- Travis: Add JRuby 9.1.5.0 to matrix [\#424](https://github.com/skywinder/github-changelog-generator/pull/424) ([olleolleolle](https://github.com/olleolleolle))
+
+## [v1.13.2](https://github.com/skywinder/github-changelog-generator/tree/v1.13.2) (2016-09-29)
+[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.13.2...v1.13.2)
+
 ## [1.13.2](https://github.com/skywinder/github-changelog-generator/tree/1.13.2) (2016-09-29)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.13.1...1.13.2)

@@ -211,6 +294,7 @@

 **Implemented enhancements:**

+- We should add a git-generate-changelog command. [\#255](https://github.com/skywinder/github-changelog-generator/issues/255)
 - YAML front matter [\#322](https://github.com/skywinder/github-changelog-generator/pull/322) ([retorquere](https://github.com/retorquere))
 - Git Subcommand [\#288](https://github.com/skywinder/github-changelog-generator/pull/288) ([dlanileonardo](https://github.com/dlanileonardo))

--- a/21
+++ b/21
@@ -1,13 +1,16 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"

+ruby RUBY_VERSION
+
 gemspec

 group :development, :test do
-  gem "rake"
  gem "bundler"
  gem "overcommit", ">= 0.31"
-  gem "rubocop", ">= 0.43"
+  gem "rake"
+  gem "rubocop", ">= 0.50"
 end

 group :development do
@@ -15,16 +18,12 @@ group :development do
 end

 group :test do
-  gem "vcr"
-  gem "multi_json"
-  gem "webmock"
+  gem "codeclimate-test-reporter", "~> 1.0"
  gem "coveralls", "~>0.8", require: false
-  gem "simplecov", "~>0.10", require: false
-  gem "codeclimate-test-reporter", "~>0.4"
-  if RUBY_VERSION > "2"
-    gem "json", "~> 2.0", ">= 2.0.2"
-  else
  gem "json"
-  end
+  gem "multi_json"
  gem "rspec", "< 4"
+  gem "simplecov", "~>0.10", require: false
+  gem "vcr"
+  gem "webmock"
 end
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/github_changelog_generator.svg)](http://badge.fury.io/rb/github_changelog_generator)
 [![Dependency Status](https://gemnasium.com/skywinder/github-changelog-generator.svg)](https://gemnasium.com/skywinder/github-changelog-generator)
 [![Build Status](https://travis-ci.org/skywinder/github-changelog-generator.svg?branch=master)](https://travis-ci.org/skywinder/github-changelog-generator)
+[![Build status](https://ci.appveyor.com/api/projects/status/xdfnfmdjfo0upm7m?svg=true)](https://ci.appveyor.com/project/olleolleolle/github-changelog-generator)
 [![Inline docs](http://inch-ci.org/github/skywinder/github-changelog-generator.svg)](http://inch-ci.org/github/skywinder/github-changelog-generator)
 [![Code Climate](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/gpa.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
 [![Test Coverage](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/coverage.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
@@ -24,16 +25,16 @@ GitHub Changelog Generator ![GitHub Logo](../master/images/logo.jpg)

 ### Changelog generation has never been so easy

-**Fully automate changelog generation** - This gem generates change log file based on **tags**, **issues** and merged **pull requests** (and splits them into separate lists according to labels) from :octocat: GitHub Issue Tracker.
+**Fully automated changelog generation** - This gem generates a change log file based on **tags**, **issues** and merged **pull requests** (and splits them into separate lists according to labels) from :octocat: GitHub Issue Tracker.

-Since now you don't have to fill your `CHANGELOG.md` manually: just run the script, relax and take a cup of :coffee: before your next release! :tada:
+Since you don't have to fill your `CHANGELOG.md` manually now: just run the script, relax and take a cup of :coffee: before your next release! :tada:

->### *What’s the point of a change log?*
+### *What’s the point of a change log?*
 To make it easier for users and contributors to see precisely what notable changes have been made between each release (or version) of the project.
 ### *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)*
+:arrow_right: *[http://keepachangelog.com](http://keepachangelog.com)*

 ## Installation

@@ -77,8 +78,8 @@ See also Troubleshooting.
      github_changelog_generator

 -  Or, run this from anywhere:
-    - `github_changelog_generator -u github_username -p github_project`
-    - `github_changelog_generator  github_username/github_project`
+      `github_changelog_generator -u github_username -p github_project`
+      `github_changelog_generator  github_username/github_project`

 - If you are running it against a repository on a Github Enterprise install, you must specify *both* `--github-site` and `--github-api` command line options:

@@ -104,7 +105,7 @@ since-tag=1.0.0

 ### GitHub token

-GitHub only allows only 50 unauthenticated requests per hour. 
+GitHub only allows 50 unauthenticated requests per hour.
 Therefore, it's recommended to run this script with authentication by using a **token**.

 Here's how:
@@ -118,8 +119,12 @@ You can set an environment variable by running the following command at the prom

    export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"

-So, if you got an error like this:
->! /Library/Ruby/Gems/2.0.0/gems/github_api-0.12.2/lib/github_api/response/raise_error.rb:14:in `on_complete'
+So, if you get a message like this:
+
+``` markdown
+API rate limit exceeded for github_username.
+See: https://developer.github.com/v3/#rate-limiting
+```

 It's time to create this token! (Or, wait an hour for GitHub to reset your unauthenticated request limit.)

@@ -151,6 +156,8 @@ end

 All command line options can be passed to the `rake` task as `config` parameters. And since you're naming the `rake` task yourself, you can create as many as you want.

+You can look for params names from the [parser source code (#setup_parser)](https://github.com/skywinder/github-changelog-generator/blob/master/lib/github_changelog_generator/parser.rb). For example, to translate the bugs label to Portuguese, instead of setting `config.bugs_label`, you have to set `config.bug_prefix`, and so on.
+
 ## Features and advantages of this project
 - Generate canonical, neat change log file, followed by [basic change log guidelines](http://keepachangelog.com) :gem:
 - Optionally generate **Unreleased** changes (closed issues that have not released yet) :dizzy:
@@ -206,14 +213,14 @@ An auto-generated changelog really helps, even if you manually fill in the relea

 For example:

-When I found a closed bug, it's very useful know which release fixed it. 
-In this case, you can easily find the issue by \# in `CHANGELOG.md`.
+When you find a closed bug, it is very useful to know which release fixed it.
+So that you can easily find the issue by \# in `CHANGELOG.md`.

 - it's not quite as easy to find this in handwritten releases notes
 - a generated file saves you the trouble of remembering everything;
  sometimes people forget to add things to a handwritten file

-Ultimately, I think GitHub Releases is ideal for end-users. 
+Ultimately, I think GitHub Releases are ideal for end-users.
 Meanwhile, `CHANGELOG.md` lives right in the repository, with its detailed list of changes, which is handy for developers.
 Finally, there's nothing wrong with using GitHub Releases alongside `CHANGELOG.md` in this combination.

@@ -254,14 +261,14 @@ can't get the latest version of Ruby installed.
 ## Contributing

 1. Create an issue and describe your idea
-2. [Fork it] (https://github.com/skywinder/Github-Changelog-Generator/fork)
+2. [Fork it](https://github.com/skywinder/github-changelog-generator/fork)
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Publish the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request
 7. Profit! :white_check_mark:

-*To test your workflow with changelog generator, you can use [test repo](https://github.com/skywinder/changelog_test/)*
+You can test your workflow with changelog generator with [the skywinder/changelog_test repo](https://github.com/skywinder/changelog_test/).

 ## License

--- a/32
+++ b/32
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler"
 require "bundler/gem_tasks"
 require "rubocop/rake_task"
@@ -10,31 +11,10 @@ require "overcommit"
 RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:rspec)

-task :copy_man_page_to_manpath do |_t|
-  known_manpath_paths = %w(/etc/manpath.config /etc/manpaths)
-  manpath = known_manpath_paths.find do |f|
-    path = Pathname(f)
-    path.file? && path.readable?
+desc "When releasing the gem, re-fetch latest cacert.pem from curl.haxx.se. Developer task."
+task :update_ssl_ca_file do
+  `pushd lib/github_changelog_generator/ssl_certs && curl --remote-name --time-cond cacert.pem https://curl.haxx.se/ca/cacert.pem && popd`
 end

-  next unless manpath
-
-  writable_man_path = Pathname(manpath).each_line.find do |line|
-    path = Pathname(line.chomp)
-    path.directory? && path.writable?
-  end
-
-  next unless writable_man_path
-
-  man_prefix = Pathname("#{writable_man_path.chomp}/man1")
-  man_pages = "man/git-*.1"
-
-  Pathname.glob(man_pages) do |path|
-    if path.exist? && man_prefix.exist? && man_prefix.writable?
-      FileUtils.cp(path, man_prefix + path.basename)
-    end
-  end
-end
-
-task checks: [:rubocop, :rspec]
-task default: [:rubocop, :rspec]
+task checks: %i[rubocop rspec]
+task default: %i[rubocop rspec]
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,9 @@ environment:
    - ruby_version: "21" # Older version, but matches Travis-CI
    - ruby_version: "21-x64"

+init:
+  - git config --global core.autocrlf true
+
 install:
  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%

@@ -48,3 +51,8 @@ notifications:
      - sky4winder+githubchangeloggenerator@gmail.com
    on_build_success: false
    on_build_status_changed: true
+  - provider: GitHubPullRequest
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true
+
--- a/circle.yml
+++ b/circle.yml
@@ -1,8 +0,0 @@
-notify:
-  webhooks:
-    # A list of hook hashes, containing the url field
-    # gitter hook
-    - url: https://webhooks.gitter.im/e/2d81eb1ae7695fdc82c4
-    - url: https://webhooks.gitter.im/e/3ec6a35fad7e9991058e
-
-
--- a/gemfiles/Gemfile.2_1
+++ b/gemfiles/Gemfile.2_1
@@ -1,3 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'rack', '~> 1.6'
-gem 'activesupport', '~> 4'
--- a/gemfiles/Gemfile.2_3_1
+++ b/gemfiles/Gemfile.2_3_1
@@ -1,3 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'rack', '>= 2'
-gem 'activesupport', '>= 4'
--- a/gemfiles/Gemfile.2_4_0
+++ b/gemfiles/Gemfile.2_4_0
@@ -1,3 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'rack', '>= 2'
-
--- a/gemfiles/Gemfile.jruby-9.1.5.0
+++ b/gemfiles/Gemfile.jruby-9.1.5.0
@@ -1,3 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'rack', '>= 2'
-
--- a/github_changelog_generator.gemspec
+++ b/github_changelog_generator.gemspec
@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "github_changelog_generator/version"
@@ -18,16 +18,17 @@ Gem::Specification.new do |spec|
  spec.homepage = "https://github.com/skywinder/Github-Changelog-Generator"
  spec.license = "MIT"

-  spec.files = Dir["{bin,lib,man,spec}/**/*"] + %w(LICENSE Rakefile README.md)
+  spec.files = Dir["{bin,lib,man,spec}/**/*"] + %w[LICENSE Rakefile README.md]

  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
  spec.require_paths = ["lib"]

  spec.add_runtime_dependency "rake", ">= 10.0"
-  spec.add_runtime_dependency "rainbow", ">= 2.1"
-  spec.add_runtime_dependency("octokit", ["~> 4.0"])
+  spec.add_runtime_dependency "rainbow", ">= 2.2.1"
+  spec.add_runtime_dependency("octokit", ["~> 4.6"])
  spec.add_runtime_dependency("faraday-http-cache")
  spec.add_runtime_dependency("activesupport")
-  spec.add_runtime_dependency("retriable", ["~> 2.1"])
+  spec.add_runtime_dependency("retriable", ["~> 3.0"])
+  spec.add_runtime_dependency("multi_json")
 end
--- a/lib/github_changelog_generator.rb
+++ b/lib/github_changelog_generator.rb
@@ -5,17 +5,18 @@ require "octokit"
 require "faraday-http-cache"
 require "logger"
 require "active_support"
+require "active_support/core_ext/object/blank"
 require "json"
 require "multi_json"
 require "benchmark"

-require_relative "github_changelog_generator/helper"
-require_relative "github_changelog_generator/options"
-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"
+require "github_changelog_generator/helper"
+require "github_changelog_generator/options"
+require "github_changelog_generator/parser"
+require "github_changelog_generator/parser_file"
+require "github_changelog_generator/generator/generator"
+require "github_changelog_generator/version"
+require "github_changelog_generator/reader"

 # The main module, where placed all classes (now, at least)
 module GitHubChangelogGenerator
@@ -33,14 +34,10 @@ module GitHubChangelogGenerator
    def run
      log = @generator.compound_changelog

-      output_filename = (@options[:output]).to_s
-      File.open(output_filename, "w") { |file| file.write(log) }
+      output_filename = @options[:output].to_s
+      File.open(output_filename, "wb") { |file| file.write(log) }
      puts "Done!"
      puts "Generated log placed in #{Dir.pwd}/#{output_filename}"
    end
  end
-
-  if __FILE__ == $PROGRAM_NAME
-    GitHubChangelogGenerator::ChangelogGenerator.new.run
-  end
 end
--- a/lib/github_changelog_generator/generator/generator.rb
+++ b/lib/github_changelog_generator/generator/generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../octo_fetcher"
 require_relative "generator_generation"
 require_relative "generator_fetcher"
@@ -35,16 +36,17 @@ module GitHubChangelogGenerator
      detect_actual_closed_dates(@issues + @pull_requests)
    end

-    # Encapsulate characters to make markdown look as expected.
+    ENCAPSULATED_CHARACTERS = %w(< > * _ \( \) [ ] #)
+
+    # Encapsulate characters to make Markdown look as expected.
    #
    # @param [String] string
    # @return [String] encapsulated input string
    def encapsulate_string(string)
-      string.gsub! '\\', '\\\\'
+      string = string.gsub('\\', '\\\\')

-      encpas_chars = %w(< > * _ \( \) [ ] #)
-      encpas_chars.each do |char|
-        string.gsub! char, "\\#{char}"
+      ENCAPSULATED_CHARACTERS.each do |char|
+        string = string.gsub(char, "\\#{char}")
      end

      string
@@ -55,14 +57,23 @@ module GitHubChangelogGenerator
    # @param [Array] pull_requests List or PR's in new section
    # @param [Array] issues List of issues in new section
    # @param [String] newer_tag Name of the newer tag. Could be nil for `Unreleased` section
-    # @param [String] older_tag_name Older tag, used for the links. Could be nil for last tag.
+    # @param [Hash, nil] older_tag Older tag, used for the links. Could be nil for last tag.
    # @return [String] Ready and parsed section
-    def create_log_for_tag(pull_requests, issues, newer_tag, older_tag_name = nil)
+    def create_log_for_tag(pull_requests, issues, newer_tag, older_tag = nil)
      newer_tag_link, newer_tag_name, newer_tag_time = detect_link_tag_time(newer_tag)

      github_site = options[:github_site] || "https://github.com"
      project_url = "#{github_site}/#{options[:user]}/#{options[:project]}"

+      # If the older tag is nil, go back in time from the latest tag and find
+      # the SHA for the first commit.
+      older_tag_name =
+        if older_tag.nil?
+          @fetcher.commits_before(newer_tag_time).last["sha"]
+        else
+          older_tag["name"]
+        end
+
      log = generate_header(newer_tag_name, newer_tag_link, newer_tag_time, older_tag_name, project_url)

      if options[:issues]
@@ -70,7 +81,7 @@ module GitHubChangelogGenerator
        log += issues_to_log(issues, pull_requests)
      end

-      if options[:pulls]
+      if options[:pulls] && options[:add_pr_wo_labels]
        # Generate pull requests:
        log += generate_sub_section(pull_requests, options[:merge_prefix])
      end
--- a/lib/github_changelog_generator/generator/generator_fetcher.rb
+++ b/lib/github_changelog_generator/generator/generator_fetcher.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
  class Generator
    MAX_THREAD_NUMBER = 25
@@ -77,7 +78,7 @@ module GitHubChangelogGenerator
          issue["actual_date"] = commit["commit"]["author"]["date"]

          # issue['actual_date'] = commit['author']['date']
-        rescue
+        rescue StandardError
          puts "Warning: Can't fetch commit #{event['commit_id']}. It is probably referenced from another repo."
          issue["actual_date"] = issue["closed_at"]
        end
--- a/lib/github_changelog_generator/generator/generator_generation.rb
+++ b/lib/github_changelog_generator/generator/generator_generation.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
  class Generator
    # Main function to start change log generation
@@ -20,7 +21,10 @@ module GitHubChangelogGenerator

      log += File.read(options[:base]) if File.file?(options[:base])

-      log += "\n\n\\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
+      credit_line = "\n\n\\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
+      log.gsub!(credit_line, "") # Remove old credit lines
+      log += credit_line
+
      @log = log
    end

@@ -64,7 +68,7 @@ module GitHubChangelogGenerator
      log += if newer_tag_name.equal?(options[:unreleased_label])
               "## [#{newer_tag_name}](#{release_url})\n\n"
             else
-               "## [#{newer_tag_name}](#{release_url}) (#{time_string})\n"
+               "## [#{newer_tag_name}](#{release_url}) (#{time_string})\n\n"
             end

      if options[:compare_link] && older_tag_link
@@ -81,22 +85,21 @@ module GitHubChangelogGenerator
    def generate_log_between_tags(older_tag, newer_tag)
      filtered_issues, filtered_pull_requests = filter_issues_for_tags(newer_tag, older_tag)

-      older_tag_name = older_tag.nil? ? detect_since_tag : older_tag["name"]
-
      if newer_tag.nil? && filtered_issues.empty? && filtered_pull_requests.empty?
        # do not generate empty unreleased section
        return ""
      end

-      create_log_for_tag(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)
+      create_log_for_tag(filtered_pull_requests, filtered_issues, newer_tag, older_tag)
    end

-    # Apply all filters to issues and pull requests
+    # Filters issues and pull requests based on, respectively, `closed_at` and `merged_at`
+    #  timestamp fields.
    #
    # @return [Array] filtered issues and pull requests
    def filter_issues_for_tags(newer_tag, older_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)
+      filtered_pull_requests = delete_by_time(@pull_requests, "merged_at", older_tag, newer_tag)
+      filtered_issues        = delete_by_time(@issues, "closed_at", older_tag, newer_tag)

      newer_tag_name = newer_tag.nil? ? nil : newer_tag["name"]

--- a/lib/github_changelog_generator/generator/generator_processor.rb
+++ b/lib/github_changelog_generator/generator/generator_processor.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
  class Generator
    # delete all labels with labels from options[:exclude_labels] array
@@ -125,19 +126,17 @@ module GitHubChangelogGenerator
    # @return [Array] filtered array of issues
    def include_issues_by_labels(issues)
      filtered_issues = filter_by_include_labels(issues)
-      filtered_issues |= filter_wo_labels(issues)
+      filtered_issues = filter_wo_labels(filtered_issues)
      filtered_issues
    end

    # @return [Array] issues without labels or empty array if add_issues_wo_labels is false
    def filter_wo_labels(issues)
      if options[:add_issues_wo_labels]
-        issues_wo_labels = issues.select do |issue|
-          !issue["labels"].map { |l| l["name"] }.any?
+        issues
+      else
+        issues.select { |issue| issue["labels"].map { |l| l["name"] }.any? }
      end
-        return issues_wo_labels
-      end
-      []
    end

    def filter_by_include_labels(issues)
@@ -197,8 +196,8 @@ module GitHubChangelogGenerator
        end
      end

-      pull_requests.select! do |pr|
-        !pr["merged_at"].nil?
+      pull_requests.reject! do |pr|
+        pr["merged_at"].nil?
      end

      pull_requests
--- a/lib/github_changelog_generator/generator/generator_tags.rb
+++ b/lib/github_changelog_generator/generator/generator_tags.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
  class Generator
    # fetch, filter tags, fetch dates and sort them in time order
@@ -7,30 +8,47 @@ module GitHubChangelogGenerator
      detect_due_tag

      all_tags = @fetcher.get_all_tags
-      included_tags = filter_excluded_tags(all_tags)
-
      fetch_tags_dates(all_tags) # Creates a Hash @tag_times_hash
-      @sorted_tags   = sort_tags_by_date(included_tags)
-      @filtered_tags = get_filtered_tags(included_tags)
+      all_sorted_tags = sort_tags_by_date(all_tags)

-      @tag_section_mapping = build_tag_section_mapping(@filtered_tags, sorted_tags)
+      @sorted_tags   = filter_excluded_tags(all_sorted_tags)
+      @filtered_tags = get_filtered_tags(@sorted_tags)
+
+      # Because we need to properly create compare links, we need a sorted list
+      # of all filtered tags (including the excluded ones). We'll exclude those
+      # tags from section headers inside the mapping function.
+      section_tags = get_filtered_tags(all_sorted_tags)
+
+      @tag_section_mapping = build_tag_section_mapping(section_tags, @filtered_tags)

      @filtered_tags
    end

-    # @param [Array] filtered_tags are the tags that need a subsection output
-    # @param [Array] all_tags is the list of all tags ordered from newest -> oldest
+    # @param [Array] section_tags are the tags that need a subsection output
+    # @param [Array] filtered_tags is the list of filtered tags ordered from newest -> oldest
    # @return [Hash] key is the tag to output, value is an array of [Left Tag, Right Tag]
    # PRs to include in this section will be >= [Left Tag Date] and <= [Right Tag Date]
-    def build_tag_section_mapping(filtered_tags, all_tags)
+    # rubocop:disable Style/For - for allows us to be more concise
+    def build_tag_section_mapping(section_tags, filtered_tags)
      tag_mapping = {}
-      filtered_tags.each do |tag|
-        older_tag_idx = all_tags.index(tag) + 1
-        older_tag = all_tags[older_tag_idx]
+      for i in 0..(section_tags.length - 1)
+        tag = section_tags[i]
+
+        # Don't create section header for the "since" tag
+        next if @since_tag && tag["name"] == @since_tag
+
+        # Don't create a section header for the first tag in between_tags
+        next if options[:between_tags] && tag == section_tags.last
+
+        # Don't create a section header for excluded tags
+        next unless filtered_tags.include?(tag)
+
+        older_tag = section_tags[i + 1]
        tag_mapping[tag] = [older_tag, tag]
      end
      tag_mapping
    end
+    # rubocop:enable Style/For

    # Sort all tags by date, newest to oldest
    def sort_tags_by_date(tags)
@@ -95,13 +113,12 @@ module GitHubChangelogGenerator
      sections.first["version"] if sections && sections.any?
    end

-    # Return tags after filtering tags in lists provided by option: --between-tags & --exclude-tags
+    # Return tags after filtering tags in lists provided by option: --exclude-tags
    #
    # @return [Array]
    def get_filtered_tags(all_tags)
      filtered_tags = filter_since_tag(all_tags)
-      filtered_tags = filter_due_tag(filtered_tags)
-      filter_between_tags(filtered_tags)
+      filter_due_tag(filtered_tags)
    end

    # @param [Array] all_tags all tags
@@ -113,7 +130,7 @@ module GitHubChangelogGenerator
        if all_tags.map { |t| t["name"] }.include? tag
          idx = all_tags.index { |t| t["name"] == tag }
          filtered_tags = if idx > 0
-                            all_tags[0..idx - 1]
+                            all_tags[0..idx]
                          else
                            []
                          end
@@ -144,23 +161,6 @@ module GitHubChangelogGenerator
      filtered_tags
    end

-    # @param [Array] all_tags all tags
-    # @return [Array] filtered tags according :between_tags option
-    def filter_between_tags(all_tags)
-      filtered_tags = all_tags
-      tag_names     = filtered_tags.map { |ft| ft["name"] }
-
-      if options[:between_tags]
-        options[:between_tags].each do |tag|
-          unless tag_names.include?(tag)
-            Helper.log.warn "Warning: can't find tag #{tag}, specified with --between-tags option."
-          end
-        end
-        filtered_tags = all_tags.select { |tag| options[:between_tags].include?(tag["name"]) }
-      end
-      filtered_tags
-    end
-
    # @param [Array] all_tags all tags
    # @return [Array] filtered tags according :exclude_tags or :exclude_tags_regex option
    def filter_excluded_tags(all_tags)
@@ -177,18 +177,19 @@ module GitHubChangelogGenerator

    def apply_exclude_tags(all_tags)
      if options[:exclude_tags].is_a?(Regexp)
-        filter_tags_with_regex(all_tags, options[:exclude_tags])
+        filter_tags_with_regex(all_tags, options[:exclude_tags], "--exclude-tags")
      else
        filter_exact_tags(all_tags)
      end
    end

    def apply_exclude_tags_regex(all_tags)
-      filter_tags_with_regex(all_tags, Regexp.new(options[:exclude_tags_regex]))
+      regex = Regexp.new(options[:exclude_tags_regex])
+      filter_tags_with_regex(all_tags, regex, "--exclude-tags-regex")
    end

-    def filter_tags_with_regex(all_tags, regex)
-      warn_if_nonmatching_regex(all_tags)
+    def filter_tags_with_regex(all_tags, regex, regex_option_name)
+      warn_if_nonmatching_regex(all_tags, regex, regex_option_name)
      all_tags.reject { |tag| regex =~ tag["name"] }
    end

@@ -199,11 +200,10 @@ module GitHubChangelogGenerator
      all_tags.reject { |tag| options[:exclude_tags].include?(tag["name"]) }
    end

-    def warn_if_nonmatching_regex(all_tags)
-      unless all_tags.map { |t| t["name"] }.any? { |t| options[:exclude_tags] =~ t }
+    def warn_if_nonmatching_regex(all_tags, regex, regex_option_name)
+      unless all_tags.map { |t| t["name"] }.any? { |t| regex =~ t }
        Helper.log.warn "Warning: unable to reject any tag, using regex "\
-                        "#{options[:exclude_tags].inspect} in --exclude-tags "\
-                        "option."
+                        "#{regex.inspect} in #{regex_option_name} option."
      end
    end

--- a/lib/github_changelog_generator/helper.rb
+++ b/lib/github_changelog_generator/helper.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "logger"
 require "rainbow"

--- a/lib/github_changelog_generator/octo_fetcher.rb
+++ b/lib/github_changelog_generator/octo_fetcher.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+require "tmpdir"
 require "retriable"
 module GitHubChangelogGenerator
  # A Fetcher responsible for all requests to GitHub and all basic manipulation with related data
@@ -23,16 +25,17 @@ module GitHubChangelogGenerator
    # @option options [Boolean] :http_cache Use ActiveSupport::Cache::FileStore to cache http requests
    # @option options [Boolean] :cache_file If using http_cache, this is the cache file path
    # @option options [Boolean] :cache_log If using http_cache, this is the cache log file path
-    def initialize(options = {}) # rubocop:disable Metrics/CyclomaticComplexity
+    def initialize(options = {})
      @options      = options || {}
      @user         = @options[:user]
      @project      = @options[:project]
      @since        = @options[:since]
      @http_cache   = @options[:http_cache]
-      @cache_file   = @options.fetch(:cache_file, "/tmp/github-changelog-http-cache") if @http_cache
-      @cache_log    = @options.fetch(:cache_log, "/tmp/github-changelog-logger.log") if @http_cache
-      init_cache if @http_cache
-
+      if @http_cache
+        @cache_file = @options.fetch(:cache_file) { File.join(Dir.tmpdir, "github-changelog-http-cache") }
+        @cache_log  = @options.fetch(:cache_log) { File.join(Dir.tmpdir, "github-changelog-logger.log") }
+        init_cache
+      end
      @github_token = fetch_github_token

      @request_options               = { per_page: PER_PAGE_NUMBER }
@@ -40,8 +43,14 @@ module GitHubChangelogGenerator
      @github_options[:access_token] = @github_token unless @github_token.nil?
      @github_options[:api_endpoint] = @options[:github_endpoint] unless @options[:github_endpoint].nil?

-      client_type = @options[:github_endpoint].nil? ? Octokit::Client : Octokit::EnterpriseAdminClient
-      @client     = client_type.new(@github_options)
+      configure_octokit_ssl
+
+      @client = Octokit::Client.new(@github_options)
+    end
+
+    def configure_octokit_ssl
+      ca_file = @options[:ssl_ca_file] || ENV["SSL_CA_FILE"] || File.expand_path("../ssl_certs/cacert.pem", __FILE__)
+      Octokit.connection_options = { ssl: { ca_file: ca_file } }
    end

    def init_cache
@@ -227,6 +236,17 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
      end
    end

+    # Fetch all commits before certain point
+    #
+    # @return [String]
+    def commits_before(start_time)
+      commits = []
+      iterate_pages(@client, "commits_before", start_time.to_datetime.to_s) do |new_commits|
+        commits.concat(new_commits)
+      end
+      commits
+    end
+
    private

    def stringify_keys_deep(indata)
@@ -244,38 +264,49 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
      end
    end

+    MovedPermanentlyError = Class.new(RuntimeError)
+
    # Iterates through all pages until there are no more :next pages to follow
    # yields the result per page
    #
    # @param [Octokit::Client] client
    # @param [String] method (eg. 'tags')
+    #
+    # @yield [Sawyer::Resource] An OctoKit-provided response (which can be empty)
+    #
    # @return [Integer] total number of pages
    def iterate_pages(client, method, *args)
-      if args.size == 1 && args.first.is_a?(Hash)
-        request_options = args.delete_at(0)
-      elsif args.size > 1 && args.last.is_a?(Hash)
-        request_options = args.delete_at(args.length - 1)
-      end
+      request_opts = extract_request_args(args)
+      args.push(@request_options.merge(request_opts))

-      args.push(@request_options.merge(request_options))
+      number_of_pages = 1

-      pages = 1
-
-      check_github_response do
-        client.send(method, user_project, *args)
-      end
+      check_github_response { client.send(method, user_project, *args) }
      last_response = client.last_response
+      if last_response.status == 301
+        raise MovedPermanentlyError, last_response.data[:url]
+      end

-      yield last_response.data
+      yield(last_response.data)

      until (next_one = last_response.rels[:next]).nil?
-        pages += 1
+        number_of_pages += 1

        last_response = check_github_response { next_one.get }
-        yield last_response.data
+        yield(last_response.data)
      end

-      pages
+      number_of_pages
+    end
+
+    def extract_request_args(args)
+      if args.size == 1 && args.first.is_a?(Hash)
+        args.delete_at(0)
+      elsif args.size > 1 && args.last.is_a?(Hash)
+        args.delete_at(args.length - 1)
+      else
+        {}
+      end
    end

    # This is wrapper with rescue block
@@ -285,7 +316,9 @@ Make sure, that you push tags to remote repo via 'git push --tags'"
      Retriable.retriable(retry_options) do
        yield
      end
-
+    rescue MovedPermanentlyError => e
+      Helper.log.error("#{e.class}: #{e.message}")
+      sys_abort("The repository has moved, please update your configuration")
    rescue Octokit::Forbidden => e
      Helper.log.error("#{e.class}: #{e.message}")
      sys_abort("Exceeded retry limit")
--- a/lib/github_changelog_generator/options.rb
+++ b/lib/github_changelog_generator/options.rb
@@ -1,60 +1,57 @@
 # frozen_string_literal: true
+
 require "delegate"
 module GitHubChangelogGenerator
  class Options < SimpleDelegator
    UnsupportedOptionError = Class.new(ArgumentError)

-    KNOWN_OPTIONS = [
-      :add_issues_wo_labels,
-      :add_pr_wo_labels,
-      :author,
-      :base,
-      :between_tags,
-      :bug_labels,
-      :bug_prefix,
-      :cache_file,
-      :cache_log,
-      :compare_link,
-      :date_format,
-      :due_tag,
-      :enhancement_labels,
-      :enhancement_prefix,
-      :exclude_labels,
-      :exclude_tags,
-      :exclude_tags_regex,
-      :filter_issues_by_milestone,
-      :frontmatter,
-      :future_release,
-      :git_remote,
-      :github_endpoint,
-      :github_site,
-      :header,
-      :http_cache,
-      :include_labels,
-      :issue_prefix,
-      :issue_line_labels,
-      :issues,
-      :max_issues,
-      :merge_prefix,
-      :output,
-      :project,
-      :pulls,
-      :release_branch,
-      :release_url,
-      :simple_list,
-      :since_tag,
-      :token,
-      :unreleased,
-      :unreleased_label,
-      :unreleased_only,
-      :user,
-      :usernames_as_github_logins,
-      :verbose
-    ]
-
-    THESE_ARE_DIFFERENT = [
-      :tag1,
-      :tag2
+    KNOWN_OPTIONS = %i[
+      add_issues_wo_labels
+      add_pr_wo_labels
+      author
+      base
+      between_tags
+      bug_labels
+      bug_prefix
+      cache_file
+      cache_log
+      compare_link
+      date_format
+      due_tag
+      enhancement_labels
+      enhancement_prefix
+      exclude_labels
+      exclude_tags
+      exclude_tags_regex
+      filter_issues_by_milestone
+      frontmatter
+      future_release
+      git_remote
+      github_endpoint
+      github_site
+      header
+      http_cache
+      include_labels
+      issue_prefix
+      issue_line_labels
+      issues
+      max_issues
+      merge_prefix
+      output
+      project
+      pulls
+      release_branch
+      release_url
+      simple_list
+      since_tag
+      ssl_ca_file
+      token
+      unreleased
+      unreleased_label
+      unreleased_only
+      user
+      usernames_as_github_logins
+      verbose
    ]

    def initialize(values)
@@ -78,15 +75,11 @@ module GitHubChangelogGenerator
    end

    def unsupported_options
-      values.keys - supported_options
+      values.keys - KNOWN_OPTIONS
    end

    def supported_option?(key)
-      supported_options.include?(key)
-    end
-
-    def supported_options
-      KNOWN_OPTIONS + THESE_ARE_DIFFERENT
+      KNOWN_OPTIONS.include?(key)
    end
  end
 end
--- a/lib/github_changelog_generator/parser.rb
+++ b/lib/github_changelog_generator/parser.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 require "optparse"
 require "pp"
 require_relative "version"
@@ -13,7 +14,10 @@ module GitHubChangelogGenerator
      ParserFile.new(options).parse!

      parser = setup_parser(options)
-      parser.parse!
+      begin parser.parse!
+      rescue OptionParser::InvalidOption => e
+        abort [e, parser].join("\n")
+      end

      fetch_user_and_project(options)

@@ -128,9 +132,6 @@ module GitHubChangelogGenerator
        opts.on("--issue-line-labels x,y,z", Array, 'The specified labels will be shown in brackets next to each matching issue. Use "ALL" to show all labels. Default is [].') do |list|
          options[:issue_line_labels] = list
        end
-        opts.on("--between-tags  x,y,z", Array, "Change log will be filled only between specified tags") do |list|
-          options[:between_tags] = list
-        end
        opts.on("--exclude-tags  x,y,z", Array, "Change log will exclude specified tags") do |list|
          options[:exclude_tags] = list
        end
@@ -167,12 +168,15 @@ module GitHubChangelogGenerator
        opts.on("--[no-]http-cache", "Use HTTP Cache to cache Github API requests (useful for large repos) Default is true.") do |http_cache|
          options[:http_cache] = http_cache
        end
-        opts.on("--cache-file [CACHE-FILE]", "Filename to use for cache. Default is /tmp/github-changelog-http-cache") do |cache_file|
+        opts.on("--cache-file [CACHE-FILE]", "Filename to use for cache. Default is github-changelog-http-cache in a temporary directory.") do |cache_file|
          options[:cache_file] = cache_file
        end
-        opts.on("--cache-log [CACHE-LOG]", "Filename to use for cache log. Default is /tmp/github-changelog-logger.log") do |cache_log|
+        opts.on("--cache-log [CACHE-LOG]", "Filename to use for cache log. Default is github-changelog-logger.log in a temporary directory.") do |cache_log|
          options[:cache_log] = cache_log
        end
+        opts.on("--ssl-ca-file [PATH]", "Path to cacert.pem file. Default is a bundled lib/github_changelog_generator/ssl_certs/cacert.pem. Respects SSL_CA_PATH.") do |ssl_ca_file|
+          options[:ssl_ca_file] = ssl_ca_file
+        end
        opts.on("--[no-]verbose", "Run verbosely. Default is true") do |v|
          options[:verbose] = v
        end
@@ -191,8 +195,6 @@ module GitHubChangelogGenerator
    # @return [Hash] Default options
    def self.default_options
      Options.new(
-        tag1: nil,
-        tag2: nil,
        date_format: "%Y-%m-%d",
        output: "CHANGELOG.md",
        base: "HISTORY.md",
@@ -205,12 +207,13 @@ module GitHubChangelogGenerator
        unreleased: true,
        unreleased_label: "Unreleased",
        compare_link: true,
-        enhancement_labels: %w(enhancement Enhancement),
-        bug_labels: %w(bug Bug),
-        exclude_labels: %w(duplicate question invalid wontfix Duplicate Question Invalid Wontfix),
+        enhancement_labels: ["enhancement", "Enhancement", "Type: Enhancement"],
+        bug_labels: ["bug", "Bug", "Type: Bug"],
+        exclude_labels: ["duplicate", "question", "invalid", "wontfix", "Duplicate", "Question", "Invalid", "Wontfix", "Meta: Exclude From Changelog"],
        issue_line_labels: [],
        max_issues: nil,
        simple_list: false,
+        ssl_ca_file: nil,
        verbose: true,
        header: "# Change Log",
        merge_prefix: "**Merged pull requests:**",
@@ -218,9 +221,7 @@ module GitHubChangelogGenerator
        bug_prefix: "**Fixed bugs:**",
        enhancement_prefix: "**Implemented enhancements:**",
        git_remote: "origin",
-        http_cache: true,
-        cache_file: "/tmp/github-changelog-http-cache",
-        cache_log: "/tmp/github-changelog-logger.log"
+        http_cache: true
      )
    end

@@ -276,7 +277,7 @@ module GitHubChangelogGenerator

        begin
          param = match[2].nil?
-        rescue
+        rescue StandardError
          puts "Can't detect user and name from first parameter: '#{arg0}' -> exit'"
          return
        end
--- a/lib/github_changelog_generator/parser_file.rb
+++ b/lib/github_changelog_generator/parser_file.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "pathname"

 module GitHubChangelogGenerator
@@ -47,7 +48,7 @@ module GitHubChangelogGenerator
      return if non_configuration_line?(line)
      option_name, value = extract_pair(line)
      @options[option_key_for(option_name)] = convert_value(value, option_name)
-    rescue
+    rescue StandardError
      raise ParserError, "Failed on line ##{line_number}: \"#{line.gsub(/[\n\r]+/, '')}\""
    end

@@ -65,8 +66,8 @@ module GitHubChangelogGenerator
      [key.tr("-", "_").to_sym, value.gsub(/[\n\r]+/, "")]
    end

-    KNOWN_ARRAY_KEYS = [:exclude_labels, :include_labels, :bug_labels,
-                        :enhancement_labels, :issue_line_labels, :between_tags, :exclude_tags]
+    KNOWN_ARRAY_KEYS = %i[exclude_labels include_labels bug_labels
+                          enhancement_labels issue_line_labels between_tags exclude_tags]
    KNOWN_INTEGER_KEYS = [:max_issues]

    def convert_value(value, option_name)
--- a/lib/github_changelog_generator/reader.rb
+++ b/lib/github_changelog_generator/reader.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Enrico Stahn <mail@enricostahn.com>
 #
--- a/lib/github_changelog_generator/ssl_certs/cacert.pem
+++ b/lib/github_changelog_generator/ssl_certs/cacert.pem
--- a/lib/github_changelog_generator/task.rb
+++ b/lib/github_changelog_generator/task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rake"
 require "rake/tasklib"
 require "github_changelog_generator"
@@ -7,7 +8,7 @@ module GitHubChangelogGenerator
  class RakeTask < ::Rake::TaskLib
    include ::Rake::DSL if defined?(::Rake::DSL)

-    OPTIONS = %w( user project token date_format output
+    OPTIONS = %w[ user project token date_format output
                  bug_prefix enhancement_prefix issue_prefix
                  header merge_prefix issues
                  add_issues_wo_labels add_pr_wo_labels
@@ -18,7 +19,7 @@ module GitHubChangelogGenerator
                  between_tags exclude_tags exclude_tags_regex since_tag max_issues
                  github_site github_endpoint simple_list
                  future_release release_branch verbose release_url
-                  base )
+                  base ]

    OPTIONS.each do |o|
      attr_accessor o.to_sym
--- a/lib/github_changelog_generator/version.rb
+++ b/lib/github_changelog_generator/version.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
-  VERSION = "1.14.0"
+  VERSION = "1.15.0-alpha"
 end
--- a/man/git-generate-changelog.1
+++ b/man/git-generate-changelog.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-GENERATE\-CHANGELOG" "1" "November 2016" "" ""
+.TH "GIT\-GENERATE\-CHANGELOG" "1" "December 2016" "" ""
 .
 .SH "NAME"
 \fBgit\-generate\-changelog\fR \- Generate changelog from github
@@ -256,13 +256,13 @@ Use HTTP Cache to cache Github API requests (useful for large repos) Default is
 \-\-[no\-]cache\-file [CACHE\-FILE]
 .
 .P
-Filename to use for cache\. Default is /tmp/github\-changelog\-http\-cache
+Filename to use for cache\. Default is github\-changelog\-http\-cache in a temporary directory\.
 .
 .P
 \-\-cache\-log [CACHE\-LOG]
 .
 .P
-Filename to use for cache log\. Default is /tmp/github\-changelog\-logger\.log
+Filename to use for cache log\. Default is github\-changelog\-logger\.log in a temporary directory\.
 .
 .P
 \-\-[no\-]verbose
--- a/man/git-generate-changelog.1.html
+++ b/man/git-generate-changelog.1.html
@@ -192,10 +192,6 @@

 <p>   Issues with the specified labels will be always added to "Implemented enhancements" section. Default is 'enhancement,Enhancement'</p>

-<p>   --between-tags x,y,z</p>
-
-<p>   Change log will be filled only between specified tags</p>
-
 <p>   --exclude-tags x,y,z</p>

 <p>   Change log will exclude specified tags</p>
@@ -246,11 +242,11 @@

 <p>   --[no-]cache-file [CACHE-FILE]</p>

-<p>   Filename to use for cache. Default is /tmp/github-changelog-http-cache</p>
+<p>   Filename to use for cache. Default is github-changelog-http-cache in a temporary directory.</p>

 <p>   --cache-log [CACHE-LOG]</p>

-<p>   Filename to use for cache log. Default is /tmp/github-changelog-logger.log</p>
+<p>   Filename to use for cache log. Default is github-changelog-logger.log in a temporary directory.</p>

 <p>   --[no-]verbose</p>

@@ -281,7 +277,7 @@

  <ol class='man-decor man-foot man foot'>
    <li class='tl'></li>
-    <li class='tc'>November 2016</li>
+    <li class='tc'>December 2016</li>
    <li class='tr'>git-generate-changelog(1)</li>
  </ol>

--- a/man/git-generate-changelog.html
+++ b/man/git-generate-changelog.html
@@ -184,10 +184,6 @@

 <p>   Issues with the specified labels will be always added to "Implemented enhancements" section. Default is 'enhancement,Enhancement'</p>

-<p>   --between-tags x,y,z</p>
-
-<p>   Change log will be filled only between specified tags</p>
-
 <p>   --exclude-tags x,y,z</p>

 <p>   Change log will exclude specified tags</p>
--- a/man/git-generate-changelog.md
+++ b/man/git-generate-changelog.md
@@ -119,10 +119,6 @@ Automatically generate change log from your tags, issues, labels and pull reques

   Issues with the specified labels will be always added to "Implemented enhancements" section. Default is 'enhancement,Enhancement'

-   --between-tags x,y,z
-
-   Change log will be filled only between specified tags
-
   --exclude-tags x,y,z

   Change log will exclude specified tags
@@ -173,11 +169,15 @@ Automatically generate change log from your tags, issues, labels and pull reques

   --[no-]cache-file [CACHE-FILE]

-   Filename to use for cache. Default is /tmp/github-changelog-http-cache
+   Filename to use for cache. Default is github-changelog-http-cache in a temporary directory.

   --cache-log [CACHE-LOG]

-   Filename to use for cache log. Default is /tmp/github-changelog-logger.log
+   Filename to use for cache log. Default is github-changelog-logger.log in a temporary directory.
+
+    --ssl-ca-file [PATH]
+
+   Path to cacert.pem file. Default is a bundled lib/github_changelog_generator/ssl_certs/cacert.pem.  Respects SSL_CA_PATH.

   --[no-]verbose

--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Enrico Stahn <mail@enricostahn.com>
 #
@@ -16,7 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "codeclimate-test-reporter"
 require "simplecov"
 require "coveralls"
 require "vcr"
@@ -28,8 +28,7 @@ end

 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
                                                                 Coveralls::SimpleCov::Formatter,
-                                                                 SimpleCov::Formatter::HTMLFormatter,
-                                                                 CodeClimate::TestReporter::Formatter
+                                                                 SimpleCov::Formatter::HTMLFormatter
                                                               ])
 SimpleCov.start do
  add_filter "gemfiles/"
--- a/spec/unit/generator/generator_generation_spec.rb
+++ b/spec/unit/generator/generator_generation_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module GitHubChangelogGenerator
+  describe Generator do
+    describe "#get_string_for_issue" do
+      let(:issue) do
+        { "title" => "Bug in code" }
+      end
+
+      it "formats an issue according to options" do
+        expect do
+          described_class.new.get_string_for_issue(issue)
+        end.not_to raise_error
+      end
+    end
+  end
+end
--- a/spec/unit/generator/generator_processor_spec.rb
+++ b/spec/unit/generator/generator_processor_spec.rb
@@ -1,19 +1,32 @@
 # frozen_string_literal: true
+
 module GitHubChangelogGenerator
  describe Generator do
-    context "#exclude_issues_by_labels" do
-      let(:label) { { "name" => "BAD" } }
-      let(:issue) { { "labels" => [label] } }
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
+    let(:options) { {} }
+    let(:generator) { described_class.new(default_options.merge(options)) }
+
+    let(:bad_label) { { "name" => "BAD" } }
+    let(:bad_issue) { { "labels" => [bad_label] } }
    let(:good_label) { { "name" => "GOOD" } }
    let(:good_issue) { { "labels" => [good_label] } }
-      let(:issues) { [issue, good_issue] }
-      subject(:generator) { described_class.new(exclude_labels: %w(BAD BOO)) }
+    let(:unlabeled_issue) { { "labels" => [] } }
+    let(:issues) { [bad_issue, good_issue, unlabeled_issue] }

-      it "removes issues with labels in the exclude_label list" do
-        result = generator.exclude_issues_by_labels(issues)
+    describe "#exclude_issues_by_labels" do
+      subject do
+        generator.exclude_issues_by_labels(issues)
+      end

-        expect(result).to include(good_issue)
-        expect(result).not_to include(issue)
+      let(:expected_issues) { issues }
+
+      it { is_expected.to eq(expected_issues) }
+
+      context "when 'exclude_lables' is provided" do
+        let(:options) { { exclude_labels: %w[BAD BOO] } }
+        let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+        it { is_expected.to eq(expected_issues) }
      end

      context "with no option given" do
@@ -25,5 +38,43 @@ module GitHubChangelogGenerator
        end
      end
    end
+
+    describe "#get_filtered_issues" do
+      subject do
+        generator.get_filtered_issues(issues)
+      end
+
+      let(:expected_issues) { issues }
+
+      it { is_expected.to eq(expected_issues) }
+
+      context "when 'exclude_labels' is provided" do
+        let(:options) { { exclude_labels: %w[BAD BOO] } }
+        let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+        it { is_expected.to eq(expected_issues) }
+      end
+
+      context "when 'add_issues_wo_labels' is false" do
+        let(:options) { { add_issues_wo_labels: false } }
+        let(:expected_issues) { [bad_issue, good_issue] }
+
+        it { is_expected.to eq(expected_issues) }
+
+        context "with 'exclude_labels'" do
+          let(:options) { { add_issues_wo_labels: false, exclude_labels: %w[GOOD] } }
+          let(:expected_issues) { [bad_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
+      end
+
+      context "when 'include_labels' is specified" do
+        let(:options) { { include_labels: %w[GOOD] } }
+        let(:expected_issues) { [good_issue] }
+
+        it { is_expected.to eq(expected_issues) }
+      end
+    end
  end
 end
--- a/spec/unit/generator/generator_tags_spec.rb
+++ b/spec/unit/generator/generator_tags_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 describe GitHubChangelogGenerator::Generator do
  def tag_with_name(tag)
    {
@@ -12,174 +13,231 @@ describe GitHubChangelogGenerator::Generator do
    end
  end

-  describe "#filter_between_tags" do
-    context "when between_tags nil" do
+  describe "#tag_section_mapping" do
+    let(:all_tags) { tags_from_strings(%w[8 7 6 5 4 3 2 1]) }
+    let(:sorted_tags) { all_tags }
+
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
+    let(:options) { {} }
+    let(:generator) { described_class.new(default_options.merge(options)) }
+
    before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: nil)
+      allow_any_instance_of(GitHubChangelogGenerator::OctoFetcher).to receive(:get_all_tags).and_return(all_tags)
+      allow(generator).to receive(:fetch_tags_dates).with(all_tags)
+      allow(generator).to receive(:sort_tags_by_date).with(all_tags).and_return(sorted_tags)
+      generator.fetch_and_filter_tags
    end

    subject do
-        @generator.get_filtered_tags(tags_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
-    end
-    context "when between_tags same as input array" do
-      before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3))
-      end
-      subject do
-        @generator.get_filtered_tags(tags_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+      generator.tag_section_mapping
    end

-    context "when between_tags filled with correct values" do
-      before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2))
-      end
-      subject do
-        @generator.get_filtered_tags(tags_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2))) }
+    shared_examples_for "a section mapping" do
+      it { is_expected.to be_a(Hash) }
+      it { is_expected.to eq(expected_mapping) }
    end

-    context "when between_tags filled with invalid values" do
-      before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: %w(1 q w))
+    shared_examples_for "a full changelog" do
+      let(:expected_mapping) do
+        {
+          tag_with_name("8") => [tag_with_name("7"), tag_with_name("8")],
+          tag_with_name("7") => [tag_with_name("6"), tag_with_name("7")],
+          tag_with_name("6") => [tag_with_name("5"), tag_with_name("6")],
+          tag_with_name("5") => [tag_with_name("4"), tag_with_name("5")],
+          tag_with_name("4") => [tag_with_name("3"), tag_with_name("4")],
+          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")],
+          tag_with_name("2") => [tag_with_name("1"), tag_with_name("2")],
+          tag_with_name("1") => [nil, tag_with_name("1")]
+        }
      end

-      subject do
-        @generator.get_filtered_tags(tags_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_from_strings(%w(1))) }
-    end
+      it_behaves_like "a section mapping"
    end

-  describe "#get_filtered_tags" do
-    subject do
-      generator.get_filtered_tags(tags_from_strings(%w(1 2 3 4 5)))
+    shared_examples_for "a changelog with some exclusions" do
+      let(:expected_mapping) do
+        {
+          tag_with_name("8") => [tag_with_name("7"), tag_with_name("8")],
+          tag_with_name("6") => [tag_with_name("5"), tag_with_name("6")],
+          tag_with_name("4") => [tag_with_name("3"), tag_with_name("4")],
+          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")],
+          tag_with_name("1") => [nil, tag_with_name("1")]
+        }
      end

-    context "respects between tags" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3)) }
+      it_behaves_like "a section mapping"
+    end

-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+    context "with no constraints" do
+      it_behaves_like "a full changelog"
+    end
+
+    context "with since only" do
+      let(:options) { { since_tag: "6" } }
+      let(:expected_mapping) do
+        {
+          tag_with_name("8") => [tag_with_name("7"), tag_with_name("8")],
+          tag_with_name("7") => [tag_with_name("6"), tag_with_name("7")]
+        }
+      end
+
+      it_behaves_like "a section mapping"
+    end
+
+    context "with due only" do
+      let(:options) { { due_tag: "4" } }
+      let(:expected_mapping) do
+        {
+          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")],
+          tag_with_name("2") => [tag_with_name("1"), tag_with_name("2")],
+          tag_with_name("1") => [nil, tag_with_name("1")]
+        }
+      end
+
+      it_behaves_like "a section mapping"
+    end
+
+    context "with since and due" do
+      let(:options) { { since_tag: "2", due_tag: "5" } }
+      let(:expected_mapping) do
+        {
+          tag_with_name("4") => [tag_with_name("3"), tag_with_name("4")],
+          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")]
+        }
+      end
+
+      it_behaves_like "a section mapping"
+    end
+
+    context "with excluded tags" do
+      context "as a list of strings" do
+        let(:options) { { exclude_tags: %w[2 5 7] } }
+
+        it_behaves_like "a changelog with some exclusions"
+      end
+
+      context "as a regex" do
+        let(:options) { { exclude_tags: /[257]/ } }
+
+        it_behaves_like "a changelog with some exclusions"
+      end
+
+      context "as a regex string" do
+        let(:options) { { exclude_tags_regex: "[257]" } }
+
+        it_behaves_like "a changelog with some exclusions"
+      end
    end
  end

  describe "#filter_excluded_tags" do
-    subject { generator.filter_excluded_tags(tags_from_strings(%w(1 2 3))) }
+    subject { generator.filter_excluded_tags(tags_from_strings(%w[1 2 3])) }

    context "with matching string" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
+      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w[3]) }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1 2])) }
    end

    context "with non-matching string" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(invalid tags)) }
+      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w[invalid tags]) }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
    end

    context "with matching regex" do
      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[23]/) }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1])) }
    end

    context "with non-matching regex" do
      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[abc]/) }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
    end
  end

  describe "#filter_excluded_tags_regex" do
-    subject { generator.filter_excluded_tags(tags_from_strings(%w(1 2 3))) }
+    subject { generator.filter_excluded_tags(tags_from_strings(%w[1 2 3])) }

    context "with matching regex" do
      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags_regex: "[23]") }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1])) }
    end

    context "with non-matching regex" do
      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags_regex: "[45]") }
      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+      it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
    end
  end

  describe "#filter_since_tag" do
    context "with filled array" do
-      subject { generator.filter_since_tag(tags_from_strings(%w(1 2 3))) }
+      subject { generator.filter_since_tag(tags_from_strings(%w[1 2 3])) }

      context "with valid since tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "2") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w(1))) }
+        it { is_expected.to match_array(tags_from_strings(%w[1 2])) }
      end

      context "with invalid since tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "Invalid tag") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+        it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
      end
    end

    context "with empty array" do
-      subject { generator.filter_since_tag(tags_from_strings(%w())) }
+      subject { generator.filter_since_tag(tags_from_strings(%w[])) }

      context "with valid since tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "2") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w())) }
+        it { is_expected.to match_array(tags_from_strings(%w[])) }
      end

      context "with invalid since tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(since_tag: "Invalid tag") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w())) }
+        it { is_expected.to match_array(tags_from_strings(%w[])) }
      end
    end
  end

  describe "#filter_due_tag" do
    context "with filled array" do
-      subject { generator.filter_due_tag(tags_from_strings(%w(1 2 3))) }
+      subject { generator.filter_due_tag(tags_from_strings(%w[1 2 3])) }

      context "with valid due tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "2") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w(3))) }
+        it { is_expected.to match_array(tags_from_strings(%w[3])) }
      end

      context "with invalid due tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "Invalid tag") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w(1 2 3))) }
+        it { is_expected.to match_array(tags_from_strings(%w[1 2 3])) }
      end
    end

    context "with empty array" do
-      subject { generator.filter_due_tag(tags_from_strings(%w())) }
+      subject { generator.filter_due_tag(tags_from_strings(%w[])) }

      context "with valid due tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "2") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w())) }
+        it { is_expected.to match_array(tags_from_strings(%w[])) }
      end

      context "with invalid due tag" do
        let(:generator) { GitHubChangelogGenerator::Generator.new(due_tag: "Invalid tag") }
        it { is_expected.to be_a Array }
-        it { is_expected.to match_array(tags_from_strings(%w())) }
+        it { is_expected.to match_array(tags_from_strings(%w[])) }
      end
    end
  end
@@ -232,13 +290,13 @@ describe GitHubChangelogGenerator::Generator do
      @generator.sort_tags_by_date(tags)
    end
    context "sort unsorted tags" do
-      let(:tags) { tags_from_strings %w(valid_tag1 valid_tag2 valid_tag3) }
+      let(:tags) { tags_from_strings %w[valid_tag1 valid_tag2 valid_tag3] }

      it { is_expected.to be_a_kind_of(Array) }
      it { is_expected.to match_array(tags.reverse!) }
    end
    context "sort sorted tags" do
-      let(:tags) { tags_from_strings %w(valid_tag3 valid_tag2 valid_tag1) }
+      let(:tags) { tags_from_strings %w[valid_tag3 valid_tag2 valid_tag1] }

      it { is_expected.to be_a_kind_of(Array) }
      it { is_expected.to match_array(tags) }
--- a/spec/unit/octo_fetcher_spec.rb
+++ b/spec/unit/octo_fetcher_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 VALID_TOKEN = "0123456789abcdef"
 INVALID_TOKEN = "0000000000000000"

@@ -299,7 +300,7 @@ describe GitHubChangelogGenerator::OctoFetcher do
        pull_requests = fetcher.fetch_closed_pull_requests

        pr = pull_requests.first
-        expect(pr.keys).to eq(%w(url id html_url diff_url patch_url issue_url number state locked title user body created_at updated_at closed_at merged_at merge_commit_sha assignee assignees milestone commits_url review_comments_url review_comment_url comments_url statuses_url head base _links))
+        expect(pr.keys).to eq(%w[url id html_url diff_url patch_url issue_url number state locked title user body created_at updated_at closed_at merged_at merge_commit_sha assignee assignees milestone commits_url review_comments_url review_comment_url comments_url statuses_url head base _links])
      end
    end
  end
@@ -500,7 +501,7 @@ describe GitHubChangelogGenerator::OctoFetcher do
        commit = fetcher.fetch_commit(event)

        expectations = [
-          %w(sha decfe840d1a1b86e0c28700de5362d3365a29555),
+          %w[sha decfe840d1a1b86e0c28700de5362d3365a29555],
          ["url",
           "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555"],
          # OLD API: "https://api.github.com/repos/skywinder/changelog_test/git/commits/decfe840d1a1b86e0c28700de5362d3365a29555"],
@@ -525,4 +526,18 @@ describe GitHubChangelogGenerator::OctoFetcher do
      end
    end
  end
+
+  describe "#commits_before" do
+    context "when API is valid", :vcr do
+      let(:start_time) { Time.parse("Wed Mar 4 18:47:17 2015 +0200") }
+
+      subject do
+        fetcher.commits_before(start_time)
+      end
+
+      it "returns commits" do
+        expect(subject.last["sha"]).to eq("4c2d6d1ed58bdb24b870dcb5d9f2ceed0283d69d")
+      end
+    end
+  end
 end
--- a/spec/unit/options_spec.rb
+++ b/spec/unit/options_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe GitHubChangelogGenerator::Options do
  describe "#initialize" do
    context "with known options" do
--- a/spec/unit/parse_file_spec.rb
+++ b/spec/unit/parse_file_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 describe GitHubChangelogGenerator::ParserFile do
  describe ".github_changelog_generator" do
    let(:options) { {} }
@@ -13,7 +14,7 @@ describe GitHubChangelogGenerator::ParserFile do
      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options, StringIO.new("")) }

      it "does not change the options" do
-        expect { parser.parse! }.to_not change { options }
+        expect { parser.parse! }.to_not(change { options })
      end
    end

@@ -51,12 +52,11 @@ describe GitHubChangelogGenerator::ParserFile do

      context "turns exclude-labels into an Array", bug: "#327" do
        let(:file) do
-          StringIO.new(<<EOF
-exclude-labels=73a91042-da6f-11e5-9335-1040f38d7f90,7adf83b4-da6f-11e5-ae18-1040f38d7f90
-header_label=# My changelog
-EOF
-                      )
+          line1 = "exclude-labels=73a91042-da6f-11e5-9335-1040f38d7f90,7adf83b4-da6f-11e5-ae18-1040f38d7f90\n"
+          line2 = "header_label=# My changelog\n"
+          StringIO.new(line1 + line2)
        end
+
        it "reads exclude_labels into an Array" do
          expect { parser.parse! }.to change { options[:exclude_labels] }
            .from(default_options[:exclude_labels])
--- a/spec/unit/parser_spec.rb
+++ b/spec/unit/parser_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 describe GitHubChangelogGenerator::Parser do
  describe ".user_project_from_remote" do
    context "when remote is type 1" do
--- a/spec/unit/reader_spec.rb
+++ b/spec/unit/reader_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Enrico Stahn <mail@enricostahn.com>
 #
--- a/spec/vcr/GitHubChangelogGenerator_OctoFetcher/_commits_before/when_API_is_valid/returns_commits.json
+++ b/spec/vcr/GitHubChangelogGenerator_OctoFetcher/_commits_before/when_API_is_valid/returns_commits.json
Author	SHA1	Message	Date
Olle Jonsson	07a665d800	v1.15.0-alpha	2017-10-01 15:28:09 +02:00
Umberto Nicoletti	1f68ef8bad	Use closed_at and merged_at when filtering issues/prs (#504 ) * use closed_at and merged_at when filtering issues/prs * document use of closed_at and merged_at	2017-09-30 20:45:31 +02:00
Olle Jonsson	efa960ce1c	Travis: update CI matrix (#561 ) - Ruby 2.2.8, 2.3.5 and 2.4.2	2017-09-18 22:04:22 +02:00
Olle Jonsson	ba086bbf07	Travis: Configure cache: bundler: true (#563 )	2017-09-18 22:02:18 +02:00
Olle Jonsson	ada39f9735	Merge pull request #562 from olleolleolle/fix/use-jruby-9-1-13-0 Travis: use JRuby 9.1.13.0; don't redo rvm's job	2017-09-18 21:33:46 +02:00
Olle Jonsson	bf2436037f	Travis: add fast_finish: true to matrix	2017-09-18 21:14:47 +02:00
Olle Jonsson	9662c935c3	RuboCop 0.50.0; lints	2017-09-18 21:14:47 +02:00
Olle Jonsson	7f12a55ae8	Travis: use JRuby 9.1.13.0; don't redo rvm's job	2017-09-18 21:14:10 +02:00
Olle Jonsson	b94fb7f839	Remove all old credit lines in the output then add a new one (#526 ) * Fixes #507 - Removes old credit lines in log so that there are no duplicates * Added missing newline at end of file * Replaced single-quoted empty string with double quotes	2017-09-10 11:56:11 +02:00
Olle Jonsson	519cd5b136	Tiny whitespace detail [ci skip]	2017-09-10 11:55:49 +02:00
Jerome Lacoste	d2a8dc3977	warn_if_nonmatching_regex should display proper help message when used with exclude-tags-regex (#551 )	2017-08-09 10:06:32 +02:00
Lucas Huang	33f89614d4	Delete circle.yml (#532 )	2017-07-30 17:48:27 +02:00
Olle Jonsson	c805da1886	Merge pull request #550 from hunner/chef-adjust-tag-section-mapping Fix section mapping, hiding untagged PRs, and hiding untagged issues	2017-07-30 17:44:46 +02:00
Hunter Haugen	a287bd872b	Rebase, pass rubocop, remove between-tags references This is a rebase and resubmission of #453	2017-07-27 15:51:49 -07:00
Thom May	b1121cb1ee	Use our default labels across the board Signed-off-by: Thom May <thom@chef.io>	2017-07-27 10:44:00 -07:00
Tom Duffield	0ca7371306	Add tests for label filtering Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:41:52 -07:00
Tom Duffield	ce63f648ac	include default options in tags tests Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:39:38 -07:00
Tom Duffield	5932cb730b	Fix parameter type in doc for generator Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:39:28 -07:00
Tom Duffield	726f8f79fb	Don't show untagged issues when desired When `add_issues_wo_labels` is false, do not include issues that do not have any labels in the CHANGELOG (per documentation). Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:39:22 -07:00
Tom Duffield	b91609283e	Don't show untagged PRs As far as I can tell, `add_pr_wo_labels` wasn't actually implemented. Implementing this per the documentation. Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:55 -07:00
Tom Duffield	174baec266	Use first SHA for last tag Rather than having the last tag be an empty husk, generate a full changelog link using the first sha from the repository. Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:49 -07:00
Tom Duffield	f57b4c283d	Rename tag section mapping test Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:44 -07:00
Tom Duffield	ee5a507f76	Filter excluded tags within the section map builder Because we need might need excluded tags to build compare links, the section map generator needs to have access to those tags. But, we don't want excluded tags to have section headers. So instead, we'll create another copy of the list that doesn't have tags excluded. Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:38 -07:00
Tom Duffield	66177c58e3	DRY up the tests and address Rubocop feedback Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:32 -07:00
Tom Duffield	d6c26ef4a9	Generate mapping that will match expectations This change neccesitated changing the behavior or the `filter_since_tag`. Since we want our compare links to include the since tag, we need to keep that tag in the filtered list. Instead, we detect that the tag is the since tag and filter it out. This will prevent the since_tag header from being duplicated when pulling from a base. The same goes for the first tag listed in between_tags. We don't want an empty section header for this. Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:37:26 -07:00
Tom Duffield	c718930fb1	Add initial tests for tag_section_mapping Before we do anything, let's get a solid expectation of what we want our section headers to look like. Signed-off-by: Tom Duffield <tom@chef.io>	2017-07-27 10:36:11 -07:00
Ian Roberts	4c26bbd7c0	Add newline after version (#548 ) Add newline after version name and Full Changelog link	2017-07-19 15:26:40 +02:00
Olle Jonsson	8dd91f6f10	README: repair broken Markdown [ci skip] - and be more clear about the skywinder/changelog_test repo	2017-07-16 17:52:47 +02:00
Stanislav Kozlovski	87f65faffc	Merge branch 'master' into master	2017-07-03 09:45:14 +03:00
Stanislav Kozlovski	e5f0a55304	Merge branch 'master' into master	2017-06-28 21:33:28 +03:00
Lucas Huang	b21e7eaaf7	Update generator_generation.rb (#542 ) Fix the syntax so `credit_line` is recognizable as a variable. #541	2017-06-28 16:55:42 +02:00
Olle Jonsson	ee4c72c7aa	Revert "AppVeyor: drop init line, add .gitattributes (#539 )" This reverts commit `e37ce502ea`.	2017-06-27 21:14:37 +02:00
Olle Jonsson	e37ce502ea	AppVeyor: drop init line, add .gitattributes (#539 )	2017-06-27 21:08:10 +02:00
Olle Jonsson	e77202163c	AppVeyor: Windows configuration to pass RuboCop (#538 ) * AppVeyor: Windows configuration to pass RuboCop * README: AppVeyor build badge * AppVeyor: GitHubPullRequest notification	2017-06-27 20:40:55 +02:00
Lucas Huang	d0e7593e98	Fix the syntax ambiguity on credit-line-bug (#537 ) * fix a syntax ambiguity	2017-06-27 19:45:57 +02:00
Lucas Huang	fb7e21f9f8	Credit line bug (#535 ) * Fix a bug that generates multiple credit lines	2017-06-27 07:45:59 +02:00
Lucas Huang	3798d0637c	Update README.md (#534 )	2017-06-25 10:48:55 +02:00
Lucas Huang	f643b3e44e	Update README.md (#531 ) A better README.md file	2017-06-25 08:41:12 +02:00
Olle Jonsson	0be0631320	Travis: jruby-9.1.12.0	2017-06-19 09:16:23 +02:00
Enether	5bbeb93869	Replaced single-quoted empty string with double quotes	2017-06-03 18:39:48 +03:00
Enether	3d27670053	Added missing newline at end of file	2017-06-03 18:26:15 +03:00
Enether	2cc15f7be0	Fixes #507 - Removes old credit lines in log so that there are no duplicates	2017-06-03 18:22:23 +03:00
Alexander Delgado	a26bcc326b	README: Update the token failure example to OctoKit 404 failure (#525 )	2017-05-29 08:54:32 +02:00
Olle Jonsson	20d059b78e	Travis: jruby-9.1.10.0 (#523 )	2017-05-26 12:24:51 +02:00
Olle Jonsson	6ad5aa106d	Bug: require ActiveSupport core_ext blank (#520 )	2017-05-25 14:07:34 +02:00
Lucas Huang	e9ee9556ce	remove --between_tags option (#501 )	2017-05-25 00:29:31 +02:00
Olle Jonsson	6707927c1e	Travis CI: Drop 2.1 (#517 )	2017-05-25 00:19:08 +02:00
Olle Jonsson	1093c75250	Travis: use jruby-9.1.9.0 (#506 )	2017-05-25 00:11:31 +02:00
Olle Jonsson	874c23c64f	Chore: Rubocop 0.49.0 (#516 ) * Rubocoping	2017-05-25 00:11:02 +02:00
Olle Jonsson	26b124a67c	bundled cacert.pem with --ssl-ca-file PATH option (#480 ) * Add a bundled cacert.pem from curl's website * Using the --ssl-ca-file PATH option overrides ENV var SSL_CA_PATH * Having none of those allow you to use the default, the bundled cacert.pem * Octokit's SSL config uses this new setting * Rake task to update_ssl_ca_file * Rubocop target 2.2	2017-05-24 23:43:31 +02:00
fatData	4798a8a3d8	Update README.md (#490 )	2017-05-21 23:53:16 +02:00
Lucas Huang	9bbfa3add5	Rescue invalid commands and present the valid options list (#498 ) * rescue invalid commands * recuse invalid command	2017-05-14 21:30:43 +02:00
Dreckiger-Dan	1492c406e9	Fixed headline in README.md (#496 ) ###Alternatives -> ### Alternatives	2017-05-09 06:36:12 +02:00
Olle Jonsson	f72d8d9912	Travis: use latest rubies (#488 )	2017-04-20 16:42:37 +02:00
Olle Jonsson	bf20ab7543	Use ruby-2.4.1 in CI (#487 )	2017-04-13 09:04:23 +02:00
Olle Jonsson	9cb6306b47	Travis: jruby-9.1.8.0 (#485 )	2017-03-10 10:12:33 +01:00
Olle Jonsson	d334aa01f2	Option parsing: Remove tag1, tag2 cruft (#479 )	2017-02-08 21:58:30 +01:00
Olle Jonsson	1e9e72f1a5	Update to latest CodeClimate (#478 ) * Update to latest CodeClimate * SpecHelper: drop CodeClimate formatter	2017-02-08 21:09:23 +01:00
Olle Jonsson	acf1c1604a	Gemspec: update retriable to 3.0 (#477 )	2017-02-08 20:45:19 +01:00
Olle Jonsson	d29c117454	Travis: new JRuby, develop on 2.4.0 (#476 ) * Travis: new JRuby, develop on 2.4.0 * CircleCI: ensure new rubygems * Rubocop: RegexpMatch too edgy; long blocks OK in specs * Travis: JRuby head fails bundle install * Travis: Allow failures for jruby-head	2017-02-08 19:52:53 +01:00
Olle Jonsson	8d74965019	Create temporary cache files in Dir.tmpdir (#459 ) * OctoFetcher: http_cache options conditional * Locate cache directory using Dir.tmpdir * Cache files options can not have defaults	2017-02-08 18:14:02 +01:00
Danny Guo	17702543ef	Fix readme typos (#467 )	2016-12-31 18:38:03 +01:00
Olle Jonsson	4ec3ad4a54	Gemspec: demand rainbow 2.2.1+ (#466 )	2016-12-31 11:01:43 +01:00
Olle Jonsson	08e7a954ff	Generated CHANGELOG.md	2016-12-31 10:41:00 +01:00
Olle Jonsson	8ea623fd81	v1.14.3	2016-12-31 10:33:06 +01:00
Olle Jonsson	6e61dfb378	CodeClimate configuration file (#465 )	2016-12-30 01:31:40 +01:00
Olle Jonsson	3fee4fca75	Build against 2.4.0	2016-12-27 19:59:53 +01:00
Olle Jonsson	9fc00f3dc3	Travis: add jruby-head, 2.4.0-rc1 (#463 )	2016-12-21 16:14:07 +01:00
Olle Jonsson	132ecf255c	Gemfiles for building versions separately dropped (#461 ) - simpler build by using the ruby version marker in shared gemfile	2016-12-03 13:51:28 +01:00
Olle Jonsson	238f779d38	Order Gemfile gems (#460 ) Order Gemfile gems A-Z; add ruby version marker	2016-12-02 22:25:45 +01:00
Olle Jonsson	0b88c3bd54	Travis: Use ruby 2.3.3 and 2.2.6 (#452 ) * Travis: Use ruby 2.3.3 and 2.2.6	2016-11-22 21:14:04 +01:00
Olle Jonsson	9c0f7c723f	Merge pull request #455 from eliperkins/fix-enterprise Use Octokit::Client for both .com and Enterprise	2016-11-22 20:57:27 +01:00
Eli Perkins	881ecc161c	Use Octokit::Client for both .com and Enterprise Octokit:EnterpriseAdminClient is only meant to be used for GHE admin panel endpoints, such as Admin Stats, Management Console, etc. This repairs GHE functionality by passing the API endpoint parameters into Octokit::Client and letting it handle the rest.	2016-11-22 13:07:48 -05:00
Olle Jonsson	88cbcd22ed	Merge pull request #454 from edusantana/show-where-task-param-are README: Documentation update about RakeTask params and how to translate labels	2016-11-21 14:28:48 +01:00
Eduardo de Santana Medeiros Alexandre	07081ccf46	capitalize Portuguese	2016-11-20 20:16:04 -03:00
Eduardo de Santana Medeiros Alexandre	a9b49927ee	Say where params come from	2016-11-20 12:47:07 -03:00
Olle Jonsson	4a74bd0ba6	CHANGELOG for v0.14.2	2016-11-12 10:10:28 +01:00
Olle Jonsson	879668b605	v1.14.2	2016-11-12 10:04:18 +01:00
Olle Jonsson	92137ba0b2	Merge pull request #449 from skywinder/fix/can-not-convert-sawyer-resource-to-array-448 OctoFetcher: Moved repositories fail explicitly	2016-11-11 00:44:09 +01:00
Olle Jonsson	b2a29d7279	Travis: Use a Gemfile name that won't outdate	2016-11-10 21:09:19 +01:00
Olle Jonsson	52d14f4b0a	Travis: gemfile pointing right	2016-11-10 21:08:14 +01:00
Olle Jonsson	4d4e8ef5a4	Travis: Use jruby-9.1.6.0 and 2.4.0-preview3	2016-11-10 20:48:23 +01:00
Olle Jonsson	d4dfc99127	OctoFetcher: Moved repositories fail explicitly	2016-11-10 20:37:46 +01:00
Olle Jonsson	88b23ba790	Bump OctoKit dep	2016-11-10 19:32:42 +01:00
Olle Jonsson	d122e00a1a	OctoFetcher#iterate_pages: extract method	2016-11-10 19:32:24 +01:00
Olle Jonsson	3c39c0c178	v1.14.1	2016-11-06 20:30:11 +01:00
Olle Jonsson	c10c583509	Merge pull request #445 from rnelson0/patch-1 Add multi_json as a runtime dependency	2016-11-06 17:58:58 +01:00
Rob Nelson	f6466d7a22	Update github_changelog_generator.gemspec Typo	2016-11-06 11:20:03 -05:00
Rob Nelson	aff1561042	Add multi_json as a runtime dependency Fixes #444	2016-11-06 09:53:30 -05:00
Olle Jonsson	289b2e1866	CHANGELOG for v1.14.0	2016-11-05 10:24:51 +01:00
@@ -1 +1 @@
 .3.1
 .4.0