Merge pull request #310 from puppetlabs/modulesync_updates

Modulesync updates

.gitignore

@@ -7,4 +7,3 @@ spec/fixtures/
 coverage/
 .idea/
 *.iml
-*.swp

.travis.yml

@@ -1,4 +1,5 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"

Gemfile

@@ -11,39 +11,37 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'rake',                    :require => false
-  gem 'rspec-core', '~> 3.1.7',  :require => false
+  gem 'rspec-core', '3.1.7',     :require => false
   gem 'rspec-puppet', '~> 2.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
   gem 'pry'
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  if beaker_version
+  if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
-  if beaker_rspec_version
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
 end
 
+
+
 if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', *location_for(facterversion)
+  gem 'facter', facterversion, :require => false
 else
   gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', *location_for(puppetversion)
+  gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end

Rakefile

@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')

manifests/init.pp

@@ -106,7 +106,7 @@
     }
 
     if $_append_header {
-      concat_fragment { "#{$name}_header":
+      concat_fragment { "${name}_header":
         tag     => $safe_name,
         content => $warn_message,
         order   => '0',