From 2a9a17922ed871e7c636044a03e2cda399d97875 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 18 Dec 2017 20:20:14 +0100
Subject: [PATCH] Update release steps

---
 lib/voxpupuli/release/rake_tasks.rb | 32 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/voxpupuli/release/rake_tasks.rb b/lib/voxpupuli/release/rake_tasks.rb
index a0de02f..d8453d3 100644
--- a/lib/voxpupuli/release/rake_tasks.rb
+++ b/lib/voxpupuli/release/rake_tasks.rb
@@ -23,37 +23,35 @@
 end
 
 desc 'release new version through Travis-ci'
-task "travis_release" do
+task "travis_release" => [:check_version, :check_changelog, 'module:clean'] do
 
   require 'puppet_blacksmith/rake_tasks'
   Blacksmith::RakeTask.new do |t|
-    t.build = false # do not build the module nor push it to the Forge
-    # just do the tagging [:clean, :tag, :bump_commit]
+    t.tag_message_pattern = "Version %s" # Use annotated commits
   end
 
-  m = Blacksmith::Modulefile.new
-  v = m.version
-  raise "Refusing to release an RC or build-release (#{v}).\n" +
-        "Please set a semver *release* version." unless v =~ /^\d+\.\d+.\d+$/
-
-  Rake::Task[:check_changelog].invoke
-  # do a "manual" module:release (clean, tag, bump, commit, push tags)
-  Rake::Task["module:clean"].invoke
-
   # idempotently create tags
+  m = Blacksmith::Modulefile.new
   g = Blacksmith::Git.new
-  Rake::Task["module:tag"].invoke unless g.has_version_tag?(v)
+  Rake::Task["module:tag"].invoke unless g.has_version_tag?(m.version)
 
-  v_inc = m.increase_version(v)
-  v_new = "#{v_inc}-rc0"
+  # Bump to the next version as rc0
+  v_new = "#{m.increase_version(m.version)}-rc0"
   ENV['BLACKSMITH_FULL_VERSION'] = v_new
-  Rake::Task["module:bump:full"].invoke
+  Rake::Task["module:bump_commit:full"].invoke
 
   # push it out, and let travis do the release:
-  g.commit_modulefile!(v_new)
   g.push!
 end
 
+desc 'Check if the version is a semver release version'
+task :check_version do
+  m = Blacksmith::Modulefile.new
+  v = m.version
+  fail "Refusing to release an RC or build-release (#{v}).\n" +
+       "Please set a semver *release* version." unless v =~ /^\d+\.\d+.\d+$/
+end
+
 desc 'Check Changelog.'
 task :check_changelog do
   v = Blacksmith::Modulefile.new.version