add tests

.gitignore

@@ -1,9 +0,0 @@
-bin/
-!bin/git-generate-changelog
-!bin/github_changelog_generator
-pkg/
-coverage/
-.bundle
-spec/*.lock
-doc
-.yardoc

.rubocop.yml

@@ -6,51 +6,3 @@ Metrics/LineLength:
 #http://viget.com/extend/just-use-double-quoted-ruby-strings
 Style/StringLiterals:
   EnforcedStyle: double_quotes
-
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-    Enabled: false
-
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-    Enabled: false
-
-Style/FileName:
-    Exclude:
-      - 'bin/git-generate-changelog'
-
-#TODOS
-# Offense count: 14
-Metrics/AbcSize:
-  Enabled: false
-
-# Offense count: 1
-Style/AccessorMethodName:
-  Enabled: false
-
-# Offense count: 10
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/MutableConstant:
-    Enabled: false
-    

.rubocop_todo.yml

@@ -1,33 +1,37 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-02-23 17:18:27 +0200 using RuboCop version 0.37.2.
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-05-25 17:16:04 +0300 using RuboCop version 0.31.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/ImplicitStringConcatenation:
-  Exclude:
-    - 'lib/github_changelog_generator/parser.rb'
-
 # Offense count: 14
 Metrics/AbcSize:
-  Enabled: false
+  Max: 57
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 182
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 7
 
-# Offense count: 2
+# Offense count: 22
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 84
+
+# Offense count: 1
 Metrics/PerceivedComplexity:
   Max: 8
 
-# Offense count: 1
+# Offense count: 2
 Style/AccessorMethodName:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 8
 Style/Documentation:
   Enabled: false
 
@@ -36,16 +40,13 @@ Style/Documentation:
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
+# Offense count: 1
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-# SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Enabled: false
 
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Enabled: false

.travis.yml

@@ -1,27 +1,14 @@
-cache:
-  - bundler
+sudo: false
+cache: bundler
 language: ruby
-before_install:
-  - gem update --system
-  - gem install bundler
 rvm:
-  - 2.1
-script: bundle exec rake checks
-matrix:
-  include:
-    # Test install on clean system
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - gem install *.gem
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - bundle install --gemfile spec/install-gem-in-bundler.gemfile
+- 2.1.0
+script:
+- bundle exec rake
 notifications:
   email:
     recipients:
-      - sky4winder+githubchangeloggenerator@gmail.com
+    - sky4winder+githubchangeloggenerator@gmail.com
     on_success: never
     on_failure: change
 addons:

.yardopts

@@ -1,2 +0,0 @@
---markup=markdown
-

CHANGELOG.md

@@ -1,354 +1,7 @@
 # Change Log
 
-## [1.13.1](https://github.com/skywinder/github-changelog-generator/tree/1.13.1) (2016-07-22)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.13.0...1.13.1)
-
-**Implemented enhancements:**
-
-- Don't constrain runtime deps. [\#400](https://github.com/skywinder/github-changelog-generator/pull/400) ([jkeiser](https://github.com/jkeiser))
-
-**Fixed bugs:**
-
-- `--user` flag should not be ignored [\#397](https://github.com/skywinder/github-changelog-generator/issues/397)
-- GHE not working with --github-site set to an enterprise site [\#395](https://github.com/skywinder/github-changelog-generator/issues/395)
-
-**Closed issues:**
-
-- Contributors Section [\#398](https://github.com/skywinder/github-changelog-generator/issues/398)
-
-**Merged pull requests:**
-
-- Ability to implicity set user and project from command line [\#401](https://github.com/skywinder/github-changelog-generator/pull/401) ([skywinder](https://github.com/skywinder))
-- Show how to use it with Rakefile [\#399](https://github.com/skywinder/github-changelog-generator/pull/399) ([edusantana](https://github.com/edusantana))
-- Adds documentation on using a GHE endpoint [\#396](https://github.com/skywinder/github-changelog-generator/pull/396) ([cormacmccarthy](https://github.com/cormacmccarthy))
-- Rake task usage: Added a missing option exclude\_tags\_regex [\#393](https://github.com/skywinder/github-changelog-generator/pull/393) ([perlun](https://github.com/perlun))
-- Parser: YARD docstrings and a rename, and RegExp named capture groups [\#391](https://github.com/skywinder/github-changelog-generator/pull/391) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.13.0](https://github.com/skywinder/github-changelog-generator/tree/1.13.0) (2016-07-04)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.12.1...1.13.0)
-
-**Merged pull requests:**
-
-- Carry PR \#301: usernames\_as\_github\_logins [\#392](https://github.com/skywinder/github-changelog-generator/pull/392) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.12.1](https://github.com/skywinder/github-changelog-generator/tree/1.12.1) (2016-05-09)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.12.0...1.12.1)
-
-**Fixed bugs:**
-
-- github\_changelog\_generator/generator/generator\_tags.rb:61:in `detect\_since\_tag': undefined method `\[\]' for nil:NilClass \(NoMethodError\) [\#351](https://github.com/skywinder/github-changelog-generator/issues/351)
-
-**Closed issues:**
-
-- Add a LICENSE file [\#369](https://github.com/skywinder/github-changelog-generator/issues/369)
-- Error installing on Ubuntu 14.04 [\#364](https://github.com/skywinder/github-changelog-generator/issues/364)
-
-**Merged pull requests:**
-
-- Move dev gems to add\_development\_dependency [\#373](https://github.com/skywinder/github-changelog-generator/pull/373) ([skywinder](https://github.com/skywinder))
-- Add MIT LICENSE file [\#370](https://github.com/skywinder/github-changelog-generator/pull/370) ([olleolleolle](https://github.com/olleolleolle))
-- Avoid nil bug in detect\_since\_tag [\#368](https://github.com/skywinder/github-changelog-generator/pull/368) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.12.0](https://github.com/skywinder/github-changelog-generator/tree/1.12.0) (2016-04-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.8...1.12.0)
-
-**Closed issues:**
-
-- .github\_changelog\_generator config file is not consistent with the internal options hash [\#312](https://github.com/skywinder/github-changelog-generator/issues/312)
-- Feature request: YAML front matter [\#276](https://github.com/skywinder/github-changelog-generator/issues/276)
-
-**Merged pull requests:**
-
-- Added tag exclusion with a filter \(string or regex\) [\#320](https://github.com/skywinder/github-changelog-generator/pull/320) ([soundstep](https://github.com/soundstep))
-
-## [1.11.8](https://github.com/skywinder/github-changelog-generator/tree/1.11.8) (2016-03-22)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.7...1.11.8)
-
-**Implemented enhancements:**
-
-- ParserFile: Allow comments in settings file [\#358](https://github.com/skywinder/github-changelog-generator/pull/358) ([olleolleolle](https://github.com/olleolleolle))
-
-**Fixed bugs:**
-
-- Error when specifying exclude\_labels [\#327](https://github.com/skywinder/github-changelog-generator/issues/327)
-- Parse options file options into arrays, integers, flags, and other [\#354](https://github.com/skywinder/github-changelog-generator/pull/354) ([olleolleolle](https://github.com/olleolleolle))
-
-**Closed issues:**
-
-- Installation fails on Ubuntu [\#352](https://github.com/skywinder/github-changelog-generator/issues/352)
-- Test installing on Windows: use AppVeyor [\#348](https://github.com/skywinder/github-changelog-generator/issues/348)
-- Can't run under RubyGems 2.5.1 and Ruby 2.3.0 [\#325](https://github.com/skywinder/github-changelog-generator/issues/325)
-- Ruby 2.3.0 - Deprecation warning: Github::ResponseWrapper\#respond\_to?\(:to\_ary\) is old fashion which takes only one parameter [\#323](https://github.com/skywinder/github-changelog-generator/issues/323)
-- between-tags and exclude-tags do not work in .github\_changelog\_generator [\#317](https://github.com/skywinder/github-changelog-generator/issues/317)
-- Add a "documentation" label [\#284](https://github.com/skywinder/github-changelog-generator/issues/284)
-
-**Merged pull requests:**
-
-- Replace shelling-out-to-Git w/ Dir call [\#360](https://github.com/skywinder/github-changelog-generator/pull/360) ([olleolleolle](https://github.com/olleolleolle))
-- ParserFile: fail parsing with config file line number; use a File instead of a filename [\#357](https://github.com/skywinder/github-changelog-generator/pull/357) ([olleolleolle](https://github.com/olleolleolle))
-- On gem install, do not try to copy manpage files in the "extensions" step [\#356](https://github.com/skywinder/github-changelog-generator/pull/356) ([olleolleolle](https://github.com/olleolleolle))
-- Refactor: call it option\_name, instead of key\_sym [\#355](https://github.com/skywinder/github-changelog-generator/pull/355) ([olleolleolle](https://github.com/olleolleolle))
-- Add a `bundle install` test [\#353](https://github.com/skywinder/github-changelog-generator/pull/353) ([jkeiser](https://github.com/jkeiser))
-- Add an AppVeyor config [\#350](https://github.com/skywinder/github-changelog-generator/pull/350) ([Arcanemagus](https://github.com/Arcanemagus))
-- README: Document GitHub token URI scope [\#345](https://github.com/skywinder/github-changelog-generator/pull/345) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.7](https://github.com/skywinder/github-changelog-generator/tree/1.11.7) (2016-03-04)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.6...1.11.7)
-
-**Merged pull requests:**
-
-- Add Olle Jonsson as co-author [\#347](https://github.com/skywinder/github-changelog-generator/pull/347) ([skywinder](https://github.com/skywinder))
-- Gemspec, default date [\#346](https://github.com/skywinder/github-changelog-generator/pull/346) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.6](https://github.com/skywinder/github-changelog-generator/tree/1.11.6) (2016-03-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.5...1.11.6)
-
-**Fixed bugs:**
-
-- Can't build on Windows [\#340](https://github.com/skywinder/github-changelog-generator/issues/340)
-
-**Closed issues:**
-
-- install error "Not a git repository" [\#339](https://github.com/skywinder/github-changelog-generator/issues/339)
-
-**Merged pull requests:**
-
-- Gemspec: Calculate date using Date stdlib [\#343](https://github.com/skywinder/github-changelog-generator/pull/343) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.5](https://github.com/skywinder/github-changelog-generator/tree/1.11.5) (2016-03-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.4...1.11.5)
-
-**Merged pull requests:**
-
-- Test clean install in Travis [\#344](https://github.com/skywinder/github-changelog-generator/pull/344) ([jkeiser](https://github.com/jkeiser))
-- Update Rakefile to avoid install-breaking bug [\#341](https://github.com/skywinder/github-changelog-generator/pull/341) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.4](https://github.com/skywinder/github-changelog-generator/tree/1.11.4) (2016-02-26)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.3...1.11.4)
-
-**Merged pull requests:**
-
-- Man page copying: only copy .1 [\#338](https://github.com/skywinder/github-changelog-generator/pull/338) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.3](https://github.com/skywinder/github-changelog-generator/tree/1.11.3) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.2...1.11.3)
-
-**Closed issues:**
-
-- Cannot install gem [\#335](https://github.com/skywinder/github-changelog-generator/issues/335)
-
-## [1.11.2](https://github.com/skywinder/github-changelog-generator/tree/1.11.2) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.1...1.11.2)
-
-**Fixed bugs:**
-
-- Getting an error on install [\#329](https://github.com/skywinder/github-changelog-generator/issues/329)
-
-**Merged pull requests:**
-
-- Fix installation by not running the specs - which have dependencies [\#337](https://github.com/skywinder/github-changelog-generator/pull/337) ([skywinder](https://github.com/skywinder))
-
-## [1.11.1](https://github.com/skywinder/github-changelog-generator/tree/1.11.1) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.0...1.11.1)
-
-**Merged pull requests:**
-
-- Add rubocop and rspec as runtime dependencies [\#336](https://github.com/skywinder/github-changelog-generator/pull/336) ([jkeiser](https://github.com/jkeiser))
-- \[Refactor\] ParserFile class use Pathname [\#334](https://github.com/skywinder/github-changelog-generator/pull/334) ([olleolleolle](https://github.com/olleolleolle))
-- \[Refactor\] Generator\#exclude\_issues\_by\_labels simpler, tested [\#332](https://github.com/skywinder/github-changelog-generator/pull/332) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.0](https://github.com/skywinder/github-changelog-generator/tree/1.11.0) (2016-02-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.5...1.11.0)
-
-## [1.10.5](https://github.com/skywinder/github-changelog-generator/tree/1.10.5) (2016-02-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.4...1.10.5)
-
-## [1.10.4](https://github.com/skywinder/github-changelog-generator/tree/1.10.4) (2016-02-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.3...1.10.4)
-
-**Fixed bugs:**
-
-- Rake and Bundler as runtime deps [\#333](https://github.com/skywinder/github-changelog-generator/pull/333) ([olleolleolle](https://github.com/olleolleolle))
-
-**Merged pull requests:**
-
-- Test case for \#327 [\#331](https://github.com/skywinder/github-changelog-generator/pull/331) ([olleolleolle](https://github.com/olleolleolle))
-- Fix crash installing on systems without overcommit [\#330](https://github.com/skywinder/github-changelog-generator/pull/330) ([jkeiser](https://github.com/jkeiser))
-
-## [1.10.3](https://github.com/skywinder/github-changelog-generator/tree/1.10.3) (2016-02-23)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.2...1.10.3)
-
-## [1.10.2](https://github.com/skywinder/github-changelog-generator/tree/1.10.2) (2016-02-23)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.11.0...1.10.2)
-
-## [v1.11.0](https://github.com/skywinder/github-changelog-generator/tree/v1.11.0) (2016-02-23)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.1...v1.11.0)
-
-**Implemented enhancements:**
-
-- 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))
-
-**Fixed bugs:**
-
-- detect\_since\_tag undefined [\#328](https://github.com/skywinder/github-changelog-generator/issues/328)
-
-**Merged pull requests:**
-
-- Update README.md [\#324](https://github.com/skywinder/github-changelog-generator/pull/324) ([Zearin](https://github.com/Zearin))
-
-## [1.10.1](https://github.com/skywinder/github-changelog-generator/tree/1.10.1) (2016-01-06)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.0...1.10.1)
-
-**Fixed bugs:**
-
-- Parser: avoid Ruby exit, to make Rake tasks work [\#315](https://github.com/skywinder/github-changelog-generator/pull/315) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.10.0](https://github.com/skywinder/github-changelog-generator/tree/1.10.0) (2016-01-05)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.9.0...1.10.0)
-
-**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))
-
-**Closed issues:**
-
-- PRs not closed on master branch show up in changelog [\#280](https://github.com/skywinder/github-changelog-generator/issues/280)
-
-**Merged pull requests:**
-
-- Update bundler [\#306](https://github.com/skywinder/github-changelog-generator/pull/306) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Fixes \#280 Add release-branch option to filter the Pull Requests [\#305](https://github.com/skywinder/github-changelog-generator/pull/305) ([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:**
-
-- Fix issue with missing events \(in case of events for issue \>30\) [\#268](https://github.com/skywinder/github-changelog-generator/pull/268) ([skywinder](https://github.com/skywinder))
-- Use since\_tag as default for older\_tag [\#267](https://github.com/skywinder/github-changelog-generator/pull/267) ([raphink](https://github.com/raphink))
-
-## [1.8.0](https://github.com/skywinder/github-changelog-generator/tree/1.8.0) (2015-08-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.7.0...1.8.0)
-
-**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:**
-
-- Add `--due-tag` option [\#265](https://github.com/skywinder/github-changelog-generator/pull/265) ([skywinder](https://github.com/skywinder))
-- 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 --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)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.6.2...1.7.0)
-
-**Implemented enhancements:**
-
-- Custom header [\#251](https://github.com/skywinder/github-changelog-generator/issues/251)
-- Arbitrary templates [\#242](https://github.com/skywinder/github-changelog-generator/issues/242)
-
-## [1.6.2](https://github.com/skywinder/github-changelog-generator/tree/1.6.2) (2015-07-16)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.6.1...1.6.2)
-
-**Fixed bugs:**
-
-- --unreleased-only broken [\#250](https://github.com/skywinder/github-changelog-generator/issues/250)
-
-## [1.6.1](https://github.com/skywinder/github-changelog-generator/tree/1.6.1) (2015-06-12)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.6.0...1.6.1)
-
-**Implemented enhancements:**
-
-- Ability to specify custom section header [\#241](https://github.com/skywinder/github-changelog-generator/issues/241)
-
-**Fixed bugs:**
-
-- not encapsulated character `\<` [\#249](https://github.com/skywinder/github-changelog-generator/issues/249)
-
-## [1.6.0](https://github.com/skywinder/github-changelog-generator/tree/1.6.0) (2015-06-11)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.5.0...1.6.0)
-
-**Implemented enhancements:**
-
-- Issues with any label  except "bug", "enhancement" should not be excluded by default. [\#240](https://github.com/skywinder/github-changelog-generator/issues/240)
-- Add ability to specify custom labels for enhancements & bugfixes [\#54](https://github.com/skywinder/github-changelog-generator/issues/54)
-
-**Fixed bugs:**
-
-- --user and --project options are broken [\#246](https://github.com/skywinder/github-changelog-generator/issues/246)
-- Exclude and Include tags is broken [\#245](https://github.com/skywinder/github-changelog-generator/issues/245)
-
-## [1.5.0](https://github.com/skywinder/github-changelog-generator/tree/1.5.0) (2015-05-26)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.4.1...1.5.0)
-
-**Implemented enhancements:**
-
-- Show `Unreleased` section even when there is no tags in repo. [\#228](https://github.com/skywinder/github-changelog-generator/issues/228)
-- Add option `--exclude-tags x,y,z` [\#214](https://github.com/skywinder/github-changelog-generator/issues/214)
-- Generate change log between 2 specific tags [\#172](https://github.com/skywinder/github-changelog-generator/issues/172)
-- Yanked releases support [\#53](https://github.com/skywinder/github-changelog-generator/issues/53)
-
-**Merged pull requests:**
-
-- Big refactoring [\#243](https://github.com/skywinder/github-changelog-generator/pull/243) ([skywinder](https://github.com/skywinder))
-
 ## [1.4.1](https://github.com/skywinder/github-changelog-generator/tree/1.4.1) (2015-05-19)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.4.0...1.4.1)
 
 **Implemented enhancements:**
@@ -358,23 +11,28 @@
 **Fixed bugs:**
 
 - github\_changelog\_generator.rb:220:in ``': No such file or directory - pwd \(Errno::ENOENT\) [\#237](https://github.com/skywinder/github-changelog-generator/issues/237)
+
 - Doesnot generator changelog [\#235](https://github.com/skywinder/github-changelog-generator/issues/235)
+
 - Exclude closed \(not merged\) PR's from changelog. [\#69](https://github.com/skywinder/github-changelog-generator/issues/69)
 
 **Merged pull requests:**
 
 - Wrap GitHub requests in function check\_github\_response [\#238](https://github.com/skywinder/github-changelog-generator/pull/238) ([skywinder](https://github.com/skywinder))
+
 - Add fetch token tests [\#236](https://github.com/skywinder/github-changelog-generator/pull/236) ([skywinder](https://github.com/skywinder))
+
 - Add future release option [\#231](https://github.com/skywinder/github-changelog-generator/pull/231) ([sildur](https://github.com/sildur))
 
 ## [1.4.0](https://github.com/skywinder/github-changelog-generator/tree/1.4.0) (2015-05-07)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.11...1.4.0)
 
 **Implemented enhancements:**
 
 - 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:**
 
@@ -382,14 +40,22 @@
 
 **Merged pull requests:**
 
+- Cleanup [\#220](https://github.com/skywinder/github-changelog-generator/pull/220) ([tuexss](https://github.com/tuexss))
+
 - 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))
+
 - 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))
+
 - Add --max-issues argument to limit requests [\#76](https://github.com/skywinder/github-changelog-generator/pull/76) ([sneal](https://github.com/sneal))
 
 ## [1.3.11](https://github.com/skywinder/github-changelog-generator/tree/1.3.11) (2015-03-21)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.10...1.3.11)
 
 **Merged pull requests:**
@@ -397,30 +63,35 @@
 - Add  fallback with warning message to prevent crash in case of exceed API Rate Limit \(temporary workaround for \#71\) [\#75](https://github.com/skywinder/github-changelog-generator/pull/75) ([skywinder](https://github.com/skywinder))
 
 ## [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))
 
 ## [1.3.9](https://github.com/skywinder/github-changelog-generator/tree/1.3.9) (2015-03-06)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.8...1.3.9)
 
 **Implemented enhancements:**
 
 - Improve method of detecting owner and repository [\#63](https://github.com/skywinder/github-changelog-generator/issues/63)
 
-**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))
 
 ## [1.3.8](https://github.com/skywinder/github-changelog-generator/tree/1.3.8) (2015-03-05)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.6...1.3.8)
 
 ## [1.3.6](https://github.com/skywinder/github-changelog-generator/tree/1.3.6) (2015-03-05)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.5...1.3.6)
 
 ## [1.3.5](https://github.com/skywinder/github-changelog-generator/tree/1.3.5) (2015-03-04)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.4...1.3.5)
 
 **Fixed bugs:**
@@ -428,6 +99,7 @@
 - Pull Requests in Wrong Tag [\#60](https://github.com/skywinder/github-changelog-generator/issues/60)
 
 ## [1.3.4](https://github.com/skywinder/github-changelog-generator/tree/1.3.4) (2015-03-03)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.3...1.3.4)
 
 **Fixed bugs:**
@@ -435,6 +107,7 @@
 - --no-issues appears to break PRs [\#59](https://github.com/skywinder/github-changelog-generator/issues/59)
 
 ## [1.3.3](https://github.com/skywinder/github-changelog-generator/tree/1.3.3) (2015-03-03)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.2...1.3.3)
 
 **Closed issues:**
@@ -442,6 +115,7 @@
 - Add \# character to encapsulate list. [\#58](https://github.com/skywinder/github-changelog-generator/issues/58)
 
 ## [1.3.2](https://github.com/skywinder/github-changelog-generator/tree/1.3.2) (2015-03-03)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.1...1.3.2)
 
 **Fixed bugs:**
@@ -449,16 +123,21 @@
 - generation failed if github commit api return `404 Not Found` [\#57](https://github.com/skywinder/github-changelog-generator/issues/57)
 
 ## [1.3.1](https://github.com/skywinder/github-changelog-generator/tree/1.3.1) (2015-02-27)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.0...1.3.1)
 
 ## [1.3.0](https://github.com/skywinder/github-changelog-generator/tree/1.3.0) (2015-02-26)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.8...1.3.0)
 
 **Implemented enhancements:**
 
 - Do not show `Unreleased` section, when it's empty. [\#55](https://github.com/skywinder/github-changelog-generator/issues/55)
+
 - Separate list exclude and include labels [\#52](https://github.com/skywinder/github-changelog-generator/issues/52)
+
 - Unreleased issues in separate section [\#47](https://github.com/skywinder/github-changelog-generator/issues/47)
+
 - Separate by lists: Enhancements, Bugs, Pull requests. [\#31](https://github.com/skywinder/github-changelog-generator/issues/31)
 
 **Fixed bugs:**
@@ -470,6 +149,7 @@
 - Implement filtering of Pull Requests by milestones [\#50](https://github.com/skywinder/github-changelog-generator/pull/50) ([skywinder](https://github.com/skywinder))
 
 ## [1.2.8](https://github.com/skywinder/github-changelog-generator/tree/1.2.8) (2015-02-17)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.7...1.2.8)
 
 **Closed issues:**
@@ -479,16 +159,19 @@
 **Merged pull requests:**
 
 - Feature/fix 37 [\#49](https://github.com/skywinder/github-changelog-generator/pull/49) ([skywinder](https://github.com/skywinder))
+
 - Prettify output [\#48](https://github.com/skywinder/github-changelog-generator/pull/48) ([skywinder](https://github.com/skywinder))
 
 ## [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))
 
 ## [1.2.6](https://github.com/skywinder/github-changelog-generator/tree/1.2.6) (2015-01-21)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.5...1.2.6)
 
 **Merged pull requests:**
@@ -496,32 +179,41 @@
 - fix link tag format [\#45](https://github.com/skywinder/github-changelog-generator/pull/45) ([sugamasao](https://github.com/sugamasao))
 
 ## [1.2.5](https://github.com/skywinder/github-changelog-generator/tree/1.2.5) (2015-01-15)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.4...1.2.5)
 
 **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)
 
 **Fixed bugs:**
 
 - Sometimes user is NULL during merges [\#41](https://github.com/skywinder/github-changelog-generator/issues/41)
+
 - Crash when try generate log for rails [\#35](https://github.com/skywinder/github-changelog-generator/issues/35)
 
 ## [1.2.3](https://github.com/skywinder/github-changelog-generator/tree/1.2.3) (2014-12-16)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.2...1.2.3)
 
 **Implemented enhancements:**
 
 - Add ability to run with one parameter instead -u -p [\#38](https://github.com/skywinder/github-changelog-generator/issues/38)
+
 - Detailed output [\#33](https://github.com/skywinder/github-changelog-generator/issues/33)
 
 **Fixed bugs:**
@@ -531,16 +223,23 @@
 **Merged pull requests:**
 
 - Implement async fetching [\#39](https://github.com/skywinder/github-changelog-generator/pull/39) ([skywinder](https://github.com/skywinder))
+
 - Fix crash when user is NULL [\#40](https://github.com/skywinder/github-changelog-generator/pull/40) ([skywinder](https://github.com/skywinder))
 
 ## [1.2.2](https://github.com/skywinder/github-changelog-generator/tree/1.2.2) (2014-12-10)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.1...1.2.2)
 
 **Fixed bugs:**
 
 - Encapsulate \[ \> \* \_ \ \] signs in issues names [\#34](https://github.com/skywinder/github-changelog-generator/issues/34)
 
+**Merged pull requests:**
+
+- Add a Bitdeli Badge to README [\#36](https://github.com/skywinder/github-changelog-generator/pull/36) ([bitdeli-chef](https://github.com/bitdeli-chef))
+
 ## [1.2.1](https://github.com/skywinder/github-changelog-generator/tree/1.2.1) (2014-11-22)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.0...1.2.1)
 
 **Fixed bugs:**
@@ -550,18 +249,23 @@
 **Merged pull requests:**
 
 - Issues for last tag not in list [\#29](https://github.com/skywinder/github-changelog-generator/pull/29) ([skywinder](https://github.com/skywinder))
+
 - Disable default --filter-pull-requests option. [\#28](https://github.com/skywinder/github-changelog-generator/pull/28) ([skywinder](https://github.com/skywinder))
 
 ## [1.2.0](https://github.com/skywinder/github-changelog-generator/tree/1.2.0) (2014-11-19)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.1.4...1.2.0)
 
 **Merged pull requests:**
 
 - Add filter for pull-requests labels. \(option --filter-pull-requests\) [\#27](https://github.com/skywinder/github-changelog-generator/pull/27) ([skywinder](https://github.com/skywinder))
+
 - Add ability to insert authors of pull-requests \(--\[no-\]author option\) [\#25](https://github.com/skywinder/github-changelog-generator/pull/25) ([skywinder](https://github.com/skywinder))
+
 - Don't receive issues in case of --no-isses flag specied [\#24](https://github.com/skywinder/github-changelog-generator/pull/24) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.4](https://github.com/skywinder/github-changelog-generator/tree/1.1.4) (2014-11-18)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.1.2...1.1.4)
 
 **Implemented enhancements:**
@@ -573,23 +277,29 @@
 - Sort tags by date [\#23](https://github.com/skywinder/github-changelog-generator/pull/23) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.2](https://github.com/skywinder/github-changelog-generator/tree/1.1.2) (2014-11-12)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.1.1...1.1.2)
 
 **Merged pull requests:**
 
 - Fix bug with dot signs in project name [\#18](https://github.com/skywinder/github-changelog-generator/pull/18) ([skywinder](https://github.com/skywinder))
+
 - Fix bug with dot signs in user name [\#17](https://github.com/skywinder/github-changelog-generator/pull/17) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.1](https://github.com/skywinder/github-changelog-generator/tree/1.1.1) (2014-11-10)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.1.0...1.1.1)
 
 **Merged pull requests:**
 
 - Remove duplicates of issues and pull-requests with same number [\#15](https://github.com/skywinder/github-changelog-generator/pull/15) ([skywinder](https://github.com/skywinder))
+
 - Sort issues by tags [\#14](https://github.com/skywinder/github-changelog-generator/pull/14) ([skywinder](https://github.com/skywinder))
+
 - Add ability to add or exclude issues without any labels [\#13](https://github.com/skywinder/github-changelog-generator/pull/13) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.0](https://github.com/skywinder/github-changelog-generator/tree/1.1.0) (2014-11-10)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.0.1...1.1.0)
 
 **Implemented enhancements:**
@@ -599,19 +309,22 @@
 **Fixed bugs:**
 
 - Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/github-changelog-generator/issues/12)
+
 - Markdown formating in the last line wrong [\#9](https://github.com/skywinder/github-changelog-generator/issues/9)
 
 ## [1.0.1](https://github.com/skywinder/github-changelog-generator/tree/1.0.1) (2014-11-10)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.0.0...1.0.1)
 
 ## [1.0.0](https://github.com/skywinder/github-changelog-generator/tree/1.0.0) (2014-11-07)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/0.1.0...1.0.0)
 
 **Implemented enhancements:**
 
 - 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:**
 
@@ -619,21 +332,28 @@
 
 **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)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/0.0.2...0.1.0)
 
 **Merged pull requests:**
 
 - Fix parsing date of pull request [\#3](https://github.com/skywinder/github-changelog-generator/pull/3) ([skywinder](https://github.com/skywinder))
+
 - Add changelog generation for last tag [\#2](https://github.com/skywinder/github-changelog-generator/pull/2) ([skywinder](https://github.com/skywinder))
+
 - Add option \(-o --output\) to specify name of the output file. [\#1](https://github.com/skywinder/github-changelog-generator/pull/1) ([skywinder](https://github.com/skywinder))
 
 ## [0.0.2](https://github.com/skywinder/github-changelog-generator/tree/0.0.2) (2014-11-06)
+
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/0.0.1...0.0.2)
 
 ## [0.0.1](https://github.com/skywinder/github-changelog-generator/tree/0.0.1) (2014-11-06)
 
 
+
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -1,15 +1,14 @@
 source "https://rubygems.org"
 
-gemspec
+gem "rake", ">=10.4.2"
+
+gem "github_api", ">=0.12.3"
+gem "colorize", ">=0.7.7"
 
 group :test do
-  gem "rake"
-  gem "bundler"
+  gem "rspec"
   gem "rubocop"
-  gem "overcommit"
-  gem "coveralls", "~>0.8", require: false
-  gem "simplecov", "~>0.10", require: false
-  gem "codeclimate-test-reporter", "~>0.4"
-  # JSON 2.0.1 is ruby 2.0+
-  gem "json", "< 2.0"
+  gem "coveralls", require: false
+  gem "simplecov", require: false
+  gem "codeclimate-test-reporter"
 end

Gemfile.lock

@@ -1,108 +1,107 @@
-PATH
-  remote: .
-  specs:
-    github_changelog_generator (1.13.1)
-      colorize (>= 0.7)
-      github_api (>= 0.12)
-      rake (>= 10.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
-    ast (2.3.0)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.6.0)
+    addressable (2.3.8)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    colorize (0.8.1)
-    coveralls (0.8.14)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+    colorize (0.7.7)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.2)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
-    github_api (0.14.4)
-      addressable (~> 2.4.0)
+    github_api (0.12.3)
+      addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      oauth2 (~> 1.0.0)
-    hashie (3.4.4)
-    iniparse (1.4.2)
-    json (1.8.3)
-    jwt (1.5.4)
-    multi_json (1.12.1)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
+    hashie (3.4.1)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    json (1.8.2)
+    jwt (1.5.0)
+    mime-types (2.5)
+    mini_portile (0.6.2)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    overcommit (0.34.2)
-      childprocess (~> 0.5.8)
-      iniparse (~> 1.4)
-    parser (2.3.1.2)
-      ast (~> 2.2)
+    parser (2.2.2.2)
+      ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
-    rack (1.6.4)
-    rainbow (2.1.0)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rack (1.6.1)
+    rainbow (2.0.0)
+    rake (10.4.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    rubocop (0.31.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      json (>= 1.8, < 3)
+      json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.6.0)
-    unicode-display_width (1.1.0)
+    tins (1.5.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  codeclimate-test-reporter (~> 0.4)
-  coveralls (~> 0.8)
-  github_changelog_generator!
-  json (< 2.0)
-  overcommit
-  rake
-  rspec (>= 3.2)
+  codeclimate-test-reporter
+  colorize (>= 0.7.7)
+  coveralls
+  github_api (>= 0.12.3)
+  rake (>= 10.4.2)
+  rspec
   rubocop
-  simplecov (~> 0.10)
-
-BUNDLED WITH
-   1.12.5
+  simplecov

LICENSE

@@ -1,9 +0,0 @@
-The MIT License (MIT)
-Copyright (c) 2016 Petr Korolev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

README.md

@@ -21,7 +21,7 @@ GitHub Changelog Generator ![GitHub Logo](../master/images/logo.jpg)
   - [License](#license)
 
  
-### Changelog generation has never been so easy
+### 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 labels) from :octocat: GitHub Issue Tracker.
 
@@ -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
 
@@ -45,7 +45,7 @@ Because software tools are for people. If you don’t care, why are you contribu
 
 		github_changelog_generator -u skywinder -p ActionSheetPicker-3.0
 
-- In general, it looks like this:
+- In general it looks like this:
 
 > ## [1.2.5](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.5) (2015-01-15)
 > 
@@ -67,174 +67,152 @@ Because software tools are for people. If you don’t care, why are you contribu
 
 
 ## Usage
-**It's really simple!**
+**It's really simple**: 
 
-- If your **`git remote`** `origin` refers to your GitHub repo, just go to your project folder and run:
+- If your **git remote** `origin` refers to your GitHub repo, then just go to your project folder and run:
 
 		github_changelog_generator
 
--  Or, run this from anywhere:
+-  or from anywhere:
     - `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:
-
-        github_changelog_generator --github-site="https://github.yoursite.com" \
-                                   --github-api="https://github.yoursite.com/api/v3/"
-
-This generates a changelog to the `CHANGELOG.md` file, with pretty markdown formatting.
+As output you will get `CHANGELOG.md` file with pretty *Markdown-formatted* changelog.
 
 ### Params
-Type `github_changelog_generator --help` for details.
+Type `github_changelog_generator --help` for detailed usage.
 
-For more details about params, read the Wiki page: [**Advanced change log generation examples**](https://github.com/skywinder/github-changelog-generator/wiki/Advanced-change-log-generation-examples)
+    Usage: changelog_generator [options]
+    -u, --user [USER]                         Username of the owner of target GitHub repo
+    -p, --project [PROJECT]                   Name of project on GitHub
+    -t, --token [TOKEN]                       To make more than 50 requests per hour your GitHub token required. You can generate it here: https://github.com/settings/tokens/new
+    -f, --date-format [FORMAT]                Date format. Default is %d/%m/%y
+    -o, --output [NAME]                       Output file. Default is CHANGELOG.md
+        --[no-]verbose                        Run verbosely. Default is true
+        --[no-]issues                         Include closed issues to changelog. Default is true
+        --[no-]issues-wo-labels               Include closed issues without labels to changelog. Default is true
+        --[no-]pr-wo-labels                   Include pull requests without labels to changelog. Default is true
+        --[no-]pull-requests                  Include pull-requests to changelog. Default is true
+        --[no-]filter-by-milestone            Use milestone to detect when issue was resolved. Default is true
+        --[no-]author                         Add author of pull-request in the end. Default is true
+        --unreleased-only                     Generate log from unreleased closed issues only.
+        --[no-]unreleased                     Add to log unreleased closed issues. Default is true
+        --[no-]compare-link                   Include compare link between older version and newer version. Default is true
+        --include-labels  x,y,z               Issues only with that labels will be included to changelog. Default is 'bug,enhancement'
+        --exclude-labels  x,y,z               Issues with that labels will be always excluded from changelog. Default is 'duplicate,question,invalid,wontfix'
+        --max-issues [NUMBER]                 Max number of issues to fetch from GitHub. Default is unlimited.
+        --github-site [URL]                   The Enterprise Github site on which your project is hosted.
+        --github-api [URL]                    The enterprise endpoint to use for your Github API.
+        --future-release [RELEASE-VERSION]    Put the unreleased changes in the specified release number.
+    -v, --version                             Print version number
+    -h, --help                                Displays Help
 
-### Params File
-In your project root, you can put a params file named `.github_changelog_generator` to override default params:
-
-Example:
-```
-unreleased=false
-future-release=5.0.0
-since-tag=1.0.0
-```
 
 ### GitHub token
 
-GitHub only allows only 50 unauthenticated requests per hour. 
-Therefore, it's recommended to run this script with authentication by using a **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)
 
-Here's how:
+**You can easily [generate it here](https://github.com/settings/tokens)**.
 
-- [Generate a token here](https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token) - you only need "repo" scope for private repositories
-- Either:
-    - Run the script with `--token <your-40-digit-token>`; **OR**
-    - Set the `CHANGELOG_GITHUB_TOKEN` environment variable to your 40 digit token
+And:
 
-You can set an environment variable by running the following command at the prompt, or by adding it to your shell profile (e.g., `~/.bash_profile` or `~/.zshrc`):
+- Run with key `-t [your-16-digit-token]` 
+- Or set environment variable `CHANGELOG_GITHUB_TOKEN` and specify there your token. 
  		
-        export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"
+	i.e. add to your `~/.bash_profile` or `~/.zshrc` or any other place to load ENV variables string :
 
-So, if you got an error like this:
+        export CHANGELOG_GITHUB_TOKEN="your-40-digit-github-token"
+
+So, if you got 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'
 
-It's time to create this token! (Or, wait an hour for GitHub to reset your unauthenticated request limit.)
+It's time to create this token or wait for 1 hour before GitHub reset the counter for your IP.
 
-## 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 probably don't want your project's open issues and PRs for all past features listed in your historic changelog, either.
-
-That's where `--base <your-manual-changelog.md>` comes in handy!
-This option lets append your old manual changelog to the end of the generated entries.
-
-If you have a `HISTORY.md` file in your project, it will automatically be picked as the static historical changelog and appended.
-
-### Rake task
-
-You love `rake`? We do, too! So, we've made it even easier for you: 
-we've provided a `rake` task library for your changelog generation.
-
-Just put something like this in your `Rakefile`:
-
-```ruby
-require 'github_changelog_generator/task'
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.since_tag = '0.1.14'
-  config.future_release = '0.2.0'
-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.
-
-## 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:
+##Features and advantages of this project
+- Generate canonical, neat change log file, followed by [basic change log guidlines](http://keepachangelog.com/) :gem:
+- Possible to generate **Unreleased** changes (closed issues that have not released yet) :dizzy:
 - **GitHub Enterprise support** via command line options! :factory:
-- Flexible format **customization**:
-    - **Customize** issues that **should be added** to changelog :eight_spoked_asterisk:
-    - **Custom date formats** supported (but keep [ISO 8601](http://xkcd.com/1179/) in mind!) :date:
-    - Manually specify the version that fixed an issue (for cases when the issue's Closed date doesn't match) by giving the issue's `milestone` the same name as the tag of version :pushpin:
-    - Automatically **exclude specific issues** that are irrelevant to your changelog (by default, any issue labeled `question`, `duplicate`, `invalid`, or `wontfix`) :scissors:
-- **Distinguish** issues **by labels**. :mag_right:
-    - Merged pull requests (all merged pull-requests) :twisted_rightwards_arrows:
-    - Bug fixes (issues labeled `bug`) :beetle:
-    - Enhancements (issues labeled `enhancement`) :star2:
-    - Issues (closed issues with no labels) :non-potable_water:
+- Flexible format **customisation**:
+    - **Customize** issues, that **should be added** to changelog :eight_spoked_asterisk:
+    - **Custom date format** supported (but get in mind [ISO 8601](http://xkcd.com/1179/) ) :date:
+    - Ability to manually specify in which version issue was fixed (in case, when closed date is not match) by setting `milestone` of issue the same name as tag of  required version :pushpin:
+    - Automatically **exclude specific issues**, not-related to change log (any issue, that has label `question` `duplicate` `invalid` `wontfix`by default)  :scissors:
+- **Distinguish** issues **according labels**. :mag_right:
+    - Merged pull requests (all `merged` pull-requests) :twisted_rightwards_arrows:
+    - Bug fixes (by label `bug` in issue) :beetle:
+    - Enhancements (by label `enhancement` in issue) :star2:
+    - 	Issues (closed issues `w/o any labels`) :non-potable_water:    
 
-- Manually include or exclude issues by labels :wrench:
-- Customize lots more! Tweak the changelog to fit your preferences :tophat:
-(*See `github_changelog_generator --help`  for details)*
+- You can manually set which labels should be included/excluded. :wrench:
+- Apply a lot of other customisations, to fit changelog for your personal style :tophat: 
+(*look `github_changelog_generator --help`  for details)*
 
 
 ###Alternatives
-Here is a [wikipage list of alternatives](https://github.com/skywinder/Github-Changelog-Generator/wiki/Alternatives) that I found. But none satisfied my requirements.
+Here is a [wikipage list of alternatives](https://github.com/skywinder/Github-Changelog-Generator/wiki/Alternatives), that I found. But none satisfied my requirements.
 
-*If you know other projects, feel free to edit this Wiki page!*
+*If you know other projects - feel free to edit this Wiki page!*
 
 
 ### Projects using this library
-Here's a [wikipage list of projects](https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator).
+[Wikipage with list of projects](https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) 
 
 If you've used this project in a live app, please let me know! Nothing makes me happier than seeing someone else take my work and go wild with it.
 
-*If you are using `github_changelog_generator` to generate your project's changelog, or know of other projects using it, please [add it to this list] (https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator).*
+*If you are using `github_changelog_generator` for generation change log in your project or know another project that uses it, please add it to [this] (https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) list.*
 
 ## Am I missing some essential feature?
 
 - **Nothing is impossible!** 
 
-- Open an [issue](https://github.com/skywinder/Github-Changelog-Generator/issues/new) and let's make the generator better together!
+- Open an [issue](https://github.com/skywinder/Github-Changelog-Generator/issues/new) and let's make generator better together! 
 
-- *Bug reports, feature requests, patches, and well-wishes are always welcome.* :heavy_exclamation_mark:
+- *Bug reports, feature requests, patches, well-wishes are always welcome* :heavy_exclamation_mark:
 
 ## FAQ
 
 - ***I already use GitHub Releases. Why do I need this?***
 
-GitHub Releases is a very good thing. And it's very good practice to maintain it. (Not a lot of people are using it yet!) :congratulations:
+GitHub Releases is a very good thing. And it's very good practice to maintain it (not so much people using it yet)! :congratulations:
 
-*BTW: I would like to support GitHub Releases in [next releases](https://github.com/skywinder/github-changelog-generator/issues/56) ;)*
+*BDW: I would like to support GitHub Releases in [next releases](https://github.com/skywinder/github-changelog-generator/issues/56) ;)*
 
-I'm not trying to compare the quality of handwritten and auto-generated logs. That said....
+I'm not try to compare quality of auto-generated and manually generated logs.. but:
 
-An auto-generated changelog really helps, even if you manually fill in the release notes!
+The auto generated Changelog really helps even if you manually fill Releases notes!
 
 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 I found a closed bug - it's very useful to understand, in which release it was fixed. In that case you can easily find this 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
+- it's not so quite easy to find it in manually filled Releases notes.
+- this file can also help you to build your Release note and not miss features in manually-filled list.
 
-Ultimately, I think GitHub Releases is 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.
+In the end:
 
-- ***I received a warning: "GitHub API rate limit exceed"  What does this mean?***
+I think, that GitHub Releases is more for end-users.
+But `CHANGELOG.md` could stay in the repo for developers with detailed list of changes.
+And it's nothing bad to combine GitHub Releases and `CHANGELOG.md` file together in that manner.
 
-GitHub [limits the number of API requests](https://developer.github.com/v3/#rate-limiting) you can make in an hour. You can make up to 5,000 requests per hour. For unauthenticated requests, the rate limit is only up to 60 requests per hour. Unauthenticated requests are associated with your IP address (not the user making requests).
+- ***I received a warning: GitHub API rate limit exceed, what does this mean?***
 
-If you're seeing this warning, please do the following:
+GitHub [limits the number of API requests](https://developer.github.com/v3/#rate-limiting) you can make in an hour. You can make up to 5,000 requests per hour. For unauthenticated requests, the rate limit allows you to make up to 60 requests per hour. Unauthenticated requests are associated with your IP address, and not the user making requests.
 
-1. Make sure you're providing an OAuth token, so you're not making requests anonymously. Using an OAuth token increases your hourly request maximum from 60 to 5000.
-2. If you have a large repo with lots of issues/PRs, you can use `--max-issues NUM` to limit the number of issues that are pulled back. For example: `--max-issues 1000`
+If you're seeing this warning:
+
+1. Make sure you're providing an OAuth token so you're not anonymously making requests. This will increase the number of requests from 60 to 5000 per hour.
+2. You probably have a large repo with lots of issues/PRs. You can use the `--max-issues NUM` argument to limit the number of issues that are pulled back. For example: `--max-issues 1000`
 
 ## Contributing
 
-1. Create an issue and describe your idea
+1. Create an issue to discuss about your idea
 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`)
+5. Push to 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/)*
-
 ## License
 
 Github Changelog Generator is released under the [MIT License](http://www.opensource.org/licenses/MIT).

Rakefile

@@ -1,39 +1,7 @@
-require "bundler"
-require "bundler/gem_tasks"
 require "rubocop/rake_task"
 require "rspec/core/rake_task"
-require "pathname"
-require "fileutils"
-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?
-  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: [:copy_man_page_to_manpath]
+task default: [:rubocop, :rspec]

appveyor.yml

@@ -1,50 +0,0 @@
-version: "{build}"
-
-platform: x64
-
-branches:
-    only:
-      - master
-
-clone_depth: 10
-
-skip_tags: true
-
-# See here for Ruby versions pre-installed:
-#  http://www.appveyor.com/docs/installed-software#ruby
-environment:
-  matrix:
-    - ruby_version: "21" # Older version, but matches Travis-CI
-    - ruby_version: "21-x64"
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-
-  # Print version and location for pre-installed ruby
-  - ruby --version
-  - where ruby
-
-  # Install latest version of RubyGems
-  - gem update --system --no-document --no-post-install-message
-  - gem --version
-  - where gem
-
-  # Print version and location for pre-installed bundler
-  - bundler --version
-  - where bundler
-
-build_script:
-  # Install ruby dependencies
-  - bundle install --retry 3
-  - bundle exec rake checks
-
-test_script:
-  - gem build github_changelog_generator
-  - gem install *.gem
-
-notifications:
-  - provider: Email
-    to:
-      - sky4winder+githubchangeloggenerator@gmail.com
-    on_build_success: false
-    on_build_status_changed: true

bin/git-generate-changelog

@@ -1,4 +0,0 @@
-#! /usr/bin/env ruby
-
-require_relative "../lib/github_changelog_generator"
-GitHubChangelogGenerator::ChangelogGenerator.new.run

github_changelog_generator.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "github_changelog_generator/version"
@@ -8,27 +9,23 @@ Gem::Specification.new do |spec|
   spec.version            = GitHubChangelogGenerator::VERSION
   spec.default_executable = "github_changelog_generator"
 
-  spec.required_ruby_version = ">= 1.9.3"
-  spec.authors = ["Petr Korolev", "Olle Jonsson"]
+  spec.required_ruby_version     = ">= 1.9.3"
+  spec.authors = ["Petr Korolev"]
   spec.email = "sky4winder+github_changelog_generator@gmail.com"
-
+  spec.date = `date +"%Y-%m-%d"`.strip!
   spec.summary = "Script, that automatically generate changelog from your tags, issues, labels and pull requests."
   spec.description = "Changelog generation has never been so easy. Fully automate changelog generation - this gem generate change log file based on tags, issues and merged pull requests from Github issue tracker."
   spec.homepage = "https://github.com/skywinder/Github-Changelog-Generator"
-  spec.license = "MIT"
-
-  spec.files = Dir["{bin,lib,man,spec}/**/*"] + %w(LICENSE Rakefile README.md)
+  spec.license       = "MIT"
 
+  spec.files = `git ls-files -z`.split("\x0")
   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 "github_api", ">= 0.12"
-  spec.add_runtime_dependency "colorize", ">= 0.7"
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_development_dependency "overcommit", ">= 0.31"
-  spec.add_development_dependency "rspec", ">= 3.2"
-  spec.add_development_dependency "bundler", ">= 1.7"
-  spec.add_development_dependency "rubocop", ">= 0.31"
+  spec.add_runtime_dependency("github_api", ["~> 0.12"])
+  spec.add_runtime_dependency("colorize", ["~> 0.7"])
 end

lib/CHANGELOG.md

@@ -1,33 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/skywinder/changelog_test/tree/HEAD)
-
-[Full Changelog](https://github.com/skywinder/changelog_test/compare/0.0.4...HEAD)
-
-**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:**
-
-- BugFix [\#11](https://github.com/skywinder/changelog_test/issues/11)
-
-**Closed issues:**
-
-- Issue closed from commit from PR [\#14](https://github.com/skywinder/changelog_test/issues/14)
-- Issue, closed by PR [\#12](https://github.com/skywinder/changelog_test/issues/12)
-- Issue [\#10](https://github.com/skywinder/changelog_test/issues/10)
-- Issue with some other label - Should be in closed issues [\#8](https://github.com/skywinder/changelog_test/issues/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))
-- 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))
-
 ## [0.0.4](https://github.com/skywinder/changelog_test/tree/0.0.4) (2015-05-22)
+
 [Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.3...0.0.4)
 
 **Closed issues:**
@@ -39,6 +13,7 @@
 - Add automatically generated change log file. [\#5](https://github.com/skywinder/changelog_test/pull/5) ([skywinder](https://github.com/skywinder))
 
 ## [v0.0.3](https://github.com/skywinder/changelog_test/tree/v0.0.3) (2015-03-04)
+
 [Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.2...v0.0.3)
 
 **Merged pull requests:**
@@ -46,6 +21,7 @@
 - fix \#3. hotfix. Should appear in v0.0.3 [\#4](https://github.com/skywinder/changelog_test/pull/4) ([skywinder](https://github.com/skywinder))
 
 ## [v0.0.2](https://github.com/skywinder/changelog_test/tree/v0.0.2) (2015-03-04)
+
 [Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.1...v0.0.2)
 
 **Merged pull requests:**
@@ -55,4 +31,5 @@
 ## [v0.0.1](https://github.com/skywinder/changelog_test/tree/v0.0.1) (2015-03-02)
 
 
+
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

lib/github_changelog_generator.rb

@@ -5,9 +5,7 @@ require "json"
 require "colorize"
 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"
@@ -28,7 +26,7 @@ module GitHubChangelogGenerator
     def run
       log = @generator.compound_changelog
 
-      output_filename = (@options[:output]).to_s
+      output_filename = "#{@options[:output]}"
       File.open(output_filename, "w") { |file| file.write(log) }
       puts "Done!"
       puts "Generated log placed in #{Dir.pwd}/#{output_filename}"

lib/github_changelog_generator/fetcher.rb

@@ -1,10 +1,11 @@
+require "logger"
+
 module GitHubChangelogGenerator
   # A Fetcher responsible for all requests to GitHub and all basic manipulation with related data
   # (such as filtering, validating, e.t.c)
   #
   # Example:
   # fetcher = GitHubChangelogGenerator::Fetcher.new options
-
   class Fetcher
     PER_PAGE_NUMBER = 30
     CHANGELOG_GITHUB_TOKEN = "CHANGELOG_GITHUB_TOKEN"
@@ -15,15 +16,22 @@ module GitHubChangelogGenerator
 
     def initialize(options = {})
       @options = options || {}
+
+      @logger = Logger.new(STDOUT)
+      @logger.formatter = proc do |_severity, _datetime, _progname, msg|
+        "#{msg}\n"
+      end
+
       @user = @options[:user]
       @project = @options[:project]
       @github_token = fetch_github_token
-      @github_options = { per_page: PER_PAGE_NUMBER }
-      @github_options[:oauth_token] = @github_token unless @github_token.nil?
-      @github_options[:endpoint] = @options[:github_endpoint] unless @options[:github_endpoint].nil?
-      @github_options[:site] = @options[:github_endpoint] unless @options[:github_site].nil?
+      @tag_times_hash = {}
+      github_options = { per_page: PER_PAGE_NUMBER }
+      github_options[:oauth_token] = @github_token unless @github_token.nil?
+      github_options[:endpoint] = @options[:github_endpoint] unless @options[:github_endpoint].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,
@@ -33,7 +41,7 @@ module GitHubChangelogGenerator
     def fetch_github_token
       env_var = @options[:token] ? @options[:token] : (ENV.fetch CHANGELOG_GITHUB_TOKEN, nil)
 
-      Helper.log.warn NO_TOKEN_PROVIDED.yellow unless env_var
+      @logger.warn NO_TOKEN_PROVIDED.yellow unless env_var
 
       env_var
     end
@@ -43,45 +51,43 @@ module GitHubChangelogGenerator
     def get_all_tags
       print "Fetching tags...\r" if @options[:verbose]
 
-      check_github_response { github_fetch_tags }
+      tags = []
+
+      check_github_response { github_fetch_tags(tags) }
+
+      tags
     end
 
-    # This is wrapper with rescue block
-    # @return [Object] returns exactly the same, what you put in the block, but wrap it with begin-rescue block
     def check_github_response
       begin
         value = yield
       rescue Github::Error::Unauthorized => e
-        Helper.log.error e.body.red
+        @logger.error e.body.red
         abort "Error: wrong GitHub token"
       rescue Github::Error::Forbidden => e
-        Helper.log.warn e.body.red
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+        @logger.warn e.body.red
+        @logger.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
       end
       value
     end
 
-    # Fill input array with tags
-    # @return [Array] array of tags in repo
-    def github_fetch_tags
-      tags = []
+    def github_fetch_tags(tags)
       response = @github.repos.tags @options[:user], @options[:project]
       page_i = 0
       count_pages = response.count_pages
       response.each_page do |page|
         page_i += PER_PAGE_NUMBER
         print_in_same_line("Fetching tags... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
-        tags.concat(page) unless page.nil?
+        tags.concat(page)
       end
       print_empty_line
 
       if tags.count == 0
-        Helper.log.warn "Warning: Can't find any tags in repo.\
+        @logger.warn "Warning: Can't find any tags in repo.\
 Make sure, that you push tags to remote repo via 'git push --tags'".yellow
       else
-        Helper.log.info "Found #{tags.count} tags"
+        @logger.info "Found #{tags.count} tags"
       end
-      tags
     end
 
     # This method fetch all closed issues and separate them to pull requests and pure issues
@@ -106,10 +112,10 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
           break if @options[:max_issues] && issues.length >= @options[:max_issues]
         end
         print_empty_line
-        Helper.log.info "Received issues: #{issues.count}"
+        @logger.info "Received issues: #{issues.count}"
 
       rescue
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+        @logger.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
       end
 
       # separate arrays of issues and pull requests:
@@ -123,16 +129,7 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
     def fetch_closed_pull_requests
       pull_requests = []
       begin
-        response = if @options[:release_branch].nil?
-                     @github.pull_requests.list @options[:user],
-                                                @options[:project],
-                                                state: "closed"
-                   else
-                     @github.pull_requests.list @options[:user],
-                                                @options[:project],
-                                                state: "closed",
-                                                base: @options[:release_branch]
-                   end
+        response = @github.pull_requests.list @options[:user], @options[:project], state: "closed"
         page_i = 0
         count_pages = response.count_pages
         response.each_page do |page|
@@ -143,20 +140,17 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
         end
         print_empty_line
       rescue
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+        @logger.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
       end
 
-      Helper.log.info "Fetching merged dates: #{pull_requests.count}"
+      @logger.info "Fetching merged dates: #{pull_requests.count}"
       pull_requests
     end
 
-    # Print specified line on the same string
-    # @param [String] log_string
     def print_in_same_line(log_string)
       print log_string + "\r"
     end
 
-    # Print long line with spaces on same line to clear prev message
     def print_empty_line
       print_in_same_line("                                                                       ")
     end
@@ -172,16 +166,13 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
         issues_slice.each do |issue|
           threads << Thread.new do
             begin
-              response = @github.issues.events.list user: @options[:user],
-                                                    repo: @options[:project],
-                                                    issue_number: issue["number"]
-              issue[:events] = []
-              response.each_page do |page|
-                issue[:events].concat(page)
-              end
+              obj = @github.issues.events.list user: @options[:user],
+                                               repo: @options[:project],
+                                               issue_number: issue["number"]
             rescue
-              Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+              @logger.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
             end
+            issue[:events] = obj.body
             print_in_same_line("Fetching events for issues and PR: #{i + 1}/#{issues.count}")
             i += 1
           end
@@ -193,26 +184,32 @@ Make sure, that you push tags to remote repo via 'git push --tags'".yellow
       # to clear line from prev print
       print_empty_line
 
-      Helper.log.info "Fetching events for issues and PR: #{i}"
+      @logger.info "Fetching events for issues and PR: #{i}"
     end
 
-    # Fetch tag time from repo
-    #
-    # @param [Hash] tag
+    # Try to find tag date in local hash.
+    # Otherwise fFetch tag time and put it to local hash file.
+    # @param [String] tag_name name of the tag
     # @return [Time] time of specified tag
-    def fetch_date_of_tag(tag)
-      begin
-        commit_data = @github.git_data.commits.get @options[:user],
-                                                   @options[:project],
-                                                   tag["commit"]["sha"]
-      rescue
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+    def get_time_of_tag(tag_name)
+      fail ChangelogGeneratorError, "tag_name is nil".red if tag_name.nil?
+
+      if @tag_times_hash[tag_name["name"]]
+        return @tag_times_hash[tag_name["name"]]
       end
-      time_string = commit_data["committer"]["date"]
-      Time.parse(time_string)
+
+      begin
+        github_git_data_commits_get = @github.git_data.commits.get @options[:user],
+                                                                   @options[:project],
+                                                                   tag_name["commit"]["sha"]
+      rescue
+        @logger.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+      end
+      time_string = github_git_data_commits_get["committer"]["date"]
+      @tag_times_hash[tag_name["name"]] = Time.parse(time_string)
     end
 
-    # Fetch commit for specified event
+    # Fetch commit for specifed event
     # @return [Hash]
     def fetch_commit(event)
       @github.git_data.commits.get @options[:user], @options[:project], event[:commit_id]

lib/github_changelog_generator/generator/generator.rb

@@ -1,4 +1,4 @@
-require_relative "../fetcher"
+require "github_changelog_generator/fetcher"
 require_relative "generator_generation"
 require_relative "generator_fetcher"
 require_relative "generator_processor"
@@ -10,7 +10,7 @@ module GitHubChangelogGenerator
   end
 
   class Generator
-    attr_accessor :options, :filtered_tags, :github
+    attr_accessor :options, :all_tags, :github
 
     # A Generator responsible for all logic, related with change log generation from ready-to-parse issues
     #
@@ -19,7 +19,7 @@ module GitHubChangelogGenerator
     #   content = generator.compound_changelog
     def initialize(options = nil)
       @options = options || {}
-      @tag_times_hash = {}
+
       @fetcher = GitHubChangelogGenerator::Fetcher.new @options
     end
 
@@ -41,7 +41,7 @@ module GitHubChangelogGenerator
     def encapsulate_string(string)
       string.gsub! '\\', '\\\\'
 
-      encpas_chars = %w(< > * _ \( \) [ ] #)
+      encpas_chars = %w(> * _ \( \) [ ] #)
       encpas_chars.each do |char|
         string.gsub! char, "\\#{char}"
       end
@@ -56,7 +56,7 @@ module GitHubChangelogGenerator
     # @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.
     # @return [String] Ready and parsed section
-    def create_log_for_tag(pull_requests, issues, newer_tag, older_tag_name = nil)
+    def create_log(pull_requests, issues, newer_tag, older_tag_name = nil)
       newer_tag_link, newer_tag_name, newer_tag_time = detect_link_tag_time(newer_tag)
 
       github_site = options[:github_site] || "https://github.com"
@@ -66,7 +66,7 @@ module GitHubChangelogGenerator
 
       if @options[:issues]
         # Generate issues:
-        log += issues_to_log(issues, pull_requests)
+        log += issues_to_log(issues)
       end
 
       if @options[:pulls]
@@ -77,14 +77,13 @@ module GitHubChangelogGenerator
       log
     end
 
-    # Generate ready-to-paste log from list of issues and pull requests.
+    # Generate ready-to-paste log from list of issues.
     #
     # @param [Array] issues
-    # @param [Array] pull_requests
     # @return [String] generated log for issues
-    def issues_to_log(issues, pull_requests)
+    def issues_to_log(issues)
       log = ""
-      bugs_a, enhancement_a, issues_a = parse_by_sections(issues, pull_requests)
+      bugs_a, enhancement_a, issues_a = parse_by_sections(issues)
 
       log += generate_sub_section(enhancement_a, @options[:enhancement_prefix])
       log += generate_sub_section(bugs_a, @options[:bug_prefix])
@@ -96,9 +95,8 @@ module GitHubChangelogGenerator
     # (bugs, features, or just closed issues) by labels
     #
     # @param [Array] issues
-    # @param [Array] pull_requests
     # @return [Array] tuple of filtered arrays: (Bugs, Enhancements Issues)
-    def parse_by_sections(issues, pull_requests)
+    def parse_by_sections(issues)
       issues_a = []
       enhancement_a = []
       bugs_a = []
@@ -106,12 +104,12 @@ module GitHubChangelogGenerator
       issues.each do |dict|
         added = false
         dict.labels.each do |label|
-          if @options[:bug_labels].include? label.name
+          if label.name == "bug"
             bugs_a.push dict
             added = true
             next
           end
-          if @options[:enhancement_labels].include? label.name
+          if label.name == "enhancement"
             enhancement_a.push dict
             added = true
             next
@@ -119,24 +117,6 @@ module GitHubChangelogGenerator
         end
         issues_a.push dict unless added
       end
-
-      added_pull_requests = []
-      pull_requests.each do |dict|
-        dict.labels.each do |label|
-          if @options[:bug_labels].include? label.name
-            bugs_a.push dict
-            added_pull_requests.push dict
-            next
-          end
-          if @options[:enhancement_labels].include? label.name
-            enhancement_a.push dict
-            added_pull_requests.push dict
-            next
-          end
-        end
-      end
-      added_pull_requests.each { |p| pull_requests.delete(p) }
-
       [bugs_a, enhancement_a, issues_a]
     end
   end

lib/github_changelog_generator/generator/generator_fetcher.rb

@@ -17,11 +17,11 @@ module GitHubChangelogGenerator
       # Async fetching tags:
       threads = []
       i = 0
-      all = @filtered_tags.count
-      @filtered_tags.each do |tag|
+      all = @all_tags.count
+      @all_tags.each do |tag|
         print "                                 \r"
         threads << Thread.new do
-          get_time_of_tag(tag)
+          @fetcher.get_time_of_tag(tag)
           print "Fetching tags dates: #{i + 1}/#{all}\r" if @options[:verbose]
           i += 1
         end
@@ -41,18 +41,18 @@ module GitHubChangelogGenerator
           threads << Thread.new { find_closed_date_by_commit(issue) }
         end
         threads.each(&:join)
+        puts "Fetching closed dates for issues: Done!" if @options[:verbose]
       end
-      puts "Fetching closed dates for issues: Done!" if @options[:verbose]
     end
 
     # Fill :actual_date parameter of specified issue by closed date of the commit, if it was closed by commit.
     # @param [Hash] issue
     def find_closed_date_by_commit(issue)
-      unless issue[:events].nil?
+      unless issue["events"].nil?
         # if it's PR -> then find "merged event", in case of usual issue -> fond closed date
         compare_string = issue[:merged_at].nil? ? "closed" : "merged"
         # reverse! - to find latest closed event. (event goes in date order)
-        issue[:events].reverse!.each do |event|
+        issue["events"].reverse!.each do |event|
           if event[:event].eql? compare_string
             set_date_from_event(event, issue)
             break

lib/github_changelog_generator/generator/generator_generation.rb

@@ -5,20 +5,15 @@ module GitHubChangelogGenerator
     # @return [String] Generated change log file
     def compound_changelog
       fetch_and_filter_tags
-      sort_tags_by_date(@filtered_tags)
       fetch_issues_and_pr
 
-      log = ""
-      log += @options[:frontmatter] if @options[:frontmatter]
-      log += "#{@options[:header]}\n\n"
+      log = "# Change Log\n\n"
 
-      log += if @options[:unreleased_only]
-               generate_log_between_tags(filtered_tags[0], nil)
-             else
-               generate_log_for_all_tags
-             end
-
-      log += File.read(@options[:base]) if File.file?(@options[:base])
+      if @options[:unreleased_only]
+        log += generate_log_between_tags(all_tags[0], nil)
+      else
+        log += generate_log_for_all_tags
+      end
 
       log += "\n\n\\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
       @log = log
@@ -29,7 +24,7 @@ module GitHubChangelogGenerator
       tag1 = @options[:tag1]
       tag2 = @options[:tag2]
       tags_strings = []
-      filtered_tags.each { |x| tags_strings.push(x["name"]) }
+      all_tags.each { |x| tags_strings.push(x["name"]) }
 
       if tags_strings.include?(tag1)
         if tags_strings.include?(tag2)
@@ -39,10 +34,10 @@ module GitHubChangelogGenerator
           index2 = hash[tag2]
           log += generate_log_between_tags(all_tags[index1], all_tags[index2])
         else
-          raise ChangelogGeneratorError, "Can't find tag #{tag2} -> exit".red
+          fail ChangelogGeneratorError, "Can't find tag #{tag2} -> exit".red
         end
       else
-        raise ChangelogGeneratorError, "Can't find tag #{tag1} -> exit".red
+        fail ChangelogGeneratorError, "Can't find tag #{tag1} -> exit".red
       end
       log
     end
@@ -53,13 +48,13 @@ 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"
+          log += "- #{merge_string}\n\n"
         end
-        log += "\n"
       end
       log
     end
@@ -79,16 +74,11 @@ module GitHubChangelogGenerator
       time_string = newer_tag_time.strftime @options[:date_format]
 
       # Generate tag name and link
-      release_url = if @options[:release_url]
-                      format(@options[:release_url], newer_tag_link)
-                    else
-                      "#{project_url}/tree/#{newer_tag_link}"
-                    end
-      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"
-             end
+      if newer_tag_name.equal? @options[:unreleased_label]
+        log += "## [#{newer_tag_name}](#{project_url}/tree/#{newer_tag_link})\n\n"
+      else
+        log += "## [#{newer_tag_name}](#{project_url}/tree/#{newer_tag_link}) (#{time_string})\n\n"
+      end
 
       if @options[:compare_link] && older_tag_link
         # Generate compare link
@@ -104,14 +94,14 @@ 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"]
+      older_tag_name = older_tag.nil? ? nil : 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(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)
     end
 
     # Apply all filters to issues and pull requests
@@ -138,11 +128,11 @@ module GitHubChangelogGenerator
 
       log = generate_unreleased_section
 
-      (1...filtered_tags.size).each do |index|
-        log += generate_log_between_tags(filtered_tags[index], filtered_tags[index - 1])
+      (1...all_tags.size).each do |index|
+        log += generate_log_between_tags(all_tags[index], all_tags[index - 1])
       end
-      if @filtered_tags.count != 0
-        log += generate_log_between_tags(nil, filtered_tags.last)
+      if @all_tags.count != 0
+        log += generate_log_between_tags(nil, all_tags.last)
       end
 
       log
@@ -151,7 +141,7 @@ module GitHubChangelogGenerator
     def generate_unreleased_section
       log = ""
       if @options[:unreleased]
-        unreleased_log = generate_log_between_tags(filtered_tags[0], nil)
+        unreleased_log = generate_log_between_tags(all_tags[0], nil)
         log += unreleased_log if unreleased_log
       end
       log
@@ -160,7 +150,7 @@ module GitHubChangelogGenerator
     # Parse issue and generate single line formatted issue line.
     #
     # Example output:
-    # - Add coveralls integration [\#223](https://github.com/skywinder/github-changelog-generator/pull/223) (@skywinder)
+    # - Add coveralls integration [\#223](https://github.com/skywinder/github-changelog-generator/pull/223) ([skywinder](https://github.com/skywinder))
     #
     # @param [Hash] issue Fetched issue from GitHub
     # @return [String] Markdown-formatted single issue
@@ -168,22 +158,17 @@ module GitHubChangelogGenerator
       encapsulated_title = encapsulate_string issue[:title]
 
       title_with_number = "#{encapsulated_title} [\\##{issue[:number]}](#{issue.html_url})"
-      issue_line_with_user(title_with_number, issue)
-    end
 
-    private
-
-    def issue_line_with_user(line, issue)
-      return line if !@options[:author] || issue.pull_request.nil?
-
-      user = issue.user
-      return "#{line} ({Null user})" unless user
-
-      if @options[:usernames_as_github_logins]
-        "#{line} (@#{user.login})"
-      else
-        "#{line} ([#{user.login}](#{user.html_url}))"
+      unless issue.pull_request.nil?
+        if @options[:author]
+          if issue.user.nil?
+            title_with_number += " ({Null user})"
+          else
+            title_with_number += " ([#{issue.user.login}](#{issue.user.html_url}))"
+          end
+        end
       end
+      title_with_number
     end
   end
 end

lib/github_changelog_generator/generator/generator_processor.rb

@@ -4,12 +4,13 @@ module GitHubChangelogGenerator
     # @param [Array] issues
     # @return [Array] filtered array
     def exclude_issues_by_labels(issues)
-      return issues if !@options[:exclude_labels] || @options[:exclude_labels].empty?
-
-      issues.reject do |issue|
-        labels = issue.labels.map(&:name)
-        (labels & @options[:exclude_labels]).any?
+      unless @options[:exclude_labels].nil?
+        issues = issues.select do |issue|
+          var = issue.labels.map(&:name) & @options[:exclude_labels]
+          !(var).any?
+        end
       end
+      issues
     end
 
     # @return [Array] filtered issues accourding milestone
@@ -35,7 +36,7 @@ module GitHubChangelogGenerator
           false
         else
           # check, that this milestone in tag list:
-          milestone_is_tag = @filtered_tags.find do |tag|
+          milestone_is_tag = @all_tags.find do |tag|
             tag.name == issue.milestone.title
           end
 
@@ -56,33 +57,33 @@ module GitHubChangelogGenerator
           true
         else
           # check, that this milestone in tag list:
-          @filtered_tags.find { |tag| tag.name == issue.milestone.title }.nil?
+          @all_tags.find { |tag| tag.name == issue.milestone.title }.nil?
         end
       end
     end
 
     # Method filter issues, that belong only specified tag range
-    # @param [Array] issues issues to filter
+    # @param [Array] array of issues to filter
     # @param [Symbol] hash_key key of date value default is :actual_date
     # @param [String] older_tag all issues before this tag date will be excluded. May be nil, if it's first tag
     # @param [String] newer_tag all issue after this tag will be excluded. May be nil for unreleased section
     # @return [Array] filtered issues
-    def delete_by_time(issues, hash_key = :actual_date, older_tag = nil, newer_tag = nil)
+    def delete_by_time(array, hash_key = :actual_date, older_tag = nil, newer_tag = nil)
       # in case if not tags specified - return unchanged array
-      return issues if older_tag.nil? && newer_tag.nil?
+      return array if older_tag.nil? && newer_tag.nil?
 
-      newer_tag_time = newer_tag && get_time_of_tag(newer_tag)
-      older_tag_time = older_tag && get_time_of_tag(older_tag)
+      newer_tag_time = newer_tag && @fetcher.get_time_of_tag(newer_tag)
+      older_tag_time = older_tag && @fetcher.get_time_of_tag(older_tag)
 
-      issues.select do |issue|
-        if issue[hash_key]
-          time = Time.parse(issue[hash_key]).utc
+      array.select do |req|
+        if req[hash_key]
+          time = Time.parse(req[hash_key]).utc
 
           tag_in_range_old = tag_newer_old_tag?(older_tag_time, time)
 
           tag_in_range_new = tag_older_new_tag?(newer_tag_time, time)
 
-          tag_in_range = tag_in_range_old && tag_in_range_new
+          tag_in_range = (tag_in_range_old) && (tag_in_range_new)
 
           tag_in_range
         else
@@ -92,20 +93,20 @@ module GitHubChangelogGenerator
     end
 
     def tag_older_new_tag?(newer_tag_time, time)
-      tag_in_range_new = if newer_tag_time.nil?
-                           true
-                         else
-                           time <= newer_tag_time
-                         end
+      if newer_tag_time.nil?
+        tag_in_range_new = true
+      else
+        tag_in_range_new = time <= newer_tag_time
+      end
       tag_in_range_new
     end
 
     def tag_newer_old_tag?(older_tag_time, t)
-      tag_in_range_old = if older_tag_time.nil?
-                           true
-                         else
-                           t > older_tag_time
-                         end
+      if older_tag_time.nil?
+        tag_in_range_old = true
+      else
+        tag_in_range_old = t > older_tag_time
+      end
       tag_in_range_old
     end
 
@@ -132,7 +133,7 @@ module GitHubChangelogGenerator
     def filter_by_include_labels(issues)
       filtered_issues = @options[:include_labels].nil? ? issues : issues.select do |issue|
         labels = issue.labels.map(&:name) & @options[:include_labels]
-        labels.any?
+        (labels).any?
       end
       filtered_issues
     end
@@ -177,10 +178,8 @@ 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
+        pr[:merged_at] = fetched_pr[:merged_at]
+        closed_pull_requests.delete(fetched_pr)
       end
 
       pull_requests.select! do |pr|

lib/github_changelog_generator/generator/generator_tags.rb

@@ -2,34 +2,15 @@ module GitHubChangelogGenerator
   class Generator
     # fetch, filter tags, fetch dates and sort them in time order
     def fetch_and_filter_tags
-      @filtered_tags = get_filtered_tags(@fetcher.get_all_tags)
+      @all_tags = get_filtered_tags(@fetcher.get_all_tags)
       fetch_tags_dates
+      sort_tags_by_date
     end
 
     # Sort all tags by date
-    def sort_tags_by_date(tags)
+    def sort_tags_by_date
       puts "Sorting tags..." if @options[:verbose]
-      tags.sort_by! do |x|
-        get_time_of_tag(x)
-      end.reverse!
-    end
-
-    # Try to find tag date in local hash.
-    # Otherwise fFetch tag time and put it to local hash file.
-    # @param [Hash] tag_name name of the tag
-    # @return [Time] time of specified tag
-    def get_time_of_tag(tag_name)
-      raise ChangelogGeneratorError, "tag_name is nil".red if tag_name.nil?
-
-      name_of_tag = tag_name["name"]
-      time_for_name = @tag_times_hash[name_of_tag]
-      if !time_for_name.nil?
-        time_for_name
-      else
-        time_string = @fetcher.fetch_date_of_tag tag_name
-        @tag_times_hash[name_of_tag] = time_string
-        time_string
-      end
+      @all_tags.sort_by! { |x| @fetcher.get_time_of_tag(x) }.reverse!
     end
 
     # Detect link, name and time for specified tag.
@@ -38,7 +19,7 @@ module GitHubChangelogGenerator
     # @return [Array] link, name and time of the tag
     def detect_link_tag_time(newer_tag)
       # if tag is nil - set current time
-      newer_tag_time = newer_tag.nil? ? Time.new : get_time_of_tag(newer_tag)
+      newer_tag_time = newer_tag.nil? ? Time.new : @fetcher.get_time_of_tag(newer_tag)
 
       # if it's future release tag - set this value
       if newer_tag.nil? && @options[:future_release]
@@ -52,133 +33,21 @@ module GitHubChangelogGenerator
       [newer_tag_link, newer_tag_name, newer_tag_time]
     end
 
-    # @return [Object] try to find newest tag using #Reader and :base option if specified otherwise returns nil
-    def detect_since_tag
-      @since_tag ||= @options.fetch(:since_tag) { version_of_first_item }
-    end
-
-    def version_of_first_item
-      return unless File.file?(@options[:base].to_s)
-
-      sections = GitHubChangelogGenerator::Reader.new.read(@options[:base])
-      sections.first["version"] if sections && sections.any?
-    end
-
     # Return tags after filtering tags in lists provided by option: --between-tags & --exclude-tags
     #
     # @return [Array]
     def get_filtered_tags(all_tags)
-      filtered_tags = filter_since_tag(all_tags)
-      filtered_tags = filter_between_tags(filtered_tags)
-      filter_excluded_tags(filtered_tags)
-    end
-
-    # @param [Array] all_tags all tags
-    # @return [Array] filtered tags according :since_tag option
-    def filter_since_tag(all_tags)
-      filtered_tags = all_tags
-      tag = detect_since_tag
-      if tag
-        if all_tags.map(&:name).include? tag
-          idx = all_tags.index { |t| t.name == tag }
-          filtered_tags = if idx > 0
-                            all_tags[0..idx - 1]
-                          else
-                            []
-                          end
-        else
-          Helper.log.warn "Warning: can't find tag #{tag}, specified with --since-tag option."
-        end
-      end
-      filtered_tags
-    end
-
-    # @param [Array] all_tags all tags
-    # @return [Array] filtered tags according :due_tag option
-    def filter_due_tag(all_tags)
-      filtered_tags = all_tags
-      tag = @options[:due_tag]
-      if tag
-        if (all_tags.count > 0) && (all_tags.map(&:name).include? tag)
-          idx = all_tags.index { |t| t.name == tag }
-          last_index = all_tags.count - 1
-          filtered_tags = if idx > 0 && idx < last_index
-                            all_tags[idx + 1..last_index]
-                          else
-                            []
-                          end
-        else
-          Helper.log.warn "Warning: can't find tag #{tag}, specified with --due-tag option."
-        end
-      end
-      filtered_tags
-    end
-
-    # @param [Array] all_tags all tags
-    # @return [Array] filtered tags according :between_tags option
-    def filter_between_tags(all_tags)
+      all_tags = all_tags
       filtered_tags = all_tags
       if @options[:between_tags]
         @options[:between_tags].each do |tag|
-          unless all_tags.map(&:name).include? tag
-            Helper.log.warn "Warning: can't find tag #{tag}, specified with --between-tags option."
+          unless all_tags.include? tag
+            puts "Warning: can't find tag #{tag}, specified with --between-tags option.".yellow
           end
         end
-        filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag.name }
+        filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag }
       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)
-      if @options[:exclude_tags]
-        apply_exclude_tags(all_tags)
-      elsif @options[:exclude_tags_regex]
-        apply_exclude_tags_regex(all_tags)
-      else
-        all_tags
-      end
-    end
-
-    private
-
-    def apply_exclude_tags(all_tags)
-      if @options[:exclude_tags].is_a?(Regexp)
-        filter_tags_with_regex(all_tags, @options[: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]))
-    end
-
-    def filter_tags_with_regex(all_tags, regex)
-      warn_if_nonmatching_regex(all_tags)
-      all_tags.reject { |tag| regex =~ 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
   end
 end

lib/github_changelog_generator/helper.rb

@@ -1,37 +0,0 @@
-require "logger"
-module GitHubChangelogGenerator
-  module Helper
-    # @return true if the currently running program is a unit test
-    def self.test?
-      defined? SpecHelper
-    end
-
-    @log ||= if test?
-               Logger.new(nil) # don't show any logs when running tests
-             else
-               Logger.new(STDOUT)
-             end
-    @log.formatter = proc do |severity, _datetime, _progname, msg|
-      string = "#{msg}\n"
-
-      if severity == "DEBUG"
-        string = string.magenta
-      elsif severity == "INFO"
-        string = string.white
-      elsif severity == "WARN"
-        string = string.yellow
-      elsif severity == "ERROR"
-        string = string.red
-      elsif severity == "FATAL"
-        string = string.red.bold
-      end
-
-      string
-    end
-
-    # Logging happens using this method
-    class << self
-      attr_reader :log
-    end
-  end
-end

lib/github_changelog_generator/parser.rb

@@ -2,41 +2,31 @@
 require "optparse"
 require "pp"
 require_relative "version"
-require_relative "helper"
+
 module GitHubChangelogGenerator
   class Parser
     # parse options with optparse
     def self.parse_options
-      options = default_options
-
-      ParserFile.new(options).parse!
+      options = get_default_options
 
       parser = setup_parser(options)
+
       parser.parse!
 
-      fetch_user_and_project(options)
+      detect_user_and_project(options)
 
-      abort(parser.banner) unless options[:user] && options[:project]
+      if !options[:user] || !options[:project]
+        puts parser.banner
+        exit
+      end
 
-      print_options(options)
-
-      options
-    end
-
-    # If options set to verbose, print the parsed options.
-    #
-    # The GitHub `:token` key is censored in the output.
-    #
-    # @param options [Hash] The options to display
-    # @option options [Boolean] :verbose If false this method does nothing
-    def self.print_options(options)
       if options[:verbose]
-        Helper.log.info "Performing task with options:"
-        options_to_display = options.clone
-        options_to_display[:token] = options_to_display[:token].nil? ? nil : "hidden value"
-        pp options_to_display
+        puts "Performing task with options:"
+        pp options
         puts ""
       end
+
+      options
     end
 
     # setup parsing options
@@ -58,27 +48,6 @@ module GitHubChangelogGenerator
         opts.on("-o", "--output [NAME]", "Output file. Default is CHANGELOG.md") do |last|
           options[:output] = last
         end
-        opts.on("-b", "--base [NAME]", "Optional base file to append generated changes to.") do |last|
-          options[:base] = last
-        end
-        opts.on("--bugs-label [LABEL]", "Setup custom label for bug-fixes section. Default is \"**Fixed bugs:**\"") do |v|
-          options[:bug_prefix] = v
-        end
-        opts.on("--enhancement-label [LABEL]", "Setup custom label for enhancements section. Default is \"**Implemented enhancements:**\"") do |v|
-          options[:enhancement_prefix] = v
-        end
-        opts.on("--issues-label [LABEL]", "Setup custom label for closed-issues section. Default is \"**Closed issues:**\"") do |v|
-          options[:issue_prefix] = v
-        end
-        opts.on("--header-label [LABEL]", "Setup custom header label. Default is \"# Change Log\"") do |v|
-          options[:header] = v
-        end
-        opts.on("--front-matter [JSON]", "Add YAML front matter. Formatted as JSON because it's easier to add on the command line") do |v|
-          options[:frontmatter] = JSON.parse(v).to_yaml + "---\n"
-        end
-        opts.on("--pr-label [LABEL]", "Setup custom label for pull requests section. Default is \"**Merged pull requests:**\"") do |v|
-          options[:merge_prefix] = v
-        end
         opts.on("--[no-]issues", "Include closed issues in changelog. Default is true") do |v|
           options[:issues] = v
         end
@@ -97,9 +66,6 @@ module GitHubChangelogGenerator
         opts.on("--[no-]author", "Add author of pull-request in the end. Default is true") do |author|
           options[:author] = author
         end
-        opts.on("--usernames-as-github-logins", "Use GitHub tags instead of Markdown links for the author of an issue or pull-request.") do |v|
-          options[:usernames_as_github_logins] = v
-        end
         opts.on("--unreleased-only", "Generate log from unreleased closed issues only.") do |v|
           options[:unreleased_only] = v
         end
@@ -112,39 +78,18 @@ module GitHubChangelogGenerator
         opts.on("--[no-]compare-link", "Include compare link (Full Changelog) between older version and newer version. Default is true") do |v|
           options[:compare_link] = v
         end
-        opts.on("--include-labels  x,y,z", Array, "Only issues with the specified labels will be included in the changelog.") do |list|
+        opts.on("--include-labels  x,y,z", Array, 'Only issues with the specified labels will be included in the changelog. Default is \'bug,enhancement\'') do |list|
           options[:include_labels] = list
         end
         opts.on("--exclude-labels  x,y,z", Array, 'Issues with the specified labels will be always excluded from changelog. Default is \'duplicate,question,invalid,wontfix\'') do |list|
           options[:exclude_labels] = list
         end
-        opts.on("--bug-labels  x,y,z", Array, 'Issues with the specified labels will be always added to "Fixed bugs" section. Default is \'bug,Bug\'') do |list|
-          options[:bug_labels] = list
-        end
-        opts.on("--enhancement-labels  x,y,z", Array, 'Issues with the specified labels will be always added to "Implemented enhancements" section. Default is \'enhancement,Enhancement\'') do |list|
-          options[:enhancement_labels] = list
-        end
-        opts.on("--between-tags  x,y,z", Array, "Change log will be filled only between specified tags") do |list|
+        opts.on("--between-tags  x,y,z", Array, "Change log will be filed 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
-        opts.on("--exclude-tags-regex [REGEX]", "Apply a regular expression on tag names so that they can be excluded, for example: --exclude-tags-regex \".*\+\d{1,}\" ") do |last|
-          options[:exclude_tags_regex] = last
-        end
-        opts.on("--since-tag  x", "Change log will start after specified tag") do |v|
-          options[:since_tag] = v
-        end
-        opts.on("--due-tag  x", "Change log will end before specified tag") do |v|
-          options[:due_tag] = v
-        end
         opts.on("--max-issues [NUMBER]", Integer, "Max number of issues to fetch from GitHub. Default is unlimited") do |max|
           options[:max_issues] = max
         end
-        opts.on("--release-url [URL]", "The URL to point to for release links, in printf format (with the tag as variable).") do |url|
-          options[:release_url] = url
-        end
         opts.on("--github-site [URL]", "The Enterprise Github site on which your project is hosted.") do |last|
           options[:github_site] = last
         end
@@ -157,9 +102,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
@@ -175,14 +117,13 @@ module GitHubChangelogGenerator
       parser
     end
 
-    # @return [Hash] Default options
-    def self.default_options
-      {
+    # just get default options
+    def self.get_default_options
+      options = {
         tag1: nil,
         tag2: nil,
         date_format: "%Y-%m-%d",
         output: "CHANGELOG.md",
-        base: "HISTORY.md",
         issues: true,
         add_issues_wo_labels: true,
         add_pr_wo_labels: true,
@@ -192,79 +133,56 @@ 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),
+        include_labels: %w(bug enhancement),
+        exclude_labels: %w(duplicate question invalid wontfix),
         max_issues: nil,
         simple_list: false,
         verbose: true,
-        header: "# Change Log",
         merge_prefix: "**Merged pull requests:**",
         issue_prefix: "**Closed issues:**",
         bug_prefix: "**Fixed bugs:**",
         enhancement_prefix: "**Implemented enhancements:**",
         git_remote: "origin"
       }
+
+      options
     end
 
-    # If `:user` or `:project` not set in options, try setting them
-    # Valid unnamed parameters:
-    # 1) in 1 param: repo_name/project
-    # 2) in 2 params: repo name project
-    def self.fetch_user_and_project(options)
-      if options[:user].nil? || options[:project].nil?
-        user, project = user_and_project_from_git(options, ARGV[0], ARGV[1])
-        options[:user] ||= user
-        options[:project] ||= project
-      end
-    end
-
-    # Sets `:user` and `:project` in `options` from CLI arguments or `git remote`
-    # @param [String] arg0 first argument in cli
-    # @param [String] arg1 second argument in cli
-    # @return [Array<String>] user and project, or nil if unsuccessful
-    def self.user_and_project_from_git(options, arg0 = nil, arg1 = nil)
-      user, project = user_project_from_option(arg0, arg1, options[:github_site])
-      unless user && project
+    # Detects user and project from git
+    def self.detect_user_and_project(options)
+      options[:user], options[:project] = user_project_from_option(ARGV[0], ARGV[1], options[:github_site])
+      if !options[:user] || !options[:project]
         if ENV["RUBYLIB"] =~ /ruby-debug-ide/
-          user = "skywinder"
-          project = "changelog_test"
+          options[:user] = "skywinder"
+          options[:project] = "changelog_test"
         else
           remote = `git config --get remote.#{options[:git_remote]}.url`
-          user, project = user_project_from_remote(remote)
+          options[:user], options[:project] = user_project_from_remote(remote)
         end
       end
-
-      [user, project]
     end
 
-    # Returns GitHub username and project from CLI arguments
+    # Try to find user and project name from git remote output
     #
-    # @param arg0 [String] This parameter takes two forms: Either a full
-    #                      GitHub URL, or a 'username/projectname', or
-    #                      simply a GitHub username
-    # @param arg1 [String] If arg0 is given as a username,
-    #                      then arg1 can given as a projectname
-    # @param github_site [String] Domain name of GitHub site
-    #
-    # @return [Array, nil] user and project, or nil if unsuccessful
-    def self.user_project_from_option(arg0, arg1, github_site)
+    # @param [String] output of git remote command
+    # @return [Array] user and project
+    def self.user_project_from_option(arg0, arg1, github_site = nil)
       user = nil
       project = nil
       github_site ||= "github.com"
       if arg0 && !arg1
-        # this match should parse  strings such "https://github.com/skywinder/Github-Changelog-Generator" or
-        # "skywinder/Github-Changelog-Generator" to user and name
+        # this match should parse  strings such "https://github.com/skywinder/Github-Changelog-Generator" or "skywinder/Github-Changelog-Generator" to user and name
+        puts arg0
         match = /(?:.+#{Regexp.escape(github_site)}\/)?(.+)\/(.+)/.match(arg0)
 
         begin
           param = match[2].nil?
         rescue
           puts "Can't detect user and name from first parameter: '#{arg0}' -> exit'"
-          return
+          exit
         end
         if param
-          return
+          exit
         else
           user = match[1]
           project = match[2]
@@ -273,43 +191,43 @@ module GitHubChangelogGenerator
       [user, project]
     end
 
-    # These patterns match these formats:
-    #
-    # ```
-    # origin	git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
-    # git@github.com:skywinder/Github-Changelog-Generator.git
-    # ```
-    #
-    # and
-    #
-    # ```
-    # origin	https://github.com/skywinder/ChangelogMerger (fetch)
-    # https://github.com/skywinder/ChangelogMerger
-    # ```
-    GIT_REMOTE_PATTERNS = [
-      /.*(?:[:\/])(?<user>(?:-|\w|\.)*)\/(?<project>(?:-|\w|\.)*)(?:\.git).*/,
-      /.*\/(?<user>(?:-|\w|\.)*)\/(?<project>(?:-|\w|\.)*).*/
-    ]
-
-    # Returns GitHub username and project from git remote output
-    #
-    # @param git_remote_output [String] Output of git remote command
+    # Try to find user and project name from git remote output
     #
+    # @param [String] output of git remote command
     # @return [Array] user and project
-    def self.user_project_from_remote(git_remote_output)
+    def self.user_project_from_remote(remote)
+      # try to find repo in format:
+      # origin	git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
+      # git@github.com:skywinder/Github-Changelog-Generator.git
+      regex1 = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/
+
+      # try to find repo in format:
+      # origin	https://github.com/skywinder/ChangelogMerger (fetch)
+      # https://github.com/skywinder/ChangelogMerger
+      regex2 = /.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/
+
+      remote_structures = [regex1, regex2]
+
       user = nil
       project = nil
-      GIT_REMOTE_PATTERNS.each do |git_remote_pattern|
-        git_remote_pattern =~ git_remote_output
+      remote_structures.each do |regex|
+        matches = Regexp.new(regex).match(remote)
 
-        if Regexp.last_match
-          user = Regexp.last_match(:user)
-          project = Regexp.last_match(:project)
-          break
+        if matches && matches[1] && matches[2]
+          puts "Detected user:#{matches[1]}, project:#{matches[2]}"
+          user = matches[1]
+          project = matches[2]
         end
+
+        break unless matches.nil?
       end
 
       [user, project]
     end
   end
+
+  if __FILE__ == $PROGRAM_NAME
+    remote = "invalid reference to project"
+    p user_project_from_option(ARGV[0], ARGV[1], remote)
+  end
 end

lib/github_changelog_generator/parser_file.rb

@@ -1,103 +0,0 @@
-require "pathname"
-
-module GitHubChangelogGenerator
-  ParserError = Class.new(StandardError)
-
-  # ParserFile is a configuration file reader which sets options in the
-  # given Hash.
-  #
-  # In your project's root, you can put a file named
-  # <tt>.github_changelog_generator</tt> to override defaults.
-  #
-  # Example:
-  #   header_label=# My Super Changelog
-  #   ; Comments are allowed
-  #   future-release=5.0.0
-  #   # Ruby-style comments, too
-  #   since-tag=1.0.0
-  #
-  # The configuration format is <tt>some-key=value</tt> or <tt>some_key=value</tt>.
-  #
-  class ParserFile
-    # @param options [Hash] options to be configured from file contents
-    # @param file [nil,IO] configuration file handle, defaults to opening `.github_changelog_generator`
-    def initialize(options, file = open_settings_file)
-      @options = options
-      @file = file
-    end
-
-    # Sets options using configuration file content
-    def parse!
-      return unless @file
-      @file.each_with_index { |line, i| parse_line!(line, i + 1) }
-      @file.close
-    end
-
-    private
-
-    FILENAME = ".github_changelog_generator"
-
-    def open_settings_file
-      path = Pathname(File.expand_path(FILENAME))
-      File.open(path) if path.exist?
-    end
-
-    def parse_line!(line, line_number)
-      return if non_configuration_line?(line)
-      option_name, value = extract_pair(line)
-      @options[option_key_for(option_name)] = convert_value(value, option_name)
-    rescue
-      raise ParserError, "Failed on line ##{line_number}: \"#{line.gsub(/[\n\r]+/, '')}\""
-    end
-
-    # Returns true if the line starts with a pound sign or a semi-colon.
-    def non_configuration_line?(line)
-      line =~ /^[\#;]/ || line =~ /^[\s]+$/
-    end
-
-    # Returns a the option name 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
-
-    KNOWN_ARRAY_KEYS = [:exclude_labels, :include_labels, :bug_labels,
-                        :enhancement_labels, :between_tags, :exclude_tags]
-    KNOWN_INTEGER_KEYS = [:max_issues]
-
-    def convert_value(value, option_name)
-      if KNOWN_ARRAY_KEYS.include?(option_name)
-        value.split(",")
-      elsif KNOWN_INTEGER_KEYS.include?(option_name)
-        value.to_i
-      elsif value =~ /^(true|t|yes|y|1)$/i
-        true
-      elsif value =~ /^(false|f|no|n|0)$/i
-        false
-      else
-        value
-      end
-    end
-
-    IRREGULAR_OPTIONS = {
-      bugs_label: :bug_prefix,
-      enhancement_label: :enhancement_prefix,
-      issues_label: :issue_prefix,
-      header_label: :header,
-      front_matter: :frontmatter,
-      pr_label: :merge_prefix,
-      issues_wo_labels: :add_issues_wo_labels,
-      pr_wo_labels: :add_pr_wo_labels,
-      pull_requests: :pulls,
-      filter_by_milestone: :filter_issues_by_milestone,
-      github_api: :github_endpoint
-    }
-
-    def option_key_for(option_name)
-      IRREGULAR_OPTIONS.fetch(option_name) { option_name }
-    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.zip(matches.captures)])
-          break
-        end
+        captures.merge!(Hash[matches.names.map.zip(matches.captures)]) unless matches.nil?
+
+        # Try Regular Expressions until you find one that delivers results
+        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|
-        section = parse_heading(heading)
-        section["content"] = sections.at(index + 1)
-        section
+      headings.each_with_index do |heading, index|
+        captures = parse_heading(heading)
+        captures["content"] = sections.at(index + 1)
+        changelog.push captures
       end
+
+      changelog
     end
 
     def read(file_path)

lib/github_changelog_generator/task.rb

@@ -1,67 +0,0 @@
-require "rake"
-require "rake/tasklib"
-require "github_changelog_generator"
-
-module GitHubChangelogGenerator
-  class RakeTask < ::Rake::TaskLib
-    include ::Rake::DSL if defined?(::Rake::DSL)
-
-    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
-                  pulls filter_issues_by_milestone author
-                  unreleased_only unreleased unreleased_label
-                  compare_link include_labels exclude_labels
-                  bug_labels enhancement_labels
-                  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 )
-
-    OPTIONS.each do |o|
-      attr_accessor o.to_sym
-    end
-
-    # Public: Initialise a new GitHubChangelogGenerator::RakeTask.
-    #
-    # Example
-    #
-    #   GitHubChangelogGenerator::RakeTask.new
-    def initialize(*args, &task_block)
-      @name = args.shift || :changelog
-
-      define(args, &task_block)
-    end
-
-    def define(args, &task_block)
-      desc "Generate a Change log from GitHub"
-
-      yield(*[self, args].slice(0, task_block.arity)) if task_block
-
-      # clear any (auto-)pre-existing task
-      Rake::Task[@name].clear if Rake::Task.task_defined?(@name)
-
-      task @name do
-        # mimick parse_options
-        options = Parser.default_options
-
-        Parser.fetch_user_and_project(options)
-
-        OPTIONS.each do |o|
-          v = instance_variable_get("@#{o}")
-          options[o.to_sym] = v unless v.nil?
-        end
-
-        generator = Generator.new options
-
-        log = generator.compound_changelog
-
-        output_filename = (options[:output]).to_s
-        File.open(output_filename, "w") { |file| file.write(log) }
-        puts "Done!"
-        puts "Generated log placed in #{Dir.pwd}/#{output_filename}"
-      end
-    end
-  end
-end

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = "1.13.1"
+  VERSION = "1.4.1"
 end

man/git-generate-changelog.1

@@ -1,252 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GIT\-GENERATE\-CHANGELOG" "1" "October 2015" "" ""
-.
-.SH "NAME"
-\fBgit\-generate\-changelog\fR \- Generate changelog from github
-.
-.SH "SYNOPSIS"
-\fBgit generate\-changelog\fR [\-h|\-\-help] [\-u|\-\-user] [\-p|\-\-project]
-.
-.SH "DESCRIPTION"
-Automatically generate change log from your tags, issues, labels and pull requests on GitHub\.
-.
-.SH "OPTIONS"
-\-u, \-\-user [USER]
-.
-.P
-Username of the owner of target GitHub repo
-.
-.P
-\-p, \-\-project [PROJECT]
-.
-.P
-Name of project on GitHub
-.
-.P
-\-t, \-\-token [TOKEN]
-.
-.P
-To make more than 50 requests per hour your GitHub token is required\. You can generate it at: https://github\.com/settings/tokens/new
-.
-.P
-\-f, \-\-date\-format [FORMAT]
-.
-.P
-Date format\. Default is %Y\-%m\-%d
-.
-.P
-\-o, \-\-output [NAME]
-.
-.P
-Output file\. Default is CHANGELOG\.md
-.
-.P
-\-b, \-\-base [NAME]
-.
-.P
-Optional base file to append generated changes to\.
-.
-.P
-\-\-bugs\-label [LABEL]
-.
-.P
-Setup custom label for bug\-fixes section\. Default is "\fBFixed bugs:\fR
-.
-.P
-\-\-enhancement\-label [LABEL]
-.
-.P
-Setup custom label for enhancements section\. Default is "\fBImplemented enhancements:\fR"
-.
-.P
-\-\-issues\-label [LABEL]
-.
-.P
-Setup custom label for closed\-issues section\. Default is "\fBClosed issues:\fR"
-.
-.P
-\-\-header\-label [LABEL]
-.
-.P
-Setup custom header label\. Default is "# Change Log"
-.
-.P
-\-\-pr\-label [LABEL]
-.
-.P
-Setup custom label for pull requests section\. Default is "\fBMerged pull requests:\fR"
-.
-.P
-\-\-[no\-]issues
-.
-.P
-Include closed issues in changelog\. Default is true
-.
-.P
-\-\-[no\-]issues\-wo\-labels
-.
-.P
-Include closed issues without labels in changelog\. Default is true
-.
-.P
-\-\-[no\-]pr\-wo\-labels
-.
-.P
-Include pull requests without labels in changelog\. Default is true
-.
-.P
-\-\-[no\-]pull\-requests
-.
-.P
-Include pull\-requests in changelog\. Default is true
-.
-.P
-\-\-[no\-]filter\-by\-milestone
-.
-.P
-Use milestone to detect when issue was resolved\. Default is true
-.
-.P
-\-\-[no\-]author
-.
-.P
-Add author of pull\-request in the end\. Default is true
-.
-.P
-\-\-unreleased\-only
-.
-.P
-Generate log from unreleased closed issues only\.
-.
-.P
-\-\-[no\-]unreleased
-.
-.P
-Add to log unreleased closed issues\. Default is true
-.
-.P
-\-\-unreleased\-label [label]
-.
-.P
-Add to log unreleased closed issues\. Default is true
-.
-.P
-\-\-[no\-]compare\-link
-.
-.P
-Include compare link (Full Changelog) between older version and newer version\. Default is true
-.
-.P
-\-\-include\-labels x,y,z
-.
-.P
-Only issues with the specified labels will be included in the changelog\.
-.
-.P
-\-\-exclude\-labels x,y,z
-.
-.P
-Issues with the specified labels will be always excluded from changelog\. Default is \'duplicate,question,invalid,wontfix\'
-.
-.P
-\-\-bug\-labels x,y,z
-.
-.P
-Issues with the specified labels will be always added to "Fixed bugs" section\. Default is \'bug,Bug\'
-.
-.P
-\-\-enhancement\-labels x,y,z
-.
-.P
-Issues with the specified labels will be always added to "Implemented enhancements" section\. Default is \'enhancement,Enhancement\'
-.
-.P
-\-\-between\-tags x,y,z
-.
-.P
-Change log will be filled only between specified tags
-.
-.P
-\-\-exclude\-tags x,y,z
-.
-.P
-Change log will exclude specified tags
-.
-.P
-\-\-since\-tag x
-.
-.P
-Change log will start after specified tag
-.
-.P
-\-\-due\-tag x
-.
-.P
-Change log will end before specified tag
-.
-.P
-\-\-max\-issues [NUMBER]
-.
-.P
-Max number of issues to fetch from GitHub\. Default is unlimited
-.
-.P
-\-\-release\-url [URL]
-.
-.P
-The URL to point to for release links, in printf format (with the tag as variable)\.
-.
-.P
-\-\-github\-site [URL]
-.
-.P
-The Enterprise Github site on which your project is hosted\.
-.
-.P
-\-\-github\-api [URL]
-.
-.P
-The enterprise endpoint to use for your Github API\.
-.
-.P
-\-\-simple\-list
-.
-.P
-Create simple list from issues and pull requests\. Default is false\.
-.
-.P
-\-\-future\-release [RELEASE\-VERSION]
-.
-.P
-Put the unreleased changes in the specified release number\.
-.
-.P
-\-\-[no\-]verbose
-.
-.P
-Run verbosely\. Default is true
-.
-.P
-\-v, \-\-version
-.
-.P
-Print version number
-.
-.P
-\-h, \-\-help
-.
-.P
-Displays Help
-.
-.SH "EXAMPLES"
-.
-.SH "AUTHOR"
-Written by Petr Korolev sky4winder@gmail\.com
-.
-.SH "REPORTING BUGS"
-<\fIhttps://github\.com/skywinder/github\-changelog\-generator/issues\fR>
-.
-.SH "SEE ALSO"
-<\fIhttps://github\.com/skywinder/github\-changelog\-generator/\fR>

man/git-generate-changelog.html

@@ -1,262 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-generate-changelog(1) - Generate changelog from github</title>
-  <style type='text/css' media='all'>
-  /* style: man */
-  body#manpage {margin:0}
-  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
-  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
-  .mp h2 {margin:10px 0 0 0}
-  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
-  .mp h3 {margin:0 0 0 4ex}
-  .mp dt {margin:0;clear:left}
-  .mp dt.flush {float:left;width:8ex}
-  .mp dd {margin:0 0 0 9ex}
-  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
-  .mp pre {margin-bottom:20px}
-  .mp pre+h2,.mp pre+h3 {margin-top:22px}
-  .mp h2+pre,.mp h3+pre {margin-top:5px}
-  .mp img {display:block;margin:auto}
-  .mp h1.man-title {display:none}
-  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
-  .mp h2 {font-size:16px;line-height:1.25}
-  .mp h1 {font-size:20px;line-height:2}
-  .mp {text-align:justify;background:#fff}
-  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
-  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
-  .mp u {text-decoration:underline}
-  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
-  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
-  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
-  .mp b.man-ref {font-weight:normal;color:#434241}
-  .mp pre {padding:0 4ex}
-  .mp pre code {font-weight:normal;color:#434241}
-  .mp h2+pre,h3+pre {padding-left:0}
-  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
-  ol.man-decor {width:100%}
-  ol.man-decor li.tl {text-align:left}
-  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
-  ol.man-decor li.tr {text-align:right;float:right}
-  </style>
-</head>
-<!--
-  The following styles are deprecated and will be removed at some point:
-  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
-
-  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
-  .man-navigation should be used instead.
--->
-<body id='manpage'>
-  <div class='mp' id='man'>
-
-  <div class='man-navigation' style='display:none'>
-    <a href="#NAME">NAME</a>
-    <a href="#SYNOPSIS">SYNOPSIS</a>
-    <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#OPTIONS">OPTIONS</a>
-    <a href="#EXAMPLES">EXAMPLES</a>
-    <a href="#AUTHOR">AUTHOR</a>
-    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
-    <a href="#SEE-ALSO">SEE ALSO</a>
-  </div>
-
-  <ol class='man-decor man-head man head'>
-    <li class='tl'>git-generate-changelog(1)</li>
-    <li class='tc'></li>
-    <li class='tr'>git-generate-changelog(1)</li>
-  </ol>
-
-  <h2 id="NAME">NAME</h2>
-<p class="man-name">
-  <code>git-generate-changelog</code> - <span class="man-whatis">Generate changelog from github</span>
-</p>
-
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
-
-<p><code>git generate-changelog</code> [-h|--help] [-u|--user] [-p|--project]</p>
-
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
-
-<p>Automatically generate change log from your tags, issues, labels and pull requests on GitHub.</p>
-
-<h2 id="OPTIONS">OPTIONS</h2>
-
-<p>  -u, --user [USER]</p>
-
-<p>  Username of the owner of target GitHub repo</p>
-
-<p>  -p, --project [PROJECT]</p>
-
-<p>  Name of project on GitHub</p>
-
-<p>  -t, --token [TOKEN]</p>
-
-<p>  To make more than 50 requests per hour your GitHub token is required. You can generate it at: https://github.com/settings/tokens/new</p>
-
-<p>  -f, --date-format [FORMAT]</p>
-
-<p>  Date format. Default is %Y-%m-%d</p>
-
-<p>  -o, --output [NAME]</p>
-
-<p>  Output file. Default is CHANGELOG.md</p>
-
-<p>  -b, --base [NAME]</p>
-
-<p>  Optional base file to append generated changes to.</p>
-
-<p>   --bugs-label [LABEL]</p>
-
-<p>   Setup custom label for bug-fixes section. Default is "<strong>Fixed bugs:</strong></p>
-
-<p>   --enhancement-label [LABEL]</p>
-
-<p>   Setup custom label for enhancements section. Default is "<strong>Implemented enhancements:</strong>"</p>
-
-<p>   --issues-label [LABEL]</p>
-
-<p>   Setup custom label for closed-issues section. Default is "<strong>Closed issues:</strong>"</p>
-
-<p>   --header-label [LABEL]</p>
-
-<p>   Setup custom header label. Default is "# Change Log"</p>
-
-<p>   --pr-label [LABEL]</p>
-
-<p>   Setup custom label for pull requests section. Default is "<strong>Merged pull requests:</strong>"</p>
-
-<p>   --[no-]issues</p>
-
-<p>   Include closed issues in changelog. Default is true</p>
-
-<p>   --[no-]issues-wo-labels</p>
-
-<p>   Include closed issues without labels in changelog. Default is true</p>
-
-<p>   --[no-]pr-wo-labels</p>
-
-<p>   Include pull requests without labels in changelog. Default is true</p>
-
-<p>   --[no-]pull-requests</p>
-
-<p>   Include pull-requests in changelog. Default is true</p>
-
-<p>   --[no-]filter-by-milestone</p>
-
-<p>   Use milestone to detect when issue was resolved. Default is true</p>
-
-<p>   --[no-]author</p>
-
-<p>   Add author of pull-request in the end. Default is true</p>
-
-<p>   --unreleased-only</p>
-
-<p>   Generate log from unreleased closed issues only.</p>
-
-<p>   --[no-]unreleased</p>
-
-<p>   Add to log unreleased closed issues. Default is true</p>
-
-<p>   --unreleased-label [label]</p>
-
-<p>   Add to log unreleased closed issues. Default is true</p>
-
-<p>   --[no-]compare-link</p>
-
-<p>   Include compare link (Full Changelog) between older version and newer version. Default is true</p>
-
-<p>   --include-labels x,y,z</p>
-
-<p>   Only issues with the specified labels will be included in the changelog.</p>
-
-<p>   --exclude-labels x,y,z</p>
-
-<p>   Issues with the specified labels will be always excluded from changelog. Default is 'duplicate,question,invalid,wontfix'</p>
-
-<p>   --bug-labels x,y,z</p>
-
-<p>   Issues with the specified labels will be always added to "Fixed bugs" section. Default is 'bug,Bug'</p>
-
-<p>   --enhancement-labels x,y,z</p>
-
-<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>
-
-<p>   --since-tag x</p>
-
-<p>   Change log will start after specified tag</p>
-
-<p>   --due-tag x</p>
-
-<p>   Change log will end before specified tag</p>
-
-<p>   --max-issues [NUMBER]</p>
-
-<p>   Max number of issues to fetch from GitHub. Default is unlimited</p>
-
-<p>   --release-url [URL]</p>
-
-<p>   The URL to point to for release links, in printf format (with the tag as variable).</p>
-
-<p>   --github-site [URL]</p>
-
-<p>   The Enterprise Github site on which your project is hosted.</p>
-
-<p>   --github-api [URL]</p>
-
-<p>   The enterprise endpoint to use for your Github API.</p>
-
-<p>   --simple-list</p>
-
-<p>   Create simple list from issues and pull requests. Default is false.</p>
-
-<p>   --future-release [RELEASE-VERSION]</p>
-
-<p>   Put the unreleased changes in the specified release number.</p>
-
-<p>   --[no-]verbose</p>
-
-<p>   Run verbosely. Default is true</p>
-
-<p>  -v, --version</p>
-
-<p>  Print version number</p>
-
-<p>  -h, --help</p>
-
-<p>  Displays Help</p>
-
-<h2 id="EXAMPLES">EXAMPLES</h2>
-
-<h2 id="AUTHOR">AUTHOR</h2>
-
-<p>Written by Petr Korolev sky4winder@gmail.com</p>
-
-<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
-
-<p>&lt;<a href="https://github.com/skywinder/github-changelog-generator/issues" data-bare-link="true">https://github.com/skywinder/github-changelog-generator/issues</a>&gt;</p>
-
-<h2 id="SEE-ALSO">SEE ALSO</h2>
-
-<p>&lt;<a href="https://github.com/skywinder/github-changelog-generator/" data-bare-link="true">https://github.com/skywinder/github-changelog-generator/</a>&gt;</p>
-
-
-  <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
-    <li class='tc'>October 2015</li>
-    <li class='tr'>git-generate-changelog(1)</li>
-  </ol>
-
-  </div>
-</body>
-</html>

man/git-generate-changelog.md

@@ -1,179 +0,0 @@
-git-generate-changelog(1) - Generate changelog from github
-================================
-
-## SYNOPSIS
-
-`git generate-changelog` [-h|--help] [-u|--user] [-p|--project]
-
-## DESCRIPTION
-
-Automatically generate change log from your tags, issues, labels and pull requests on GitHub.
-
-## OPTIONS
-
-  -u, --user [USER]
-
-  Username of the owner of target GitHub repo
-
-  -p, --project [PROJECT]
-
-  Name of project on GitHub
-
-  -t, --token [TOKEN]
-
-  To make more than 50 requests per hour your GitHub token is required. You can generate it at: https://github.com/settings/tokens/new
-
-  -f, --date-format [FORMAT]
-
-  Date format. Default is %Y-%m-%d
-
-  -o, --output [NAME]
-
-  Output file. Default is CHANGELOG.md
-
-  -b, --base [NAME]
-
-  Optional base file to append generated changes to.
-
-   --bugs-label [LABEL]
-
-   Setup custom label for bug-fixes section. Default is "**Fixed bugs:**
-
-   --enhancement-label [LABEL]
-
-   Setup custom label for enhancements section. Default is "**Implemented enhancements:**"
-
-   --issues-label [LABEL]
-
-   Setup custom label for closed-issues section. Default is "**Closed issues:**"
-
-   --header-label [LABEL]
-
-   Setup custom header label. Default is "# Change Log"
-
-   --pr-label [LABEL]
-
-   Setup custom label for pull requests section. Default is "**Merged pull requests:**"
-
-   --[no-]issues
-
-   Include closed issues in changelog. Default is true
-
-   --[no-]issues-wo-labels
-
-   Include closed issues without labels in changelog. Default is true
-
-   --[no-]pr-wo-labels
-
-   Include pull requests without labels in changelog. Default is true
-
-   --[no-]pull-requests
-
-   Include pull-requests in changelog. Default is true
-
-   --[no-]filter-by-milestone
-
-   Use milestone to detect when issue was resolved. Default is true
-
-   --[no-]author
-
-   Add author of pull-request in the end. Default is true
-
-   --unreleased-only
-
-   Generate log from unreleased closed issues only.
-
-   --[no-]unreleased
-
-   Add to log unreleased closed issues. Default is true
-
-   --unreleased-label [label]
-
-   Add to log unreleased closed issues. Default is true
-
-   --[no-]compare-link
-
-   Include compare link (Full Changelog) between older version and newer version. Default is true
-
-   --include-labels x,y,z
-
-   Only issues with the specified labels will be included in the changelog.
-
-   --exclude-labels x,y,z
-
-   Issues with the specified labels will be always excluded from changelog. Default is 'duplicate,question,invalid,wontfix'
-
-   --bug-labels x,y,z
-
-   Issues with the specified labels will be always added to "Fixed bugs" section. Default is 'bug,Bug'
-
-   --enhancement-labels x,y,z
-
-   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
-
-   --since-tag x
-
-   Change log will start after specified tag
-
-   --due-tag x
-
-   Change log will end before specified tag
-
-   --max-issues [NUMBER]
-
-   Max number of issues to fetch from GitHub. Default is unlimited
-
-   --release-url [URL]
-
-   The URL to point to for release links, in printf format (with the tag as variable).
-
-   --github-site [URL]
-
-   The Enterprise Github site on which your project is hosted.
-
-   --github-api [URL]
-
-   The enterprise endpoint to use for your Github API.
-
-   --simple-list
-
-   Create simple list from issues and pull requests. Default is false.
-
-   --future-release [RELEASE-VERSION]
-
-   Put the unreleased changes in the specified release number.
-
-   --[no-]verbose
-
-   Run verbosely. Default is true
-
-  -v, --version
-
-  Print version number
-
-  -h, --help
-
-  Displays Help
-
-
-## EXAMPLES
-
-## AUTHOR
-
-Written by Petr Korolev sky4winder@gmail.com
-
-## REPORTING BUGS
-
-&lt;<https://github.com/skywinder/github-changelog-generator/issues>&gt;
-
-## SEE ALSO
-
-&lt;<https://github.com/skywinder/github-changelog-generator/>&gt;

spec/install-gem-in-bundler.gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "github_changelog_generator", path: Dir.glob("../pkg/github_changelog_generator-*.gem")[0]

spec/spec_helper.rb

@@ -19,37 +19,99 @@ require "codeclimate-test-reporter"
 require "simplecov"
 require "coveralls"
 
-# This module is only used to check the environment is currently a testing env
-module SpecHelper
-end
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-                                                                 Coveralls::SimpleCov::Formatter,
-                                                                 SimpleCov::Formatter::HTMLFormatter,
-                                                                 CodeClimate::TestReporter::Formatter
-                                                               ])
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter,
+  CodeClimate::TestReporter::Formatter
+]
 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/fetcher_spec.rb

@@ -52,7 +52,7 @@ describe GitHubChangelogGenerator::Fetcher do
         @fetcher = GitHubChangelogGenerator::Fetcher.new(options)
       end
       it "should raise Unauthorized error" do
-        expect { @fetcher.github_fetch_tags }.to raise_error Github::Error::Unauthorized
+        expect { @fetcher.github_fetch_tags [] }.to raise_error Github::Error::Unauthorized
       end
     end
   end

spec/unit/generator/generator_processor_spec.rb

@@ -1,28 +0,0 @@
-module GitHubChangelogGenerator
-  describe Generator do
-    context "#exclude_issues_by_labels" do
-      let(:label) { double("the-bad-label", name: "BAD") }
-      let(:issue) { double("the-issue-to-be-excluded", labels: [label]) }
-      let(:good_label) { double("a-good-label", name: "GOOD") }
-      let(:good_issue) { double("an-issue-to-be-kept", labels: [good_label]) }
-      let(:issues) { [issue, good_issue] }
-      subject(:generator) { described_class.new(exclude_labels: %w(BAD BOO)) }
-
-      it "removes issues with labels in the exclude_label list" do
-        result = generator.exclude_issues_by_labels(issues)
-
-        expect(result).to include(good_issue)
-        expect(result).not_to include(issue)
-      end
-
-      context "with no option given" do
-        subject(:generator) { described_class.new }
-        it "passes everything through when no option given" do
-          result = generator.exclude_issues_by_labels(issues)
-
-          expect(result).to eq(issues)
-        end
-      end
-    end
-  end
-end

spec/unit/generator/generator_tags_spec.rb

@@ -1,243 +1,29 @@
 describe GitHubChangelogGenerator::Generator do
-  def tag_mash_with_name(tag)
-    Hashie::Mash.new.tap { |mash_tag| mash_tag.name = tag }
-  end
-
-  def tags_mash_from_strings(tags_strings)
-    tags_strings.map do |tag|
-      tag_mash_with_name(tag)
-    end
-  end
-
-  describe "#filter_between_tags" do
-    context "when between_tags nil" do
-      before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: nil)
-      end
-
-      subject do
-        @generator.get_filtered_tags(tags_mash_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_mash_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_mash_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
-    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_mash_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2))) }
-    end
-
-    context "when between_tags filled with invalid values" do
-      before do
-        @generator = GitHubChangelogGenerator::Generator.new(between_tags: %w(1 q w))
-      end
-
-      subject do
-        @generator.get_filtered_tags(tags_mash_from_strings(%w(1 2 3)))
-      end
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1))) }
-    end
-  end
-
   describe "#get_filtered_tags" do
-    subject do
-      generator.get_filtered_tags(tags_mash_from_strings(%w(1 2 3 4 5)))
-    end
-
-    context "with excluded and between tags" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3), exclude_tags: %w(2)) }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 3))) }
-    end
-  end
-
-  describe "#filter_excluded_tags" do
-    subject { generator.filter_excluded_tags(tags_mash_from_strings(%w(1 2 3))) }
-
-    context "with matching string" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2))) }
-    end
-
-    context "with non-matching string" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(invalid tags)) }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_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_mash_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_mash_from_strings(%w(1 2 3))) }
-    end
-  end
-
-  describe "#filter_excluded_tags_regex" do
-    subject { generator.filter_excluded_tags(tags_mash_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_mash_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_mash_from_strings(%w(1 2 3))) }
-    end
-  end
-
-  describe "#filter_since_tag" do
-    context "with filled array" do
-      subject { generator.filter_since_tag(tags_mash_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_mash_from_strings(%w(1))) }
-      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_mash_from_strings(%w(1 2 3))) }
-      end
-    end
-
-    context "with empty array" do
-      subject { generator.filter_since_tag(tags_mash_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_mash_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_mash_from_strings(%w())) }
-      end
-    end
-  end
-
-  describe "#filter_due_tag" do
-    context "with filled array" do
-      subject { generator.filter_due_tag(tags_mash_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_mash_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_mash_from_strings(%w(1 2 3))) }
-      end
-    end
-
-    context "with empty array" do
-      subject { generator.filter_due_tag(tags_mash_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_mash_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_mash_from_strings(%w())) }
-      end
-    end
-  end
-
-  describe "#get_time_of_tag" do
-    current_time = Time.now
-    before(:all) { @generator = GitHubChangelogGenerator::Generator.new }
-    context "run with nil parameter" do
-      it "should raise ChangelogGeneratorError" do
-        expect { @generator.get_time_of_tag nil }.to raise_error(GitHubChangelogGenerator::ChangelogGeneratorError)
-      end
-    end
-    context "fetch already filled tag" do
-      before { @generator.instance_variable_set :@tag_times_hash, "valid_tag" => current_time }
-      subject { @generator.get_time_of_tag tag_mash_with_name("valid_tag") }
-      it { is_expected.to be_a_kind_of(Time) }
-      it { is_expected.to eq(current_time) }
-    end
-    context "fetch not filled tag" do
-      before do
-        mock = double("fake fetcher")
-        allow(mock).to receive_messages(fetch_date_of_tag: current_time)
-        @generator.instance_variable_set :@fetcher, mock
-      end
-      subject do
-        of_tag = @generator.get_time_of_tag(tag_mash_with_name("valid_tag"))
-        of_tag
-      end
-      it { is_expected.to be_a_kind_of(Time) }
-      it { is_expected.to eq(current_time) }
-    end
-  end
-
-  describe "#sort_tags_by_date" do
-    let(:time1) { Time.now }
-    let(:time2) { Time.now }
-    let(:time3) { Time.now }
-
     before(:all) do
       @generator = GitHubChangelogGenerator::Generator.new
     end
 
-    before do
-      @generator.instance_variable_set(:@tag_times_hash, "valid_tag1" => time1,
-                                                         "valid_tag2" => time2,
-                                                         "valid_tag3" => time3)
+    context "when between_tags nil" do
+      # before(:each) do
+      #   @generator.options = {}
+      # end
+      subject { @generator.get_filtered_tags(%w(1 2 3)) }
+      it { is_expected.to be_a(Array) }
+      it { is_expected.to match_array(%w(1 2 3)) }
     end
 
-    subject do
-      @generator.sort_tags_by_date(tags)
-    end
-    context "sort unsorted tags" do
-      let(:tags) { tags_mash_from_strings %w(valid_tag1 valid_tag2 valid_tag3) }
+    context "when between_tags 1" do
+      # before(:each) do
+      #   @generator.options = {between_tags: ["1"]}
+      # end
 
-      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_mash_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) }
+      subject do
+        @generator.instance_variable_set("@options", between_tags: ["1"])
+        @generator.get_filtered_tags(%w(1 2 3))
+      end
+      it { is_expected.to be_a(Array) }
+      it { is_expected.to match_array(%w(1)) }
     end
   end
 end

spec/unit/parse_file_spec.rb

@@ -1,73 +0,0 @@
-describe GitHubChangelogGenerator::ParserFile do
-  describe ".github_changelog_generator" do
-    let(:options) { {} }
-
-    context "when the well-known default file does not exist" do
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options) }
-      subject { parser.parse! }
-      it { is_expected.to be_nil }
-    end
-
-    context "when file is empty" do
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options, StringIO.new("")) }
-
-      it "does not change the options" do
-        expect { parser.parse! }.to_not change { options }
-      end
-    end
-
-    context "when file is incorrect" do
-      let(:options_before_change) { options.dup }
-      let(:file) { StringIO.new("unreleased_label=staging\nunreleased: false") }
-      let(:parser) do
-        GitHubChangelogGenerator::ParserFile.new(options, file)
-      end
-      it { expect { parser.parse! }.to raise_error(/line #2/) }
-    end
-
-    context "allows empty lines and comments with semi-colon or pound sign" do
-      let(:file) { StringIO.new("\n   \n# Comment on first line\nunreleased_label=staging\n; Comment on third line\nunreleased=false") }
-      let(:parser) do
-        GitHubChangelogGenerator::ParserFile.new(options, file)
-      end
-      it { expect { parser.parse! }.not_to raise_error }
-    end
-
-    context "when override default values" do
-      let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
-      let(:options) { {}.merge(default_options) }
-      let(:options_before_change) { options.dup }
-      let(:file) { StringIO.new("unreleased_label=staging\nunreleased=false\nheader==== Changelog ===") }
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options, file) }
-
-      it "changes the options" do
-        expect { parser.parse! }.to change { options }
-          .from(options_before_change)
-          .to(options_before_change.merge(unreleased_label: "staging",
-                                          unreleased: false,
-                                          header: "=== Changelog ==="))
-      end
-
-      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
-                      )
-        end
-        it "reads exclude_labels into an Array" do
-          expect { parser.parse! }.to change { options[:exclude_labels] }
-            .from(default_options[:exclude_labels])
-            .to(["73a91042-da6f-11e5-9335-1040f38d7f90", "7adf83b4-da6f-11e5-ae18-1040f38d7f90"])
-        end
-
-        it "translates given header_label into the :header option" do
-          expect { parser.parse! }.to change { options[:header] }
-            .from(default_options[:header])
-            .to("# My changelog")
-        end
-      end
-    end
-  end
-end

spec/unit/parser_spec.rb

@@ -1,21 +1,21 @@
 describe GitHubChangelogGenerator::Parser do
-  describe ".user_project_from_remote" do
-    context "when remote is type 1" do
+  describe "#self.user_project_from_remote" do
+    context "when remote is 1" do
       subject { GitHubChangelogGenerator::Parser.user_project_from_remote("origin  https://github.com/skywinder/ActionSheetPicker-3.0 (fetch)") }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
     end
-    context "when remote is type 2" do
+    context "when remote is 2" do
       subject { GitHubChangelogGenerator::Parser.user_project_from_remote("https://github.com/skywinder/ActionSheetPicker-3.0") }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
     end
-    context "when remote is type 3" do
+    context "when remote is 3" do
       subject { GitHubChangelogGenerator::Parser.user_project_from_remote("https://github.com/skywinder/ActionSheetPicker-3.0") }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
     end
-    context "when remote is type 4" do
+    context "when remote is 4" do
       subject { GitHubChangelogGenerator::Parser.user_project_from_remote("origin git@github.com:skywinder/ActionSheetPicker-3.0.git (fetch)") }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
@@ -26,18 +26,18 @@ describe GitHubChangelogGenerator::Parser do
       it { is_expected.to match_array([nil, nil]) }
     end
   end
-  describe ".user_project_from_option" do
-    context "when option is invalid" do
-      it("should return nil") { expect(GitHubChangelogGenerator::Parser.user_project_from_option("blah", nil, nil)).to be_nil }
-    end
+  describe "#self.user_project_from_option" do
+    # context "when option is invalid" do
+    #   it("should exit") { expect { GitHubChangelogGenerator::Parser.user_project_from_option("blah", nil) }.to raise_error(SystemExit) }
+    # end
 
     context "when option is valid" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", nil, nil) }
+      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", nil) }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
     end
     context "when option nil" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option(nil, nil, nil) }
+      subject { GitHubChangelogGenerator::Parser.user_project_from_option(nil, nil) }
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array([nil, nil]) }
     end
@@ -56,25 +56,5 @@ describe GitHubChangelogGenerator::Parser do
       it { is_expected.to be_a(Array) }
       it { is_expected.to match_array([nil, nil]) }
     end
-    context "when all args is not nil" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", "blah", "https://codeclimate.com") }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array([nil, nil]) }
-    end
-  end
-  describe ".fetch_user_and_project" do
-    before :each do
-      ARGV = ["https://github.com/skywinder/github-changelog-generator"]
-    end
-    context do
-      let(:valid_user) { "initialized_user" }
-      let(:options) { { user: valid_user } }
-      let(:options_before_change) { options.dup }
-      it "should leave user unchanged" do
-        expect { GitHubChangelogGenerator::Parser.fetch_user_and_project(options) }.to change { options }
-          .from(options_before_change)
-          .to(options_before_change.merge(project: "github-changelog-generator"))
-      end
-    end
   end
 end