From 74655cce06d9b5ad84928f2ca4cda776ed174002 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Tue, 23 Feb 2016 12:21:10 -0800 Subject: [PATCH 1/6] If Rakefile is an extension, any requires are runtime deps --- Gemfile | 1 - Gemfile.lock | 2 +- github_changelog_generator.gemspec | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 8841647..8452dc5 100644 --- a/Gemfile +++ b/Gemfile @@ -8,5 +8,4 @@ group :test do gem "coveralls", "~>0.8", require: false gem "simplecov", "~>0.10", require: false gem "codeclimate-test-reporter", "~>0.4" - gem "overcommit", "~>0.31" end diff --git a/Gemfile.lock b/Gemfile.lock index 406bb95..59d6ac9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ PATH github_changelog_generator (1.10.3) colorize (~> 0.7) github_api (~> 0.12) + overcommit (~> 0.31) GEM remote: https://rubygems.org/ @@ -97,7 +98,6 @@ DEPENDENCIES codeclimate-test-reporter (~> 0.4) coveralls (~> 0.8) github_changelog_generator! - overcommit (~> 0.31) rake (~> 10.0) rspec (~> 3.2) rubocop (~> 0.31) diff --git a/github_changelog_generator.gemspec b/github_changelog_generator.gemspec index b110954..a449e68 100644 --- a/github_changelog_generator.gemspec +++ b/github_changelog_generator.gemspec @@ -26,6 +26,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency("github_api", ["~> 0.12"]) spec.add_runtime_dependency("colorize", ["~> 0.7"]) + spec.add_runtime_dependency("overcommit", "~>0.31") # Development only spec.add_development_dependency "bundler", "~> 1.7" From b8f7dbaa2e949ee244d27896403664e3c4f34f68 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 23 Feb 2016 22:24:10 +0100 Subject: [PATCH 2/6] Test case for #327 --- spec/files/github_changelog_params_327 | 1 + spec/unit/parse_file_spec.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 spec/files/github_changelog_params_327 diff --git a/spec/files/github_changelog_params_327 b/spec/files/github_changelog_params_327 new file mode 100644 index 0000000..21fce1c --- /dev/null +++ b/spec/files/github_changelog_params_327 @@ -0,0 +1 @@ +exclude-labels=73a91042-da6f-11e5-9335-1040f38d7f90,7adf83b4-da6f-11e5-ae18-1040f38d7f90 \ No newline at end of file diff --git a/spec/unit/parse_file_spec.rb b/spec/unit/parse_file_spec.rb index 92d56e6..e08168d 100644 --- a/spec/unit/parse_file_spec.rb +++ b/spec/unit/parse_file_spec.rb @@ -36,6 +36,20 @@ describe GitHubChangelogGenerator::ParserFile do unreleased: false, header: "=== Changelog ===")) end + + context "turns exclude-label into an Array", bug: '#327' do + let(:options) { + { + params_file: 'spec/files/github_changelog_params_327' + } + } + it "reads exclude_labels into an Array" do + expect { parse.parse! }.to change { options[:exclude_labels] } + .from(nil) + .to(["73a91042-da6f-11e5-9335-1040f38d7f90", "7adf83b4-da6f-11e5-ae18-1040f38d7f90"]) + + end + end end end end From 74f93460bc8d95d05f5605d29f39eee3670b6cec Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 23 Feb 2016 22:25:07 +0100 Subject: [PATCH 3/6] Spec: Avoid a deprecation --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e8fa625..5e4530f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,11 +23,11 @@ require "coveralls" module SpecHelper end -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ Coveralls::SimpleCov::Formatter, SimpleCov::Formatter::HTMLFormatter, CodeClimate::TestReporter::Formatter -] +]) SimpleCov.start require "github_changelog_generator" From 540251ab6034d30be43b8fb5d289e491a9bdf4eb Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 23 Feb 2016 22:28:24 +0100 Subject: [PATCH 4/6] Typo --- spec/unit/parse_file_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unit/parse_file_spec.rb b/spec/unit/parse_file_spec.rb index e08168d..41eafbd 100644 --- a/spec/unit/parse_file_spec.rb +++ b/spec/unit/parse_file_spec.rb @@ -37,7 +37,7 @@ describe GitHubChangelogGenerator::ParserFile do header: "=== Changelog ===")) end - context "turns exclude-label into an Array", bug: '#327' do + context "turns exclude-labels into an Array", bug: '#327' do let(:options) { { params_file: 'spec/files/github_changelog_params_327' From 06585b1c69f9b151de03042305ec11beb9e35bb7 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 23 Feb 2016 23:39:53 +0100 Subject: [PATCH 5/6] Rake and Bundler as runtime deps To support Rakefile running at install. See #329 --- github_changelog_generator.gemspec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/github_changelog_generator.gemspec b/github_changelog_generator.gemspec index a449e68..3fe5427 100644 --- a/github_changelog_generator.gemspec +++ b/github_changelog_generator.gemspec @@ -24,11 +24,9 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] + spec.add_runtime_dependency "rake", "~> 10.0" + spec.add_runtime_dependency "bundler", "~> 1.7" spec.add_runtime_dependency("github_api", ["~> 0.12"]) spec.add_runtime_dependency("colorize", ["~> 0.7"]) spec.add_runtime_dependency("overcommit", "~>0.31") - - # Development only - spec.add_development_dependency "bundler", "~> 1.7" - spec.add_development_dependency "rake", "~> 10.0" end From 95d4e49171246dd555894bc88b3e0edd9d8e7547 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Wed, 24 Feb 2016 15:14:16 +0200 Subject: [PATCH 6/6] Update changelog for version 1.10.4 --- CHANGELOG.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04618ab..2f39315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log -## [1.10.3](https://github.com/skywinder/github-changelog-generator/tree/1.10.3) (2016-02-23) -[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.2...1.10.3) +## [1.10.4](https://github.com/skywinder/github-changelog-generator/tree/1.10.4) (2016-02-24) +[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.3...1.10.4) **Fixed bugs:** -- Getting an error on install [\#329](https://github.com/skywinder/github-changelog-generator/issues/329) +- Rake and Bundler as runtime deps [\#333](https://github.com/skywinder/github-changelog-generator/pull/333) ([olleolleolle](https://github.com/olleolleolle)) + +**Merged pull requests:** + +- Test case for \#327 [\#331](https://github.com/skywinder/github-changelog-generator/pull/331) ([olleolleolle](https://github.com/olleolleolle)) +- Fix crash installing on systems without overcommit [\#330](https://github.com/skywinder/github-changelog-generator/pull/330) ([jkeiser](https://github.com/jkeiser)) + +## [1.10.3](https://github.com/skywinder/github-changelog-generator/tree/1.10.3) (2016-02-23) +[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.2...1.10.3) ## [1.10.2](https://github.com/skywinder/github-changelog-generator/tree/1.10.2) (2016-02-23) [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/v1.11.0...1.10.2)