Changelog generation

2 files changed, 9 insertions, 7 deletions

diff --git a/Gemfile b/Gemfile
index fcbbb0f..9582ffc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,8 @@ group :development, :unit_tests do
   gem 'puppet-lint-file_source_rights-check',              :require => false
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
-  gem 'github_changelog_generator',                        :require => false
+  gem 'github_changelog_generator',                        :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches'
+  gem 'puppet-blacksmith',                                 :require => false
 end
 
 group :system_tests do
diff --git a/Rakefile b/Rakefile
index 2f894e1..30b3fc0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,8 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'github_changelog_generator/task'
+require 'puppet_blacksmith'
+require 'puppet_blacksmith/rake_tasks'
 
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
@@ -10,10 +13,8 @@ end
 
 PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 
-task :changelog do
-  sh 'github_changelog_generator'
-  if File.file? 'CHANGELOG.base.md'
-    sh 'cat CHANGELOG.md CHANGELOG.base.md > CHANGELOG.new.md'
-    sh 'mv CHANGELOG.new.md CHANGELOG.md'
-  end
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  m = Blacksmith::Modulefile.new
+  config.future_release = m.version
+  config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
 end