Merge pull request #326 from echocat/develop

backmerge for release 7.0.0

.fixtures.yml

@@ -1,5 +1,5 @@
 fixtures:
   repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
   symlinks:
-    graphite: "#{source_dir}"
+    graphite: "#{source_dir}"

.gitattributes

@@ -0,0 +1,6 @@
+* text=auto
+
+# Templates need to always use *nix-style line endings, as they can sometimes
+# be copied from a Windows machine to a *nix machine and used there (such as
+# when running Beaker tests on a Windows host).
+templates/** eol=lf

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2017-03-17 - 7.0.0 (Major release)
+
+#### Features:
+
+- Add support for Ubuntu Xenial (see compatibility part of README)
+- Add the ability to specify an alternative python binary
+- Allow setting service provider by parameter
+- Make logrotation optional
+- Autodetect additional whisper dirs
+- Optimizations for Amazon Linux
+- Add parameter gr_carbon_log_rotate
+
+#### Bugfixes:
+
+- Some smaller fixes
+
 ## 2016-05-31 - 6.0.4 (Bugfix release)
 
 #### Bugfixes:

Gemfile

@@ -10,15 +10,32 @@ def location_for(place, version = nil)
   end
 end
 
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'] || '~> 4')
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'] || '~> 2')
 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 'rspec-puppet-facts',                 :require => false
 gem 'metadata-json-lint',                 :require => false
-gem 'rake', '< 11.0.0' # rubi <1.9 versus rake 11.0.0 workaround
+# rubi <1.9 versus rake 11.0.0 workaround
+gem 'rake', '< 11.0.0',                   :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+gem 'json', '< 2.0.0',                    :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
 
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+
+# Only explicitly specify Facter/Hiera if a version has been specified.
+# Otherwise it can lead to strange bundler behavior. If you are seeing weird
+# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
+# to `1` and then run bundle install.
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
+gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
+
+
+# Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
+
+# Evaluate ~/.gemfile if it exists
+if File.exists?(File.join(Dir.home, '.gemfile'))
+  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+end