From f2bd1ab9f11d774c645453c9d3fb7e237bc2fc1f Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Oct 2016 10:04:07 +0200 Subject: modulesync 0.12.8 --- .gitignore | 3 ++- .msync.yml | 2 +- .rubocop.yml | 3 ++- .travis.yml | 24 +++++++++++++----------- Gemfile | 4 ++-- Rakefile | 6 ++---- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 21ff492..3c1af2d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ Gemfile.lock Gemfile.local vendor/ .vendor/ -spec/fixtures/ +spec/fixtures/manifests/ +spec/fixtures/modules/ .vagrant/ .bundle/ coverage/ diff --git a/.msync.yml b/.msync.yml index 0ac5eef..42eea23 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '0.12.0' +modulesync_config_version: '0.12.8' diff --git a/.rubocop.yml b/.rubocop.yml index 5aadd1b..d6a3948 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,6 +4,7 @@ AllCops: Include: - ./**/*.rb Exclude: + - files/**/* - vendor/**/* - .vendor/**/* - pkg/**/* @@ -492,7 +493,7 @@ Lint/UselessAssignment: Enabled: True Style/ClosingParenthesisIndentation: - Enabled: False + Enabled: True # RSpec diff --git a/.travis.yml b/.travis.yml index 9e7c9a7..f51b3ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,26 +19,28 @@ matrix: 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 + - rvm: 2.1.9 env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test - - rvm: 2.1 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test - - rvm: 2.2 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test + - rvm: 2.1.9 + env: PUPPET_VERSION="~> 4.0" CHECK=test + - rvm: 2.2.5 + env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.3.1 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build + env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes - rvm: 2.3.1 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop + env: PUPPET_VERSION="~> 4.0" CHECK=rubocop - rvm: 2.3.1 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.4.0-preview1 - env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test allow_failures: - rvm: 2.4.0-preview1 notifications: email: false deploy: provider: puppetforge + deploy: + branch: ha-bug-puppet-forge user: puppet password: secure: "PzzvPB326Yx0hheLbusZGYCGW4i1jOOMjwJMC/7QpbN4+gvMdmHpmQP3XeQ5tm+YYXqLPMyr1he1viTln8GPqLk1qpzF55H5mTakPxMjWZfRYvM+Q7lmtOEsBEXXSJk0ZYwMHXGVd8ouDrhaRzS2JqnhCAhLat0HeLcERWZx6Ok=" @@ -46,5 +48,5 @@ deploy: tags: true # all_branches is required to use tags all_branches: true - # Only publish if our main Ruby target builds - rvm: 2.3.1 + # Only publish the build marked with "DEPLOY_TO_FORGE" + condition: "$DEPLOY_TO_FORGE = yes" diff --git a/Gemfile b/Gemfile index ddbd23d..8613079 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ def location_for(place, fake_version = nil) end group :test do - gem 'puppetlabs_spec_helper', :require => false + gem 'puppetlabs_spec_helper', '~> 1.2.2', :require => false gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-utils', :require => false @@ -25,7 +25,7 @@ group :test do gem 'metadata-json-lint', :require => false gem 'puppet-blacksmith', :require => false gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git' - gem 'puppet-strings', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git' + gem 'puppet-strings', '0.4.0', :require => false gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0' gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' end diff --git a/Rakefile b/Rakefile index 9cbcf7c..5191307 100644 --- a/Rakefile +++ b/Rakefile @@ -34,11 +34,9 @@ RSpec::Core::RakeTask.new(:acceptance) do |t| t.pattern = 'spec/acceptance' end -desc 'Run tests metadata_lint, lint, syntax, spec' +desc 'Run tests metadata_lint, release_checks' task test: [ :metadata_lint, - :lint, - :syntax, - :spec, + :release_checks, ] # vim: syntax=ruby -- cgit v1.2.3 From 69494914dc654778c36677b6f57412682378d7e1 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Oct 2016 10:09:32 +0200 Subject: rubocop: fix Style/ClosingParenthesisIndentation --- spec/classes/unattended_upgrades_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb index d927a55..ea88fad 100644 --- a/spec/classes/unattended_upgrades_spec.rb +++ b/spec/classes/unattended_upgrades_spec.rb @@ -480,14 +480,14 @@ describe 'unattended_upgrades' do should contain_apt__conf('unattended-upgrades').with( require: 'Package[unattended-upgrades]', notify_update: true - ) + ) end it do should contain_apt__conf('periodic').with( require: 'Package[unattended-upgrades]', notify_update: true - ) + ) end it do -- cgit v1.2.3 From 1af98e12e41532c7f9d325dd867e7f2b830abb82 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Oct 2016 10:12:23 +0200 Subject: remove trailing whitespace --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fd3f3e..5e95730 100644 --- a/README.md +++ b/README.md @@ -110,8 +110,8 @@ Using unattended\_upgrades simply consists of including the module and if needed ``` * `verbose` (`0`): Send report mail to root. * `options` (`{}`): A hash of settings with these possible keys: - * `force_confdef` (`true`) : Use the default option for new config files if one - is available, don't prompt. If no default can be found, you will be prompted + * `force_confdef` (`true`) : Use the default option for new config files if one + is available, don't prompt. If no default can be found, you will be prompted unless one of the confold or confnew options is also given * `force_confold` (`true`): Always use the old config files, don't prompt * `force_connew` (`false`): Always use the new config files, don't prompt -- cgit v1.2.3 From b294082b63a5f19fda1cb10300b446eaffe9b9e6 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Oct 2016 10:18:43 +0200 Subject: release 2.1.0 --- CHANGELOG.md | 41 +++++++++++++++++++++++++++++++---------- metadata.json | 4 ++-- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a0f2a9..fb6ec87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,24 +3,36 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased][unreleased] +## 2016-10-05 - Release 2.1.0 + +- Modulesync with latest Vox Pupuli defaults +- Add support for Linux Mint +- Improve parameter validation and testing +- Add support for Ubuntu 16.04 and 16.10 +- Ubuntu: Issue EOL warning for unsupported release + + +## 2016-05-26 - Release 2.0.0 -## Release 2.0.0 - 2016-05-26 - Drop Ruby1.8 Support -- Modulesync to latest voxpupuli defaults +- Modulesync to latest Vox Pupuli defaults - Improve spec tests - Update documentation - Add parameter to control reboot time - Update default parameters for legacy_origin option - Add options support -## Release 1.1.1 - 2016-01-11 + +## 2016-01-11 - Release 1.1.1 ### Changed + - CHANGELOG: Fixed comparison URL's for the releases - CHANGELOG: Fixed changed header for 1.1.1 - Fix a facts lookup issue that caused us to break on Ubuntu -## Release 1.1.0 - 2016-01-08 + +## 2016-01-08 - Release 1.1.0 + ### Added - Support Raspbian - Support for Debian Jessie and Ubuntu Wiley @@ -37,27 +49,36 @@ This project adheres to [Semantic Versioning](http://semver.org/). - integrate in modulesync -## [1.0.3] - 2015-04-23 +## 2015-04-23 - Release 1.0.3 + ### Changed - Tested on Puppet 4. - Remove inclusion of `apt` class. -## [1.0.2] - 2015-04-22 + +## 2015-04-22 - Release 1.0.2 + ### Changed - Resolve some Travis related packaging issues. -## [1.0.1] - 2015-04-22 + +## 2015-04-22 - Release 1.0.1 + ### Changed - Resolve some Travis related packaging issues. -## 1.0.0 - 2015-04-22 + +## 2015-04-22 - Release 1.0.0 + ### Added - Full configuration of unattended-upgrades and all possible options for `APT::Periodic`. - Test suite covering the current behaviour. - README with full documentation. - Boilerplate such as Gemfile, Travis configuration, LICENSE and so on. -[unreleased]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/HEAD...1.1.1 +[unreleased]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/HEAD...2.1.0 +[2.1.0]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/2.1.0...2.0.0 +[2.0.0]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/2.0.0...1.1.1 [1.1.1]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/1.1.1...1.1.0 [1.1.0]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/1.1.0...1.0.2 [1.0.3]: https://github.com/voxpupuli/puppet-unattended_upgrades/compare/1.0.2...1.0.3 diff --git a/metadata.json b/metadata.json index 95ab82e..e9d65f3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,7 +1,7 @@ { "name": "puppet-unattended_upgrades", - "version": "2.0.1-rc0", - "author": "voxpupuli", + "version": "2.1.0", + "author": "Vox Pupuli", "summary": "Provides an interface for managing Apt unattended_upgrades with Puppet", "license": "Apache-2.0", "source": "https://github.com/voxpupuli/puppet-unattended_upgrades.git", -- cgit v1.2.3