Update concat to c307bee3933d88e6028274b0fa122a9b0c87b1d4

c307bee3933d88e6028274b0fa122a9b0c87b1d4 Merge pull request #366 from thrnio/fix_spec_vagrant
8484bc5072142c9f0cc5a90918e6e43efe4dedf0 Merge pull request #367 from thrnio/allow_integer_owner
a6ebae9857e40e31179659401a64d81d57eac8d9 Allow integer UID/GID for $owner/$group
5efd30a0e193e1b95c3077c9610886df70735769 (MODULES-2572) Fix acceptance test vagrant URLs
fd4f1e2d46a86f1659da420f4ce042882d38e021 Merge pull request #361 from jhoblitt/feature/selinux
60051ae55d1d398f0439ae91e9fdaf0d944789b4 add log/ to .gitignore
ff1e65a901381349e3ed37591605e8baac24be21 (MODULES-2303) add selinux related params to concat type
e250a262a5d8adf01640706d33ef6c8ffcd6a89c Merge pull request #364 from bmjen/fix-frag-backup
ca58571ab2fd3619a9ae516987689d051b3814ff (MODULES-1700) Re-factored original fix, to not default to backing up fragments.
370e38aafe9aa155920a54179edc7384b6621570 Merge pull request #363 from jhoblitt/fix-broken-backup
b6f1ac1d359fdf3e1fe95d411a430c71cb449eb1 (MODULES-1700) remove all reliance on resource defaults
fede2461c1cf82267ba65b7f40b60b9d3e4d5ca1 Never backup fragments, no matter what $backup for concat resource is used
65a7cf29041265ee8bf35edef216cf160189cd9a Merge pull request #360
ac28069b1392938f7ced0f0ff34497bc2b75e716 Merge pull request #358 from buzzdeee/master
d5c305c2bf03912987fe7eba0da31dccadb65805 Recent OpenBSD changed to ruby22 as default interpreter, that now is also used by Puppet, so adapt to that.
b957bb9 Merge pull request #357 from mhaskel/revert-sol12
05426bb Revert "Add support for Solaris 12"
fb022ee Merge pull request #355 from mhaskel/1.2.4-prep
db914f1 1.2.4 prep
89fceb4 Merge pull request #354 from bmjen/merge-master
d336ea0 Merge pull request #352 from mhaskel/pe_next_fixes
c129edf Use AIO ruby if available
c47e72c Merge pull request #351 from hunner/mergeback
afe258a Merge remote-tracking branch 'puppetlabs/1.2.x'
848554e Merge pull request #350 from mhaskel/pe_next_fixes
408633f Missed a typo
e936813 Merge pull request #348 from gwollman/bug/master/FreeBSD-ruby-interpreter
2f82480 Merge pull request #349 from mhaskel/pe_next_fixes
a72be83 Use the correct vardir in the tests
839de04 (#2208) FreeBSD: call /usr/local/bin/ruby explicitly
adb17a4 Merge pull request #344 from drewfisher314/ticket/2135-add-solaris-12
47359c3 Merge pull request #347 from mhaskel/aio_fix
967880f check for nil
b36f071 Merge pull request #346 from mhaskel/aio_fix
f654561 Default test vardir to the aio paths for *nix systems
8618076 Merge pull request #345 from mhaskel/aio_helper
7473415 Add helper to install puppet/pe/puppet-agent
588757d Merge pull request #343 from raphink/fix/is_pe_master
5bc2d58 Add support for Solaris 12
17b836b Compare $::is_pe as bool, not string
35958b3 Merge pull request #339 from hunner/add_helper
130a334 Merge pull request #340 from bmjen/╯°□°╯︵┻━┻
52cb97c Update CHANGELOG with yanked 2.x releases
6ad7f74 Update spec tests for rspec-puppet 2.0
e71af81 (╯°□°)╯︵┻━┻ the 2.0.x rewrite
9dd00aa Add helper to install puppet/pe/puppet-agent
b84f710 Merge pull request #335 from justinstoller/maint/master/set-puppet-version
d39884e (maint) allow setting PUPPET_VERSION in acceptance
171a304 Merge pull request #334 from bmjen/fix-windows
0ea02e4 fixes special characters test to support windows file restrictions
375de4a Merge pull request #333 from puppetlabs/travisci_update
2059f81 Updated travisci file to do testing for Puppet 4
4c13cb0 Merge pull request #332 from bmjen/bug/safe-name-on-windows
4a78188 (MODULES-2094) Extend regexp to remove parenthesis on safe names
724dcaa Merge pull request #330 from duritong/fix_autorequire
09a380c (MODULES-2023) - autorequire the file we are generating
8d7d427 Merge pull request #328 from puppetlabs/2.0.x-to-master
5997e65 Merge pull request #326 from bmjen/refix-lint
a5cce42 fixes bug introduced by a linting fix
6cecf8c Merge pull request #324 from bmjen/1.2.3_prep
75d1e96 Merge pull request #325 from bmjen/2.0.1_prep
d6ee5a8 Release 2.0.1 prep
5267d35 1.2.3 Release prep
6751adb 1.2.3 Release prep
b0c874b Merge pull request #323 from bmjen/update-readme
d4376cb updates init.pp to pass linting
abf40f0 update README with correct behavior for fragment  parameter
1869563 Merge pull request #322 from DavidS/fixup-readme
f1b7a50 Fixup the wording in README
ddcf87f Merge pull request #321 from bmjen/empty-concats
6264171 Merge pull request #319 from bmjen/add-file-autorequire
64b9288 fix defaulted force behavior
773b858 Merge pull request #320 from DavidS/add-warn-warning
b271bff (MODULES-2080) Call out changed behaviour of 'warn' parameter
78fdb4e adds file autorequire
e9ee044 Merge pull request #318 from bmjen/frag-targeting
db33829 fix fragment target handling
02c5f4b Merge pull request #317 from bmjen/tableflip
2292759 fixes dependency bug in creating the target file
f4d4ca0 Add ability to unittest puppet 4
8c4e5fc Merge pull request #316 from bmjen/merge_2.0.x
bb55d80 Merge pull request #314 from bmjen/2.0.0-prep
ca73b72 fix linting
5ab5672 Merge pull request #313 from bmjen/2.0.0-prep
26033e6 2.0.0 release prep
9c5857f 1.2.2 release prep
2d5734c Merge pull request #312 from bmjen/1.2.2-prep
b5f1764 update metadata.json
4ea84be Merge pull request #311 from bmjen/1.2.2-prep
8d04426 1.2.2 release prep
d654dea Merge pull request #310 from puppetlabs/modulesync_updates
4be434d Lint fixes
84ee577 fix Gemfile
754c927 beaker gemfile fixes
16988df sync via modulesync
40cbb29 sync via modulesync
ee3e184 Merge pull request #308 from cyberious/master
0587e37 Merge pull request #309 from justinstoller/maint/master/valid-json
32e417a (maint) fixup invalid JSON
1a2975a (maint) Only add newline if string does not end with newline
f24437c Merge pull request #307 from bmjen/ensure-newline
118e802 readd ensure_newline param and tests for backwards compatibility
b880a99 Merge pull request #306 from bmjen/re-refactor-2.0
6876399 re-refactor of concat to not depend on file_concat
b2c4145 Merge pull request #305 from bmjen/fix-geppeto
1534050 fixes the metadata.json to be geppeto compliant
bcf3af5 Merge pull request #304 from bmjen/update-dep-version
cd21d8b update metadata.json with correct dependencies and setting exact version for file_concat dependency
253f497 Merge pull request #303 from bmjen/modules-1933
0459eba MODULES-1933: fixes backup passing in fragments without concat resource
562977a Merge pull request redhat-openstack#299 from psoloway/readme
6aebeea Merge pull request #302 from bmjen/cuz-strict-variables
ef4aac8 fix for strict variables checking
2d64759 Update README per cd03959
16104d0 Merge pull request #300 from IceBear2k/master
e562bcd Revert and fix regex
30cb251 Merge pull request redhat-openstack#298 from bmjen/fix-windows-acceptance
3809409 fixes acceptance tests on windows
583c528 Merge pull request redhat-openstack#296 from bmjen/fix-windows
6cfa62b fixes windows.
e2b189e Merge pull request redhat-openstack#297 from bmjen/o_____p
cd03959 re-add removed params for backwards compatibility
ea5af52 Merge pull request redhat-openstack#295 from hunner/fix_metadata
2ccde9d Merge pull request redhat-openstack#294 from bmjen/geppetto-fix
c96ae6a The jenkins geppetto plugin is still complaining
4e61c33 more geppetto lint fixes
f23bd17 Merge pull request redhat-openstack#293 from bmjen/geppetto-fix
71c815b fix linting errors
5059019 Merge pull request redhat-openstack#291 from psoloway/readme
9970cc6 Merge pull request redhat-openstack#290 from bmjen/refactor-native
ececd06 Merge pull request redhat-openstack#292 from bmjen/release-prep-1.2.1
8198296 Updates CHANGELOG and metadata for 1.2.1 release
51bd49f refactor concat to wrap electrical/file_concat
d45e281 Updates README per 936dc29
15ecb98 Merge pull request redhat-openstack#288 from woneill/ticket/MODULES-1700-backup_files_for_static_compiler
aa133e2 Override File default with backup value instead of assuming 'false'
e34eac0 (MODULES-1700) Change the filebucketing behavior so static_compiler can handle them
a0942af Merge pull request redhat-openstack#284 from buzzdeee/master
6f88096 Merge pull request redhat-openstack#287 from j-vizcaino/feature/setup-user-group-explicitly
936dc29 Merge pull request redhat-openstack#289 from puppetlabs/1.2.x
c2d056b spec/setup: Fix indent
e811550 setup: update tests to check for proper user/group ownership
0193fd2 setup: set user/group explicitly for dirs & script
b20d8b9 Fix breakage on OpenBSD in similar fashion as it is done for Windows. Broken since the switch from the shell script to the ruby script.
710b3d5 Merge pull request redhat-openstack#268 from mhaskel/1.2.0-prep
7f97a0e 1.2.0 prep

Change-Id: I01b7a6e43d8db5dd295ee610fc019175a6fa406c

Puppetfile

@@ -27,7 +27,7 @@ mod 'common',
   :git => 'https://github.com/purpleidea/puppet-common.git'
 
 mod 'concat',
-  :commit => '52d0f1d6809c9f1d8453f9e3ca10d792e67acc89',
+  :commit => 'c307bee3933d88e6028274b0fa122a9b0c87b1d4',
   :git => 'https://github.com/puppetlabs/puppetlabs-concat.git'
 
 mod 'corosync',

concat/.gitignore

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

concat/.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'"
@@ -11,5 +12,7 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

concat/CHANGELOG.md

@@ -1,3 +1,65 @@
+##2015-07-21 - Supported Release 1.2.4
+###Summary
+
+This release includes some ruby path and lint fixes.
+
+####Bugfixes
+- Use correct ruby path with PE and AIO
+- Lint fixes
+- Use correct ruby path on FreeBSD
+- Test fixes
+
+##2015-06-02 - Supported Release 2.0.1 [YANKED]
+###Summary
+
+This is a bugfix release. 
+
+####Bugfixes
+- Fixes dependency graphing with concurrent modification of the same file.
+- Fixes handling fragment target.
+- Fixes the defaulted force behavior to handle empty concats correctly.
+
+##2015-06-02 - Supported Release 1.2.3
+###Summary
+
+This release includes a README fix to document correct behavior of fragment target parameter.
+
+####Bugfixes
+- README Fix to correctly document how a fragment $target param should work.
+
+##2015-05-12 - Supported Release 2.0.0 [YANKED]
+###Summary
+
+This is a major release. Includes re-implementation of concat to use native Type and Providers, resulting in significantly improved performance and testability. Also includes a bugfix to alpha ordering of fragments.
+
+####Features
+- Re-implementation of concat to use native Type and Providers.
+
+####Bugfixes
+- Fixes a bug in alpha ordering of fragments.
+
+##2015-05-12 - Supported Release 1.2.2
+###Summary
+
+This release includes a bugfix.
+
+####Bugfixes
+- Fixes a bug introduced by MODULES-1700, in handling default retrieval of fragment backup parameter.
+
+##2015-04-14 - Supported Release 1.2.1
+###Summary
+
+This release includes bugfixes, test improvements, and a rewritten README.
+
+####Bugfixes
+
+- Verifies existence of $is_pe before using it.
+- Adds validation for $order param to not allow restricted characters.
+- Sets the group id on Fragments for versions of Facter that contain the $gid fact.
+- Sets the script group to 0 if the script is owned by root.
+- Explicitly sets script and concat directories to the same owner and group.
+- Re-adds support for fragment backup, so that static compiler can work with filebucket (MODULES-1700).
+
 ##2015-02-17 - Supported Release 1.2.0
 ###Summary
 

concat/Gemfile

@@ -11,38 +11,36 @@ 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-puppet', '~> 1.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
 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
+  gem 'beaker-puppet_install_helper', :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

concat/README.md

@@ -139,6 +139,10 @@ All the parameters listed below are optional.
 
 Specifies whether (and how) to back up the destination file before overwriting it. Your value gets passed on to Puppet's [native `file` resource](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-backup) for execution. Valid options: 'true', 'false', or a string representing either a target filebucket or a filename extension beginning with ".". Default value: 'puppet'.
 
+#####`backup_fragments`
+
+Specifies whether to backup concat fragments using the backup setting of the target concat file. Valid options: 'true' and 'false'. Default value: 'false'.
+
 #####`ensure`
 
 Specifies whether the destination file should exist. Setting to 'absent' tells Puppet to delete the destination file if it exists, and negates the effect of any other parameters. Valid options: 'present' and 'absent'. Default value: 'present'.
@@ -195,6 +199,36 @@ If you set this parameter to 'true', Puppet adds the following message:
 # This file is managed by Puppet. DO NOT EDIT.
 ~~~
 
+#####`selinux_ignore_defaults`
+
+See the `file` type's
+[`selinux_ignore_defaults`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selinux_ignore_defaults)
+documentention.
+
+#####`selrange`
+
+See the `file` type's
+[`selrange`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selrange)
+documentention.
+
+#####`selrole`
+
+See the `file` type's
+[`selrole`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-selrole)
+documentention.
+
+#####`seltype`
+
+See the `file` type's
+[`seltype`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-seltype)
+documentention.
+
+#####`seluser`
+
+See the `file` type's
+[`seluser`](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-seluser)
+documentention.
+
 ####`concat::fragment`
 
 
@@ -218,7 +252,7 @@ Specifies a file to read into the content of the fragment. **Note**: You must su
 
 #####`target`
 
-*Required.* Specifies the destination file of the fragment. Valid options: a string containing an absolute path.
+*Required.* Specifies the destination file of the fragment. Valid options: a string containing the title of the parent `concat` resource.
 
 ###Deprecations
 
@@ -280,4 +314,4 @@ For more information, see our [module contribution guide.](https://docs.puppetla
 
 ###Contributors
 
-To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors)
+To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors)

concat/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')

concat/manifests/fragment.pp

@@ -57,6 +57,16 @@
   if $backup {
     warning('The $backup parameter to concat::fragment is deprecated and has no effect')
   }
+
+  # Checks the target concat resources for whether fragments should be backed up or not
+  # otherwise defaults to false.
+  $enable_backup = concat_getparam(Concat[$target], 'backup_fragments')
+  $target_backup = concat_getparam(Concat[$target], 'backup')
+  $_backup = $enable_backup ? {
+      true    => $target_backup,
+      default => false
+  }
+
   if $ensure == undef {
     $my_ensure = concat_getparam(Concat[$target], 'ensure')
   } else {
@@ -118,7 +128,7 @@
     mode    => $fragmode,
     source  => $source,
     content => $content,
-    backup  => false,
+    backup  => $_backup,
     replace => true,
     alias   => "concat_fragment_${name}",
     notify  => Exec["concat_${target}"]