[RELEASE 1.2.0]

.travis.yml

@@ -25,14 +25,11 @@ install:
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
   - eval "$(chef shell-init bash)"
   - openssl aes-256-cbc -K $encrypted_de6880523b74_key -iv $encrypted_de6880523b74_iv -in codenamephp.pem.enc -out codenamephp.pem -d
+  - gem install github_changelog_generator
 
 script:
   - chef exec rake
-
-before_deploy:
-  - git config --local user.name "Travis CI"
-  - git config --local user.email "travis@codename-php.de"
-  - git remote set-url --push origin "https://$GH_TOKEN@github.com/codenamephp/chef.cookbook.gui.git"
+
 deploy:
   - provider: script
     on:

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 
-## [v1.1.1](https://github.com/codenamephp/chef.cookbook.gui/tree/v1.1.1) (2018-06-08)
+## [1.2.0](https://github.com/codenamephp/chef.cookbook.gui/tree/1.2.0) (2018-06-13)
+[Full Changelog](https://github.com/codenamephp/chef.cookbook.gui/compare/v1.1.1...1.2.0)
+
+**Implemented enhancements:**
+
+- Create task to generate changelog [\#12](https://github.com/codenamephp/chef.cookbook.gui/issues/12)
+
+**Fixed bugs:**
+
+- xfce config in /etc/skel is missing folder [\#9](https://github.com/codenamephp/chef.cookbook.gui/issues/9)
+
+## [v1.1.1](https://github.com/codenamephp/chef.cookbook.gui/tree/v1.1.1) (2018-06-07)
 [Full Changelog](https://github.com/codenamephp/chef.cookbook.gui/compare/v1.1.0...v1.1.1)
 
 **Implemented enhancements:**
@@ -11,6 +22,10 @@
 
 - config folder is created with the wrong permissions [\#8](https://github.com/codenamephp/chef.cookbook.gui/issues/8)
 
+**Merged pull requests:**
+
+- Release 1.1.1 [\#10](https://github.com/codenamephp/chef.cookbook.gui/pull/10) ([bastianschwarz](https://github.com/bastianschwarz))
+
 ## [v1.1.0](https://github.com/codenamephp/chef.cookbook.gui/tree/v1.1.0) (2018-06-06)
 [Full Changelog](https://github.com/codenamephp/chef.cookbook.gui/compare/v1.0.0...v1.1.0)
 

Rakefile

@@ -11,7 +11,16 @@ def use_dokken?
   ENV['USE_DOKKEN'] || ci?
 end
 
-task default: %w[style unit integration]
+task default: %w[style unit integration documentation]
+
+namespace :git do
+  desc 'Setting up git for pushing'
+  task :setup do
+    sh 'git config --local user.name "Travis CI"'
+    sh 'git config --local user.email "travis@codename-php.de"'
+    sh 'git remote set-url --push origin "https://' + ENV['GH_TOKEN'] + '@github.com/codenamephp/chef.cookbook.gui.git"'
+  end
+end
 
 namespace :style do
   require 'rubocop/rake_task'
@@ -81,7 +90,21 @@ end
 desc 'Run Test Kitchen integration tests'
 task :integration, %i[regexp action] => ci? || use_dokken? ? %w[integration:dokken] : %w[integration:vagrant]
 
-namespace :release do
+namespace :documentation do
+  desc 'Generate changelog from current commit message'
+  task changelog_commit: ['git:setup'] do
+    match = Regexp.new('\[RELEASE\s([\d\.]+)\]').match(ENV['TRAVIS_COMMIT_MESSAGE'])
+    unless match.nil?
+      sh 'github_changelog_generator --future-release ' + match[1].to_s
+      sh 'git status'
+      sh 'git add CHANGELOG.md && git commit --allow-empty -m"[skip ci] Updated changelog" && git push origin ' + ENV['TRAVIS_BRANCH']
+    end
+  end
+end
+desc 'Run the documentation cycle'
+task documentation: %w[documentation:changelog_commit]
+
+namespace :release ['git:setup'] do
   desc 'Tag and release to supermarket with stove'
   task :stove do
     sh 'chef exec stove --username codenamephp --key ./codenamephp.pem'

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache-2.0'
 description 'Cookbook to install linux guis like cinammon or gnome'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.1.1'
+version '1.2.0'
 chef_version '>= 13.0' if respond_to?(:chef_version)
 issues_url 'https://github.com/codenamephp/chef.cookbook.gui/issues' if respond_to?(:issues_url)
 source_url 'https://github.com/codenamephp/chef.cookbook.gui' if respond_to?(:source_url)

recipes/xfce.rb

@@ -15,7 +15,7 @@
   subscribes :start, 'package[install xfce from package]', :delayed
 end
 
-remote_directory '/etc/skel/xfce4' do
+remote_directory '/etc/skel/.config/xfce4' do
   action :create_if_missing
   source 'xfce4'
   owner 'root'

spec/unit/recipes/xfce_spec.rb

@@ -37,7 +37,7 @@
     end
 
     it 'will copy the config to the /etc/skel diretory for all newly created users' do
-      expect(chef_run).to create_remote_directory_if_missing('/etc/skel/xfce4')
+      expect(chef_run).to create_remote_directory_if_missing('/etc/skel/.config/xfce4')
     end
   end
 

test/smoke/xfce/xfce_test.rb

@@ -18,7 +18,7 @@
     # it { should be_running }
   end
 
-  describe directory('/etc/skel/xfce4') do
+  describe directory('/etc/skel/.config/xfce4') do
     it { should exist }
     it { should be_directory }
   end