From 0be06313208f1a51925bf59fcb280cd718bf8045 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 19 Jun 2017 09:16:23 +0200 Subject: [PATCH 1/9] Travis: jruby-9.1.12.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f479f3..7b70d59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: gemfile: spec/install-gem-in-bundler.gemfile - rvm: 2.3.4 - rvm: 2.4.1 - - rvm: jruby-9.1.10.0 + - rvm: jruby-9.1.12.0 jdk: oraclejdk8 env: - JRUBY_OPTS=--debug From f643b3e44e8353444b0fca56f22a640f9f026f14 Mon Sep 17 00:00:00 2001 From: Lucas Huang Date: Sat, 24 Jun 2017 23:41:12 -0700 Subject: [PATCH 2/9] Update README.md (#531) A better README.md file --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4598d63..9225b76 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ GitHub Changelog Generator ![GitHub Logo](../master/images/logo.jpg) Since you don't have to fill your `CHANGELOG.md` manually now: just run the script, relax and take a cup of :coffee: before your next release! :tada: ->### *What’s the point of a change log?* +### *What’s the point of a change log?* To make it easier for users and contributors to see precisely what notable changes have been made between each release (or version) of the project. ### *Why should I care?* Because software tools are for people. If you don’t care, why are you contributing to open source? Surely, there must be a kernel (ha!) of care somewhere in that lovely little brain of yours. -> :arrow_right: *[http://keepachangelog.com](http://keepachangelog.com)* +:arrow_right: *[http://keepachangelog.com](http://keepachangelog.com)* ## Installation @@ -74,16 +74,16 @@ See also Troubleshooting. - If your **`git remote`** `origin` refers to your GitHub repo, just go to your project folder and run: - github_changelog_generator + github_changelog_generator - Or, run this from anywhere: - - `github_changelog_generator -u github_username -p github_project` - - `github_changelog_generator github_username/github_project` + `github_changelog_generator -u github_username -p github_project` + `github_changelog_generator github_username/github_project` - If you are running it against a repository on a Github Enterprise install, you must specify *both* `--github-site` and `--github-api` command line options: - github_changelog_generator --github-site="https://github.yoursite.com" \ - --github-api="https://github.yoursite.com/api/v3/" + github_changelog_generator --github-site="https://github.yoursite.com" \ + --github-api="https://github.yoursite.com/api/v3/" This generates a changelog to the `CHANGELOG.md` file, with pretty markdown formatting. @@ -116,7 +116,7 @@ Here's how: You can set an environment variable by running the following command at the prompt, or by adding it to your shell profile (e.g., `~/.bash_profile` or `~/.zshrc`): - export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»" + export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»" So, if you get a message like this: From 3798d0637c21bed35a03e15c6df2e6acf9efdccf Mon Sep 17 00:00:00 2001 From: Lucas Huang Date: Sun, 25 Jun 2017 01:48:55 -0700 Subject: [PATCH 3/9] Update README.md (#534) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9225b76..3dd30a3 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Because software tools are for people. If you don’t care, why are you contribu ## Installation - gem install github_changelog_generator + gem install github_changelog_generator See also Troubleshooting. @@ -46,7 +46,7 @@ See also Troubleshooting. - Look at **[CHANGELOG.md](https://github.com/skywinder/Github-Changelog-Generator/blob/master/CHANGELOG.md)** for this project - [ActionSheetPicker-3.0/CHANGELOG.md](https://github.com/skywinder/ActionSheetPicker-3.0/blob/master/CHANGELOG.md) was generated by command: - github_changelog_generator -u skywinder -p ActionSheetPicker-3.0 + github_changelog_generator -u skywinder -p ActionSheetPicker-3.0 - In general, it looks like this: @@ -116,7 +116,7 @@ Here's how: You can set an environment variable by running the following command at the prompt, or by adding it to your shell profile (e.g., `~/.bash_profile` or `~/.zshrc`): - export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»" + export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»" So, if you get a message like this: From fb7e21f9f89f6541e53af63fb415f079eb7f79b6 Mon Sep 17 00:00:00 2001 From: Lucas Huang Date: Mon, 26 Jun 2017 22:45:59 -0700 Subject: [PATCH 4/9] Credit line bug (#535) * Fix a bug that generates multiple credit lines --- .../generator/generator_generation.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index a86bf89..c642766 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -21,7 +21,8 @@ module GitHubChangelogGenerator log += File.read(options[:base]) if File.file?(options[:base]) - log += "\n\n\\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*" + credit_line = "\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*" + log += "\n\n\#{credit_line}" if log.include? credit_line == false @log = log end From d0e7593e98fb1cfd2f5355c07468b330f19a8bc3 Mon Sep 17 00:00:00 2001 From: Lucas Huang Date: Tue, 27 Jun 2017 10:45:57 -0700 Subject: [PATCH 5/9] Fix the syntax ambiguity on credit-line-bug (#537) * fix a syntax ambiguity --- .../generator/generator_generation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index c642766..7312178 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -22,7 +22,7 @@ module GitHubChangelogGenerator log += File.read(options[:base]) if File.file?(options[:base]) credit_line = "\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*" - log += "\n\n\#{credit_line}" if log.include? credit_line == false + log += "\n\n\#{credit_line}" unless log.include?(credit_line) @log = log end From e77202163c7b82df45d41be24b1dda368e8480e4 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Jun 2017 20:40:55 +0200 Subject: [PATCH 6/9] AppVeyor: Windows configuration to pass RuboCop (#538) * AppVeyor: Windows configuration to pass RuboCop * README: AppVeyor build badge * AppVeyor: GitHubPullRequest notification --- README.md | 1 + appveyor.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 3dd30a3..20a94bb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![Gem Version](https://badge.fury.io/rb/github_changelog_generator.svg)](http://badge.fury.io/rb/github_changelog_generator) [![Dependency Status](https://gemnasium.com/skywinder/github-changelog-generator.svg)](https://gemnasium.com/skywinder/github-changelog-generator) [![Build Status](https://travis-ci.org/skywinder/github-changelog-generator.svg?branch=master)](https://travis-ci.org/skywinder/github-changelog-generator) +[![Build status](https://ci.appveyor.com/api/projects/status/xdfnfmdjfo0upm7m?svg=true)](https://ci.appveyor.com/project/olleolleolle/github-changelog-generator) [![Inline docs](http://inch-ci.org/github/skywinder/github-changelog-generator.svg)](http://inch-ci.org/github/skywinder/github-changelog-generator) [![Code Climate](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/gpa.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator) [![Test Coverage](https://codeclimate.com/github/skywinder/github-changelog-generator/badges/coverage.svg)](https://codeclimate.com/github/skywinder/github-changelog-generator) diff --git a/appveyor.yml b/appveyor.yml index dbd2114..8d26c01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,9 @@ environment: - ruby_version: "21" # Older version, but matches Travis-CI - ruby_version: "21-x64" +init: + - git config --global core.autocrlf true + install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% @@ -48,3 +51,8 @@ notifications: - sky4winder+githubchangeloggenerator@gmail.com on_build_success: false on_build_status_changed: true + - provider: GitHubPullRequest + on_build_success: true + on_build_failure: true + on_build_status_changed: true + From e37ce502ea10106348d32eac074c834dc3827064 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Jun 2017 21:08:10 +0200 Subject: [PATCH 7/9] AppVeyor: drop init line, add .gitattributes (#539) --- .gitattributes | 2 ++ appveyor.yml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..99cda56 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +* text eol=lf + diff --git a/appveyor.yml b/appveyor.yml index 8d26c01..bde52a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,9 +17,6 @@ environment: - ruby_version: "21" # Older version, but matches Travis-CI - ruby_version: "21-x64" -init: - - git config --global core.autocrlf true - install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% From ee4c72c7aa54192dc7452c861d4f0c4cccf9a81c Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Jun 2017 21:14:37 +0200 Subject: [PATCH 8/9] Revert "AppVeyor: drop init line, add .gitattributes (#539)" This reverts commit e37ce502ea10106348d32eac074c834dc3827064. --- .gitattributes | 2 -- appveyor.yml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 99cda56..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text eol=lf - diff --git a/appveyor.yml b/appveyor.yml index bde52a7..8d26c01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,9 @@ environment: - ruby_version: "21" # Older version, but matches Travis-CI - ruby_version: "21-x64" +init: + - git config --global core.autocrlf true + install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% From b21e7eaaf76512b6992339869493b4c5746bf065 Mon Sep 17 00:00:00 2001 From: Lucas Huang Date: Wed, 28 Jun 2017 07:55:42 -0700 Subject: [PATCH 9/9] Update generator_generation.rb (#542) Fix the syntax so `credit_line` is recognizable as a variable. #541 --- .../generator/generator_generation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb index 7312178..5ca5ac6 100644 --- a/lib/github_changelog_generator/generator/generator_generation.rb +++ b/lib/github_changelog_generator/generator/generator_generation.rb @@ -22,7 +22,7 @@ module GitHubChangelogGenerator log += File.read(options[:base]) if File.file?(options[:base]) credit_line = "\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*" - log += "\n\n\#{credit_line}" unless log.include?(credit_line) + log += "\n\n#{credit_line}" unless log.include?(credit_line) @log = log end