diff --git a/.sync.yml b/.sync.yml index d62eb5f..1492961 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,46 +1,49 @@ --- Gemfile: required: ':system_tests': - gem: 'puppet-module-posix-system-r#{minor_version}' platforms: ruby - gem: 'puppet-module-win-system-r#{minor_version}' platforms: - mswin - mingw - x64_mingw - gem: beaker version: '~> 3.34' from_env: BEAKER_VERSION - gem: beaker-abs from_env: BEAKER_ABS_VERSION version: '~> 0.5' - gem: beaker-pe - gem: beaker-hostgenerator from_env: BEAKER_HOSTGENERATOR_VERSION - gem: beaker-rspec from_env: BEAKER_RSPEC_VERSION - gem: beaker-puppet from_env: BEAKER_PUPPET_VERSION version: '~> 0.15' ':development': - gem: puppet-strings optional: ':development': - gem: 'github_changelog_generator' git: 'https://github.com/skywinder/github-changelog-generator' ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" spec/spec_helper.rb: mock_with: ':rspec' .rubocop.yml: default_configs: RSpec/InstanceVariable: Enabled: false .gitignore: required: - '.rspec' - 'appveyor.yml' + +Rakefile: + changelog_version_tag_pattern: '%s' diff --git a/CHANGELOG.md b/CHANGELOG.md index 580d3ea..9cba87d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,33 +1,42 @@ # Change log All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). +## [1.0.3](https://github.com/puppetlabs/puppetlabs-zfs_core/tree/1.0.3) (2019-10-31) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-zfs_core/compare/1.0.2...1.0.3) + +### Added + +- \(MODULES-8823\) Add support for overlay option in zfs on Linux [\#22](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/22) ([GabrielNagy](https://github.com/GabrielNagy)) +- Use "zpool status -P" instead of "zpool status" [\#14](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/14) ([bluthg](https://github.com/bluthg)) + ## [1.0.2](https://github.com/puppetlabs/puppetlabs-zfs_core/tree/1.0.2) (2019-02-12) [Full Changelog](https://github.com/puppetlabs/puppetlabs-zfs_core/compare/1.0.1...1.0.2) ### Added - Add anchors for l10n [\#10](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/10) ([joshcooper](https://github.com/joshcooper)) - Expand test coverage [\#8](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/8) ([joshcooper](https://github.com/joshcooper)) - \(L10n\) Delivering translations for POT and README files [\#7](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/7) ([ehom](https://github.com/ehom)) ### Fixed - \(L10n\) Updating translations for readmes/README\_ja\_JP.md [\#11](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/11) ([ehom](https://github.com/ehom)) ## [1.0.1](https://github.com/puppetlabs/puppetlabs-zfs_core/tree/1.0.1) (2018-08-20) [Full Changelog](https://github.com/puppetlabs/puppetlabs-zfs_core/compare/1.0.0...1.0.1) ### Added - Install module on all hosts, not just those with default role [\#4](https://github.com/puppetlabs/puppetlabs-zfs_core/pull/4) ([joshcooper](https://github.com/joshcooper)) ## [1.0.0](https://github.com/puppetlabs/puppetlabs-zfs_core/tree/1.0.0) (2018-05-22) [Full Changelog](https://github.com/puppetlabs/puppetlabs-zfs_core/compare/576d12b67e6d531b15315329d7a98f4c3549e2dc...1.0.0) \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/Rakefile b/Rakefile index 395df54..e1d5f7b 100644 --- a/Rakefile +++ b/Rakefile @@ -1,86 +1,86 @@ require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any? require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any? def changelog_user return unless Rake.application.top_level_tasks.include? "changelog" returnVal = nil || JSON.load(File.read('metadata.json'))['author'] raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? puts "GitHubChangelogGenerator user:#{returnVal}" returnVal end def changelog_project return unless Rake.application.top_level_tasks.include? "changelog" returnVal = nil returnVal ||= begin metadata_source = JSON.load(File.read('metadata.json'))['source'] metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z}) metadata_source_match && metadata_source_match[1] end raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil? puts "GitHubChangelogGenerator project:#{returnVal}" returnVal end def changelog_future_release return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version'] + returnVal = "%s" % JSON.load(File.read('metadata.json'))['version'] raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? puts "GitHubChangelogGenerator future_release:#{returnVal}" returnVal end PuppetLint.configuration.send('disable_relative') if Bundler.rubygems.find_name('github_changelog_generator').any? GitHubChangelogGenerator::RakeTask.new :changelog do |config| raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? config.user = "#{changelog_user}" config.project = "#{changelog_project}" config.future_release = "#{changelog_future_release}" config.exclude_labels = ['maintenance'] config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." config.add_pr_wo_labels = true config.issues = false config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" config.configure_sections = { "Changed" => { "prefix" => "### Changed", "labels" => ["backwards-incompatible"], }, "Added" => { "prefix" => "### Added", "labels" => ["feature", "enhancement"], }, "Fixed" => { "prefix" => "### Fixed", "labels" => ["bugfix"], }, } end else desc 'Generate a Changelog from GitHub' task :changelog do raise <= Gem::Version.new('2.2.2')" EOM end end diff --git a/metadata.json b/metadata.json index dd65c6a..de3d00f 100644 --- a/metadata.json +++ b/metadata.json @@ -1,66 +1,66 @@ { "name": "puppetlabs-zfs_core", - "version": "1.0.2", + "version": "1.0.3", "author": "puppetlabs", "summary": "Manage zfs. Create destroy and set properties on zfs instances.", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-zfs_core", "project_page": "https://github.com/puppetlabs/puppetlabs-zfs_core", "issues_url": "https://tickets.puppetlabs.com/projects/MODULES", "dependencies": [ ], "operatingsystem_support": [ { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "7" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "7" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "8" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "16.04" ] }, { "operatingsystem": "Solaris", "operatingsystemrelease": [ "11" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 6.0.0 < 7.0.0" } ], "pdk-version": "1.14.0", "template-url": "https://github.com/puppetlabs/pdk-templates#1.14.0", "template-ref": "1.14.0-0-g1bf3a4e" }