From e3666aa487681228511fc0e032e3cd6816a763d5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 12 Jan 2017 22:47:44 +0100 Subject: [PATCH 1/3] bump required puppet version to 4.6.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 24860fd4..ed0a02c3 100644 --- a/metadata.json +++ b/metadata.json @@ -45,7 +45,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 3.8.7 < 5.0.0" + "version_requirement": ">= 4.6.1 < 5.0.0" } ] } From cc81d8d6ae7428b55d4a3209298bea59c8c3ae8a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 12 Jan 2017 22:48:52 +0100 Subject: [PATCH 2/3] modulesync 0.18.0 --- .msync.yml | 2 +- .travis.yml | 7 +------ Gemfile | 8 +++++--- Rakefile | 11 +++++++++++ spec/spec_helper.rb | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.msync.yml b/.msync.yml index d505802e..3a5a013f 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '0.16.7' +modulesync_config_version: '0.18.0' diff --git a/.travis.yml b/.travis.yml index 4f97be7b..723dc215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ --- sudo: false +dist: trusty language: ruby cache: bundler bundler_args: --without system_tests development @@ -15,12 +16,6 @@ script: matrix: fast_finish: true include: - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test - - rvm: 2.1.9 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test - rvm: 2.1.9 env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.2.6 diff --git a/Gemfile b/Gemfile index 0fa24c66..09a4303d 100644 --- a/Gemfile +++ b/Gemfile @@ -27,10 +27,12 @@ group :test do gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git' gem 'puppet-strings', '~> 1.0.0', :require => false gem 'rubocop-rspec', '~> 1.9.0', :require => false if RUBY_VERSION >= '2.3.0' - gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' gem 'mocha', '>= 1.2.1', :require => false - gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0' - gem 'simplecov-console', :require => false if RUBY_VERSION >= '2.0.0' + gem 'coveralls', :require => false + gem 'simplecov-console', :require => false + gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2' + gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2' + gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2' end group :development do diff --git a/Rakefile b/Rakefile index d00f2470..2def02fa 100644 --- a/Rakefile +++ b/Rakefile @@ -30,4 +30,15 @@ task test: [ :metadata_lint, :release_checks, ] + +begin + require 'github_changelog_generator/task' + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + version = (Blacksmith::Modulefile.new).version + config.future_release = "#{version}" + config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module." + config.exclude_labels = %w{duplicate question invalid wontfix modulesync} + end +rescue LoadError +end # vim: syntax=ruby diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 32709c81..2aa9da74 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,7 @@ require 'rspec-puppet-facts' include RspecPuppetFacts -if Dir.exist?(File.expand_path('../../lib', __FILE__)) && RUBY_VERSION !~ %r{^1.9} +if Dir.exist?(File.expand_path('../../lib', __FILE__)) require 'coveralls' require 'simplecov' require 'simplecov-console' From 4c7be1844a921c81a7d6d1a6810e362c4ea98651 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 12 Jan 2017 22:54:30 +0100 Subject: [PATCH 3/3] [blacksmith] Bump version to 0.8.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ed0a02c3..7ddd149a 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-selinux", - "version": "0.8.0", + "version": "0.8.1-rc0", "author": "Vox Pupuli", "summary": "This class manages SELinux on RHEL based systems", "license": "Apache-2.0",