diff options
-rw-r--r-- | .rubocop.yml | 4 | ||||
-rw-r--r-- | .sync.yml | 5 | ||||
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | Rakefile | 69 | ||||
-rw-r--r-- | metadata.json | 4 | ||||
-rw-r--r-- | spec/integration/provider/cron/crontab_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/cron/crontab_spec.rb | 1 | ||||
-rw-r--r-- | spec/unit/provider/cron/parsed_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/type/cron_spec.rb | 2 |
9 files changed, 83 insertions, 12 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index faa6470..4b905f3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -66,6 +66,8 @@ Style/TrailingCommaInLiteral: Style/SymbolArray: Description: Using percent style obscures symbolic intent of array's contents. EnforcedStyle: brackets +RSpec/NamedSubject: + Enabled: false RSpec/MessageSpies: EnforcedStyle: receive Style/Documentation: @@ -82,6 +84,8 @@ Style/StringMethods: Enabled: true Layout/EndOfLine: Enabled: false +Layout/IndentHeredoc: + Enabled: false Metrics/AbcSize: Enabled: false Metrics/BlockLength: diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 0000000..ccea66d --- /dev/null +++ b/.sync.yml @@ -0,0 +1,5 @@ +--- +.rubocop.yml: + default_configs: + RSpec/NamedSubject: + Enabled: false diff --git a/.travis.yml b/.travis.yml index 81f77dd..5ef0f6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - - 2.4.1 + - 2.4.4 env: global: - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0" @@ -29,8 +29,8 @@ matrix: rvm: 2.1.9 branches: only: - - master - - /^v\d/ + - master + - /^v\d/ notifications: email: false deploy: @@ -1,6 +1,75 @@ 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? + +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 || JSON.load(File.read('metadata.json'))['name'] + raise "unable to find the changelog_project in .sync.yml or the name 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 = 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 <<EOM +The changelog tasks depends on unreleased features of the github_changelog_generator gem. +Please manually add it to your .sync.yml for now, and run `pdk update`: +--- +Gemfile: + 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')" +EOM + end +end + diff --git a/metadata.json b/metadata.json index 4f88bfb..ca4d9c7 100644 --- a/metadata.json +++ b/metadata.json @@ -77,6 +77,6 @@ } ], "pdk-version": "1.6.0", - "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", - "template-ref": "1.6.0-0-gf5564c0" + "template-url": "https://github.com/puppetlabs/pdk-templates.git", + "template-ref": "heads/master-0-g0657063" } diff --git a/spec/integration/provider/cron/crontab_spec.rb b/spec/integration/provider/cron/crontab_spec.rb index a4b57a2..0148d0c 100644 --- a/spec/integration/provider/cron/crontab_spec.rb +++ b/spec/integration/provider/cron/crontab_spec.rb @@ -1,5 +1,3 @@ -#!/usr/bin/env ruby - require 'spec_helper' require 'puppet/file_bucket/dipper' require 'puppet_spec/compiler' diff --git a/spec/unit/provider/cron/crontab_spec.rb b/spec/unit/provider/cron/crontab_spec.rb index 92924ae..f4782cc 100644 --- a/spec/unit/provider/cron/crontab_spec.rb +++ b/spec/unit/provider/cron/crontab_spec.rb @@ -1,4 +1,3 @@ -#! /usr/bin/env ruby require 'spec_helper' describe Puppet::Type.type(:cron).provider(:crontab) do diff --git a/spec/unit/provider/cron/parsed_spec.rb b/spec/unit/provider/cron/parsed_spec.rb index 6d5b752..8d6e282 100644 --- a/spec/unit/provider/cron/parsed_spec.rb +++ b/spec/unit/provider/cron/parsed_spec.rb @@ -1,5 +1,3 @@ -#!/usr/bin/env ruby - require 'spec_helper' describe Puppet::Type.type(:cron).provider(:crontab) do diff --git a/spec/unit/type/cron_spec.rb b/spec/unit/type/cron_spec.rb index 80970d0..e80ccb9 100644 --- a/spec/unit/type/cron_spec.rb +++ b/spec/unit/type/cron_spec.rb @@ -1,5 +1,3 @@ -#! /usr/bin/env ruby - require 'spec_helper' describe Puppet::Type.type(:cron), unless: Puppet.features.microsoft_windows? do |