Merge pull request #266 from echocat/develop

`backmerge for release 6.0.1

.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

.travis.yml

@@ -1,24 +1,22 @@
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+before_install: rm Gemfile.lock || true
+script: bundle exec rake validate lint spec 
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.6.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION='~> 4.0' COVERAGE=yes STRICT_VARIABLES=yes
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#stable
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION='~> 3.0' FUTURE_PARSER=yes
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION='~> 3.0'
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION='~> 3.0'
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2016-04-01 - 6.0.1 (Bugfix release)
+
+#### Features:
+
+- Add alot more unit tests
+- Add code coverage analysis
+
+#### Bugfixes:
+
+- Fix/remove parameter interpolation for `gr_base_dir`. It set correct now.
+- Fix some hardcoded paths in templates, like logrotate or init scripts
+- Fix location of local_settings.py in some cases
+
 ## 2016-03-30 - 6.0.0 (Major release)
 
 #### Features:

Gemfile

@@ -1,11 +1,28 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? "#{ENV['PUPPET_GEM_VERSION']}" : ['>= 3.3']
-facterversion = ENV.key?('FACTER_GEM_VERSION') ? "#{ENV['FACTER_GEM_VERSION']}" : ['>= 1.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint', '>= 0.3.2'
-gem 'facter', facterversion
-gem 'rspec', '< 3.2.0'
-# rubi <1.9 versus rake 11.0.0 workaround
-gem 'rake', '< 11.0.0'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+def location_for(place, version = nil)
+  if place =~ /^((?:git|https?)[:@][^#]*)#(.*)/
+    [version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, version, { :require => false }].compact
+  end
+end
+
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'] || '~> 4')
+gem 'facter', '>= 2.0'
+gem 'puppetlabs_spec_helper', '>= 0.1.0', :require => false
+gem 'puppet-lint', '>= 0.3.2',            :require => false
+gem 'rspec-puppet', '>= 2.3.2',           :require => false
+gem 'metadata-json-lint',                 :require => false
+gem 'rake', '< 11.0.0' # rubi <1.9 versus rake 11.0.0 workaround
+
+if ENV['COVERAGE'] == 'yes'
+  gem 'simplecov', :require => false
+  gem 'coveralls', :require => false
+end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end