Merge pull request #6 from puppetlabs/release

Release

7 files changed, 72 insertions, 31 deletions

diff --git a/.sync.yml b/.sync.yml
new file mode 100644
index 0000000..00a3fb4
--- /dev/null
+++ b/.sync.yml
@@ -0,0 +1,31 @@
+---
+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.13'
+        from_env: BEAKER_VERSION
+      - gem: beaker-abs
+        from_env: BEAKER_ABS_VERSION
+        version: '~> 0.1'
+      - gem: beaker-pe
+      - gem: beaker-hostgenerator
+        from_env: BEAKER_HOSTGENERATOR_VERSION
+      - gem: beaker-rspec
+        from_env: BEAKER_RSPEC_VERSION
+    ':development':
+      - gem: puppet-blacksmith
+        version: '~> 3.4'
+      - gem: puppet-strings
+
+Rakefile:
+  requires:
+    - puppet_blacksmith/rake_tasks
+    - puppet-lint/tasks/puppet-lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c44928f..33e085f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,26 @@
 # Changelog
 
-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).
+All notable changes to this project will be documented in this file.
 
-## Release 1.0.0
+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.2] - 2018-04-30
+### Added
+- Gem dependency on puppet-blacksmith, which is required to ship to the module
+  to forge.puppet.com
+### Changed
+- The Gemfile and spec/spec_helper.rb are managed by pdk. Any additional content
+  for these files should be defined in .syn.yml and spec/spec_helper_local.rb
+  respectively
+
+## [1.0.1] - 2018-04-30
+### Summary
+This is an empty release to test the release pipeline
+
+## [1.0.0] - 2018-04-27
 ### Summary
 This is the initial release of the extracted mailalias module
 
-<!--- We need to be sure to add the change set links for future releases. --->
-<!--- This is irrevelant for this first release because this is the very --->
-<!--- first tag, which is why this is commented out. --->
-<!--- [1.0.0]: https://github.com/puppetlabs/puppetlabs-mailalias_core/compare/1.0.0...1.0.0--->
+[1.0.2]: https://github.com/puppetlabs/puppetlabs-mailalias_core/compare/1.0.1...1.0.2
+[1.0.1]: https://github.com/puppetlabs/puppetlabs-mailalias_core/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/puppetlabs/puppetlabs-mailalias_core/releases/tag/1.0.0
diff --git a/Gemfile b/Gemfile
index 48e74c4..bb4eff8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,23 +32,19 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-
-  # Puppet Strings for documentation purposes
-  gem 'puppet-strings'
-  gem 'rake'
+  gem "puppet-blacksmith", '~> 3.4',                   require: false
+  gem "puppet-strings",                                require: false
 end
-
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13')
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
-  gem "beaker-pe", require: false
+  gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
 end
 
-
 puppet_version = ENV['PUPPET_GEM_VERSION']
 puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 81381e0..a39cae2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1,4 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
+require 'puppet_blacksmith/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
diff --git a/metadata.json b/metadata.json
index ff3a6bd..409ae01 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mailalias_core",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "Puppet Labs",
   "summary": "Creates an email alias in the local alias database.",
   "license": "Apache-2.0",
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9885e2d..efd225b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,17 +28,3 @@ end
 RSpec.configure do |c|
   c.default_facts = default_facts
 end
-
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# So everyone else doesn't have to include this base constant.
-module PuppetSpec
-  FIXTURE_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'fixtures') unless defined?(FIXTURE_DIR)
-end
-
-require 'puppet_spec/files'
-
-Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
-  require behaviour.relative_path_from(Pathname.new(dir))
-end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
new file mode 100644
index 0000000..0fcc231
--- /dev/null
+++ b/spec/spec_helper_local.rb
@@ -0,0 +1,13 @@
+dir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.join(dir, 'lib')
+
+# So everyone else doesn't have to include this base constant.
+module PuppetSpec
+  FIXTURE_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'fixtures') unless defined?(FIXTURE_DIR)
+end
+
+require 'puppet_spec/files'
+
+Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
+  require behaviour.relative_path_from(Pathname.new(dir))
+end