Merge branch 'feature/thor' of https://github.com/estahn/github-changelog-generator into estahn-feature/thor

Conflicts:
	Gemfile.lock

.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .rubocop.yml

.overcommit.yml

@@ -1,36 +0,0 @@
-# Use this file to configure the Overcommit hooks you wish to use. This will
-# extend the default configuration defined in:
-# https://github.com/brigade/overcommit/blob/master/config/default.yml
-#
-# At the topmost level of this YAML file is a key representing type of hook
-# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
-# customize each hook, such as whether to only run it on certain files (via
-# `include`), whether to only display output if it fails (via `quiet`), etc.
-#
-# For a complete list of hooks, see:
-# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
-#
-# For a complete list of options that you can use to customize hooks, see:
-# https://github.com/brigade/overcommit#configuration
-#
-# Uncomment the following lines to make the configuration take effect.
-
-PreCommit:
-  RuboCop:
-    enabled: true
-    #command: ['bundle', 'exec', 'rubocop'] 
-    on_warn: fail # Treat all warnings as failures
-#
-#  TrailingWhitespace:
-#    exclude:
-#      - '**/db/structure.sql' # Ignore trailing whitespace in generated files
-#
-#PostCheckout:
-#  ALL: # Special hook name that customizes all hooks of this type
-#   quiet: true # Change all post-checkout hooks to only display output on failure
-#
-#  IndexTags:
-#    enabled: true # Generate a tags file with `ctags` each time HEAD changes
-CommitMsg:
-  CapitalizedSubject:
-      enabled: false

.rubocop.yml

@@ -4,13 +4,5 @@ Metrics/LineLength:
   Enabled: false
 
 #http://viget.com/extend/just-use-double-quoted-ruby-strings
-Style/StringLiterals:
+#Style/StringLiterals:
-  EnforcedStyle: double_quotes
+#  EnforcedStyle: double_quotes
-
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-    Enabled: false
-
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-    Enabled: false

.rubocop_todo.yml

@@ -1,42 +1,81 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-12 11:23:12 +0300 using RuboCop version 0.31.0.
+# on 2015-03-27 03:03:45 +0200 using RuboCop version 0.29.1.
 # 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: 13
+# Offense count: 20
 Metrics/AbcSize:
-  Max: 71
+  Max: 114
 
 # Offense count: 1
-Metrics/CyclomaticComplexity:
+Metrics/BlockNesting:
-  Max: 7
+  Max: 4
-
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 8
 
 # Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 471
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 18
+
+# Offense count: 27
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 147
+
+# Offense count: 6
+Metrics/PerceivedComplexity:
+  Max: 20
+
+# Offense count: 3
 Style/AccessorMethodName:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/AndOr:
+  Enabled: false
+
+# Offense count: 29
+# Cop supports --auto-correct.
+Style/Blocks:
+  Enabled: false
+
+# Offense count: 7
+# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
+Style/CaseIndentation:
+  Enabled: false
+
+# Offense count: 5
 Style/Documentation:
   Enabled: false
 
 # Offense count: 1
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Enabled: false
+
+# Offense count: 6
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 17
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 2
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 Style/Next:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 5
-# Cop supports --auto-correct.
+# Configuration parameters: MaxSlashes.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 Style/RegexpLiteral:
   Enabled: false

.travis.yml

@@ -1,17 +1,17 @@
+---
 sudo: false
 cache: bundler
 language: ruby
+
 rvm:
-- 2.1.0
+  - 2.1.0
+
 script:
-- bundle exec rake
+  - bundle exec rake
+
 notifications:
   email:
     recipients:
-    - sky4winder+githubchangeloggenerator@gmail.com
+      - sky4winder+githubchangeloggenerator@gmail.com
-    on_success: never
+    on_success: never # [always|never|change]
-    on_failure: change
+    on_failure: change # [always|never|change]
-addons:
-  code_climate:
-    repo_token:
-      secure: iMpV5IAvH+/EVGZrpWnt2BnmNFzSbsRcIumsr4ZyLC8N5nrCSXyjCSy0g48btL3Sj0bSgK9hcrJsmrFd2bkqFleyAcPAzNyUQzBuIRZx47O8yFmbZ+Pj+l3+KOlmcbzJNHfDfxkxuWTmTAcSDfsiyApin721T/ey3SUuwKpZNUc=

CHANGELOG.md

@@ -1,390 +1,304 @@
 # Change Log
 
-## [1.6.0](https://github.com/skywinder/github-changelog-generator/tree/1.6.0) (2015-06-11)
+## [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.5.0...1.6.0)
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.9...1.3.10)
-
-**Implemented enhancements:**
-
-- Issues with any label expect "bug", "enhancement" are 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 closed PR's from changelog. [\#69](https://github.com/skywinder/Github-Changelog-Generator/issues/69)
-
-- 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)
 
 **Merged pull requests:**
 
-- Big refactoring [\#243](https://github.com/skywinder/github-changelog-generator/pull/243) ([skywinder](https://github.com/skywinder))
+- 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.4.1](https://github.com/skywinder/github-changelog-generator/tree/1.4.1) (2015-05-19)
+## [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.4.0...1.4.1)
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.8...1.3.9)
 
 **Implemented enhancements:**
 
-- Trees/Archives with missing change log notes for the current tag. [\#230](https://github.com/skywinder/github-changelog-generator/issues/230)
+- Improve method of detecting owner and repository [\#63](https://github.com/skywinder/Github-Changelog-Generator/issues/63)
+
+**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)
+
+**Merged pull requests:**
+
+- Fix `git remote` parsing in case, when script running without parameters inside destination directory [\#61](https://github.com/skywinder/Github-Changelog-Generator/pull/61) ([skywinder](https://github.com/skywinder))
+
+## [1.3.6](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.6) (2015-03-05)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.5...1.3.6)
+
+## [1.3.5](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.5) (2015-03-04)
+
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.4...1.3.5)
 
 **Fixed bugs:**
 
-- github\_changelog\_generator.rb:220:in ``': No such file or directory - pwd \(Errno::ENOENT\) [\#237](https://github.com/skywinder/github-changelog-generator/issues/237)
+- Pull Requests in Wrong Tag [\#60](https://github.com/skywinder/Github-Changelog-Generator/issues/60)
 
-- Doesnot generator changelog [\#235](https://github.com/skywinder/github-changelog-generator/issues/235)
+## [1.3.4](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.4) (2015-03-03)
 
-- Exclude closed \(not merged\) PR's from changelog. [\#69](https://github.com/skywinder/github-changelog-generator/issues/69)
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.3...1.3.4)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
-- Wrap GitHub requests in function check\_github\_response [\#238](https://github.com/skywinder/github-changelog-generator/pull/238) ([skywinder](https://github.com/skywinder))
+- --no-issues appears to break PRs [\#59](https://github.com/skywinder/Github-Changelog-Generator/issues/59)
 
-- Add fetch token tests [\#236](https://github.com/skywinder/github-changelog-generator/pull/236) ([skywinder](https://github.com/skywinder))
+## [1.3.3](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.3) (2015-03-03)
 
-- Add future release option [\#231](https://github.com/skywinder/github-changelog-generator/pull/231) ([sildur](https://github.com/sildur))
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.2...1.3.3)
-
-## [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)
 
 **Closed issues:**
 
-- Add CodeClimate and Inch CI [\#219](https://github.com/skywinder/github-changelog-generator/issues/219)
+- Add \# character to encapsulate list. [\#58](https://github.com/skywinder/Github-Changelog-Generator/issues/58)
 
-**Merged pull requests:**
+## [1.3.2](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.2) (2015-03-03)
 
-- Implement fetcher class [\#227](https://github.com/skywinder/github-changelog-generator/pull/227) ([skywinder](https://github.com/skywinder))
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.1...1.3.2)
 
-- Add coveralls integration [\#223](https://github.com/skywinder/github-changelog-generator/pull/223) ([skywinder](https://github.com/skywinder))
+**Fixed bugs:**
 
-- Cleanup [\#220](https://github.com/skywinder/github-changelog-generator/pull/220) ([tuexss](https://github.com/tuexss))
+- generation failed if github commit api return `404 Not Found` [\#57](https://github.com/skywinder/Github-Changelog-Generator/issues/57)
 
-- Rspec & rubocop integration [\#217](https://github.com/skywinder/github-changelog-generator/pull/217) ([skywinder](https://github.com/skywinder))
+## [1.3.1](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.1) (2015-02-27)
 
-- Implement Reader class to parse ChangeLog.md [\#216](https://github.com/skywinder/github-changelog-generator/pull/216) ([estahn](https://github.com/estahn))
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.3.0...1.3.1)
 
-- Relatively require github\_changelog\_generator library [\#207](https://github.com/skywinder/github-changelog-generator/pull/207) ([sneal](https://github.com/sneal))
+## [1.3.0](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.0) (2015-02-26)
 
-- Add --max-issues argument to limit requests [\#76](https://github.com/skywinder/github-changelog-generator/pull/76) ([sneal](https://github.com/sneal))
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.8...1.3.0)
-
-## [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:**
-
-- 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)
-
-**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)
+- 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:**
+
+- Test pull request with invalid label \(\#26\) in changelog appeared. [\#44](https://github.com/skywinder/Github-Changelog-Generator/issues/44)
 
 **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))
+- Implement filtering of Pull Requests by milestones [\#50](https://github.com/skywinder/Github-Changelog-Generator/pull/50) ([skywinder](https://github.com/skywinder))
 
-## [1.3.8](https://github.com/skywinder/github-changelog-generator/tree/1.3.8) (2015-03-05)
+## [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.3.6...1.3.8)
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.7...1.2.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:**
-
-- 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:**
-
-- --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:**
 
-- Add \# character to encapsulate list. [\#58](https://github.com/skywinder/github-changelog-generator/issues/58)
+- Bugs, that closed simultaneously with push not appeared in correct version. [\#37](https://github.com/skywinder/Github-Changelog-Generator/issues/37)
 
-## [1.3.2](https://github.com/skywinder/github-changelog-generator/tree/1.3.2) (2015-03-03)
+**Merged pull requests:**
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.1...1.3.2)
+- Feature/fix 37 [\#49](https://github.com/skywinder/Github-Changelog-Generator/pull/49) ([skywinder](https://github.com/skywinder))
 
-**Fixed bugs:**
+- Prettify output [\#48](https://github.com/skywinder/Github-Changelog-Generator/pull/48) ([skywinder](https://github.com/skywinder))
 
-- generation failed if github commit api return `404 Not Found` [\#57](https://github.com/skywinder/github-changelog-generator/issues/57)
+## [1.2.7](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.7) (2015-01-26)
 
-## [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.2.6...1.2.7)
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.3.0...1.3.1)
+**Merged pull requests:**
 
-## [1.3.0](https://github.com/skywinder/github-changelog-generator/tree/1.3.0) (2015-02-26)
+- Add compare link between older version and newer version [\#46](https://github.com/skywinder/Github-Changelog-Generator/pull/46) ([sue445](https://github.com/sue445))
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.8...1.3.0)
+## [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:**
+
+- 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:**
 
-- Do not show `Unreleased` section, when it's empty. [\#55](https://github.com/skywinder/github-changelog-generator/issues/55)
+- Use milestone to specify in which version bug was fixed [\#22](https://github.com/skywinder/Github-Changelog-Generator/issues/22)
-
-- 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:**
 
-- Pull request with invalid label \(\#26\) in changelog appeared. [\#44](https://github.com/skywinder/github-changelog-generator/issues/44)
+- Error when trying to generate log for repo without tags [\#32](https://github.com/skywinder/Github-Changelog-Generator/issues/32)
 
 **Merged pull requests:**
 
-- Implement filtering of Pull Requests by milestones [\#50](https://github.com/skywinder/github-changelog-generator/pull/50) ([skywinder](https://github.com/skywinder))
+- PrettyPrint class is included using lowercase 'pp' [\#43](https://github.com/skywinder/Github-Changelog-Generator/pull/43) ([schwing](https://github.com/schwing))
 
-## [1.2.8](https://github.com/skywinder/github-changelog-generator/tree/1.2.8) (2015-02-17)
+- support enterprise github via command line options [\#42](https://github.com/skywinder/Github-Changelog-Generator/pull/42) ([glenlovett](https://github.com/glenlovett))
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.7...1.2.8)
+## [1.2.4](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.4) (2014-12-16)
 
-**Closed issues:**
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.3...1.2.4)
 
-- Bugs, that closed simultaneously with push not appeared in correct version. [\#37](https://github.com/skywinder/github-changelog-generator/issues/37)
+**Fixed bugs:**
 
-**Merged pull requests:**
+- Sometimes user is NULL during merges [\#41](https://github.com/skywinder/Github-Changelog-Generator/issues/41)
 
-- Feature/fix 37 [\#49](https://github.com/skywinder/github-changelog-generator/pull/49) ([skywinder](https://github.com/skywinder))
+- Crash when try generate log for rails [\#35](https://github.com/skywinder/Github-Changelog-Generator/issues/35)
 
-- Prettify output [\#48](https://github.com/skywinder/github-changelog-generator/pull/48) ([skywinder](https://github.com/skywinder))
+## [1.2.3](https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.3) (2014-12-16)
 
-## [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.2...1.2.3)
-
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.6...1.2.7)
-
-**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:**
-
-- 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)
+- 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:**
 
-- Error when trying to generate log for repo without tags [\#32](https://github.com/skywinder/github-changelog-generator/issues/32)
+- Docs lacking or basic behavior not as advertised [\#30](https://github.com/skywinder/Github-Changelog-Generator/issues/30)
 
 **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))
+- Implement async fetching [\#39](https://github.com/skywinder/Github-Changelog-Generator/pull/39) ([skywinder](https://github.com/skywinder))
 
-- support enterprise github via command line options [\#42](https://github.com/skywinder/github-changelog-generator/pull/42) ([glenlovett](https://github.com/glenlovett))
+- Fix crash when user is NULL [\#40](https://github.com/skywinder/Github-Changelog-Generator/pull/40) ([skywinder](https://github.com/skywinder))
 
-## [1.2.4](https://github.com/skywinder/github-changelog-generator/tree/1.2.4) (2014-12-16)
+## [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.3...1.2.4)
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.2.1...1.2.2)
 
 **Fixed bugs:**
 
-- Sometimes user is NULL during merges [\#41](https://github.com/skywinder/github-changelog-generator/issues/41)
+- Encapsulate \[ \> \* \_ \ \] signs in issues names [\#34](https://github.com/skywinder/Github-Changelog-Generator/issues/34)
 
-- Crash when try generate log for rails [\#35](https://github.com/skywinder/github-changelog-generator/issues/35)
+**Merged pull requests:**
 
-## [1.2.3](https://github.com/skywinder/github-changelog-generator/tree/1.2.3) (2014-12-16)
+- Add a Bitdeli Badge to README [\#36](https://github.com/skywinder/Github-Changelog-Generator/pull/36) ([bitdeli-chef](https://github.com/bitdeli-chef))
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.2...1.2.3)
+## [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:**
+
+- Script fills changelog only for first 30 tags. [\#20](https://github.com/skywinder/Github-Changelog-Generator/issues/20)
+
+**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:**
 
-- Add ability to run with one parameter instead -u -p [\#38](https://github.com/skywinder/github-changelog-generator/issues/38)
+- Implement ability to retrieve GitHub token from ENV variable \(to not put it to script directly\) [\#19](https://github.com/skywinder/Github-Changelog-Generator/issues/19)
-
-- Detailed output [\#33](https://github.com/skywinder/github-changelog-generator/issues/33)
-
-**Fixed bugs:**
-
-- Docs lacking or basic behavior not as advertised [\#30](https://github.com/skywinder/github-changelog-generator/issues/30)
 
 **Merged pull requests:**
 
-- Implement async fetching [\#39](https://github.com/skywinder/github-changelog-generator/pull/39) ([skywinder](https://github.com/skywinder))
+- Sort tags by date [\#23](https://github.com/skywinder/Github-Changelog-Generator/pull/23) ([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.1.2](https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.2) (2014-11-12)
 
-## [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.1.1...1.1.2)
-
-[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))
+- Fix bug with dot signs in project name [\#18](https://github.com/skywinder/Github-Changelog-Generator/pull/18) ([skywinder](https://github.com/skywinder))
 
-## [1.2.1](https://github.com/skywinder/github-changelog-generator/tree/1.2.1) (2014-11-22)
+- Fix bug with dot signs in user name [\#17](https://github.com/skywinder/Github-Changelog-Generator/pull/17) ([skywinder](https://github.com/skywinder))
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.2.0...1.2.1)
+## [1.1.1](https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.1) (2014-11-10)
 
-**Fixed bugs:**
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.1.0...1.1.1)
-
-- Script fills changelog only for first 30 tags. [\#20](https://github.com/skywinder/github-changelog-generator/issues/20)
 
 **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))
+- 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))
 
-- Disable default --filter-pull-requests option. [\#28](https://github.com/skywinder/github-changelog-generator/pull/28) ([skywinder](https://github.com/skywinder))
+- Sort issues by tags [\#14](https://github.com/skywinder/Github-Changelog-Generator/pull/14) ([skywinder](https://github.com/skywinder))
 
-## [1.2.0](https://github.com/skywinder/github-changelog-generator/tree/1.2.0) (2014-11-19)
+- 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))
 
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.1.4...1.2.0)
+## [1.1.0](https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.0) (2014-11-10)
 
-**Merged pull requests:**
+[Full Changelog](https://github.com/skywinder/Github-Changelog-Generator/compare/1.0.1...1.1.0)
-
-- 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:**
 
-- Implement ability to retrieve GitHub token from ENV variable \(to not put it to script directly\) [\#19](https://github.com/skywinder/github-changelog-generator/issues/19)
+- Detect username and project form origin [\#11](https://github.com/skywinder/Github-Changelog-Generator/issues/11)
-
-**Merged pull requests:**
-
-- 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:**
-
-- Detect username and project form origin [\#11](https://github.com/skywinder/github-changelog-generator/issues/11)
 
 **Fixed bugs:**
 
-- Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/github-changelog-generator/issues/12)
+- 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)
+- 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)
+## [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)
+[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)
+## [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)
+[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)
+- 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 option to specify output filename [\#4](https://github.com/skywinder/Github-Changelog-Generator/issues/4)
 
 **Fixed bugs:**
 
-- Last tag not appeared in changelog [\#5](https://github.com/skywinder/github-changelog-generator/issues/5)
+- Last tag not appeared in changelog [\#5](https://github.com/skywinder/Github-Changelog-Generator/issues/5)
 
 **Merged pull requests:**
 
-- Implement support of different tags. [\#8](https://github.com/skywinder/github-changelog-generator/pull/8) ([skywinder](https://github.com/skywinder))
+- Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8) ([skywinder](https://github.com/skywinder))
 
-- Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/github-changelog-generator/pull/7) ([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)
+## [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)
+[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))
+- 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 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))
+- 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)
+## [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)
+[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)
+## [0.0.1](https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.1) (2014-11-06)
 
 
 

Gemfile

@@ -1,14 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rake", ">=10.4.2"
+gemspec
-
-gem "github_api", ">=0.12.3"
-gem "colorize", ">=0.7.7"
 
 group :test do
-  gem "rspec"
+  gem 'rspec'
-  gem "rubocop"
+  gem 'rubocop'
-  gem "coveralls", require: false
+  gem 'coveralls', require: false
-  gem "simplecov", require: false
+  gem 'simplecov', require: false
-  gem "codeclimate-test-reporter"
 end

Gemfile.lock

@@ -1,24 +1,30 @@
+PATH
+  remote: .
+  specs:
+    github_changelog_generator (1.3.11)
+      colorize (~> 0.7)
+      github_api (~> 0.12)
+      thor (~> 0.19)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.3.7)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    codeclimate-test-reporter (0.4.7)
+    colorize (0.7.5)
-      simplecov (>= 0.7.1, < 1.0.0)
+    coveralls (0.7.12)
-    colorize (0.7.7)
+      multi_json (~> 1.10)
-    coveralls (0.8.1)
-      json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
@@ -30,12 +36,11 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.4.1)
+    hashie (3.4.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    json (1.8.2)
+    jwt (1.4.1)
-    jwt (1.5.0)
+    mime-types (2.4.3)
-    mime-types (2.5)
     mini_portile (0.6.2)
     multi_json (1.11.0)
     multi_xml (0.5.5)
@@ -49,10 +54,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    parser (2.2.2.2)
+    parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
+    powerpack (0.1.0)
-    rack (1.6.1)
+    rack (1.6.0)
     rainbow (2.0.0)
     rake (10.4.2)
     rest-client (1.8.0)
@@ -63,45 +68,44 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
+    rspec-core (3.2.2)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.31.0)
+    rubocop (0.29.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.2.1, < 3.0)
+      parser (>= 2.2.0.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      multi_json (~> 1.0)
-      simplecov-html (~> 0.10.0)
+      simplecov-html (~> 0.9.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.9.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.5.1)
+    tins (1.3.5)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  codeclimate-test-reporter
+  bundler (~> 1.7)
-  colorize (>= 0.7.7)
   coveralls
-  github_api (>= 0.12.3)
+  github_changelog_generator!
-  rake (>= 10.4.2)
+  rake (~> 10.0)
   rspec
   rubocop
   simplecov

README.md

@@ -1,9 +1,8 @@
-[![Gem Version](https://badge.fury.io/rb/github_changelog_generator.svg)](http://badge.fury.io/rb/github_changelog_generator)
 [![Dependency Status](https://gemnasium.com/skywinder/github-changelog-generator.svg)](https://gemnasium.com/skywinder/github-changelog-generator)
 [![Build Status](https://travis-ci.org/skywinder/github-changelog-generator.svg?branch=master)](https://travis-ci.org/skywinder/github-changelog-generator)
-[![Inline docs](http://inch-ci.org/github/skywinder/github-changelog-generator.svg)](http://inch-ci.org/github/skywinder/github-changelog-generator)
+[![Coverage Status](http://img.shields.io/coveralls/skywinder/github-changelog-generator/master.svg)](https://coveralls.io/r/skywinder/github-changelog-generator)
 [![Code Climate](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/gpa.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
-[![Test Coverage](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/coverage.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator)
+[![Inline docs](http://inch-ci.org/github/skywinder/github-changelog-generator.svg)](http://inch-ci.org/github/skywinder/github-changelog-generator)
 
 GitHub Changelog Generator ![GitHub Logo](../master/images/logo.jpg)
 ==================
@@ -80,15 +79,38 @@ Because software tools are for people. If you don’t care, why are you contribu
 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.
+
+    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.
+    -v, --version                    Print version number
+    -h, --help                       Displays Help
 
-More detailed info about params you can find in Wiki page: [**Advanced change log generation examples**](https://github.com/skywinder/github-changelog-generator/wiki/Advanced-change-log-generation-examples)
 
 ### GitHub token
 
 Since GitHub allows you to make only 50 requests without authentication it's recommended to run this script with a token (`-t, --token` option)
 
-**You can easily [generate it here](https://github.com/settings/tokens)**.
+**You can easily [generate it here](https://github.com/settings/applications)**.
 
 And:
 
@@ -105,7 +127,7 @@ So, if you got error like this:
 It's time to create this token or wait for 1 hour before GitHub reset the counter for your IP.
 
 ##Features and advantages of this project
-- Generate canonical, neat change log file, followed by [basic change log guidelines](http://keepachangelog.com/) :gem:
+- 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 **customisation**:
@@ -133,8 +155,6 @@ Here is a [wikipage list of alternatives](https://github.com/skywinder/Github-Ch
 ### Projects using this library
 [Wikipage with list of projects](https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) 
 
-If you'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` 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?

Rakefile

@@ -1,5 +1,5 @@
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:rspec)

bin/ghclgen

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby -U
+require 'github_changelog_generator'
+GitHubChangelogGenerator::CLI.start(ARGV)

bin/github_changelog_generator

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

bump_gemfile.rb

@@ -0,0 +1,221 @@
+#!/usr/bin/env ruby
+require 'optparse'
+
+SPEC_TYPE = 'gemspec'
+
+:major
+:minor
+:patch
+
+@options = { dry_run: false, bump_number: :patch }
+
+OptionParser.new { |opts|
+  opts.banner = 'Usage: bump.rb [options]'
+
+  opts.on('-d', '--dry-run', 'Dry run') do |v|
+    @options[:dry_run] = v
+  end
+  opts.on('-a', '--major', 'Bump major version') do |_v|
+    @options[:bump_number] = :major
+  end
+  opts.on('-m', '--minor', 'Bump minor version') do |_v|
+    @options[:bump_number] = :minor
+  end
+  opts.on('-p', '--patch', 'Bump patch version') do |_v|
+    @options[:bump_number] = :patch
+  end
+  opts.on('-r', '--revert', 'Revert last bump') do |v|
+    @options[:revert] = v
+  end
+}.parse!
+
+p @options
+
+def check_repo_is_clean_or_dry_run
+  value = `#{'git status --porcelain'}`
+
+  if value.empty?
+    puts 'Repo is clean -> continue'
+  else
+    if @options[:dry_run]
+      puts 'Repo not clean, "Dry run" enabled -> continue'
+    else
+      puts 'Repository not clean -> exit'
+      exit
+    end
+  end
+end
+
+def find_spec_file
+  list_of_specs = execute_line("find . -name '*.#{SPEC_TYPE}'")
+  arr = list_of_specs.split("\n")
+
+  spec_file = ''
+
+  case arr.count
+    when 0
+      puts "No #{SPEC_TYPE} files found. -> Exit."
+      exit
+    when 1
+      spec_file = arr[0]
+    else
+      puts 'Which spec should be used?'
+      arr.each_with_index { |file, index| puts "#{index + 1}. #{file}" }
+      input_index = Integer(gets.chomp)
+      spec_file = arr[input_index - 1]
+  end
+
+  if spec_file.nil?
+    puts "Can't find specified spec file -> exit"
+    exit
+  end
+
+  spec_file.sub('./', '')
+end
+
+def find_current_gem_file
+  list_of_specs = execute_line("find . -name '*.gem'")
+  arr = list_of_specs.split("\n")
+
+  spec_file = ''
+
+  case arr.count
+    when 0
+      puts "No #{SPEC_TYPE} files found. -> Exit."
+      exit
+    when 1
+      spec_file = arr[0]
+    else
+      puts 'Which spec should be used?'
+      arr.each_with_index { |file, index| puts "#{index + 1}. #{file}" }
+      input_index = Integer(gets.chomp)
+      spec_file = arr[input_index - 1]
+  end
+
+  if spec_file.nil?
+    puts "Can't find specified spec file -> exit"
+    exit
+  end
+
+  spec_file.sub('./', '')
+end
+
+def find_version_in_podspec(podspec)
+  readme = File.read(podspec)
+
+  # try to find version in format 1.22.333
+  re = /(\d+)\.(\d+)\.(\d+)/m
+
+  match_result = re.match(readme)
+
+  unless match_result
+    puts 'Not found any versions'
+    exit
+  end
+
+  puts "Found version #{match_result[0]}"
+  [match_result[0], match_result.captures]
+end
+
+def bump_version(versions_array)
+  bumped_result = versions_array.dup
+  bumped_result.map!(&:to_i)
+
+  case @options[:bump_number]
+    when :major
+      bumped_result[0] += 1
+      bumped_result[1] = 0
+      bumped_result[2] = 0
+    when :minor
+      bumped_result[1] += 1
+      bumped_result[2] = 0
+    when :patch
+      bumped_result[2] += 1
+    else
+      fail('unknown bump_number')
+  end
+
+  bumped_version = bumped_result.join('.')
+  puts "Bump version: #{versions_array.join('.')} -> #{bumped_version}"
+  bumped_version
+end
+
+def execute_line(line)
+  output = `#{line}`
+  check_exit_status(output)
+
+  output
+end
+
+def execute_line_if_not_dry_run(line)
+  if @options[:dry_run]
+    puts "Dry run: #{line}"
+    nil
+  else
+    puts line
+    value = `#{line}`
+    puts value
+    check_exit_status(value)
+    value
+  end
+end
+
+def check_exit_status(output)
+  if $CHILD_STATUS.exitstatus != 0
+    puts "Output:\n#{output}\nExit status = #{$CHILD_STATUS.exitstatus} ->Terminate script."
+    exit
+  end
+end
+
+def run_bumping_script
+  check_repo_is_clean_or_dry_run
+  spec_file = find_spec_file
+  result, versions_array = find_version_in_podspec(spec_file)
+  bumped_version = bump_version(versions_array)
+
+  unless @options[:dry_run]
+    puts 'Are you sure? Press Y to continue:'
+    str = gets.chomp
+    if str != 'Y'
+      puts '-> exit'
+      exit
+    end
+  end
+
+  execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" README.md")
+  execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" #{spec_file}")
+  execute_line_if_not_dry_run("git commit --all -m \"Update #{$SPEC_TYPE} to version #{bumped_version}\"")
+  execute_line_if_not_dry_run("git tag #{bumped_version}")
+  execute_line_if_not_dry_run('git push')
+  execute_line_if_not_dry_run('git push --tags')
+  execute_line_if_not_dry_run("gem build #{spec_file}")
+
+  gem = find_current_gem_file
+  execute_line_if_not_dry_run("gem push #{gem}")
+  # execute_line_if_not_dry_run("pod trunk push #{spec_file}")
+end
+
+def revert_last_bump
+  spec_file = find_spec_file
+  result, _ = find_version_in_podspec(spec_file)
+
+  puts "DELETE tag #{result} and HARD reset HEAD~1?\nPress Y to continue:"
+  str = gets.chomp
+  if str != 'Y'
+    puts '-> exit'
+    exit
+  end
+  execute_line_if_not_dry_run("git tag -d #{result}")
+  execute_line_if_not_dry_run('git reset --hard HEAD~1')
+  execute_line_if_not_dry_run("git push --delete origin #{result}")
+end
+
+if __FILE__ == $PROGRAM_NAME
+
+  if @options[:revert]
+    revert_last_bump
+  else
+    run_bumping_script
+  end
+
+end

github_changelog_generator.gemspec

@@ -1,32 +1,32 @@
 # coding: utf-8
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "github_changelog_generator/version"
+require 'github_changelog_generator/version'
 
 Gem::Specification.new do |spec|
-  spec.name               = "github_changelog_generator"
+  spec.name               = 'github_changelog_generator'
   spec.version            = GitHubChangelogGenerator::VERSION
-  spec.default_executable = "github_changelog_generator"
+  spec.default_executable = 'github_changelog_generator'
 
-  spec.required_ruby_version     = ">= 1.9.3"
+  spec.required_ruby_version     = '>= 1.9.3'
-  spec.authors = ["Petr Korolev"]
+  spec.authors = ['Petr Korolev']
-  spec.email = "sky4winder+github_changelog_generator@gmail.com"
+  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.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.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.homepage = 'https://github.com/skywinder/Github-Changelog-Generator'
-  spec.license       = "MIT"
+  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.require_paths = ['lib']
 
-  spec.add_runtime_dependency("github_api", ["~> 0.12"])
+  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_runtime_dependency("colorize", ["~> 0.7"])
+  spec.add_development_dependency 'rake', '~> 10.0'
 
-  # Development only
+  spec.add_runtime_dependency('github_api', ['~> 0.12'])
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_runtime_dependency('colorize', ['~> 0.7'])
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency('thor', ['~> 0.19'])
 end

lib/CHANGELOG.md

@@ -2,29 +2,7 @@
 
 ## [Unreleased](https://github.com/skywinder/changelog_test/tree/HEAD)
 
-[Full Changelog](https://github.com/skywinder/changelog_test/compare/0.0.4...HEAD)
+[Full Changelog](https://github.com/skywinder/changelog_test/compare/v0.0.3...HEAD)
-
-**Implemented enhancements:**
-
-- Enchancment [\#9](https://github.com/skywinder/changelog_test/issues/9)
-
-**Fixed bugs:**
-
-- BugFix [\#11](https://github.com/skywinder/changelog_test/issues/11)
-
-**Closed issues:**
-
-- 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)
-
-## [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:**
-
-- Test issue, that should appear in 0.0.4 [\#3](https://github.com/skywinder/changelog_test/issues/3)
 
 **Merged pull requests:**
 

lib/github_changelog_generator.rb

@@ -1,40 +1,627 @@
 #!/usr/bin/env ruby
 
-require "github_api"
+require 'github_api'
-require "json"
+require 'json'
-require "colorize"
+require 'colorize'
-require "benchmark"
+require 'benchmark'
 
-require_relative "github_changelog_generator/helper"
+require 'github_changelog_generator/parser'
-require_relative "github_changelog_generator/parser"
+require 'github_changelog_generator/generator'
-require_relative "github_changelog_generator/generator/generator"
+require 'github_changelog_generator/version'
-require_relative "github_changelog_generator/version"
+require 'github_changelog_generator/reader'
-require_relative "github_changelog_generator/reader"
+require 'github_changelog_generator/cli'
 
-# The main module, where placed all classes (now, at least)
 module GitHubChangelogGenerator
-  # Main class and entry point for this script.
   class ChangelogGenerator
-    # Class, responsible for whole change log generation cycle
+    attr_accessor :options, :all_tags, :github
-    # @return initialised instance of ChangelogGenerator
+
+    PER_PAGE_NUMBER = 30
+    GH_RATE_LIMIT_EXCEEDED_MSG = 'Warning: GitHub API rate limit (5000 per hour) exceeded, change log may be ' \
+        'missing some issues. You can limit the number of issues fetched using the `--max-issues NUM` argument.'
+
     def initialize
       @options = Parser.parse_options
-      @generator = Generator.new @options
+
+      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?
+
+      begin
+        @github = Github.new github_options
+      rescue
+        puts GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+      end
+
+      @generator = Generator.new(@options)
+
+      @all_tags = get_all_tags
+      @issues, @pull_requests = fetch_issues_and_pull_requests
+
+      if @options[:pulls]
+        @pull_requests = get_filtered_pull_requests
+      else
+        @pull_requests = []
+      end
+
+      if @options[:issues]
+        @issues = get_filtered_issues
+      else
+        @issues = []
+      end
+
+      fetch_event_for_issues_and_pr
+      detect_actual_closed_dates
+      @tag_times_hash = {}
     end
 
-    # The entry point of this script to generate change log
+    def detect_actual_closed_dates
-    # @raise (ChangelogGeneratorError) Is thrown when one of specified tags was not found in list of tags.
+      if @options[:verbose]
-    def run
+        print "Fetching closed dates for issues...\r"
-      log = @generator.compound_changelog
+      end
+
+      threads = []
+
+      @issues.each { |issue|
+        threads << Thread.new {
+          find_closed_date_by_commit(issue)
+        }
+      }
+
+      @pull_requests.each { |pull_request|
+        threads << Thread.new {
+          find_closed_date_by_commit(pull_request)
+        }
+      }
+      threads.each(&:join)
+
+      if @options[:verbose]
+        puts 'Fetching closed dates for issues: Done!'
+      end
+    end
+
+    def find_closed_date_by_commit(issue)
+      unless issue['events'].nil?
+        # if it's PR -> then find "merged event", in case of usual issue -> fond closed date
+        compare_string = issue[:merged_at].nil? ? 'closed' : 'merged'
+        # reverse! - to find latest closed event. (event goes in date order)
+        issue['events'].reverse!.each { |event|
+          if event[:event].eql? compare_string
+            if event[:commit_id].nil?
+              issue[:actual_date] = issue[:closed_at]
+            else
+              begin
+                commit = @github.git_data.commits.get @options[:user], @options[:project], event[:commit_id]
+                issue[:actual_date] = commit[:author][:date]
+              rescue
+                puts "Warning: Can't fetch commit #{event[:commit_id]}. It is probably referenced from another repo.".yellow
+                issue[:actual_date] = issue[:closed_at]
+              end
+            end
+            break
+          end
+        }
+      end
+      # TODO: assert issues, that remain without 'actual_date' hash for some reason.
+    end
+
+    def print_json(json)
+      puts JSON.pretty_generate(json)
+    end
+
+    def fetch_merged_at_pull_requests
+      if @options[:verbose]
+        print "Fetching merged dates...\r"
+      end
+      pull_requests = []
+      begin
+        response = @github.pull_requests.list @options[:user], @options[:project], state: 'closed'
+        page_i = 0
+        response.each_page do |page|
+          page_i += PER_PAGE_NUMBER
+          count_pages = response.count_pages
+          print "Fetching merged dates... #{page_i}/#{count_pages * PER_PAGE_NUMBER}\r"
+          pull_requests.concat(page)
+        end
+      rescue
+        puts GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+      end
+
+      print "                                                   \r"
+
+      @pull_requests.each { |pr|
+        fetched_pr = pull_requests.find { |fpr|
+          fpr.number == pr.number
+        }
+        pr[:merged_at] = fetched_pr[:merged_at]
+        pull_requests.delete(fetched_pr)
+      }
+
+      if @options[:verbose]
+        puts 'Fetching merged dates: Done!'
+      end
+    end
+
+    def get_filtered_pull_requests
+      fetch_merged_at_pull_requests
+
+      filtered_pull_requests = @pull_requests.select { |pr| !pr[:merged_at].nil? }
+
+      unless @options[:include_labels].nil?
+        filtered_pull_requests = @pull_requests.select { |issue|
+          # add all labels from @options[:include_labels] array
+          (issue.labels.map(&:name) & @options[:include_labels]).any?
+        }
+      end
+
+      unless @options[:exclude_labels].nil?
+        filtered_pull_requests = filtered_pull_requests.select { |issue|
+          # delete all labels from @options[:exclude_labels] array
+          !(issue.labels.map(&:name) & @options[:exclude_labels]).any?
+        }
+      end
+
+      if @options[:add_issues_wo_labels]
+        issues_wo_labels = @pull_requests.select { |issue|
+          !issue.labels.map(&:name).any?
+        }
+        filtered_pull_requests |= issues_wo_labels
+      end
+
+      if @options[:verbose]
+        puts "Filtered pull requests: #{filtered_pull_requests.count}"
+      end
+
+      filtered_pull_requests
+    end
+
+    def compound_changelog
+      log = "# Change Log\n\n"
+
+      if @options[:unreleased_only]
+        log += generate_log_between_tags(all_tags[0], nil)
+      elsif @options[:tag1] and @options[:tag2]
+        tag1 = @options[:tag1]
+        tag2 = @options[:tag2]
+        tags_strings = []
+        all_tags.each { |x| tags_strings.push(x['name']) }
+
+        if tags_strings.include?(tag1)
+          if tags_strings.include?(tag2)
+            to_a = tags_strings.map.with_index.to_a
+            hash = Hash[to_a]
+            index1 = hash[tag1]
+            index2 = hash[tag2]
+            log += generate_log_between_tags(all_tags[index1], all_tags[index2])
+          else
+            puts "Can't find tag #{tag2} -> exit"
+            exit
+          end
+        else
+          puts "Can't find tag #{tag1} -> exit"
+          exit
+        end
+      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)*"
 
       output_filename = "#{@options[:output]}"
-      File.open(output_filename, "w") { |file| file.write(log) }
+      File.open(output_filename, 'w') { |file| file.write(log) }
-      puts "Done!"
+      puts 'Done!'
-      puts "Generated log placed in #{Dir.pwd}/#{output_filename}"
+      puts "Generated log placed in #{`pwd`.strip!}/#{output_filename}"
+    end
+
+    def generate_log_for_all_tags
+      fetch_tags_dates
+
+      if @options[:verbose]
+        puts 'Sorting tags...'
+      end
+
+      @all_tags.sort_by! { |x| get_time_of_tag(x) }.reverse!
+
+      if @options[:verbose]
+        puts 'Generating log...'
+      end
+
+      log = ''
+
+      if @options[:unreleased] && @all_tags.count != 0
+        unreleased_log = generate_log_between_tags(all_tags[0], nil)
+        if unreleased_log
+          log += unreleased_log
+        end
+      end
+
+      (1...all_tags.size).each { |index|
+        log += generate_log_between_tags(all_tags[index], all_tags[index - 1])
+      }
+      if @all_tags.count != 0
+        log += generate_log_between_tags(nil, all_tags.last)
+      end
+
+      log
+    end
+
+    def fetch_tags_dates
+      if @options[:verbose]
+        print "Fetching tag dates...\r"
+      end
+
+      # Async fetching tags:
+      threads = []
+      i = 0
+      all = @all_tags.count
+      @all_tags.each { |tag|
+        # explicit set @tag_times_hash to write data safety.
+        threads << Thread.new {
+          get_time_of_tag(tag, @tag_times_hash)
+          if @options[:verbose]
+            print "Fetching tags dates: #{i + 1}/#{all}\r"
+            i += 1
+          end
+        }
+      }
+
+      print "                                 \r"
+
+      threads.each(&:join)
+
+      if @options[:verbose]
+        puts "Fetching tags dates: #{i} Done!"
+      end
+    end
+
+    def get_all_tags
+      if @options[:verbose]
+        print "Fetching tags...\r"
+      end
+
+      tags = []
+
+      begin
+        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 "Fetching tags... #{page_i}/#{count_pages * PER_PAGE_NUMBER}\r"
+          tags.concat(page)
+        end
+        print "                               \r"
+
+        if tags.count == 0
+          puts "Warning: Can't find any tags in repo. Make sure, that you push tags to remote repo via 'git push --tags'".yellow
+        elsif @options[:verbose]
+          puts "Found #{tags.count} tags"
+        end
+
+      rescue
+        puts GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+      end
+
+      tags
+    end
+
+    def fetch_github_token
+      env_var = @options[:token] ? @options[:token] : (ENV.fetch 'CHANGELOG_GITHUB_TOKEN', nil)
+
+      unless env_var
+        puts 'Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found.'.yellow
+        puts 'This script can make only 50 requests per hour to GitHub API without a token!'.yellow
+      end
+
+      @github_token ||= env_var
+    end
+
+    def generate_log_between_tags(older_tag, newer_tag)
+      # older_tag nil - means it's first tag, newer_tag nil - means it unreleased section
+      filtered_pull_requests = delete_by_time(@pull_requests, :actual_date, older_tag, newer_tag)
+      filtered_issues = delete_by_time(@issues, :actual_date, older_tag, newer_tag)
+
+      newer_tag_name = newer_tag.nil? ? nil : newer_tag['name']
+      older_tag_name = older_tag.nil? ? nil : older_tag['name']
+
+      if @options[:filter_issues_by_milestone]
+        # delete excess irrelevant issues (according milestones)
+        filtered_issues = filter_by_milestone(filtered_issues, newer_tag_name, @issues)
+        filtered_pull_requests = filter_by_milestone(filtered_pull_requests, newer_tag_name, @pull_requests)
+      end
+
+      if filtered_issues.empty? && filtered_pull_requests.empty? && newer_tag.nil?
+        # do not generate empty unreleased section
+        return ''
+      end
+
+      create_log(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)
+    end
+
+    def filter_by_milestone(filtered_issues, newer_tag_name, src_array)
+      filtered_issues.select! { |issue|
+        # leave issues without milestones
+        if issue.milestone.nil?
+          true
+        else
+          # check, that this milestone in tag list:
+          @all_tags.find { |tag| tag.name == issue.milestone.title }.nil?
+        end
+      }
+      unless newer_tag_name.nil?
+
+        # add missed issues (according milestones)
+        issues_to_add = src_array.select { |issue|
+          if issue.milestone.nil?
+            false
+          else
+            # check, that this milestone in tag list:
+            milestone_is_tag = @all_tags.find { |tag|
+              tag.name == issue.milestone.title
+            }
+
+            if milestone_is_tag.nil?
+              false
+            else
+              issue.milestone.title == newer_tag_name
+            end
+          end
+        }
+
+        filtered_issues |= issues_to_add
+      end
+      filtered_issues
+    end
+
+    def delete_by_time(array, hash_key, older_tag = nil, newer_tag = nil)
+      fail 'At least one of the tags should be not nil!' if older_tag.nil? && newer_tag.nil?
+
+      newer_tag_time = get_time_of_tag(newer_tag)
+      older_tag_time = get_time_of_tag(older_tag)
+
+      array.select { |req|
+        if req[hash_key]
+          t = Time.parse(req[hash_key]).utc
+
+          if older_tag_time.nil?
+            tag_in_range_old = true
+          else
+            tag_in_range_old = t > older_tag_time
+          end
+
+          if newer_tag_time.nil?
+            tag_in_range_new = true
+          else
+            tag_in_range_new = t <= newer_tag_time
+          end
+
+          tag_in_range = (tag_in_range_old) && (tag_in_range_new)
+
+          tag_in_range
+        else
+          false
+        end
+      }
+    end
+
+    # @param [Array] pull_requests
+    # @param [Array] issues
+    # @param [String] older_tag_name
+    # @return [String]
+    def create_log(pull_requests, issues, newer_tag, older_tag_name = nil)
+      newer_tag_time = newer_tag.nil? ? Time.new                    : get_time_of_tag(newer_tag)
+      newer_tag_name = newer_tag.nil? ? @options[:unreleased_label] : newer_tag['name']
+      newer_tag_link = newer_tag.nil? ? 'HEAD'                      : newer_tag_name
+
+      github_site = options[:github_site] || 'https://github.com'
+      project_url = "#{github_site}/#{@options[:user]}/#{@options[:project]}"
+
+      log = generate_header(newer_tag_name, newer_tag_link, newer_tag_time, older_tag_name, project_url)
+
+      if @options[:issues]
+        # Generate issues:
+        issues_a = []
+        enhancement_a = []
+        bugs_a = []
+
+        issues.each { |dict|
+          added = false
+          dict.labels.each { |label|
+            if label.name == 'bug'
+              bugs_a.push dict
+              added = true
+              next
+            end
+            if label.name == 'enhancement'
+              enhancement_a.push dict
+              added = true
+              next
+            end
+          }
+          unless added
+            issues_a.push dict
+          end
+        }
+
+        log += generate_log_from_array(enhancement_a, @options[:enhancement_prefix])
+        log += generate_log_from_array(bugs_a, @options[:bug_prefix])
+        log += generate_log_from_array(issues_a, @options[:issue_prefix])
+      end
+
+      if @options[:pulls]
+        # Generate pull requests:
+        log += generate_log_from_array(pull_requests, @options[:merge_prefix])
+      end
+
+      log
+    end
+
+    def generate_log_from_array(issues, prefix)
+      log = ''
+      if options[:simple_list].nil? && issues.any?
+        log += "#{prefix}\n\n"
+      end
+
+      if issues.any?
+        issues.each { |issue|
+          merge_string = @generator.get_string_for_issue(issue)
+          log += "- #{merge_string}\n\n"
+        }
+      end
+      log
+    end
+
+    def generate_header(newer_tag_name, newer_tag_name2, newer_tag_time, older_tag_name, project_url)
+      log = ''
+
+      # Generate date string:
+      time_string = newer_tag_time.strftime @options[:dateformat]
+
+      # Generate tag name and link
+      if newer_tag_name.equal? @options[:unreleased_label]
+        log += "## [#{newer_tag_name}](#{project_url}/tree/#{newer_tag_name2})\n\n"
+      else
+        log += "## [#{newer_tag_name}](#{project_url}/tree/#{newer_tag_name2}) (#{time_string})\n\n"
+      end
+
+      if @options[:compare_link] && older_tag_name
+        # Generate compare link
+        log += "[Full Changelog](#{project_url}/compare/#{older_tag_name}...#{newer_tag_name2})\n\n"
+      end
+
+      log
+    end
+
+    def get_time_of_tag(tag_name, tag_times_hash = @tag_times_hash)
+      if tag_name.nil?
+        return nil
+      end
+
+      if tag_times_hash[tag_name['name']]
+        return @tag_times_hash[tag_name['name']]
+      end
+
+      begin
+        github_git_data_commits_get = @github.git_data.commits.get @options[:user], @options[:project], tag_name['commit']['sha']
+      rescue
+        puts 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
+
+    def get_filtered_issues
+      issues = @issues
+
+      filtered_issues = issues
+
+      unless @options[:include_labels].nil?
+        filtered_issues = issues.select { |issue|
+          # add all labels from @options[:include_labels] array
+          (issue.labels.map(&:name) & @options[:include_labels]).any?
+        }
+      end
+
+      unless @options[:exclude_labels].nil?
+        filtered_issues = filtered_issues.select { |issue|
+          # delete all labels from @options[:exclude_labels] array
+          !(issue.labels.map(&:name) & @options[:exclude_labels]).any?
+        }
+      end
+
+      if @options[:add_issues_wo_labels]
+        issues_wo_labels = issues.select { |issue|
+          !issue.labels.map(&:name).any?
+        }
+        filtered_issues |= issues_wo_labels
+      end
+
+      if @options[:verbose]
+        puts "Filtered issues: #{filtered_issues.count}"
+      end
+
+      filtered_issues
+    end
+
+    def fetch_issues_and_pull_requests
+      if @options[:verbose]
+        print "Fetching closed issues...\r"
+      end
+      issues = []
+
+      begin
+        response = @github.issues.list user: @options[:user], repo: @options[:project], state: 'closed', filter: 'all', labels: nil
+        page_i = 0
+        count_pages = response.count_pages
+        response.each_page do |page|
+          page_i += PER_PAGE_NUMBER
+          print "Fetching issues... #{page_i}/#{count_pages * PER_PAGE_NUMBER}\r"
+          issues.concat(page)
+          break if @options[:max_issues] && issues.length >= @options[:max_issues]
+        end
+      rescue
+        puts GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+      end
+
+      print "                               \r"
+
+      if @options[:verbose]
+        puts "Received issues: #{issues.count}"
+      end
+
+      # remove pull request from issues:
+      issues_wo_pr = issues.select { |x|
+        x.pull_request.nil?
+      }
+      pull_requests = issues.select { |x|
+        !x.pull_request.nil?
+      }
+      [issues_wo_pr, pull_requests]
+    end
+
+    def fetch_event_for_issues_and_pr
+      if @options[:verbose]
+        print "Fetching events for issues and PR: 0/#{@issues.count + @pull_requests.count}\r"
+      end
+
+      # Async fetching events:
+
+      fetch_events_async(@issues + @pull_requests)
+    end
+
+    def fetch_events_async(issues)
+      i = 0
+      max_thread_number = 50
+      threads = []
+      issues.each_slice(max_thread_number) { |issues_slice|
+        issues_slice.each { |issue|
+          threads << Thread.new {
+            begin
+              obj = @github.issues.events.list user: @options[:user], repo: @options[:project], issue_number: issue['number']
+            rescue
+              puts GH_RATE_LIMIT_EXCEEDED_MSG.yellow
+            end
+            issue[:events] = obj.body
+            print "Fetching events for issues and PR: #{i + 1}/#{@issues.count + @pull_requests.count}\r"
+            i += 1
+          }
+        }
+        threads.each(&:join)
+        threads = []
+      }
+
+      # to clear line from prev print
+      print "                                                            \r"
+
+      if @options[:verbose]
+        puts "Fetching events for issues and PR: #{i} Done!"
+      end
     end
   end
 
   if __FILE__ == $PROGRAM_NAME
-    GitHubChangelogGenerator::ChangelogGenerator.new.run
+    GitHubChangelogGenerator::ChangelogGenerator.new.compound_changelog
   end
 end

lib/github_changelog_generator/cli.rb

@@ -0,0 +1,62 @@
+#
+# Author:: Enrico Stahn <mail@enricostahn.com>
+#
+# Copyright 2014, Zanui, <engineering@zanui.com.au>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'thor'
+
+module GitHubChangelogGenerator
+  class CLI < Thor
+    default_task :generate
+
+    desc 'generate', 'Generates the CHANGELOG.md based on the given options'
+    option :user, aliases: '-u', type: :string, desc: 'Username of the owner of target GitHub repo'
+    option :project, aliases: '-p', type: :string, desc: 'Username of the owner of target GitHub repo'
+    option :token, aliases: '-t', type: :string, desc: 'To make more than 50 requests per hour your GitHub token required. You can generate it here: https://github.com/settings/tokens/new'
+    option :date_format, aliases: '-f', type: :string, default: '%d/%m/%y', desc: 'Date format.'
+    option :output, aliases: '-o', type: :string, default: 'CHANGELOG.md', desc: 'Output file.'
+    # TODO: Should be "closed_issues"
+    option :issues, type: :boolean, default: true, desc: 'Include closed issues to changelog.'
+    option :issues_wo_labels, type: :boolean, default: true, desc: 'Include closed issues without labels to changelog.'
+    option :pr_wo_labels, type: :boolean, default: true, desc: 'Include pull requests without labels to changelog.'
+    option :pull_requests, type: :boolean, default: true, desc: 'Include pull-requests to changelog.'
+    option :filter_by_milestone, type: :boolean, default: true, desc: 'Use milestone to detect when issue was resolved.'
+    option :author, type: :boolean, default: true, desc: 'Add author of pull-request in the end.'
+    option :unreleased_only, type: :boolean, default: true, desc: 'Generate log from unreleased closed issues only.'
+    option :unreleased, type: :boolean, default: true, desc: 'Add to log unreleased closed issues.'
+    option :unreleased_label, type: :boolean, default: true, desc: 'Add to log unreleased closed issues.'
+    option :compare_link, type: :boolean, default: true, desc: 'Include compare link (Full Changelog) between older version and newer version.'
+    option :include_labels, type: :array, default: %w(bug enhancement), desc: 'Issues only with that labels will be included to changelog.'
+    option :exclude_labels, type: :array, default: %w(duplicate question invalid wontfix), desc: 'Issues with that labels will be always excluded from changelog.'
+    option :max_issues, type: :numeric, desc: 'Max number of issues to fetch from GitHub. Default is unlimited'
+    option :github_site, :banner => 'URL', type: :string, desc: 'The Enterprise Github site on which your project is hosted.'
+    option :github_api, :banner => 'URL', type: :string, desc: 'The enterprise endpoint to use for your Github API.'
+    option :simple_list, type: :boolean, default: false, desc: 'Create simple list from issues and pull requests.'
+    option :verbose, type: :boolean, default: true, desc: 'Run verbosely.'
+
+    long_desc <<-LONGDESC
+Automatically generate change log from your tags, issues, labels and pull requests on GitHub.
+    LONGDESC
+    def generate
+    end
+
+    map %w[--version -v] => :__print_version
+    desc '--version, -v', 'print the version'
+    def __print_version
+      puts "Version: #{GitHubChangelogGenerator::VERSION}"
+    end
+  end
+end

lib/github_changelog_generator/fetcher.rb

@@ -1,209 +0,0 @@
-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"
-    GH_RATE_LIMIT_EXCEEDED_MSG = "Warning: Can't finish operation: GitHub API rate limit exceeded, change log may be " \
-    "missing some issues. You can limit the number of issues fetched using the `--max-issues NUM` argument."
-    NO_TOKEN_PROVIDED = "Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found. " \
-    "This script can make only 50 requests to GitHub API per hour without token!"
-
-    def initialize(options = {})
-      @options = options || {}
-      @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?
-
-      @github = check_github_response { Github.new github_options }
-    end
-
-    # Returns GitHub token. First try to use variable, provided by --token option,
-    # otherwise try to fetch it from CHANGELOG_GITHUB_TOKEN env variable.
-    #
-    # @return [String]
-    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
-
-      env_var
-    end
-
-    # Fetch all tags from repo
-    # @return [Array] array of tags
-    def get_all_tags
-      print "Fetching tags...\r" if @options[:verbose]
-
-      check_github_response { github_fetch_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
-        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
-      end
-      value
-    end
-
-    # Fill input array with tags
-    # @return [Array] array of tags in repo
-    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)
-      end
-      print_empty_line
-
-      if tags.count == 0
-        Helper.log.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"
-      end
-      tags
-    end
-
-    # This method fetch all closed issues and separate them to pull requests and pure issues
-    # (pull request is kind of issue in term of GitHub)
-    # @return [Tuple] with (issues, pull-requests)
-    def fetch_closed_issues_and_pr
-      print "Fetching closed issues...\r" if @options[:verbose]
-      issues = []
-
-      begin
-        response = @github.issues.list user: @options[:user],
-                                       repo: @options[:project],
-                                       state: "closed",
-                                       filter: "all",
-                                       labels: nil
-        page_i = 0
-        count_pages = response.count_pages
-        response.each_page do |page|
-          page_i += PER_PAGE_NUMBER
-          print_in_same_line("Fetching issues... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
-          issues.concat(page)
-          break if @options[:max_issues] && issues.length >= @options[:max_issues]
-        end
-        print_empty_line
-        Helper.log.info "Received issues: #{issues.count}"
-
-      rescue
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
-      end
-
-      # separate arrays of issues and pull requests:
-      issues.partition do |x|
-        x[:pull_request].nil?
-      end
-    end
-
-    # Fetch all pull requests. We need them to detect :merged_at parameter
-    # @return [Array] all pull requests
-    def fetch_closed_pull_requests
-      pull_requests = []
-      begin
-        response = @github.pull_requests.list @options[:user], @options[:project], state: "closed"
-        page_i = 0
-        count_pages = response.count_pages
-        response.each_page do |page|
-          page_i += PER_PAGE_NUMBER
-          log_string = "Fetching merged dates... #{page_i}/#{count_pages * PER_PAGE_NUMBER}"
-          print_in_same_line(log_string)
-          pull_requests.concat(page)
-        end
-        print_empty_line
-      rescue
-        Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
-      end
-
-      Helper.log.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
-
-    # Fetch event for all issues and add them to :events
-    # @param [Array] issues
-    # @return [Void]
-    def fetch_events_async(issues)
-      i = 0
-      max_thread_number = 50
-      threads = []
-      issues.each_slice(max_thread_number) do |issues_slice|
-        issues_slice.each do |issue|
-          threads << Thread.new do
-            begin
-              obj = @github.issues.events.list user: @options[:user],
-                                               repo: @options[:project],
-                                               issue_number: issue["number"]
-              issue[:events] = obj.body
-            rescue
-              Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG.yellow
-            end
-            print_in_same_line("Fetching events for issues and PR: #{i + 1}/#{issues.count}")
-            i += 1
-          end
-        end
-        threads.each(&:join)
-        threads = []
-      end
-
-      # to clear line from prev print
-      print_empty_line
-
-      Helper.log.info "Fetching events for issues and PR: #{i}"
-    end
-
-    # Fetch tag time from repo
-    #
-    # @param [Hash] 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
-      end
-      time_string = commit_data["committer"]["date"]
-      Time.parse(time_string)
-    end
-
-    # Fetch commit for specified event
-    # @return [Hash]
-    def fetch_commit(event)
-      @github.git_data.commits.get @options[:user], @options[:project], event[:commit_id]
-    end
-  end
-end

lib/github_changelog_generator/generator.rb

@@ -0,0 +1,35 @@
+module GitHubChangelogGenerator
+  class Generator
+    def initialize(options = nil)
+      @options = options
+    end
+
+    def get_string_for_issue(issue)
+      encapsulated_title = encapsulate_string issue[:title]
+
+      title_with_number = "#{encapsulated_title} [\\##{issue[:number]}](#{issue.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
+
+    def encapsulate_string(string)
+      string.gsub! '\\', '\\\\'
+
+      encpas_chars = %w(> * _ \( \) [ ] #)
+      encpas_chars.each do |char|
+        string.gsub! char, "\\#{char}"
+      end
+
+      string
+    end
+  end
+end

lib/github_changelog_generator/generator/generator.rb

@@ -1,123 +0,0 @@
-require_relative "../fetcher"
-require_relative "generator_generation"
-require_relative "generator_fetcher"
-require_relative "generator_processor"
-require_relative "generator_tags"
-
-module GitHubChangelogGenerator
-  # Default error for ChangelogGenerator
-  class ChangelogGeneratorError < StandardError
-  end
-
-  class Generator
-    attr_accessor :options, :filtered_tags, :github
-
-    # A Generator responsible for all logic, related with change log generation from ready-to-parse issues
-    #
-    # Example:
-    #   generator = GitHubChangelogGenerator::Generator.new
-    #   content = generator.compound_changelog
-    def initialize(options = nil)
-      @options = options || {}
-      @tag_times_hash = {}
-      @fetcher = GitHubChangelogGenerator::Fetcher.new @options
-    end
-
-    def fetch_issues_and_pr
-      issues, pull_requests = @fetcher.fetch_closed_issues_and_pr
-
-      @pull_requests = @options[:pulls] ? get_filtered_pull_requests(pull_requests) : []
-
-      @issues = @options[:issues] ? get_filtered_issues(issues) : []
-
-      fetch_events_for_issues_and_pr
-      detect_actual_closed_dates(@issues + @pull_requests)
-    end
-
-    # Encapsulate characters to make markdown look as expected.
-    #
-    # @param [String] string
-    # @return [String] encapsulated input string
-    def encapsulate_string(string)
-      string.gsub! '\\', '\\\\'
-
-      encpas_chars = %w(< > * _ \( \) [ ] #)
-      encpas_chars.each do |char|
-        string.gsub! char, "\\#{char}"
-      end
-
-      string
-    end
-
-    # Generates log for section with header and body
-    #
-    # @param [Array] pull_requests List or PR's in new section
-    # @param [Array] issues List of issues in new section
-    # @param [String] newer_tag Name of the newer tag. Could be nil for `Unreleased` section
-    # @param [String] older_tag_name Older tag, used for the links. Could be nil for last tag.
-    # @return [String] Ready and parsed section
-    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"
-      project_url = "#{github_site}/#{@options[:user]}/#{@options[:project]}"
-
-      log = generate_header(newer_tag_name, newer_tag_link, newer_tag_time, older_tag_name, project_url)
-
-      if @options[:issues]
-        # Generate issues:
-        log += issues_to_log(issues)
-      end
-
-      if @options[:pulls]
-        # Generate pull requests:
-        log += generate_sub_section(pull_requests, @options[:merge_prefix])
-      end
-
-      log
-    end
-
-    # Generate ready-to-paste log from list of issues.
-    #
-    # @param [Array] issues
-    # @return [String] generated log for issues
-    def issues_to_log(issues)
-      log = ""
-      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])
-      log += generate_sub_section(issues_a, @options[:issue_prefix])
-      log
-    end
-
-    # This method sort issues by types
-    # (bugs, features, or just closed issues) by labels
-    #
-    # @param [Array] issues
-    # @return [Array] tuple of filtered arrays: (Bugs, Enhancements Issues)
-    def parse_by_sections(issues)
-      issues_a = []
-      enhancement_a = []
-      bugs_a = []
-
-      issues.each do |dict|
-        added = false
-        dict.labels.each do |label|
-          if @options[:bug_labels].include? label.name
-            bugs_a.push dict
-            added = true
-            next
-          end
-          if @options[:enhancement_labels].include? label.name
-            enhancement_a.push dict
-            added = true
-            next
-          end
-        end
-        issues_a.push dict unless added
-      end
-      [bugs_a, enhancement_a, issues_a]
-    end
-  end
-end

lib/github_changelog_generator/generator/generator_fetcher.rb

@@ -1,83 +0,0 @@
-module GitHubChangelogGenerator
-  class Generator
-    # Fetch event for issues and pull requests
-    # @return [Array] array of fetched issues
-    def fetch_events_for_issues_and_pr
-      if @options[:verbose]
-        print "Fetching events for issues and PR: 0/#{@issues.count + @pull_requests.count}\r"
-      end
-
-      # Async fetching events:
-      @fetcher.fetch_events_async(@issues + @pull_requests)
-    end
-
-    # Async fetching of all tags dates
-    def fetch_tags_dates
-      print "Fetching tag dates...\r" if @options[:verbose]
-      # Async fetching tags:
-      threads = []
-      i = 0
-      all = @filtered_tags.count
-      @filtered_tags.each do |tag|
-        print "                                 \r"
-        threads << Thread.new do
-          get_time_of_tag(tag)
-          print "Fetching tags dates: #{i + 1}/#{all}\r" if @options[:verbose]
-          i += 1
-        end
-      end
-      threads.each(&:join)
-      puts "Fetching tags dates: #{i}" if @options[:verbose]
-    end
-
-    # Find correct closed dates, if issues was closed by commits
-    def detect_actual_closed_dates(issues)
-      print "Fetching closed dates for issues...\r" if @options[:verbose]
-
-      max_thread_number = 50
-      issues.each_slice(max_thread_number) do |issues_slice|
-        threads = []
-        issues_slice.each do |issue|
-          threads << Thread.new { find_closed_date_by_commit(issue) }
-        end
-        threads.each(&:join)
-      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?
-        # 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|
-          if event[:event].eql? compare_string
-            set_date_from_event(event, issue)
-            break
-          end
-        end
-      end
-      # TODO: assert issues, that remain without 'actual_date' hash for some reason.
-    end
-
-    # Set closed date from this issue
-    #
-    # @param [Hash] event
-    # @param [Hash] issue
-    def set_date_from_event(event, issue)
-      if event[:commit_id].nil?
-        issue[:actual_date] = issue[:closed_at]
-      else
-        begin
-          commit = @fetcher.fetch_commit(event)
-          issue[:actual_date] = commit[:author][:date]
-        rescue
-          puts "Warning: Can't fetch commit #{event[:commit_id]}. It is probably referenced from another repo.".yellow
-          issue[:actual_date] = issue[:closed_at]
-        end
-      end
-    end
-  end
-end

lib/github_changelog_generator/generator/generator_generation.rb

@@ -1,175 +0,0 @@
-module GitHubChangelogGenerator
-  class Generator
-    # Main function to start change log generation
-    #
-    # @return [String] Generated change log file
-    def compound_changelog
-      fetch_and_filter_tags
-      sort_tags_by_date(@filtered_tags)
-      fetch_issues_and_pr
-
-      log = "# Change Log\n\n"
-
-      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
-    end
-
-    # @return [String] temp method should be removed soon
-    def generate_for_2_tags(log)
-      tag1 = @options[:tag1]
-      tag2 = @options[:tag2]
-      tags_strings = []
-      filtered_tags.each { |x| tags_strings.push(x["name"]) }
-
-      if tags_strings.include?(tag1)
-        if tags_strings.include?(tag2)
-          to_a = tags_strings.map.with_index.to_a
-          hash = Hash[to_a]
-          index1 = hash[tag1]
-          index2 = hash[tag2]
-          log += generate_log_between_tags(all_tags[index1], all_tags[index2])
-        else
-          fail ChangelogGeneratorError, "Can't find tag #{tag2} -> exit".red
-        end
-      else
-        fail ChangelogGeneratorError, "Can't find tag #{tag1} -> exit".red
-      end
-      log
-    end
-
-    # @param [Array] issues List of issues on sub-section
-    # @param [String] prefix Nae of sub-section
-    # @return [String] Generate ready-to-go sub-section
-    def generate_sub_section(issues, prefix)
-      log = ""
-
-      log += "#{prefix}\n\n" if options[:simple_list] != true && issues.any?
-
-      if issues.any?
-        issues.each do |issue|
-          merge_string = get_string_for_issue(issue)
-          log += "- #{merge_string}\n\n"
-        end
-      end
-      log
-    end
-
-    # It generate one header for section with specific parameters.
-    #
-    # @param [String] newer_tag_name - name of newer tag
-    # @param [String] newer_tag_link - used for links. Could be same as #newer_tag_name or some specific value, like HEAD
-    # @param [Time] newer_tag_time - time, when newer tag created
-    # @param [String] older_tag_link - tag name, used for links.
-    # @param [String] project_url - url for current project.
-    # @return [String] - Generate one ready-to-add section.
-    def generate_header(newer_tag_name, newer_tag_link, newer_tag_time, older_tag_link, project_url)
-      log = ""
-
-      # Generate date string:
-      time_string = newer_tag_time.strftime @options[:date_format]
-
-      # Generate tag name and link
-      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
-        log += "[Full Changelog](#{project_url}/compare/#{older_tag_link}...#{newer_tag_link})\n\n"
-      end
-
-      log
-    end
-
-    # Generate log only between 2 specified tags
-    # @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
-    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? ? 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(filtered_pull_requests, filtered_issues, newer_tag, older_tag_name)
-    end
-
-    # Apply all filters to issues and pull requests
-    #
-    # @return [Array] filtered issues and pull requests
-    def filter_issues_for_tags(newer_tag, older_tag)
-      filtered_pull_requests = delete_by_time(@pull_requests, :actual_date, older_tag, newer_tag)
-      filtered_issues = delete_by_time(@issues, :actual_date, older_tag, newer_tag)
-
-      newer_tag_name = newer_tag.nil? ? nil : newer_tag["name"]
-
-      if @options[:filter_issues_by_milestone]
-        # delete excess irrelevant issues (according milestones). Issue #22.
-        filtered_issues = filter_by_milestone(filtered_issues, newer_tag_name, @issues)
-        filtered_pull_requests = filter_by_milestone(filtered_pull_requests, newer_tag_name, @pull_requests)
-      end
-      [filtered_issues, filtered_pull_requests]
-    end
-
-    # The full cycle of generation for whole project
-    # @return [String] The complete change log
-    def generate_log_for_all_tags
-      puts "Generating log..." if @options[:verbose]
-
-      log = generate_unreleased_section
-
-      (1...filtered_tags.size).each do |index|
-        log += generate_log_between_tags(filtered_tags[index], filtered_tags[index - 1])
-      end
-      if @filtered_tags.count != 0
-        log += generate_log_between_tags(nil, filtered_tags.last)
-      end
-
-      log
-    end
-
-    def generate_unreleased_section
-      log = ""
-      if @options[:unreleased]
-        unreleased_log = generate_log_between_tags(filtered_tags[0], nil)
-        log += unreleased_log if unreleased_log
-      end
-      log
-    end
-
-    # 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](https://github.com/skywinder))
-    #
-    # @param [Hash] issue Fetched issue from GitHub
-    # @return [String] Markdown-formatted single issue
-    def get_string_for_issue(issue)
-      encapsulated_title = encapsulate_string issue[:title]
-
-      title_with_number = "#{encapsulated_title} [\\##{issue[:number]}](#{issue.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

@@ -1,192 +0,0 @@
-module GitHubChangelogGenerator
-  class Generator
-    # delete all labels with labels from @options[:exclude_labels] array
-    # @param [Array] issues
-    # @return [Array] filtered array
-    def exclude_issues_by_labels(issues)
-      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
-    def filter_by_milestone(filtered_issues, tag_name, all_issues)
-      remove_issues_in_milestones(filtered_issues)
-      unless tag_name.nil?
-        # add missed issues (according milestones)
-        issues_to_add = find_issues_to_add(all_issues, tag_name)
-
-        filtered_issues |= issues_to_add
-      end
-      filtered_issues
-    end
-
-    # Add all issues, that should be in that tag, according milestone
-    #
-    # @param [Array] all_issues
-    # @param [String] tag_name
-    # @return [Array] issues with milestone #tag_name
-    def find_issues_to_add(all_issues, tag_name)
-      all_issues.select do |issue|
-        if issue.milestone.nil?
-          false
-        else
-          # check, that this milestone in tag list:
-          milestone_is_tag = @filtered_tags.find do |tag|
-            tag.name == issue.milestone.title
-          end
-
-          if milestone_is_tag.nil?
-            false
-          else
-            issue.milestone.title == tag_name
-          end
-        end
-      end
-    end
-
-    # @return [Array] array with removed issues, that contain milestones with same name as a tag
-    def remove_issues_in_milestones(filtered_issues)
-      filtered_issues.select! do |issue|
-        # leave issues without milestones
-        if issue.milestone.nil?
-          true
-        else
-          # check, that this milestone in tag list:
-          @filtered_tags.find { |tag| tag.name == issue.milestone.title }.nil?
-        end
-      end
-    end
-
-    # Method filter issues, that belong only specified tag range
-    # @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(array, hash_key = :actual_date, older_tag = nil, newer_tag = nil)
-      # in case if not tags specified - return unchanged array
-      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)
-
-      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
-        else
-          false
-        end
-      end
-    end
-
-    def tag_older_new_tag?(newer_tag_time, time)
-      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)
-      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
-
-    # Include issues with labels, specified in :include_labels
-    # @param [Array] issues to filter
-    # @return [Array] filtered array of issues
-    def include_issues_by_labels(issues)
-      filtered_issues = filter_by_include_labels(issues)
-      filtered_issues |= filter_wo_labels(issues)
-      filtered_issues
-    end
-
-    # @return [Array] issues without labels or empty array if add_issues_wo_labels is false
-    def filter_wo_labels(issues)
-      if @options[:add_issues_wo_labels]
-        issues_wo_labels = issues.select do |issue|
-          !issue.labels.map(&:name).any?
-        end
-        return issues_wo_labels
-      end
-      []
-    end
-
-    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?
-      end
-      filtered_issues
-    end
-
-    # General filtered function
-    #
-    # @param [Array] all_issues
-    # @return [Array] filtered issues
-    def filter_array_by_labels(all_issues)
-      filtered_issues = include_issues_by_labels(all_issues)
-      exclude_issues_by_labels(filtered_issues)
-    end
-
-    # Filter issues according labels
-    # @return [Array] Filtered issues
-    def get_filtered_issues(issues)
-      issues = filter_array_by_labels(issues)
-      puts "Filtered issues: #{issues.count}" if @options[:verbose]
-      issues
-    end
-
-    # This method fetches missing params for PR and filter them by specified options
-    # It include add all PR's with labels from @options[:include_labels] array
-    # And exclude all from :exclude_labels array.
-    # @return [Array] filtered PR's
-    def get_filtered_pull_requests(pull_requests)
-      pull_requests = filter_array_by_labels(pull_requests)
-      pull_requests = filter_merged_pull_requests(pull_requests)
-      puts "Filtered pull requests: #{pull_requests.count}" if @options[:verbose]
-      pull_requests
-    end
-
-    # This method filter only merged PR and
-    # fetch missing required attributes for pull requests
-    # :merged_at - is a date, when issue PR was merged.
-    # More correct to use merged date, rather than closed date.
-    def filter_merged_pull_requests(pull_requests)
-      print "Fetching merged dates...\r" if @options[:verbose]
-      closed_pull_requests = @fetcher.fetch_closed_pull_requests
-
-      pull_requests.each do |pr|
-        fetched_pr = closed_pull_requests.find do |fpr|
-          fpr.number == pr.number
-        end
-        pr[:merged_at] = fetched_pr[:merged_at]
-        closed_pull_requests.delete(fetched_pr)
-      end
-
-      pull_requests.select! do |pr|
-        !pr[:merged_at].nil?
-      end
-
-      pull_requests
-    end
-  end
-end

lib/github_changelog_generator/generator/generator_tags.rb

@@ -1,89 +0,0 @@
-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)
-      fetch_tags_dates
-    end
-
-    # Sort all tags by date
-    def sort_tags_by_date(tags)
-      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)
-      fail 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
-    end
-
-    # Detect link, name and time for specified tag.
-    #
-    # @param [Hash] newer_tag newer tag. Can be nil, if it's Unreleased section.
-    # @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)
-
-      # if it's future release tag - set this value
-      if newer_tag.nil? && @options[:future_release]
-        newer_tag_name = @options[:future_release]
-        newer_tag_link = @options[:future_release]
-      else
-        # put unreleased label if there is no name for the tag
-        newer_tag_name = newer_tag.nil? ? @options[:unreleased_label] : newer_tag["name"]
-        newer_tag_link = newer_tag.nil? ? "HEAD" : newer_tag_name
-      end
-      [newer_tag_link, newer_tag_name, newer_tag_time]
-    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_between_tags(all_tags)
-      filter_excluded_tags(filtered_tags)
-    end
-
-    def filter_between_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."
-          end
-        end
-        filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag.name }
-      end
-      filtered_tags
-    end
-
-    def filter_excluded_tags(all_tags)
-      filtered_tags = all_tags
-      if @options[:exclude_tags]
-        @options[:exclude_tags].each do |tag|
-          unless all_tags.map(&:name).include? tag
-            Helper.log.warn "Warning: can't find tag #{tag}, specified with --exclude-tags option."
-          end
-        end
-        filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag.name }
-      end
-      filtered_tags
-    end
-  end
-end

lib/github_changelog_generator/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
-
-    if test?
-      @log ||= Logger.new(nil) # don't show any logs when running tests
-    else
-      @log ||= 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

@@ -1,152 +1,16 @@
 #!/usr/bin/env ruby
-require "optparse"
+require 'optparse'
-require "pp"
+require 'pp'
-require_relative "version"
+require_relative 'version'
-require_relative "helper"
+
 module GitHubChangelogGenerator
   class Parser
-    # parse options with optparse
     def self.parse_options
-      options = get_default_options
-
-      parser = setup_parser(options)
-
-      parser.parse!
-
-      if options[:user].nil? || options[:project].nil?
-        detect_user_and_project(options)
-      end
-
-      if !options[:user] || !options[:project]
-        puts parser.banner
-        exit
-      end
-
-      if options[:verbose]
-        Helper.log.info "Performing task with options:"
-        pp options
-        puts ""
-      end
-
-      options
-    end
-
-    # setup parsing options
-    def self.setup_parser(options)
-      parser = OptionParser.new do |opts|
-        opts.banner = "Usage: github_changelog_generator [options]"
-        opts.on("-u", "--user [USER]", "Username of the owner of target GitHub repo") do |last|
-          options[:user] = last
-        end
-        opts.on("-p", "--project [PROJECT]", "Name of project on GitHub") do |last|
-          options[:project] = last
-        end
-        opts.on("-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") do |last|
-          options[:token] = last
-        end
-        opts.on("-f", "--date-format [FORMAT]", "Date format. Default is %Y-%m-%d") do |last|
-          options[:date_format] = last
-        end
-        opts.on("-o", "--output [NAME]", "Output file. Default is CHANGELOG.md") do |last|
-          options[:output] = 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("--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
-        opts.on("--[no-]issues-wo-labels", "Include closed issues without labels in changelog. Default is true") do |v|
-          options[:add_issues_wo_labels] = v
-        end
-        opts.on("--[no-]pr-wo-labels", "Include pull requests without labels in changelog. Default is true") do |v|
-          options[:add_pr_wo_labels] = v
-        end
-        opts.on("--[no-]pull-requests", "Include pull-requests in changelog. Default is true") do |v|
-          options[:pulls] = v
-        end
-        opts.on("--[no-]filter-by-milestone", "Use milestone to detect when issue was resolved. Default is true") do |last|
-          options[:filter_issues_by_milestone] = last
-        end
-        opts.on("--[no-]author", "Add author of pull-request in the end. Default is true") do |author|
-          options[:author] = author
-        end
-        opts.on("--unreleased-only", "Generate log from unreleased closed issues only.") do |v|
-          options[:unreleased_only] = v
-        end
-        opts.on("--[no-]unreleased", "Add to log unreleased closed issues. Default is true") do |v|
-          options[:unreleased] = v
-        end
-        opts.on("--unreleased-label [label]", "Add to log unreleased closed issues. Default is true") do |v|
-          options[:unreleased_label] = v
-        end
-        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. 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|
-          options[:between_tags] = list
-        end
-        opts.on("--exclude-tags  x,y,z", Array, "Change log will be exclude specified tags") do |list|
-          options[:exclude_tags] = list
-        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("--github-site [URL]", "The Enterprise Github site on which your project is hosted.") do |last|
-          options[:github_site] = last
-        end
-        opts.on("--github-api [URL]", "The enterprise endpoint to use for your Github API.") do |last|
-          options[:github_endpoint] = last
-        end
-        opts.on("--simple-list", "Create simple list from issues and pull requests. Default is false.") do |v|
-          options[:simple_list] = v
-        end
-        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("--[no-]verbose", "Run verbosely. Default is true") do |v|
-          options[:verbose] = v
-        end
-        opts.on("-v", "--version", "Print version number") do |_v|
-          puts "Version: #{GitHubChangelogGenerator::VERSION}"
-          exit
-        end
-        opts.on("-h", "--help", "Displays Help") do
-          puts opts
-          exit
-        end
-      end
-      parser
-    end
-
-    # just get default options
-    def self.get_default_options
       options = {
         tag1: nil,
         tag2: nil,
-        date_format: "%Y-%m-%d",
+        dateformat: '%Y-%m-%d',
-        output: "CHANGELOG.md",
+        output: 'CHANGELOG.md',
         issues: true,
         add_issues_wo_labels: true,
         add_pr_wo_labels: true,
@@ -154,104 +18,160 @@ module GitHubChangelogGenerator
         filter_issues_by_milestone: true,
         author: true,
         unreleased: true,
-        unreleased_label: "Unreleased",
+        unreleased_label: 'Unreleased',
         compare_link: true,
-        enhancement_labels: %w(enhancement Enhancement),
+        include_labels: %w(bug enhancement),
-        bug_labels: %w(bug Bug),
+        exclude_labels: %w(duplicate question invalid wontfix),
-        exclude_labels: %w(duplicate question invalid wontfix Duplicate Question Invalid Wontfix),
         max_issues: nil,
         simple_list: false,
         verbose: true,
-        merge_prefix: "**Merged pull requests:**",
+
-        issue_prefix: "**Closed issues:**",
+        merge_prefix: '**Merged pull requests:**',
-        bug_prefix: "**Fixed bugs:**",
+        issue_prefix: '**Closed issues:**',
-        enhancement_prefix: "**Implemented enhancements:**",
+        bug_prefix: '**Fixed bugs:**',
-        git_remote: "origin"
+        enhancement_prefix: '**Implemented enhancements:**',
+        branch: 'origin'
       }
 
-      options
+      parser = OptionParser.new do |opts|
-    end
+        opts.banner = 'Usage: github_changelog_generator [options]'
-
+        opts.on('-u', '--user [USER]', 'Username of the owner of target GitHub repo') do |last|
-    # Detects user and project from git
+          options[:user] = last
-    def self.detect_user_and_project(options)
+        end
-      options[:user], options[:project] = user_project_from_option(ARGV[0], ARGV[1], options[:github_site])
+        opts.on('-p', '--project [PROJECT]', 'Name of project on GitHub') do |last|
-      if !options[:user] || !options[:project]
+          options[:project] = last
-        if ENV["RUBYLIB"] =~ /ruby-debug-ide/
+        end
-          options[:user] = "skywinder"
+        opts.on('-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') do |last|
-          options[:project] = "changelog_test"
+          options[:token] = last
-        else
+        end
-          remote = `git config --get remote.#{options[:git_remote]}.url`
+        opts.on('-f', '--date-format [FORMAT]', 'Date format. Default is %Y-%m-%d') do |last|
-          options[:user], options[:project] = user_project_from_remote(remote)
+          options[:dateformat] = last
+        end
+        opts.on('-o', '--output [NAME]', 'Output file. Default is CHANGELOG.md') do |last|
+          options[:output] = last
+        end
+        opts.on('--[no-]issues', 'Include closed issues in changelog. Default is true') do |v|
+          options[:issues] = v
+        end
+        opts.on('--[no-]issues-wo-labels', 'Include closed issues without labels in changelog. Default is true') do |v|
+          options[:add_issues_wo_labels] = v
+        end
+        opts.on('--[no-]pr-wo-labels', 'Include pull requests without labels in changelog. Default is true') do |v|
+          options[:add_pr_wo_labels] = v
+        end
+        opts.on('--[no-]pull-requests', 'Include pull-requests in changelog. Default is true') do |v|
+          options[:pulls] = v
+        end
+        opts.on('--[no-]filter-by-milestone', 'Use milestone to detect when issue was resolved. Default is true') do |last|
+          options[:filter_issues_by_milestone] = last
+        end
+        opts.on('--[no-]author', 'Add author of pull-request in the end. Default is true') do |author|
+          options[:author] = author
+        end
+        opts.on('--unreleased-only', 'Generate log from unreleased closed issues only.') do |v|
+          options[:unreleased_only] = v
+        end
+        opts.on('--[no-]unreleased', 'Add to log unreleased closed issues. Default is true') do |v|
+          options[:unreleased] = v
+        end
+        opts.on('--unreleased-label [label]', 'Add to log unreleased closed issues. Default is true') do |v|
+          options[:unreleased_label] = v
+        end
+        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. 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('--max-issues [NUMBER]', Integer, 'Max number of issues to fetch from GitHub. Default is unlimited') do |max|
+          options[:max_issues] = max
+        end
+        opts.on('--github-site [URL]', 'The Enterprise Github site on which your project is hosted.') do |last|
+          options[:github_site] = last
+        end
+        opts.on('--github-api [URL]', 'The enterprise endpoint to use for your Github API.') do |last|
+          options[:github_endpoint] = last
+        end
+        opts.on('--simple-list', 'Create simple list from issues and pull requests. Default is false.') do |v|
+          options[:simple_list] = v
+        end
+        opts.on('--[no-]verbose', 'Run verbosely. Default is true') do |v|
+          options[:verbose] = v
+        end
+        opts.on('-v', '--version', 'Print version number') do |_v|
+          puts "Version: #{GitHubChangelogGenerator::VERSION}"
+          exit
+        end
+        opts.on('-h', '--help', 'Displays Help') do
+          puts opts
+          exit
         end
       end
-    end
 
-    # Try to find user and project name from git remote output
+      parser.parse!
-    #
+
-    # @param [String] output of git remote command
+      if ARGV[0] && !ARGV[1]
-    # @return [Array] user and project
+        github_site = options[:github_site] ? options[:github_site] : 'github.com'
-    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
-        puts arg0
+        match = /(?:.+#{Regexp.escape(github_site)}\/)?(.+)\/(.+)/.match(ARGV[0])
-        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'"
+          puts "Can't detect user and name from first parameter: '#{ARGV[0]}' -> exit'"
           exit
         end
         if param
           exit
         else
-          user = match[1]
+          options[:user] = match[1]
-          project = match[2]
+          options[:project] = match[2]
-        end
-      end
-      [user, project]
-    end
-
-    # 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(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
-      remote_structures.each do |regex|
-        matches = Regexp.new(regex).match(remote)
-
-        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]
+      if !options[:user] && !options[:project]
-    end
+        remote = `git config --get remote.#{options[:branch]}.url`
-  end
+        # try to find repo in format:
+        # origin	git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
+        # git@github.com:skywinder/Github-Changelog-Generator.git
+        match = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/.match(remote)
 
-  if __FILE__ == $PROGRAM_NAME
+        if match && match[1] && match[2]
-    remote = "invalid reference to project"
+          puts "Detected user:#{match[1]}, project:#{match[2]}"
-    p user_project_from_option(ARGV[0], ARGV[1], remote)
+          options[:user], options[:project] = match[1], match[2]
+        else
+          # try to find repo in format:
+          # origin	https://github.com/skywinder/ChangelogMerger (fetch)
+          # https://github.com/skywinder/ChangelogMerger
+          match = /.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/.match(remote)
+          if match && match[1] && match[2]
+            puts "Detected user:#{match[1]}, project:#{match[2]}"
+            options[:user], options[:project] = match[1], match[2]
+          end
+        end
+      end
+
+      if !options[:user] || !options[:project]
+        puts parser.banner
+        exit
+      end
+
+      if ARGV[1]
+        options[:tag1] = ARGV[0]
+        options[:tag2] = ARGV[1]
+      end
+
+      if options[:verbose]
+        puts 'Performing task with options:'
+        pp options
+        puts ''
+      end
+
+      options
+    end
   end
 end

lib/github_changelog_generator/reader.rb

@@ -25,7 +25,7 @@ module GitHubChangelogGenerator
   class Reader
     def initialize(options = {})
       defaults = {
-        heading_level: "##",
+        heading_level: '##',
         heading_structures: [
           /^## \[(?<version>.+?)\]\((?<url>.+?)\)( \((?<date>.+?)\))?$/,
           /^## (?<version>.+?)( \((?<date>.+?)\))?$/
@@ -49,7 +49,7 @@ module GitHubChangelogGenerator
     # @param [String] heading Heading from the ChangeLog File
     # @return [Hash] Returns a structured Hash with version, url and date
     def parse_heading(heading)
-      captures = { "version" => nil, "url" => nil, "date" => nil }
+      captures = { 'version' => nil, 'url' => nil, 'date' => nil }
 
       @heading_structures.each do |regexp|
         matches = Regexp.new(regexp).match(heading)
@@ -73,7 +73,7 @@ module GitHubChangelogGenerator
 
       headings.each_with_index do |heading, index|
         captures = parse_heading(heading)
-        captures["content"] = sections.at(index + 1)
+        captures['content'] = sections.at(index + 1)
         changelog.push captures
       end
 

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = "1.6.1"
+  VERSION = '1.3.11'
 end

spec/spec_helper.rb

@@ -15,22 +15,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "codeclimate-test-reporter"
+require 'coveralls'
-require "simplecov"
+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[
-  Coveralls::SimpleCov::Formatter,
   SimpleCov::Formatter::HTMLFormatter,
-  CodeClimate::TestReporter::Formatter
+  Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start
 
-require "github_changelog_generator"
+require 'github_changelog_generator'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -99,7 +92,7 @@ RSpec.configure do |config|
     # 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"
+    config.default_formatter = 'doc'
   end
 
   # Print the 10 slowest examples and example groups at the

spec/unit/fetcher_spec.rb

@@ -1,59 +0,0 @@
-VALID_TOKEN = "0123456789abcdef"
-INVALID_TOKEN = "0000000000000000"
-
-DEFAULT_OPTIONS = { user: "skywinder",
-                    project: "changelog_test" }
-
-def options_with_invalid_token
-  options = DEFAULT_OPTIONS
-  options[:token] = INVALID_TOKEN
-  options
-end
-
-describe GitHubChangelogGenerator::Fetcher do
-  before(:all) do
-    @fetcher = GitHubChangelogGenerator::Fetcher.new
-  end
-
-  describe "#fetch_github_token" do
-    token = GitHubChangelogGenerator::Fetcher::CHANGELOG_GITHUB_TOKEN
-    context "when token in ENV exist" do
-      before { stub_const("ENV", ENV.to_hash.merge(token => VALID_TOKEN)) }
-      subject { @fetcher.fetch_github_token }
-      it { is_expected.to eq(VALID_TOKEN) }
-    end
-    context "when token in ENV is nil" do
-      before { stub_const("ENV", ENV.to_hash.merge(token => nil)) }
-      subject { @fetcher.fetch_github_token }
-      it { is_expected.to be_nil }
-    end
-    context "when token in options and ENV is nil" do
-      before do
-        stub_const("ENV", ENV.to_hash.merge(token => nil))
-        @fetcher = GitHubChangelogGenerator::Fetcher.new(token: VALID_TOKEN)
-      end
-      subject { @fetcher.fetch_github_token }
-      it { is_expected.to eq(VALID_TOKEN) }
-    end
-    context "when token in options and ENV specified" do
-      before do
-        stub_const("ENV", ENV.to_hash.merge(token => "no_matter_what"))
-        @fetcher = GitHubChangelogGenerator::Fetcher.new(token: VALID_TOKEN)
-      end
-      subject { @fetcher.fetch_github_token }
-      it { is_expected.to eq(VALID_TOKEN) }
-    end
-  end
-
-  describe "#github_fetch_tags" do
-    context "when wrong token provided" do
-      before do
-        options = options_with_invalid_token
-        @fetcher = GitHubChangelogGenerator::Fetcher.new(options)
-      end
-      it "should raise Unauthorized error" do
-        expect { @fetcher.github_fetch_tags }.to raise_error Github::Error::Unauthorized
-      end
-    end
-  end
-end

spec/unit/generator/generator_tags_spec.rb

@@ -1,151 +0,0 @@
-def tag_mash_with_name(tag)
-  mash_tag = Hashie::Mash.new
-  mash_tag.name = tag
-  mash_tag
-end
-
-def tags_mash_from_strings(tags_strings)
-  mash_array = []
-  tags_strings.each do |tag|
-    mash_tag = tag_mash_with_name(tag)
-    mash_array << mash_tag
-  end
-  mash_array
-end
-
-describe GitHubChangelogGenerator::Generator do
-  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 valid excluded tags" 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 invalid excluded tags" 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
-  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
-    time1 = Time.now
-    time2 = Time.now
-    time3 = Time.now
-    before(:all) do
-      @generator = GitHubChangelogGenerator::Generator.new
-    end
-    context "sort unsorted tags" do
-      tags = tags_mash_from_strings %w(valid_tag1 valid_tag2 valid_tag3)
-      before do
-        @generator.instance_variable_set :@tag_times_hash, "valid_tag1" => time1, "valid_tag2" => time2, "valid_tag3" => time3
-      end
-      subject do
-        @generator.sort_tags_by_date tags
-      end
-      it { is_expected.to be_a_kind_of(Array) }
-      it { is_expected.to match_array(tags.reverse!) }
-    end
-    context "sort sorted tags" do
-      tags = tags_mash_from_strings %w(valid_tag3 valid_tag2 valid_tag1)
-      before do
-        @generator.instance_variable_set :@tag_times_hash, "valid_tag1" => time1, "valid_tag2" => time2, "valid_tag3" => time3
-      end
-      subject do
-        @generator.sort_tags_by_date tags
-      end
-      it { is_expected.to be_a_kind_of(Array) }
-      it { is_expected.to match_array(tags) }
-    end
-  end
-end

spec/unit/parser_spec.rb

@@ -1,60 +0,0 @@
-describe GitHubChangelogGenerator::Parser do
-  describe ".user_project_from_remote" do
-    context "when remote is type 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
-      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
-      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
-      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"]) }
-    end
-    context "when remote is invalid" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_remote("some invalid text") }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array([nil, nil]) }
-    end
-  end
-  describe ".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) }
-      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) }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array([nil, nil]) }
-    end
-    context "when site is nil" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", nil, nil) }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
-    end
-    context "when site is valid" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", nil, "https://codeclimate.com") }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array(["skywinder", "ActionSheetPicker-3.0"]) }
-    end
-    context "when second arg is not nil" do
-      subject { GitHubChangelogGenerator::Parser.user_project_from_option("skywinder/ActionSheetPicker-3.0", "blah", nil) }
-      it { is_expected.to be_a(Array) }
-      it { is_expected.to match_array([nil, nil]) }
-    end
-  end
-end

spec/unit/reader_spec.rb

@@ -21,71 +21,71 @@ describe GitHubChangelogGenerator::Reader do
     @reader = GitHubChangelogGenerator::Reader.new
   end
 
-  describe "#parse_heading" do
+  describe '#parse_heading' do
-    context "when heading is empty" do
+    context 'when heading is empty' do
-      subject { @reader.parse_heading("## ") }
+      subject { @reader.parse_heading('## ') }
       it { is_expected.to be_a(Hash) }
-      it { is_expected.to include("version", "url", "date") }
+      it { is_expected.to include('version', 'url', 'date') }
-      it { is_expected.to include("version" => nil, "url" => nil, "date" => nil) }
+      it { is_expected.to include('version' => nil, 'url' => nil, 'date' => nil) }
       # TODO: Doesn't work?
       # it { is_expected.to have_all_string_keys }
     end
-    context "when given version, url and date" do
+    context 'when given version, url and date' do
-      subject { @reader.parse_heading("## [1.3.10](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10) (2015-03-18)") }
+      subject { @reader.parse_heading('## [1.3.10](https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10) (2015-03-18)') }
-      it { is_expected.to include("version" => "1.3.10") }
+      it { is_expected.to include('version' => '1.3.10') }
-      it { is_expected.to include("url" => "https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10") }
+      it { is_expected.to include('url' => 'https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10') }
-      it { is_expected.to include("date" => "2015-03-18") }
+      it { is_expected.to include('date' => '2015-03-18') }
     end
-    context "when no url and date is provided" do
+    context 'when no url and date is provided' do
-      subject { @reader.parse_heading("## foobar") }
+      subject { @reader.parse_heading('## foobar') }
-      it { is_expected.to include("version" => "foobar", "url" => nil, "date" => nil) }
+      it { is_expected.to include('version' => 'foobar', 'url' => nil, 'date' => nil) }
     end
   end
 
-  describe "#parse" do
+  describe '#parse' do
-    context "when file is empty" do
+    context 'when file is empty' do
-      subject { @reader.parse("") }
+      subject { @reader.parse('') }
       it { is_expected.to be_an(Array) }
       it { is_expected.to be_empty }
     end
-    context "when file has only the header" do
+    context 'when file has only the header' do
-      subject { @reader.parse("# Change Log") }
+      subject { @reader.parse('# Change Log') }
       it { is_expected.to be_an(Array) }
       it { is_expected.to be_empty }
     end
   end
 
-  describe "example CHANGELOG files" do
+  describe 'example CHANGELOG files' do
-    subject { @reader.read(File.expand_path(File.join(File.dirname(__FILE__), "..", "files", self.class.description))) }
+    subject { @reader.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'files', self.class.description))) }
-    context "github-changelog-generator.md" do
+    context 'github-changelog-generator.md' do
       it { is_expected.to be_an(Array) }
       it { is_expected.not_to be_empty }
       it { expect(subject.count).to eq(28) }
-      it { expect(subject.first).to include("version" => "1.3.10") }
+      it { expect(subject.first).to include('version' => '1.3.10') }
-      it { expect(subject.first).to include("url" => "https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10") }
+      it { expect(subject.first).to include('url' => 'https://github.com/skywinder/Github-Changelog-Generator/tree/1.3.10') }
-      it { expect(subject.first).to include("date" => "2015-03-18") }
+      it { expect(subject.first).to include('date' => '2015-03-18') }
-      it { expect(subject.first).to include("content") }
+      it { expect(subject.first).to include('content') }
-      it "content should not be empty" do
+      it 'content should not be empty' do
-        expect(subject.first["content"]).not_to be_empty
+        expect(subject.first['content']).not_to be_empty
       end
     end
-    context "bundler.md" do
+    context 'bundler.md' do
       it { is_expected.to be_an(Array) }
       it { is_expected.not_to be_empty }
       it { expect(subject.count).to eq(151) }
-      it { expect(subject.first).to include("version" => "1.9.1") }
+      it { expect(subject.first).to include('version' => '1.9.1') }
-      it { expect(subject.first).to include("url" => nil) }
+      it { expect(subject.first).to include('url' => nil) }
-      it { expect(subject.first).to include("date" => "2015-03-21") }
+      it { expect(subject.first).to include('date' => '2015-03-21') }
-      it { expect(subject.first).to include("content") }
+      it { expect(subject.first).to include('content') }
-      it "content should not be empty" do
+      it 'content should not be empty' do
-        expect(subject.first["content"]).not_to be_empty
+        expect(subject.first['content']).not_to be_empty
       end
     end
-    context "angular.js.md" do
+    context 'angular.js.md' do
       it { is_expected.to be_an(Array) }
       it { is_expected.not_to be_empty }
       it do
-        pending("Implement heading_level for parser.")
+        pending('Implement heading_level for parser.')
         expect(subject.count).to eq(134)
       end
       # it do