Prepping release. (#24)

CHANGELOG.md

@@ -1,34 +1,35 @@
-# Changelog
+# Change log
 
-All notable changes to this project will be documented in this file.
-This project follows semver to help clients understand the impact of updates/changes.  Find out more at http://semver.org.
+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).
 
-## [v1.1.0](https://github.com/TraGicCode/tragiccode-wsusserver/tree/v1.1.0) (2018-03-18)
-[Full Changelog](https://github.com/TraGicCode/tragiccode-wsusserver/compare/v1.0.0...v1.1.0)
+## [1.1.1](https://github.com/tragiccode/tragiccode-wsusserver/tree/1.1.1) (2018-09-18)
 
-**Closed issues:**
+[Full Changelog](https://github.com/tragiccode/tragiccode-wsusserver/compare/v1.1.0...1.1.1)
 
-- Ability to configure email notifications [\#8](https://github.com/TraGicCode/tragiccode-wsusserver/issues/8)
-- Add puppet forge badge to README.md [\#5](https://github.com/TraGicCode/tragiccode-wsusserver/issues/5)
+### Fixed
 
-**Merged pull requests:**
+- \(bug\) Uncomment WSUS initial synchronization exec [\#22](https://github.com/TraGicCode/tragiccode-wsusserver/pull/22) ([TraGicCode](https://github.com/TraGicCode))
 
-- PR Template: Added PR Template [\#12](https://github.com/TraGicCode/tragiccode-wsusserver/pull/12) ([TraGicCode](https://github.com/TraGicCode))
-- Feature/configure email notifications [\#10](https://github.com/TraGicCode/tragiccode-wsusserver/pull/10) ([jblance](https://github.com/jblance))
-- Added shields.io puppetforge badge. [\#6](https://github.com/TraGicCode/tragiccode-wsusserver/pull/6) ([TraGicCode](https://github.com/TraGicCode))
+## [v1.1.0](https://github.com/tragiccode/tragiccode-wsusserver/tree/v1.1.0) (2018-03-18)
+
+[Full Changelog](https://github.com/tragiccode/tragiccode-wsusserver/compare/v1.0.0...v1.1.0)
+
+### Added
 
-## [v1.0.0](https://github.com/TraGicCode/tragiccode-wsusserver/tree/v1.0.0) (2018-01-08)
-[Full Changelog](https://github.com/TraGicCode/tragiccode-wsusserver/compare/v0.1.0...v1.0.0)
+- Feature/configure email notifications [\#10](https://github.com/TraGicCode/tragiccode-wsusserver/pull/10) ([jblance](https://github.com/jblance))
 
-**Closed issues:**
+## [v1.0.0](https://github.com/tragiccode/tragiccode-wsusserver/tree/v1.0.0) (2018-01-08)
 
-- Replace wsusserver::computertargetgroup with type and provider [\#3](https://github.com/TraGicCode/tragiccode-wsusserver/issues/3)
+[Full Changelog](https://github.com/tragiccode/tragiccode-wsusserver/compare/v0.1.0...v1.0.0)
 
-**Merged pull requests:**
+### Added
 
 - Convert wsusserver computer target group to custom type. [\#4](https://github.com/TraGicCode/tragiccode-wsusserver/pull/4) ([TraGicCode](https://github.com/TraGicCode))
 
-## [v0.1.0](https://github.com/TraGicCode/tragiccode-wsusserver/tree/v0.1.0) (2017-12-07)
+## [v0.1.0](https://github.com/tragiccode/tragiccode-wsusserver/tree/v0.1.0) (2017-12-07)
+
+[Full Changelog](https://github.com/tragiccode/tragiccode-wsusserver/compare/ab1b674fc38149f30984677d0ce4e635861f0e62...v0.1.0)
+
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -8,7 +8,7 @@ gem 'puppet-lint', '>= 1.0.0'
 gem 'puppet-strings'
 gem 'puppetlabs_spec_helper', '>= 1.0.0'
 gem 'rspec-puppet'
-gem 'github_changelog_generator'
+gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 gem 'puppet-blacksmith'
 
 gem 'beaker'

Rakefile

@@ -3,9 +3,32 @@ require 'puppet-lint/tasks/puppet-lint'
 require 'metadata-json-lint/rake_task'
 require 'puppet-strings/tasks'
 require "guard/rake_task"
-require 'github_changelog_generator/task'
+require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet_blacksmith/rake_tasks'
 
+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
 
 
 Guard::RakeTask.new(:guard)
@@ -34,10 +57,46 @@ task :test do
   end
 end
 
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
-  metadata = JSON.load(File.read(metadata_json))
-  config.future_release = "v#{metadata['version']}" if metadata['version'] =~ /^\d+\.\d+.\d+$/
-  config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nThis project follows semver to help clients understand the impact of updates/changes.  Find out more at http://semver.org."
-  config.project = metadata['name']
+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

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "tragiccode-wsusserver",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "tragiccode",
   "summary": "The wsusserver module installs and manages the windows update services on Windows systems.",
   "license": "Apache-2.0",