diff --git a/.fixtures.yml b/.fixtures.yml
index ca236c5..67added 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,7 @@
 fixtures:
   repositories:
     'stdlib':
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.5.1'
+      ref: '4.2.0'
   symlinks:
     'concat': '#{source_dir}'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87a0443..4e9bdb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,281 +1,281 @@
 =======
-##2015-06-02 - Supported Release 2.0.1
+##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-05-12 - Supported Release 2.0.0
+##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-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 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
 
 This release includes a number of bugfixes and adds support for running a validation command when using puppet >= 3.5.0.
 
 ####Features
 - Support running a validation command for Puppet >= 3.5.0
 
 ####Bugfixes
 - Reset poisoned defaults from Exec
 - Use concatfragments.rb on AIX since it doesn't support print0
 - Make sure ruby is in the path for PE (MODULES-1456)
 - Fix missing method for check_is_owned_by for windows (MODULES-1764)
 - Fix sort by numeric
 
 ##2014-10-28 - Supported Release 1.1.2
 ###Summary
 
 This release includes bugfixes and test improvements. The module was tested against SLES10 and SLES12 and found to work against those platforms with no module improvements. Metadata was updated to include those as supported platforms.
 
 ####Bugfixes
 - newline didn't work for Windows and Solaris. This has been fixed.
 - Install certs on Windows for acceptance tests
 - Update tests to work with strict variables (no module updates were required)
 - Update tests to work on Windows
 - Fix typo in CHANGELOG.md
 
 ##2014-09-10 - Supported Release 1.1.1
 ###Summary
 
 This is a bugfix release, and the first supported release of the 1.1.x series.
 
 ####Bugfixes
 - Make the `$order` parameter default to a string and be validated as an integer
   or a string
 - Use the ruby script on Solaris to not break Sol10 support
 - Add quotes to the ruby script location for Windows
 - Fix typos in README.md
 - Make regex in concat::setup case-insensitive to make it work on Windows
 - Make sure concat fragments are always replaced
 - Fix validation to allow `$backup` to be a boolean
 - Remove dependency on stdlib 4.x
 - Fix for lack of idempotency with `ensure => 'absent'`
 - Fix tests and spec_helper
 - Synchronized files for more consistency across modules via modulesync
 
 ##2014-05-14 - Release 1.1.0
 ###Summary
 
 This release is primarily a bugfix release since 1.1.0-rc1.
 
 ####Features
 - Improved testing, with tests moved to beaker
 
 ####Bugfixes
 - No longer attempts to set fragment owner and mode on Windows
 - Fix numeric sorting
 - Fix incorrect quoting
 - Fix newlines
 
 ##2014-01-03 - Release 1.1.0-rc1
 ###Summary
 
 This release of concat was 90% written by Joshua Hoblitt, and the module team
 would like to thank him for the huge amount of work he put into this release.
 
 This module deprecates a bunch of old parameters and usage patterns, modernizes
 much of the manifest code, simplifies a whole bunch of logic and makes
 improvements to almost all parts of the module.
 
 The other major feature is windows support, courtesy of luisfdez, with an
 alternative version of the concat bash script in ruby.  We've attempted to
 ensure that there are no backwards incompatible changes, all users of 1.0.0
 should be able to use 1.1.0 without any failures, but you may find deprecation
 warnings and we'll be aggressively moving for a 2.0 to remove those too.
 
 For further information on deprecations, please read:
 https://github.com/puppetlabs/puppetlabs-concat/blob/master/README.md#api-deprecations
 
 ####Removed
 - Puppet 0.24 support.
 - Filebucket backup of all file resources except the target concatenated file.
 - Default owner/user/group values.
 - Purging of long unused /usr/local/bin/concatfragments.sh
 
 ###Features
 - Windows support via a ruby version of the concat bash script.
 - Huge amount of acceptance testing work added.
 - Documentation (README) completely rewritten.
 - New parameters in concat:
  - `ensure`: Controls if the file should be present/absent at all.
  - Remove requirement to include concat::setup in manifests.
  - Made `gnu` parameter deprecated.
  - Added parameter validation.
 
 ###Bugfixes
  - Ensure concat::setup runs before concat::fragment in all cases.
  - Pluginsync references updated for modern Puppet.
  - Fix incorrect group parameter.
  - Use $owner instead of $id to avoid confusion with $::id
  - Compatibility fixes for Puppet 2.7/ruby 1.8.7
  - Use LC_ALL=C instead of LANG=C
  - Always exec the concatfragments script as root when running as root.
  - Syntax and other cleanup changes.
 
 ##2014-06-25 - Supported Release 1.0.4
 ###Summary
 
 This release has test fixes.
 
 ####Features
 - Added test support for OSX.
 
 ####Bugfixes
 
 ####Known bugs
 
 * Not supported on Windows.
 
 ##2014-06-04 - Release 1.0.3
 ###Summary
 
 This release adds compatibility for PE3.3 and fixes tests.
 
 ####Features
 - Added test support for Ubuntu Trusty.
 
 ####Bugfixes
 
 ####Known bugs
 
 *Not supported on Windows.
 
 ##2014-03-04 - Supported Release 1.0.2
 ###Summary
 
 This is a supported release. No functional changes were made from 1.0.1.
 
 ####Features
 - Huge amount of tests backported from 1.1.
 - Documentation rewrite.
 
 ####Bugfixes
 
 ####Known Bugs
 
 * Not supported on Windows.
 
 
 ##2014-02-12 - 1.0.1
 ###Summary
 
 Minor bugfixes for sorting of fragments and ordering of resources.
 
 ####Bugfixes
 - LANG => C replaced with LC_ALL => C to reduce spurious recreation of
 fragments.
 - Corrected pluginsync documentation.
 - Ensure concat::setup always runs before fragments.
 
 
 ##2013-08-09 - 1.0.0
 ###Summary
 
 Many new features and bugfixes in this release, and if you're a heavy concat
 user you should test carefully before upgrading.  The features should all be
 backwards compatible but only light testing has been done from our side before
 this release.
 
 ####Features
 - New parameters in concat:
  - `replace`: specify if concat should replace existing files.
  - `ensure_newline`: controls if fragments should contain a newline at the end.
 - Improved README documentation.
 - Add rspec:system tests (rake spec:system to test concat)
 
 ####Bugfixes
 - Gracefully handle \n in a fragment resource name.
 - Adding more helpful message for 'pluginsync = true'
 - Allow passing `source` and `content` directly to file resource, rather than
 defining resource defaults.
 - Added -r flag to read so that filenames with \ will be read correctly.
 - sort always uses LANG=C.
 - Allow WARNMSG to contain/start with '#'.
 - Replace while-read pattern with for-do in order to support Solaris.
 
 ####CHANGELOG:
 - 2010/02/19 - initial release
 - 2010/03/12 - add support for 0.24.8 and newer
              - make the location of sort configurable
              - add the ability to add shell comment based warnings to
                top of files
              - add the ablity to create empty files
 - 2010/04/05 - fix parsing of WARN and change code style to match rest
                of the code
              - Better and safer boolean handling for warn and force
              - Don't use hard coded paths in the shell script, set PATH
                top of the script
              - Use file{} to copy the result and make all fragments owned
                by root.  This means we can chnage the ownership/group of the
                resulting file at any time.
              - You can specify ensure => "/some/other/file" in concat::fragment
                to include the contents of a symlink into the final file.
 - 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name
 - 2010/05/22 - Improve documentation and show the use of ensure =>
 - 2010/07/14 - Add support for setting the filebucket behavior of files
 - 2010/10/04 - Make the warning message configurable
 - 2010/12/03 - Add flags to make concat work better on Solaris - thanks Jonathan Boyett
 - 2011/02/03 - Make the shell script more portable and add a config option for root group
 - 2011/06/21 - Make base dir root readable only for security
 - 2011/06/23 - Set base directory using a fact instead of hardcoding it
 - 2011/06/23 - Support operating as non privileged user
 - 2011/06/23 - Support dash instead of bash or sh
 - 2011/07/11 - Better solaris support
 - 2011/12/05 - Use fully qualified variables
 - 2011/12/13 - Improve Nexenta support
 - 2012/04/11 - Do not use any GNU specific extensions in the shell script
 - 2012/03/24 - Comply to community style guides
 - 2012/05/23 - Better errors when basedir isnt set
 - 2012/05/31 - Add spec tests
 - 2012/07/11 - Include concat::setup in concat improving UX
 - 2012/08/14 - Puppet Lint improvements
 - 2012/08/30 - The target path can be different from the $name
 - 2012/08/30 - More Puppet Lint cleanup
 - 2012/09/04 - RELEASE 0.2.0
 - 2012/12/12 - Added (file) $replace parameter to concat
diff --git a/README.md b/README.md
index 8a041ce..69b9a89 100644
--- a/README.md
+++ b/README.md
@@ -1,321 +1,283 @@
 #concat
 
 ####Table of Contents
 
 1. [Overview](#overview)
 2. [Module Description - What the module does and why it is useful](#module-description)
 3. [Setup - The basics of getting started with concat](#setup)
     * [What concat affects](#what-concat-affects)
     * [Beginning with concat](#beginning-with-concat)
 4. [Usage - Configuration options and additional functionality](#usage)
 5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-    * [Defines](#defines)
+    * [Public Defines](#public-defines)
     * [Parameters](#parameters)
-    * [Removed functionality](#removed-functionality)
+    * [Deprecations](#deprecations)
 6. [Limitations - OS compatibility, etc.](#limitations)
 7. [Development - Guide for contributing to the module](#development)
 
 ##Overview
 
 The concat module lets you construct files from multiple ordered fragments of text.
 
 ##Module Description
 
-The concat module lets you gather `concat::fragment` resources from your other modules and order them into a coherent file through a single `concat` resource.
+The concat module lets you gather `concat::fragment` resources from your other modules and order them through a single `concat` resource into a coherent file. It does this through a Ruby script and a temporary holding space for the fragments.
+
+##Setup
+
+###What concat affects
+
+* Installs `concatfragments.rb`.
+* Adds a `concat/` directory into Puppet's `vardir`.
 
 ###Beginning with concat
 
 To start using concat you need to create:
 
 * A concat{} resource for the final file.
 * One or more concat::fragment{}s.
 
 A minimal example might be:
 
 ~~~
 concat { '/tmp/file':
   ensure => present,
 }
 
 concat::fragment { 'tmpfile':
   target  => '/tmp/file',
   content => 'test contents',
   order   => '01'
 }
 ~~~
 
 ##Usage
 
 ###Maintain a list of the major modules on a node
 
 To maintain an motd file that lists the modules on one of your nodes, first create a class to frame up the file:
 
 ~~~
 class motd {
   $motd = '/etc/motd'
 
   concat { $motd:
     owner => 'root',
     group => 'root',
     mode  => '0644'
   }
 
   concat::fragment{ 'motd_header':
     target  => $motd,
     content => "\nPuppet modules on this server:\n\n",
     order   => '01'
   }
 
   # let local users add to the motd by creating a file called
   # /etc/motd.local
   concat::fragment{ 'motd_local':
     target => $motd,
     source => '/etc/motd.local',
     order  => '15'
   }
 }
 
 # let other modules register themselves in the motd
 define motd::register($content="", $order='10') {
   if $content == "" {
     $body = $name
   } else {
     $body = $content
   }
 
   concat::fragment{ "motd_fragment_$name":
     target  => '/etc/motd',
     order   => $order,
     content => "    -- $body\n"
   }
 }
 ~~~
 
 Then, in the declarations for each module on the node, add `motd::register{ 'Apache': }` to register the module in the motd.
 
 ~~~
 class apache {
   include apache::install, apache::config, apache::service
 
   motd::register{ 'Apache': }
 }
 ~~~
 
 These two steps populate the /etc/motd file with a list of the installed and registered modules, which stays updated even if you just remove the registered modules' `include` lines. System administrators can append text to the list by writing to /etc/motd.local.
 
 When you're finished, the motd file will look something like this:
 
 ~~~
   Puppet modules on this server:
 
     -- Apache
     -- MySQL
 
   <contents of /etc/motd.local>
 ~~~
 
 ##Reference
 
-###Defines
+**Note**: Several of this module's parameters and features have been deprecated. See the [Deprecations](#deprecations) section below.
+
+###Public defines
 * `concat`: Manages a file, compiled from one or more text fragments.
 * `concat::fragment`: Manages a fragment of text to be compiled into a file.
 
-###Types
-* `concat_file`: Generates a file with content from fragments sharing a common unique tag.
-* `concat_fragment`: Manages the fragment.
-
 ###Parameters
 
-####Define: `concat`
+####`concat`
 
 All the parameters listed below are optional.
 
 #####`backup`
 
 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'.
 
 #####`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'.
 
+
 #####`ensure_newline`
 
-Specifies whether to add a line break at the end of each fragment that doesn't already end in one. Valid options: 'true' and 'false'. Default value: 'false'.
+Specifies whether to ensure there's a new line at the end of each fragment. Valid options: 'true' and 'false'. Default value: 'false'.
 
 #####`force`
 
-Deprecated as of concat v2.0.0. Has no effect.
+In case no fragments have been added, this parameter specifies whether to go ahead and create a potentially empty file. Valid options: 'true' and 'false'. Default value: 'false'.
 
 #####`group`
 
 Specifies a permissions group for the destination file. Valid options: a string containing a group name. Default value: undefined.
 
 #####`mode`
 
 Specifies the permissions mode of the destination file. Valid options: a string containing a permission mode value in octal notation. Default value: '0644'.
 
 #####`order`
 
 Specifies a method for sorting your fragments by name within the destination file. Valid options: 'alpha' (e.g., '1, 10, 2') or 'numeric' (e.g., '1, 2, 10'). Default value: 'alpha'.
 
 You can override this setting for individual fragments by adjusting the `order` parameter in their `concat::fragment` declarations.
 
 #####`owner`
 
+
 Specifies the owner of the destination file. Valid options: a string containing a username. Default value: undefined.
 
 #####`path`
 
+
 Specifies a destination file for the combined fragments. Valid options: a string containing an absolute path. Default value: the title of your declared resource.
 
 #####`replace`
 
 Specifies whether to overwrite the destination file if it already exists. Valid options: 'true' and 'false'. Default value: 'true'.
 
 #####`validate_cmd`
 
 Specifies a validation command to apply to the destination file. Requires Puppet version 3.5 or newer. Valid options: a string to be passed to a file resource. Default value: undefined.
 
 #####`warn`
 
-Specifies whether to add a header message at the top of the destination file. Valid options: the booleans 'true' and 'false', or a string to serve as the header. Default value: 'false'.
+Specifies whether to add a warning message at the top of the destination file so users know it was autogenerated by Puppet. Valid options: 'true', 'false', or a string to be delivered as a warning message. Default value: 'false'.
 
-If you set 'warn' to 'true', `concat` adds the following line with an `order` of `0`:
+
+If you set this parameter to 'true', Puppet adds the following message:
 
 ~~~
 # This file is managed by Puppet. DO NOT EDIT.
 ~~~
 
-Before 2.0.0, this parameter would add a newline at the end of the warn
-message. To improve flexibilty, this was removed. Please add it explicitely if
-you need it.
+####`concat::fragment`
 
-####Define: `concat::fragment`
 
 Except where noted, all the below parameters are optional.
 
 #####`content`
 
 Supplies the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string. Default value: undef.
 
 #####`ensure`
 
-Deprecated as of concat v2.0.0. Has no effect.
+Specifies whether the fragment should be included in the destination file or discarded. Valid options: 'present' and 'absent'. Default value: 'present'.
 
 #####`order`
 
 Reorders your fragments within the destination file. Fragments that share the same order number are ordered by name. Valid options: a string (recommended) or an integer. Default value: '10'.
 
 #####`source`
 
 Specifies a file to read into the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string or an array, containing one or more Puppet URLs. Default value: undefined.
 
 #####`target`
 
 *Required.* Specifies the destination file of the fragment. Valid options: a string containing the title of the parent `concat` resource.
 
+###Deprecations
 
-####Type: `concat_file`
-
-#####`backup`
-
-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'.
-
-#####`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'.
-
-#####`ensure_newline`
-
-Specifies whether to add a line break at the end of each fragment that doesn't already end in one. Valid options: 'true' and 'false'. Default value: 'false'.
-
-#####`group`
-
-Specifies a permissions group for the destination file. Valid options: a string containing a group name. Default value: undefined.
-
-#####`mode`
-
-Specifies the permissions mode of the destination file. Valid options: a string containing a permission mode value in octal notation. Default value: '0644'.
-
-#####`order`
-
-Specifies a method for sorting your fragments by name within the destination file. Valid options: 'alpha' (e.g., '1, 10, 2') or 'numeric' (e.g., '1, 2, 10'). Default value: 'numeric'.
+**`concat` has the following deprecations**
 
-You can override this setting for individual fragments by adjusting the `order` parameter in their `concat::fragment` declarations.
+#####`gnu`
 
-#####`owner`
+Generates a catalog compile time warning and has no effect. This parameter was silently ignored in version `1.0.0` and will be removed in a future release.
 
-Specifies the owner of the destination file. Valid options: a string containing a username. Default value: undefined.
+#####stringified 'true'/'false' values deprecated in `warn`
 
-#####`path`
+Passing stringified boolean values (strings of 'true' and 'false') to the `warn` parameter of `concat` is deprecated. Generates a catalog compile time warning, and will be silently treated as the concatenated file header/warning message in a future release.
 
-Specifies a destination file for the combined fragments. Valid options: a string containing an absolute path. Default value: the title of your declared resource.
+Please migrate to using the Puppet DSL's native [Boolean data
+type](http://docs.puppetlabs.com/puppet/3/reference/lang_datatypes.html#booleans).
 
-#####`replace`
 
-Specifies whether to overwrite the destination file if it already exists. Valid options: 'true' and 'false'. Default value: 'true'.
-
-####`tag`
-
-*Required.* Specifies a unique tag reference to collect all concat_fragments with the same tag.
-
-#####`validate_cmd`
-
-Specifies a validation command to apply to the destination file. Requires Puppet version 3.5 or newer. Valid options: a string to be passed to a file resource. Default value: undefined.
+**`concat::fragment` has the following deprecations**
 
-####Type: `concat_fragment`
+#####`backup`
 
-#####`content`
+Generates a catalog compile time warning and has no effect. In the `1.0.0` release this parameter controlled file bucketing of the file fragment. Bucketing the fragment(s) is redundant with bucketing the final concatenated file and this feature has been removed.
 
-Supplies the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string. Default value: undef.
 
-#####`order`
-
-Reorders your fragments within the destination file. Fragments that share the same order number are ordered by name. Valid options: a string (recommended) or an integer. Default value: '10'.
+#####`group`
 
-#####`source`
+Generates a catalog compile time warning and has no effect. Had no user-visible effect in version `1.0.0` and will be removed in a future release.
 
-Specifies a file to read into the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string or an array, containing one or more Puppet URLs. Default value: undefined.
+#####`mode`
 
-#####`tag`
+Generates a catalog compile time warning and has no effect. Had no user-visible effect in version `1.0.0` and will be removed in a future release.
 
-*Required.* Specifies a unique tag to be used by concat_file to reference and collect content.
 
-#####`target`
+#####`owner`
 
-*Required.* Specifies the destination file of the fragment. Valid options: a string containing the title of the parent `concat_file` resource.
+Generates a catalog compile time warning and has no effect. Had no user-visible effect in version `1.0.0` and will be removed in a future release.
 
-###Removed functionality
+#####file paths are deprecated in `ensure`
 
-The following functionality existed in previous versions of the concat module, but was removed in version 2.0.0:
+Passing a value other than 'present' or 'absent' in the `ensure` parameter of `concat::fragment` is **deprecated**, and generates a catalog compile time warning. The warning will become a catalog compilation failure in a future release.
 
-Parameters removed from `concat::fragment`:
-* `gnu`
-* `backup`
-* `group`
-* `mode`
-* `owner`
+If you want to use the content of a file as a fragment please use the [`source`](#source) parameter.
 
-The `concat::setup` class has also been removed.
+####`concat::setup`
 
-Prior to concat version 2.0.0, if you set the `warn` parameter to a string value of 'true', 'false', 'yes', 'no', 'on', or 'off', the module translated the string to the corresponding boolean value. In concat version 2.0.0 and newer, the `warn_header` parameter treats those values the same as other strings and uses them as the content of your header message. To avoid that, pass the 'true' and 'false' values as booleans instead of strings.
+The `concat::setup` class should no longer be directly included in the manifest. It will be removed in a future release.
 
 ##Limitations
 
 This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified.
 
 ##Development
 
 Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
 
 We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
 For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
 
 ###Contributors
 
-Richard Pijnenburg ([@Richardp82](http://twitter.com/richardp82))
-
-Joshua Hoblitt ([@jhoblitt](http://twitter.com/jhoblitt))
-
-[More 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)
diff --git a/files/concatfragments.rb b/files/concatfragments.rb
new file mode 100644
index 0000000..b16f3e1
--- /dev/null
+++ b/files/concatfragments.rb
@@ -0,0 +1,153 @@
+#!/usr/bin/env ruby
+# Script to concat files to a config file.
+#
+# Given a directory like this:
+# /path/to/conf.d
+# |-- fragments
+# |   |-- 00_named.conf
+# |   |-- 10_domain.net
+# |   `-- zz_footer
+#
+# The script supports a test option that will build the concat file to a temp location and
+# use /usr/bin/cmp to verify if it should be run or not.  This would result in the concat happening
+# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds.
+#
+# Without the test option and the unless combo your services that depend on the final file would end up
+# restarting on each run, or in other manifest models some changes might get missed.
+#
+# OPTIONS:
+#  -o	The file to create from the sources
+#  -d	The directory where the fragments are kept
+#  -t	Test to find out if a build is needed, basically concats the files to a temp
+#       location and compare with what's in the final location, return codes are designed
+#       for use with unless on an exec resource
+#  -w   Add a shell style comment at the top of the created file to warn users that it
+#       is generated by puppet
+#  -f   Enables the creation of empty output files when no fragments are found
+#  -n	Sort the output numerically rather than the default alpha sort
+#
+# the command:
+#
+#   concatfragments.rb -o /path/to/conffile.cfg -d /path/to/conf.d
+#
+# creates /path/to/conf.d/fragments.concat and copies the resulting
+# file to /path/to/conffile.cfg.  The files will be sorted alphabetically
+# pass the -n switch to sort numerically.
+#
+# The script does error checking on the various dirs and files to make
+# sure things don't fail.
+require 'optparse'
+require 'fileutils'
+
+settings = {
+    :outfile => "",
+    :workdir => "",
+    :test => false,
+    :force => false,
+    :warn => "",
+    :sortarg => "",
+    :newline => false
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+  opts.separator "Specific options:"
+
+  opts.on("-o", "--outfile OUTFILE", String, "The file to create from the sources") do |o|
+    settings[:outfile] = o
+  end
+
+  opts.on("-d", "--workdir WORKDIR", String, "The directory where the fragments are kept") do |d|
+    settings[:workdir] = d
+  end
+
+  opts.on("-t", "--test", "Test to find out if a build is needed") do
+    settings[:test] = true
+  end
+
+  opts.separator "Other options:"
+  opts.on("-w", "--warn WARNMSG", String,
+          "Add a shell style comment at the top of the created file to warn users that it is generated by puppet") do |w|
+    settings[:warn] = w
+  end
+
+  opts.on("-f", "--force", "Enables the creation of empty output files when no fragments are found") do
+    settings[:force] = true
+  end
+
+  opts.on("-n", "--sort", "Sort the output numerically rather than the default alpha sort") do
+    settings[:sortarg] = "-n"
+  end
+
+  opts.on("-l", "--line", "Append a newline") do
+    settings[:newline] = true
+  end
+end.parse!
+
+# do we have -o?
+raise 'Please specify an output file with -o' unless !settings[:outfile].empty?
+
+# do we have -d?
+raise 'Please specify fragments directory with -d' unless !settings[:workdir].empty?
+
+# can we write to -o?
+if File.file?(settings[:outfile])
+  if !File.writable?(settings[:outfile])
+    raise "Cannot write to #{settings[:outfile]}"
+  end
+else
+  if !File.writable?(File.dirname(settings[:outfile]))
+    raise "Cannot write to dirname #{File.dirname(settings[:outfile])} to create #{settings[:outfile]}"
+  end
+end
+
+# do we have a fragments subdir inside the work dir?
+if !File.directory?(File.join(settings[:workdir], "fragments")) && !File.executable?(File.join(settings[:workdir], "fragments"))
+  raise "Cannot access the fragments directory"
+end
+
+# are there actually any fragments?
+if (Dir.entries(File.join(settings[:workdir], "fragments")) - %w{ . .. }).empty?
+  if !settings[:force]
+    raise "The fragments directory is empty, cowardly refusing to make empty config files"
+  end
+end
+
+Dir.chdir(settings[:workdir])
+
+if settings[:warn].empty?
+  File.open("fragments.concat", 'w') { |f| f.write("") }
+else
+  File.open("fragments.concat", 'w') { |f| f.write("#{settings[:warn]}\n") }
+end
+
+# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
+open('fragments.concat', 'a') do |f|
+  fragments = Dir.entries("fragments").sort
+  if settings[:sortarg] == '-n'
+    fragments = fragments.sort_by { |v| v.split('_').map(&:to_i) }
+  end
+  fragments.each { |entry|
+    if File.file?(File.join("fragments", entry))
+      f << File.read(File.join("fragments", entry))
+
+      # append a newline if we were asked to (invoked with -l)
+      if settings[:newline]
+        f << "\n"
+      end
+
+    end
+  }
+end
+
+if !settings[:test]
+  # This is a real run, copy the file to outfile
+  FileUtils.cp 'fragments.concat', settings[:outfile]
+else
+  # Just compare the result to outfile to help the exec decide
+  if FileUtils.cmp 'fragments.concat', settings[:outfile]
+    exit 0
+  else
+    exit 1
+  end
+end
diff --git a/lib/facter/concat_basedir.rb b/lib/facter/concat_basedir.rb
new file mode 100644
index 0000000..bfac071
--- /dev/null
+++ b/lib/facter/concat_basedir.rb
@@ -0,0 +1,11 @@
+# == Fact: concat_basedir
+#
+# A custom fact that sets the default location for fragments
+#
+# "${::vardir}/concat/"
+#
+Facter.add("concat_basedir") do
+  setcode do
+    File.join(Puppet[:vardir],"concat")
+  end
+end
diff --git a/lib/puppet/parser/functions/concat_getparam.rb b/lib/puppet/parser/functions/concat_getparam.rb
new file mode 100644
index 0000000..1757bdc
--- /dev/null
+++ b/lib/puppet/parser/functions/concat_getparam.rb
@@ -0,0 +1,35 @@
+# Test whether a given class or definition is defined
+require 'puppet/parser/functions'
+
+Puppet::Parser::Functions.newfunction(:concat_getparam,
+                                      :type => :rvalue,
+                                      :doc => <<-'ENDOFDOC'
+Takes a resource reference and name of the parameter and
+returns value of resource's parameter.
+
+*Examples:*
+
+    define example_resource($param) {
+    }
+
+    example_resource { "example_resource_instance":
+        param => "param_value"
+    }
+
+    concat_getparam(Example_resource["example_resource_instance"], "param")
+
+Would return: param_value
+ENDOFDOC
+) do |vals|
+  reference, param = vals
+  raise(ArgumentError, 'Must specify a reference') unless reference
+  raise(ArgumentError, 'Must specify name of a parameter') unless param and param.instance_of? String
+
+  return '' if param.empty?
+
+  if resource = findresource(reference.to_s)
+    return resource[param] if resource[param]
+  end
+
+  return ''
+end
diff --git a/lib/puppet/parser/functions/concat_is_bool.rb b/lib/puppet/parser/functions/concat_is_bool.rb
new file mode 100644
index 0000000..c2c2a9f
--- /dev/null
+++ b/lib/puppet/parser/functions/concat_is_bool.rb
@@ -0,0 +1,22 @@
+#
+# concat_is_bool.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:concat_is_bool, :type => :rvalue, :doc => <<-EOS
+Returns true if the variable passed to this function is a boolean.
+    EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "concat_is_bool(): Wrong number of arguments " +
+      "given (#{arguments.size} for 1)") if arguments.size != 1
+
+    type = arguments[0]
+
+    result = type.is_a?(TrueClass) || type.is_a?(FalseClass)
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/type/concat_file.rb b/lib/puppet/type/concat_file.rb
deleted file mode 100644
index 8406103..0000000
--- a/lib/puppet/type/concat_file.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'puppet/type/file/owner'
-require 'puppet/type/file/group'
-require 'puppet/type/file/mode'
-require 'puppet/util/checksums'
-
-Puppet::Type.newtype(:concat_file) do
-  @doc = "Gets all the file fragments and puts these into the target file.
-    This will mostly be used with exported resources.
-
-    example:
-      Concat_fragment <<| tag == 'unique_tag' |>>
-
-      concat_file { '/tmp/file':
-        tag            => 'unique_tag', # Mandatory
-        path           => '/tmp/file',  # Optional. If given it overrides the resource name
-        owner          => 'root',       # Optional. Default to undef
-        group          => 'root',       # Optional. Default to undef
-        mode           => '0644'        # Optional. Default to undef
-        order          => 'numeric'     # Optional, Default to 'numeric'
-        ensure_newline => false         # Optional, Defaults to false
-      }
-  "
-  ensurable do
-    defaultvalues
-
-    defaultto { :present }
-  end
-
-  def exists?
-    self[:ensure] == :present
-  end
-
-  newparam(:name, :namevar => true) do
-    desc "Resource name"
-  end
-
-  newparam(:tag) do
-    desc "Tag reference to collect all concat_fragment's with the same tag"
-  end
-
-  newparam(:path) do
-    desc "The output file"
-    defaultto do
-      resource.value(:name)
-    end
-  end
-
-  newparam(:owner, :parent => Puppet::Type::File::Owner) do
-    desc "Desired file owner."
-  end
-
-  newparam(:group, :parent => Puppet::Type::File::Group) do
-    desc "Desired file group."
-  end
-
-  newparam(:mode, :parent => Puppet::Type::File::Mode) do
-    desc "Desired file mode."
-  end
-
-  newparam(:order) do
-    desc "Controls the ordering of fragments. Can be set to alphabetical or numeric."
-    defaultto 'numeric'
-  end
-
-  newparam(:backup) do
-    desc "Controls the filebucketing behavior of the final file and see File type reference for its use."
-    defaultto 'puppet'
-  end
-
-  newparam(:replace) do
-    desc "Whether to replace a file that already exists on the local system."
-    defaultto true
-  end
-
-  newparam(:validate_cmd) do
-    desc "Validates file."
-  end
-
-  newparam(:ensure_newline) do
-    desc "Whether to ensure there is a newline after each fragment."
-    defaultto false
-  end
-
-  autorequire(:concat_fragment) do
-    catalog.resources.collect do |r|
-      if r.is_a?(Puppet::Type.type(:concat_fragment)) && r[:tag] == self[:tag]
-        r.name
-      end
-    end.compact
-  end
-
-  # Autorequire the file we are generating below
-  autorequire(:file) do
-    [self[:path]]
-  end
-
-  def should_content
-    return @generated_content if @generated_content
-    @generated_content = ""
-    content_fragments = []
-
-    resources = catalog.resources.select do |r|
-      r.is_a?(Puppet::Type.type(:concat_fragment)) && r[:tag] == self[:tag]
-    end
-
-    resources.each do |r|
-      content_fragments << ["#{r[:order]}___#{r[:name]}", fragment_content(r)]
-    end
-
-    if self[:order] == 'numeric'
-      sorted = content_fragments.sort do |a, b|
-        def decompound(d)
-          d.split('___').map { |v| v =~ /^\d+$/ ? v.to_i : v }
-        end
-
-        decompound(a[0]) <=> decompound(b[0])
-      end
-    else
-      sorted = content_fragments.sort do |a, b|
-        def decompound(d)
-          d.split('___').first
-        end
-
-        decompound(a[0]) <=> decompound(b[0])
-      end
-    end
-
-    @generated_content = sorted.map { |cf| cf[1] }.join
-
-    @generated_content
-  end
-
-  def fragment_content(r)
-    if r[:content].nil? == false
-      fragment_content = r[:content]
-    elsif r[:source].nil? == false
-      @source = nil
-      Array(r[:source]).each do |source|
-        if Puppet::FileServing::Metadata.indirection.find(source)
-          @source = source 
-          break
-        end
-      end
-      self.fail "Could not retrieve source(s) #{r[:source].join(", ")}" unless @source
-      tmp = Puppet::FileServing::Content.indirection.find(@source, :environment => catalog.environment)
-      fragment_content = tmp.content unless tmp.nil?
-    end
-
-    if self[:ensure_newline]
-      fragment_content<<"\n" unless fragment_content =~ /\n$/
-    end
-
-    fragment_content
-  end
-
-  def generate
-    file_opts = {
-      :ensure => self[:ensure] == :absent ? :absent : :file,
-    }
-
-    [:path, :owner, :group, :mode, :replace, :backup].each do |param|
-      unless self[param].nil?
-        file_opts[param] = self[param]
-      end
-    end
-
-    [Puppet::Type.type(:file).new(file_opts)]
-  end
-
-  def eval_generate
-    content = should_content
-
-    if !content.nil? and !content.empty?
-      catalog.resource("File[#{self[:path]}]")[:content] = content
-    end
-    []
-  end
-end
diff --git a/lib/puppet/type/concat_fragment.rb b/lib/puppet/type/concat_fragment.rb
deleted file mode 100644
index 4567f2f..0000000
--- a/lib/puppet/type/concat_fragment.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-Puppet::Type.newtype(:concat_fragment) do
-  @doc = "Create a concat fragment to be used by concat.
-    the `concat_fragment` type creates a file fragment to be collected by concat based on the tag.
-    The example is based on exported resources.
-
-    Example:
-    @@concat_fragment { \"uniqe_name_${::fqdn}\":
-      tag => 'unique_name',
-      order => 10, # Optional. Default to 10
-      content => 'some content' # OR
-      content => template('template.erb') # OR
-      source  => 'puppet:///path/to/file'
-    }
-  "
-
-  newparam(:name, :namevar => true) do
-    desc "Unique name"
-  end
-
-  newparam(:target) do
-    desc "Target"
-  end
-
-  newparam(:content) do
-    desc "Content"
-  end
-
-  newparam(:source) do
-    desc "Source"
-  end
-
-  newparam(:order) do
-    desc "Order"
-    defaultto '10'
-    validate do |val|
-      fail Puppet::ParseError, '$order is not a string or integer.' if !(val.is_a? String or val.is_a? Integer)
-      fail Puppet::ParseError, "Order cannot contain '/', ':', or '\n'." if val.to_s =~ /[:\n\/]/
-    end
-  end
-
-  newparam(:tag) do
-    desc "Tag name to be used by concat to collect all concat_fragments by tag name"
-  end
-
-  autorequire(:file) do
-    unless catalog.resource("Concat_file[#{self[:target]}]")
-      warning "Target Concat_file[#{self[:target]}] not found in the catalog"
-    end
-  end
-
-  validate do
-    # Check if target is set
-    fail Puppet::ParseError, "Target not set" if self[:target].nil?
-
-    # Check if tag is set
-    fail Puppet::ParseError, "Tag not set" if self[:tag].nil?
-
-    # Check if either source or content is set. raise error if none is set
-    fail Puppet::ParseError, "Set either 'source' or 'content'" if self[:source].nil? && self[:content].nil?
-
-    # Check if both are set, if so rais error
-    fail Puppet::ParseError, "Can't use 'source' and 'content' at the same time" if !self[:source].nil? && !self[:content].nil?
-  end
-end
diff --git a/manifests/fragment.pp b/manifests/fragment.pp
index 7084d9e..7b13b00 100644
--- a/manifests/fragment.pp
+++ b/manifests/fragment.pp
@@ -1,56 +1,133 @@
 # == Define: concat::fragment
 #
-# Creates a concat_fragment in the catalogue
+# Puts a file fragment into a directory previous setup using concat
 #
 # === Options:
 #
 # [*target*]
 #   The file that these fragments belong to
 # [*content*]
 #   If present puts the content into the file
 # [*source*]
 #   If content was not specified, use the source
 # [*order*]
 #   By default all files gets a 10_ prefix in the directory you can set it to
 #   anything else using this to influence the order of the content in the file
+# [*ensure*]
+#   Present/Absent or destination to a file to include another file
+# [*mode*]
+#   Deprecated
+# [*owner*]
+#   Deprecated
+# [*group*]
+#   Deprecated
+# [*backup*]
+#   Deprecated
 #
 define concat::fragment(
     $target,
-    $ensure  = undef,
     $content = undef,
     $source  = undef,
     $order   = '10',
+    $ensure  = undef,
+    $mode    = undef,
+    $owner   = undef,
+    $group   = undef,
+    $backup  = undef
 ) {
   validate_string($target)
-
-  if $ensure != undef {
-    warning('The $ensure parameter to concat::fragment is deprecated and has no effect.')
-  }
-
   validate_string($content)
   if !(is_string($source) or is_array($source)) {
     fail('$source is not a string or an Array.')
   }
-
   if !(is_string($order) or is_integer($order)) {
     fail('$order is not a string or integer.')
   } elsif (is_string($order) and $order =~ /[:\n\/]/) {
     fail("Order cannot contain '/', ':', or '\n'.")
   }
+  if $mode {
+    warning('The $mode parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $owner {
+    warning('The $owner parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $group {
+    warning('The $group parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $backup {
+    warning('The $backup parameter to concat::fragment is deprecated and has no effect')
+  }
 
-  if ! ($content or $source) {
-    crit('No content, source or symlink specified')
-  } elsif ($content and $source) {
-    fail("Can't use 'source' and 'content' at the same time")
+  $my_backup = concat_getparam(Concat[$target], 'backup')
+  $_backup = $my_backup ? {
+    ''      => undef,
+    default => $my_backup
   }
 
-  $safe_target_name = regsubst($target, '[/:\n\s\(\)]', '_', 'GM')
+  if $ensure == undef {
+    $my_ensure = concat_getparam(Concat[$target], 'ensure')
+  } else {
+    if ! ($ensure in [ 'present', 'absent' ]) {
+      warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.')
+    }
+    $my_ensure = $ensure
+  }
 
-  concat_fragment { $name:
-    target  => $target,
-    tag     => $safe_target_name,
-    order   => $order,
-    content => $content,
+  include concat::setup
+
+  $safe_name        = regsubst($name, '[/:\n]', '_', 'GM')
+  $safe_target_name = regsubst($target, '[/:\n]', '_', 'GM')
+  $concatdir        = $concat::setup::concatdir
+  $fragdir          = "${concatdir}/${safe_target_name}"
+  $fragowner        = $concat::setup::fragment_owner
+  $fraggroup        = $concat::setup::fragment_group
+  $fragmode         = $concat::setup::fragment_mode
+
+  # The file type's semantics are problematic in that ensure => present will
+  # not over write a pre-existing symlink.  We are attempting to provide
+  # backwards compatiblity with previous concat::fragment versions that
+  # supported the file type's ensure => /target syntax
+
+  # be paranoid and only allow the fragment's file resource's ensure param to
+  # be file, absent, or a file target
+  $safe_ensure = $my_ensure ? {
+    ''        => 'file',
+    undef     => 'file',
+    'file'    => 'file',
+    'present' => 'file',
+    'absent'  => 'absent',
+    default   => $my_ensure,
+  }
+
+  # if it looks line ensure => /target syntax was used, fish that out
+  if ! ($my_ensure in ['', 'present', 'absent', 'file' ]) {
+    $ensure_target = $my_ensure
+  } else {
+    $ensure_target = undef
+  }
+
+  # the file type's semantics only allows one of: ensure => /target, content,
+  # or source
+  if ($ensure_target and $source) or
+    ($ensure_target and $content) or
+    ($source and $content) {
+    fail('You cannot specify more than one of $content, $source, $ensure => /target')
+  }
+
+  if ! ($content or $source or $ensure_target) {
+    crit('No content, source or symlink specified')
+  }
+
+  file { "${fragdir}/fragments/${order}_${safe_name}":
+    ensure  => $safe_ensure,
+    owner   => $fragowner,
+    group   => $fraggroup,
+    mode    => $fragmode,
     source  => $source,
+    content => $content,
+    backup  => $_backup,
+    replace => true,
+    alias   => "concat_fragment_${name}",
+    notify  => Exec["concat_${target}"]
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index da02842..b161e00 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,128 +1,274 @@
 # == Define: concat
 #
 # Sets up so that you can use fragments to build a final config file,
 #
 # === Options:
 #
 # [*ensure*]
 #   Present/Absent
 # [*path*]
 #   The path to the final file. Use this in case you want to differentiate
 #   between the name of a resource and the file path.  Note: Use the name you
 #   provided in the target of your fragments.
 # [*owner*]
 #   Who will own the file
 # [*group*]
 #   Who will own the file
 # [*mode*]
 #   The mode of the final file
+# [*force*]
+#   Enables creating empty files if no fragments are present
 # [*warn*]
 #   Adds a normal shell style comment top of the file indicating that it is
-#   built by puppet.
-#   Before 2.0.0, this parameter would add a newline at the end of the warn
-#   message. To improve flexibilty, this was removed. Please add it explicitely
-#   if you need it.
+#   built by puppet
+# [*force*]
 # [*backup*]
 #   Controls the filebucketing behavior of the final file and see File type
 #   reference for its use.  Defaults to 'puppet'
 # [*replace*]
 #   Whether to replace a file that already exists on the local system
 # [*order*]
-#   Select whether to order associated fragments by 'alpha' or 'numeric'.
-#   Defaults to 'alpha'.
 # [*ensure_newline*]
-#   Specifies whether to ensure there's a new line at the end of each fragment.
-#   Valid options: 'true' and 'false'. Default value: 'false'.
-# [*validate_cmd*]
-#   Specifies a validation command to apply to the destination file.
-#   Requires Puppet version 3.5 or newer. Valid options: a string to be passed
-#   to a file resource. Default value: undefined.
+# [*gnu*]
+#   Deprecated
+#
+# === Actions:
+# * Creates fragment directories if it didn't exist already
+# * Executes the concatfragments.rb script to build the final file, this
+#   script will create directory/fragments.concat.   Execution happens only
+#   when:
+#   * The directory changes
+#   * fragments.concat != final destination, this means rebuilds will happen
+#     whenever someone changes or deletes the final file.  Checking is done
+#     using /usr/bin/cmp.
+#   * The Exec gets notified by something else - like the concat::fragment
+#     define
+# * Copies the file over to the final destination using a file resource
+#
+# === Aliases:
+#
+# * The exec can notified using Exec["concat_/path/to/file"] or
+#   Exec["concat_/path/to/directory"]
+# * The final file can be referenced as File["/path/to/file"] or
+#   File["concat_/path/to/file"]
 #
-
 define concat(
   $ensure         = 'present',
   $path           = $name,
   $owner          = undef,
   $group          = undef,
   $mode           = '0644',
   $warn           = false,
-  $force          = undef,
+  $force          = false,
   $backup         = 'puppet',
   $replace        = true,
   $order          = 'alpha',
   $ensure_newline = false,
   $validate_cmd   = undef,
+  $gnu            = undef
 ) {
   validate_re($ensure, '^present$|^absent$')
   validate_absolute_path($path)
   validate_string($owner)
   validate_string($group)
   validate_string($mode)
   if ! (is_string($warn) or $warn == true or $warn == false) {
     fail('$warn is not a string or boolean')
   }
-  if ! is_bool($backup) and ! is_string($backup) {
+  validate_bool($force)
+  if ! concat_is_bool($backup) and ! is_string($backup) {
     fail('$backup must be string or bool!')
   }
   validate_bool($replace)
   validate_re($order, '^alpha$|^numeric$')
   validate_bool($ensure_newline)
-
   if $validate_cmd and ! is_string($validate_cmd) {
     fail('$validate_cmd must be a string')
   }
-
-  if $force != undef {
-    warning('The $force parameter to concat is deprecated and has no effect.')
+  if $gnu {
+    warning('The $gnu parameter to concat is deprecated and has no effect')
   }
 
-  $safe_name            = regsubst($name, '[/:\n\s\(\)]', '_', 'G')
-  $default_warn_message = "# This file is managed by Puppet. DO NOT EDIT.\n"
+  include concat::setup
 
+  $safe_name            = regsubst($name, '[/:]', '_', 'G')
+  $concatdir            = $concat::setup::concatdir
+  $fragdir              = "${concatdir}/${safe_name}"
+  $concat_name          = 'fragments.concat.out'
+  $script_command       = $concat::setup::script_command
+  $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
+  $bool_warn_message    = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
+
+  # lint:ignore:quoted_booleans
   case $warn {
     true: {
       $warn_message = $default_warn_message
-      $_append_header = true
+    }
+    # lint:ignore:quoted_booleans
+    'true', 'yes', 'on': {
+    # lint:endignore
+      warning($bool_warn_message)
+      $warn_message = $default_warn_message
     }
     false: {
       $warn_message = ''
-      $_append_header = false
+    }
+    # lint:ignore:quoted_booleans
+    'false', 'no', 'off': {
+    # lint:endignore
+      warning($bool_warn_message)
+      $warn_message = ''
     }
     default: {
       $warn_message = $warn
-      $_append_header = true
     }
   }
+  # lint:endignore
+
+  $warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G')
+  $warnflag = $warnmsg_escaped ? {
+    ''      => '',
+    default => "-w '${warnmsg_escaped}'"
+  }
+
+  $forceflag = $force ? {
+    true  => '-f',
+    false => '',
+  }
+
+  $orderflag = $order ? {
+    'numeric' => '-n',
+    'alpha'   => '',
+  }
+
+  $newlineflag = $ensure_newline ? {
+    true  => '-l',
+    false => '',
+  }
+
+  File {
+    backup  => $backup,
+  }
+
+  # reset poisoned Exec defaults
+  Exec {
+    user  => undef,
+    group => undef,
+  }
 
   if $ensure == 'present' {
-    concat_file { $name:
-      tag            => $safe_name,
-      path           => $path,
-      owner          => $owner,
-      group          => $group,
-      mode           => $mode,
-      replace        => $replace,
-      backup         => $backup,
-      order          => $order,
-      ensure_newline => $ensure_newline,
-      validate_cmd   => $validate_cmd,
-    }
-
-    if $_append_header {
-      concat_fragment { "${name}_header":
-        target  => $name,
-        tag     => $safe_name,
-        content => $warn_message,
-        order   => '0',
+    file { $fragdir:
+      ensure => directory,
+      mode   => '0750',
+    }
+
+    file { "${fragdir}/fragments":
+      ensure  => directory,
+      mode    => '0750',
+      force   => true,
+      ignore  => ['.svn', '.git', '.gitignore'],
+      notify  => Exec["concat_${name}"],
+      purge   => true,
+      recurse => true,
+    }
+
+    file { "${fragdir}/fragments.concat":
+      ensure => present,
+      mode   => '0640',
+    }
+
+    file { "${fragdir}/${concat_name}":
+      ensure => present,
+      mode   => '0640',
+    }
+
+    file { $name:
+      ensure  => present,
+      owner   => $owner,
+      group   => $group,
+      mode    => $mode,
+      replace => $replace,
+      path    => $path,
+      alias   => "concat_${name}",
+      source  => "${fragdir}/${concat_name}",
+      backup  => $backup,
+    }
+
+    # Only newer versions of puppet 3.x support the validate_cmd parameter
+    if $validate_cmd {
+      File[$name] {
+        validate_cmd => $validate_cmd,
       }
     }
+
+    # remove extra whitespace from string interpolation to make testing easier
+    $command = strip(regsubst("${script_command} -o \"${fragdir}/${concat_name}\" -d \"${fragdir}\" ${warnflag} ${forceflag} ${orderflag} ${newlineflag}", '\s+', ' ', 'G'))
+
+    # make sure ruby is in the path for PE
+    if defined('$is_pe') and $::is_pe {
+      if $::kernel == 'windows' {
+        $command_path = "${::env_windows_installdir}/bin:${::path}"
+      } else {
+        $command_path = "/opt/puppet/bin:${::path}"
+      }
+    } else {
+      $command_path = $::path
+    }
+
+    # if puppet is running as root, this exec should also run as root to allow
+    # the concatfragments.rb script to potentially be installed in path that
+    # may not be accessible by a target non-root owner.
+    exec { "concat_${name}":
+      alias     => "concat_${fragdir}",
+      command   => $command,
+      notify    => File[$name],
+      subscribe => File[$fragdir],
+      unless    => "${command} -t",
+      path      => $command_path,
+      require   => [
+        File[$fragdir],
+        File["${fragdir}/fragments"],
+        File["${fragdir}/fragments.concat"],
+      ],
+    }
   } else {
-    concat_file { $name:
-      ensure => $ensure,
-      tag    => $safe_name,
-      path   => $path,
+    file { [
+      $fragdir,
+      "${fragdir}/fragments",
+      "${fragdir}/fragments.concat",
+      "${fragdir}/${concat_name}"
+    ]:
+      ensure => absent,
+      force  => true,
+    }
+
+    file { $path:
+      ensure => absent,
       backup => $backup,
     }
+
+    # lint:ignore:quoted_booleans
+    $absent_exec_command = $::kernel ? {
+      'windows' => 'cmd.exe /c exit 0',
+    # lint:ignore:quoted_booleans
+      default   => 'true',
+    # lint:endignore
+    }
+    # lint:endignore
+
+    $absent_exec_path = $::kernel ? {
+      'windows' => $::path,
+      default   => '/bin:/usr/bin',
+    }
+
+    # Need to have an unless here for idempotency.
+    exec { "concat_${name}":
+      alias   => "concat_${fragdir}",
+      command => $absent_exec_command,
+      unless  => $absent_exec_command,
+      path    => $absent_exec_path,
+    }
   }
 }
 
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/manifests/setup.pp b/manifests/setup.pp
new file mode 100644
index 0000000..c5aedd8
--- /dev/null
+++ b/manifests/setup.pp
@@ -0,0 +1,64 @@
+# === Class: concat::setup
+#
+# Sets up the concat system. This is a private class.
+#
+# [$concatdir]
+#   is where the fragments live and is set on the fact concat_basedir.
+#   Since puppet should always manage files in $concatdir and they should
+#   not be deleted ever, /tmp is not an option.
+#
+# It also copies out the concatfragments.{sh,rb} file to ${concatdir}/bin
+#
+class concat::setup {
+  if $caller_module_name != $module_name {
+    warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
+  }
+
+  if $::concat_basedir {
+    $concatdir = $::concat_basedir
+  } else {
+    fail ('$concat_basedir not defined. Try running again with pluginsync=true on the [master] and/or [main] section of your node\'s \'/etc/puppet/puppet.conf\'.')
+  }
+
+  # owner,group and mode of fragment files (on windows owner and access rights should
+  # be inherited from concatdir and not explicitly set to avoid problems)
+  $fragment_owner = $::osfamily ? { 'windows' => undef, default => $::id }
+  $fragment_mode  = $::osfamily ? { 'windows' => undef, default => '0640' }
+  # test on gid fact availability to support older facter versions
+  if defined('$gid') and $::gid and $::osfamily != 'Windows' {
+    $fragment_group = $::gid
+  } else {
+    $fragment_group = undef
+  }
+
+  $script_name = 'concatfragments.rb'
+
+  $script_path = "${concatdir}/bin/${script_name}"
+
+  $default_owner = $::osfamily ? { 'windows' => undef, default => $::id }
+
+  $default_group = $default_owner ? { 'root' => '0', default => undef }
+
+  $script_mode = $::osfamily ? { 'windows' => undef, default => '0755' }
+
+  $script_command = $::osfamily? {
+    'windows' => "ruby.exe '${script_path}'",
+    'openbsd' => "/usr/local/bin/ruby21 '${script_path}'",
+    default   => $script_path
+  }
+
+  file { $script_path:
+    ensure => file,
+    owner  => $default_owner,
+    group  => $default_group,
+    mode   => $script_mode,
+    source => "puppet:///modules/concat/${script_name}",
+  }
+
+  file { [ $concatdir, "${concatdir}/bin" ]:
+    ensure => directory,
+    owner  => $default_owner,
+    group  => $default_group,
+    mode   => '0755',
+  }
+}
diff --git a/metadata.json b/metadata.json
index 31d9144..1d45992 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,110 +1,110 @@
 {
   "name": "puppetlabs-concat",
-  "version": "2.0.1",
+  "version": "1.2.3",
   "author": "Puppet Labs",
   "summary": "Construct files from multiple fragments.",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-concat",
   "project_page": "https://github.com/puppetlabs/puppetlabs-concat",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "10 SP4",
         "11 SP1",
         "12"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "10.04",
         "12.04",
         "14.04"
       ]
     },
     {
       "operatingsystem": "Solaris",
       "operatingsystemrelease": [
         "10",
         "11"
       ]
     },
     {
       "operatingsystem": "Windows",
       "operatingsystemrelease": [
         "Server 2003 R2",
         "Server 2008 R2",
         "Server 2012",
         "Server 2012 R2"
       ]
     },
     {
       "operatingsystem": "AIX",
       "operatingsystemrelease": [
         "5.3",
         "6.1",
         "7.1"
       ]
     },
     {
       "operatingsystem": "OSX",
       "operatingsystemrelease": [
         "10.9"
       ]
     }
   ],
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.7.0 < 4.0.0"
+      "version_requirement": "3.x"
     },
     {
       "name": "puppet",
       "version_requirement": "3.x"
     }
   ],
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"}
   ]
 }
diff --git a/spec/acceptance/backup_spec.rb b/spec/acceptance/backup_spec.rb
index 0a737a5..1d3a5df 100644
--- a/spec/acceptance/backup_spec.rb
+++ b/spec/acceptance/backup_spec.rb
@@ -1,115 +1,115 @@
 require 'spec_helper_acceptance'
 
 describe 'concat backup parameter' do
   basedir = default.tmpdir('concat')
   context '=> puppet' do
     before(:all) do
       pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         file { '#{basedir}/file':
           content => "old contents\n",
         }
       EOS
       apply_manifest(pp)
     end
     pp = <<-EOS
       concat { '#{basedir}/file':
         backup => 'puppet',
       }
       concat::fragment { 'new file':
         target  => '#{basedir}/file',
         content => 'new contents',
       }
     EOS
 
     it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/)
+        expect(r.stdout).to match(/Filebucketed #{basedir}\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents'
       end
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) { should match /new contents/ }
     end
   end
 
   context '=> .backup' do
     before(:all) do
       pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         file { '#{basedir}/file':
           content => "old contents\n",
         }
       EOS
       apply_manifest(pp)
     end
     pp = <<-EOS
       concat { '#{basedir}/file':
         backup => '.backup',
       }
       concat::fragment { 'new file':
         target  => '#{basedir}/file',
         content => 'new contents',
       }
     EOS
 
     # XXX Puppet doesn't mention anything about filebucketing with a given
     # extension like .backup
     it 'applies the manifest twice  no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) { should match /new contents/ }
     end
     describe file("#{basedir}/file.backup") do
       it { should be_file }
       its(:content) { should match /old contents/ }
     end
   end
 
   # XXX The backup parameter uses validate_string() and thus can't be the
   # boolean false value, but the string 'false' has the same effect in Puppet 3
   context "=> 'false'" do
     before(:all) do
       pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         file { '#{basedir}/file':
           content => "old contents\n",
         }
       EOS
       apply_manifest(pp)
     end
     pp = <<-EOS
       concat { '#{basedir}/file':
         backup => '.backup',
       }
       concat::fragment { 'new file':
         target  => '#{basedir}/file',
         content => 'new contents',
       }
     EOS
 
     it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do
       apply_manifest(pp, :catch_failures => true) do |r|
         expect(r.stdout).to_not match(/Filebucketed/)
       end
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) { should match /new contents/ }
     end
   end
 end
diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index f84a38f..c5c9727 100644
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -1,187 +1,217 @@
 require 'spec_helper_acceptance'
 
 case fact('osfamily')
   when 'AIX'
     username = 'root'
     groupname = 'system'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
   when 'Darwin'
     username = 'root'
     groupname = 'wheel'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
   when 'windows'
     username = 'Administrator'
     groupname = 'Administrators'
     scriptname = 'concatfragments.rb'
     result = on default, "echo #{default['puppetvardir']}"
     vardir = result.raw_output.chomp
   when 'Solaris'
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
   else
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
 end
 
 describe 'basic concat test' do
   basedir = default.tmpdir('concat')
   safe_basedir = basedir.gsub(/[\/:]/, '_')
 
   shared_examples 'successfully_applied' do |pp|
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
+
+    describe file("#{vardir}/concat") do
+      it { should be_directory }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 755
+      }
+    end
+    describe file("#{vardir}/concat/bin") do
+      it { should be_directory }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 755
+      }
+    end
+    describe file("#{vardir}/concat/bin/#{scriptname}") do
+      it { should be_file }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 755
+      }
+    end
+    describe file("#{vardir}/concat/#{safe_basedir}_file") do
+      it { should be_directory }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 750
+      }
+    end
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments") do
+      it { should be_directory }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 750
+      }
+    end
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments.concat") do
+      it { should be_file }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 640
+      }
+    end
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments.concat.out") do
+      it { should be_file }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 640
+      }
+    end
   end
 
   context 'owner/group root' do
     before(:all) do
       pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
       EOS
       apply_manifest(pp)
     end
     pp = <<-EOS
       concat { '#{basedir}/file':
         owner => '#{username}',
         group => '#{groupname}',
         mode  => '0644',
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/file',
         content => '1',
         order   => '01',
       }
 
       concat::fragment { '2':
         target  => '#{basedir}/file',
         content => '2',
         order   => '02',
       }
     EOS
 
     it_behaves_like 'successfully_applied', pp
 
     describe file("#{basedir}/file") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be group", :unless => (fact('osfamily') == 'windows')) { should be_grouped_into groupname }
       it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
         should be_mode 644
       }
       its(:content) {
         should match '1'
         should match '2'
       }
     end
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments/01_1") do
+      it { should be_file }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 640
+      }
+    end
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments/02_2") do
+      it { should be_file }
+      it { should be_owned_by username }
+      it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
+        should be_mode 640
+      }
+    end
   end
 
   context 'ensure' do
     context 'works when set to present with path set' do
       before(:all) do
         pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         EOS
         apply_manifest(pp)
       end
       pp="
         concat { 'file':
           ensure => present,
           path   => '#{basedir}/file',
           mode   => '0644',
         }
         concat::fragment { '1':
           target  => 'file',
           content => '1',
           order   => '01',
         }
       "
 
       it_behaves_like 'successfully_applied', pp
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
           should be_mode 644
         }
         its(:content) { should match '1' }
       end
     end
     context 'works when set to absent with path set' do
       before(:all) do
         pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         EOS
         apply_manifest(pp)
       end
       pp="
         concat { 'file':
           ensure => absent,
           path   => '#{basedir}/file',
           mode   => '0644',
         }
         concat::fragment { '1':
           target  => 'file',
           content => '1',
           order   => '01',
         }
       "
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should_not be_file }
       end
     end
-    context 'works when set to present with path that has special characters' do
-      filename = fact('osfamily') == 'windows' ? 'file(1)' : 'file(1:2)'
-
-      before(:all) do
-        pp = <<-EOS
-        file { '#{basedir}':
-          ensure => directory,
-        }
-        EOS
-        apply_manifest(pp)
-      end
-      pp="
-        concat { '#{filename}':
-          ensure => present,
-          path   => '#{basedir}/#{filename}',
-          mode   => '0644',
-        }
-        concat::fragment { '1':
-          target  => '#{filename}',
-          content => '1',
-          order   => '01',
-        }
-      "
-
-      it_behaves_like 'successfully_applied', pp
-
-      describe file("#{basedir}/#{filename}") do
-        it { should be_file }
-        it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
-          should be_mode 644
-        }
-        its(:content) { should match '1' }
-      end
-    end
   end
 end
diff --git a/spec/acceptance/concurrency_spec.rb b/spec/acceptance/concurrency_spec.rb
deleted file mode 100644
index fcffdbd..0000000
--- a/spec/acceptance/concurrency_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'with file recursive purge' do
-  basedir = default.tmpdir('concat')
-  context 'should still create concat file' do
-    pp = <<-EOS
-      file { '#{basedir}/bar':
-        ensure => directory,
-        purge  => true,
-        recurse => true,
-      }
-
-      concat { "foobar":
-        ensure => 'present',
-        path   => '#{basedir}/bar/foobar',
-      }
-
-      concat::fragment { 'foo':
-        target => 'foobar',
-        content => 'foo',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe file("#{basedir}/bar/foobar") do
-      it { should be_file }
-      its(:content) {
-        should match 'foo'
-      }
-    end
-  end
-end
-
diff --git a/spec/acceptance/deprecation_warnings_spec.rb b/spec/acceptance/deprecation_warnings_spec.rb
new file mode 100644
index 0000000..11133ea
--- /dev/null
+++ b/spec/acceptance/deprecation_warnings_spec.rb
@@ -0,0 +1,238 @@
+require 'spec_helper_acceptance'
+
+describe 'deprecation warnings' do
+  basedir = default.tmpdir('concat')
+
+  shared_examples 'has_warning' do |pp, w|
+    it 'applies the manifest twice with a stderr regex' do
+      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m)
+      expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m)
+    end
+  end
+
+  context 'concat gnu parameter' do
+    pp = <<-EOS
+      concat { '#{basedir}/file':
+        gnu => 'foo',
+      }
+      concat::fragment { 'foo':
+        target  => '#{basedir}/file',
+        content => 'bar',
+      }
+    EOS
+    w = 'The $gnu parameter to concat is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat warn parameter =>' do
+    ['true', 'yes', 'on'].each do |warn|
+      context warn do
+        pp = <<-EOS
+          concat { '#{basedir}/file':
+            warn => '#{warn}',
+          }
+          concat::fragment { 'foo':
+            target  => '#{basedir}/file',
+            content => 'bar',
+          }
+        EOS
+        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
+
+        it_behaves_like 'has_warning', pp, w
+
+        describe file("#{basedir}/file") do
+          it { should be_file }
+          its(:content) {
+            should match '# This file is managed by Puppet. DO NOT EDIT.'
+            should match 'bar'
+          }
+        end
+      end
+    end
+
+    ['false', 'no', 'off'].each do |warn|
+      context warn do
+        pp = <<-EOS
+          concat { '#{basedir}/file':
+            warn => '#{warn}',
+          }
+          concat::fragment { 'foo':
+            target  => '#{basedir}/file',
+            content => 'bar',
+          }
+        EOS
+        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
+
+        it_behaves_like 'has_warning', pp, w
+
+        describe file("#{basedir}/file") do
+          it { should be_file }
+          its(:content) {
+            should_not match '# This file is managed by Puppet. DO NOT EDIT.'
+            should match 'bar'
+          }
+        end
+      end
+    end
+  end
+
+  context 'concat::fragment ensure parameter', :unless => fact('osfamily') == 'windows' do
+    context 'target file exists' do
+      before(:all) do
+        pp = <<-EOS
+          file { '#{basedir}':
+            ensure => directory,
+          }
+          file { '#{basedir}/file1':
+            content => "file1 contents\n",
+          }
+        EOS
+        apply_manifest(pp)
+      end
+
+      pp = <<-EOS
+        concat { '#{basedir}/file': }
+        concat::fragment { 'foo':
+          target => '#{basedir}/file',
+          ensure => '#{basedir}/file1',
+        }
+      EOS
+      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
+
+      it_behaves_like 'has_warning', pp, w
+
+      describe file("#{basedir}/file") do
+        it { should be_file }
+        its(:content) { should match 'file1 contents' }
+      end
+
+      describe 'the fragment can be changed from a symlink to a plain file', :unless => (fact("osfamily") == "windows") do
+        pp = <<-EOS
+          concat { '#{basedir}/file': }
+          concat::fragment { 'foo':
+            target  => '#{basedir}/file',
+            content => 'new content',
+          }
+        EOS
+
+        it 'applies the manifest twice with no stderr' do
+          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, :catch_changes => true)
+        end
+
+        describe file("#{basedir}/file") do
+          it { should be_file }
+          its(:content) {
+            should match 'new content'
+            should_not match 'file1 contents'
+          }
+        end
+      end
+    end # target file exists
+
+    context 'target does not exist', :unless => fact('osfamily') == 'windows' do
+      pp = <<-EOS
+        concat { '#{basedir}/file': }
+        concat::fragment { 'foo':
+          target => '#{basedir}/file',
+          ensure => '#{basedir}/file1',
+        }
+      EOS
+      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
+
+      it_behaves_like 'has_warning', pp, w
+
+      describe file("#{basedir}/file") do
+        it { should be_file }
+      end
+
+      describe 'the fragment can be changed from a symlink to a plain file', :unless => (fact('osfamily') == 'windows') do
+        pp = <<-EOS
+          concat { '#{basedir}/file': }
+          concat::fragment { 'foo':
+            target  => '#{basedir}/file',
+            content => 'new content',
+          }
+        EOS
+
+        it 'applies the manifest twice with no stderr' do
+          apply_manifest(pp, :catch_failures => true)
+          apply_manifest(pp, :catch_changes => true)
+        end
+
+        describe file("#{basedir}/file") do
+          it { should be_file }
+          its(:content) { should match 'new content' }
+        end
+      end
+    end # target file exists
+
+  end # concat::fragment ensure parameter
+
+  context 'concat::fragment mode parameter' do
+    pp = <<-EOS
+      concat { '#{basedir}/file': }
+      concat::fragment { 'foo':
+        target  => '#{basedir}/file',
+        content => 'bar',
+        mode    => 'bar',
+      }
+    EOS
+    w = 'The $mode parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment owner parameter' do
+    pp = <<-EOS
+      concat { '#{basedir}/file': }
+      concat::fragment { 'foo':
+        target  => '#{basedir}/file',
+        content => 'bar',
+        owner   => 'bar',
+      }
+    EOS
+    w = 'The $owner parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment group parameter' do
+    pp = <<-EOS
+      concat { '#{basedir}/file': }
+      concat::fragment { 'foo':
+        target  => '#{basedir}/file',
+        content => 'bar',
+        group   => 'bar',
+      }
+    EOS
+    w = 'The $group parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'concat::fragment backup parameter' do
+    pp = <<-EOS
+      concat { '#{basedir}/file': }
+      concat::fragment { 'foo':
+        target  => '#{basedir}/file',
+        content => 'bar',
+        backup  => 'bar',
+      }
+    EOS
+    w = 'The $backup parameter to concat::fragment is deprecated and has no effect'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+  context 'include concat::setup' do
+    pp = <<-EOS
+      include concat::setup
+    EOS
+    w = 'concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.'
+
+    it_behaves_like 'has_warning', pp, w
+  end
+
+end
diff --git a/spec/acceptance/empty_spec.rb b/spec/acceptance/empty_spec.rb
new file mode 100644
index 0000000..4ab6e1e
--- /dev/null
+++ b/spec/acceptance/empty_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper_acceptance'
+
+describe 'concat force empty parameter' do
+  basedir = default.tmpdir('concat')
+  context 'should run successfully' do
+    pp = <<-EOS
+      concat { '#{basedir}/file':
+        mode  => '0644',
+        force => true,
+      }
+    EOS
+
+    it 'applies the manifest twice with no stderr' do
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file("#{basedir}/file") do
+      it { should be_file }
+      its(:content) { should_not match /1\n2/ }
+    end
+  end
+end
diff --git a/spec/acceptance/fragment_source_spec.rb b/spec/acceptance/fragment_source_spec.rb
index b208979..a174e02 100644
--- a/spec/acceptance/fragment_source_spec.rb
+++ b/spec/acceptance/fragment_source_spec.rb
@@ -1,156 +1,157 @@
 require 'spec_helper_acceptance'
 
 case fact('osfamily')
   when 'AIX'
     username = 'root'
     groupname = 'system'
   when 'Darwin'
     username = 'root'
     groupname = 'wheel'
   when 'windows'
     username = 'Administrator'
     groupname = 'Administrators'
   else
     username = 'root'
     groupname = 'root'
 end
 
 describe 'concat::fragment source' do
   basedir = default.tmpdir('concat')
   context 'should read file fragments from local system' do
     pp = <<-EOS
       file { '#{basedir}/file1':
         content => "file1 contents\n"
       }
       file { '#{basedir}/file2':
         content => "file2 contents\n"
       }
       concat { '#{basedir}/foo': }
 
       concat::fragment { '1':
         target  => '#{basedir}/foo',
         source  => '#{basedir}/file1',
         require => File['#{basedir}/file1'],
       }
       concat::fragment { '2':
         target  => '#{basedir}/foo',
         content => 'string1 contents',
       }
       concat::fragment { '3':
         target  => '#{basedir}/foo',
         source  => '#{basedir}/file2',
         require => File['#{basedir}/file2'],
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/foo") do
       it { should be_file }
       its(:content) {
         should match 'file1 contents'
         should match 'string1 contents'
         should match 'file2 contents'
       }
     end
   end # should read file fragments from local system
 
   context 'should create files containing first match only.' do
     pp = <<-EOS
       file { '#{basedir}/file1':
         content => "file1 contents\n"
       }
       file { '#{basedir}/file2':
         content => "file2 contents\n"
       }
       concat { '#{basedir}/result_file1':
         owner   => '#{username}',
         group   => '#{groupname}',
         mode    => '0644',
       }
       concat { '#{basedir}/result_file2':
         owner   => '#{username}',
         group   => '#{groupname}',
         mode    => '0644',
       }
       concat { '#{basedir}/result_file3':
         owner   => '#{username}',
         group   => '#{groupname}',
         mode    => '0644',
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/result_file1',
         source  => [ '#{basedir}/file1', '#{basedir}/file2' ],
         require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ],
         order   => '01',
       }
       concat::fragment { '2':
         target  => '#{basedir}/result_file2',
         source  => [ '#{basedir}/file2', '#{basedir}/file1' ],
         require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ],
         order   => '01',
       }
       concat::fragment { '3':
         target  => '#{basedir}/result_file3',
         source  => [ '#{basedir}/file1', '#{basedir}/file2' ],
         require => [ File['#{basedir}/file1'], File['#{basedir}/file2'] ],
         order   => '01',
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
     describe file("#{basedir}/result_file1") do
       it { should be_file }
       its(:content) {
         should match 'file1 contents'
         should_not match 'file2 contents'
       }
     end
     describe file("#{basedir}/result_file2") do
       it { should be_file }
       its(:content) {
         should match 'file2 contents'
         should_not match 'file1 contents'
       }
     end
     describe file("#{basedir}/result_file3") do
       it { should be_file }
       its(:content) {
         should match 'file1 contents'
         should_not match 'file2 contents'
       }
     end
   end
 
   context 'should fail if no match on source.' do
     pp = <<-EOS
       concat { '#{basedir}/fail_no_source':
         owner   => '#{username}',
         group   => '#{groupname}',
         mode    => '0644',
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/fail_no_source',
         source => [ '#{basedir}/nofilehere', '#{basedir}/nothereeither' ],
         order   => '01',
       }
     EOS
 
     it 'applies the manifest with resource failures' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/Failed to generate additional resources using 'eval_generate'/)
+      apply_manifest(pp, :expect_failures => true)
     end
     describe file("#{basedir}/fail_no_source") do
       #FIXME: Serverspec::Type::File doesn't support exists? for some reason. so... hack.
+      it { should_not be_file }
       it { should_not be_directory }
     end
   end
 end
 
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 4e2cb80..b826851 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  centos-65-x64:
+  centos-66-x64:
     roles:
       - master
     platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+    box : puppetlabs/centos-6.6-64-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-6.6-64-nocm
     hypervisor : vagrant
 CONFIG:
-  type: foss
+  type: git
diff --git a/spec/acceptance/order_spec.rb b/spec/acceptance/order_spec.rb
index b746b1c..c158dd8 100644
--- a/spec/acceptance/order_spec.rb
+++ b/spec/acceptance/order_spec.rb
@@ -1,123 +1,123 @@
 require 'spec_helper_acceptance'
 
 describe 'concat order' do
   basedir = default.tmpdir('concat')
 
   context '=> ' do
     shared_examples 'sortby' do |order_by, match_output|
       pp = <<-EOS
       concat { '#{basedir}/foo':
         order => '#{order_by}'
       }
       concat::fragment { '1':
         target  => '#{basedir}/foo',
         content => 'string1',
         order   => '1',
       }
       concat::fragment { '2':
         target  => '#{basedir}/foo',
         content => 'string2',
         order   => '2',
       }
       concat::fragment { '10':
         target  => '#{basedir}/foo',
         content => 'string10',
       }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/foo") do
         it { should be_file }
         its(:content) { should match match_output }
       end
     end
 
     describe 'alpha' do
-      it_behaves_like 'sortby', 'alpha', /string1string10string2/
+      it_behaves_like 'sortby', 'alpha', /string10string1string2/
     end
 
     describe 'numeric' do
       it_behaves_like 'sortby', 'numeric', /string1string2string10/
     end
   end
 end # concat order
 
 describe 'concat::fragment order' do
   basedir = default.tmpdir('concat')
 
   context '=> reverse order' do
     shared_examples 'order_by' do |order_by, match_output|
       pp = <<-EOS
       concat { '#{basedir}/foo':
           order => '#{order_by}'
       }
       concat::fragment { '1':
         target  => '#{basedir}/foo',
         content => 'string1',
         order   => '15',
       }
       concat::fragment { '2':
         target  => '#{basedir}/foo',
         content => 'string2',
         # default order 10
       }
       concat::fragment { '3':
         target  => '#{basedir}/foo',
         content => 'string3',
         order   => '1',
       }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/foo") do
         it { should be_file }
         its(:content) { should match match_output }
       end
     end
     describe 'alpha' do
-      it_should_behave_like 'order_by', 'alpha', /string3string2string1/
+      it_should_behave_like 'order_by', 'alpha', /string2string1string3/
     end
     describe 'numeric' do
       it_should_behave_like 'order_by', 'numeric', /string3string2string1/
     end
   end
 
   context '=> normal order' do
     pp = <<-EOS
       concat { '#{basedir}/foo': }
       concat::fragment { '1':
         target  => '#{basedir}/foo',
         content => 'string1',
         order   => '01',
       }
       concat::fragment { '2':
         target  => '#{basedir}/foo',
         content => 'string2',
         order   => '02'
       }
       concat::fragment { '3':
         target  => '#{basedir}/foo',
         content => 'string3',
         order   => '03',
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/foo") do
       it { should be_file }
       its(:content) { should match /string1string2string3/ }
     end
   end
 end # concat::fragment order
diff --git a/spec/acceptance/replace_spec.rb b/spec/acceptance/replace_spec.rb
index 68d7383..bd597ed 100644
--- a/spec/acceptance/replace_spec.rb
+++ b/spec/acceptance/replace_spec.rb
@@ -1,261 +1,262 @@
 require 'spec_helper_acceptance'
 
 describe 'replacement of' do
   basedir = default.tmpdir('concat')
   context 'file' do
     context 'should not succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             content => "file exists\n"
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => false,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         its(:content) {
           should match 'file exists'
           should_not match '1'
           should_not match '2'
         }
       end
     end
 
     context 'should succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             content => "file exists\n"
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         its(:content) {
           should_not match 'file exists'
           should match '1'
           should match '2'
         }
       end
     end
   end # file
 
   context 'symlink', :unless => (fact("osfamily") == "windows") do
     context 'should not succeed' do
       # XXX the core puppet file type will replace a symlink with a plain file
       # when using ensure => present and source => ... but it will not when using
       # ensure => present and content => ...; this is somewhat confusing behavior
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => link,
             target => '#{basedir}/dangling',
           }
         EOS
         apply_manifest(pp)
       end
 
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => false,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       # XXX specinfra doesn't support be_linked_to on AIX
       describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX" or fact("osfamily") == "windows") do
         it { should be_linked_to "#{basedir}/dangling" }
       end
 
       describe file("#{basedir}/dangling") do
         # XXX serverspec does not have a matcher for 'exists'
         it { should_not be_file }
         it { should_not be_directory }
       end
     end
 
     context 'should succeed' do
       # XXX the core puppet file type will replace a symlink with a plain file
       # when using ensure => present and source => ... but it will not when using
       # ensure => present and content => ...; this is somewhat confusing behavior
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => link,
             target => '#{basedir}/dangling',
           }
         EOS
         apply_manifest(pp)
       end
 
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         its(:content) {
           should match '1'
           should match '2'
         }
       end
     end
   end # symlink
 
   context 'directory' do
     context 'should not succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => directory,
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file': }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with stderr for changing to file' do
         expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
         expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
       end
 
       describe file("#{basedir}/file") do
         it { should be_directory }
       end
     end
 
-    # XXX 
+    # XXX concat's force param currently enables the creation of empty files
     # when there are no fragments, and the replace param will only replace
     # files and symlinks, not directories.  The semantics either need to be
     # changed, extended, or a new param introduced to control directory
     # replacement.
     context 'should succeed', :pending => 'not yet implemented' do
       pp = <<-EOS
         concat { '#{basedir}/file':
+          force => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         its(:content) { should match '1' }
       end
     end
   end # directory
 end
diff --git a/spec/acceptance/warn_header_spec.rb b/spec/acceptance/warn_spec.rb
similarity index 98%
rename from spec/acceptance/warn_header_spec.rb
rename to spec/acceptance/warn_spec.rb
index b73414e..2788607 100644
--- a/spec/acceptance/warn_header_spec.rb
+++ b/spec/acceptance/warn_spec.rb
@@ -1,104 +1,104 @@
 require 'spec_helper_acceptance'
 
 describe 'concat warn =>' do
   basedir = default.tmpdir('concat')
   context 'true should enable default warning message' do
     pp = <<-EOS
       concat { '#{basedir}/file':
         warn  => true,
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/file',
         content => '1',
         order   => '01',
       }
 
       concat::fragment { '2':
         target  => '#{basedir}/file',
         content => '2',
         order   => '02',
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) {
         should match /# This file is managed by Puppet\. DO NOT EDIT\./
         should match /1/
         should match /2/
       }
     end
   end
   context 'false should not enable default warning message' do
     pp = <<-EOS
       concat { '#{basedir}/file':
         warn  => false,
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/file',
         content => '1',
         order   => '01',
       }
 
       concat::fragment { '2':
         target  => '#{basedir}/file',
         content => '2',
         order   => '02',
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) {
         should_not match /# This file is managed by Puppet\. DO NOT EDIT\./
         should match /1/
         should match /2/
       }
     end
   end
   context '# foo should overide default warning message' do
     pp = <<-EOS
       concat { '#{basedir}/file':
-        warn  => "# foo\n",
+        warn  => '# foo',
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/file',
         content => '1',
         order   => '01',
       }
 
       concat::fragment { '2':
         target  => '#{basedir}/file',
         content => '2',
         order   => '02',
       }
     EOS
 
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
     describe file("#{basedir}/file") do
       it { should be_file }
       its(:content) {
         should match /# foo/
         should match /1/
         should match /2/
       }
     end
   end
 end
diff --git a/spec/acceptance/warnings_spec.rb b/spec/acceptance/warnings_spec.rb
deleted file mode 100644
index 89b3c3c..0000000
--- a/spec/acceptance/warnings_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'warnings' do
-  basedir = default.tmpdir('concat')
-
-  shared_examples 'has_warning' do |pp, w|
-    it 'applies the manifest twice with a stderr regex' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m)
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m)
-    end
-  end
-
-  context 'concat force parameter deprecation' do
-    pp = <<-EOS
-      concat { '#{basedir}/file':
-        force => false,
-      }
-      concat::fragment { 'foo':
-        target  => '#{basedir}/file',
-        content => 'bar',
-      }
-    EOS
-    w = 'The $force parameter to concat is deprecated and has no effect.'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment ensure parameter deprecation' do
-    context 'target file exists' do
-    pp = <<-EOS
-      concat { '#{basedir}/file':
-      }
-      concat::fragment { 'foo':
-        target  => '#{basedir}/file',
-        ensure  => false,
-        content => 'bar',
-      }
-    EOS
-    w = 'The $ensure parameter to concat::fragment is deprecated and has no effect.'
-
-    it_behaves_like 'has_warning', pp, w
-    end
-  end
-
-  context 'concat::fragment target not found' do
-    context 'target not found' do
-    pp = <<-EOS
-      concat { 'file':
-        path => '#{basedir}/file',
-      }
-      concat::fragment { 'foo':
-        target  => '#{basedir}/file',
-        content => 'bar',
-      }
-    EOS
-    w = 'not found in the catalog'
-
-    it_behaves_like 'has_warning', pp, w
-    end
-  end
-end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 1293aeb..da994f8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,64 +1,61 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'acceptance/specinfra_stubs'
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
   # This will install the latest available package on el and deb based
   # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = {
-    :default_action => 'gem_install',
-    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
-  }
+  foss_opts = {:default_action => 'gem_install'}
 
   if default.is_pe?; then
     install_pe;
   else
     install_puppet(foss_opts);
   end
 
   hosts.each do |host|
     on hosts, "mkdir -p #{host['distmoduledir']}"
     if host['platform'] =~ /sles-1/i || host['platform'] =~ /solaris-1/i
-      get_deps = <<-EOS
+      get_stdlib = <<-EOS
       package{'wget':}
-      exec{'download-stdlib':
+      exec{'download':
         command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.5.1.tar.gz --no-check-certificate",
         path    => ['/opt/csw/bin/','/usr/bin/']
       }
       EOS
-      apply_manifest_on(host, get_deps)
+      apply_manifest_on(host, get_stdlib)
       # have to use force otherwise it checks ssl cert even though it is a local file
       on host, puppet('module install /root/puppetlabs-stdlib-4.5.1.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
     elsif host['platform'] =~ /windows/i
       on host, shell('curl -k -o c:/puppetlabs-stdlib-4.5.1.tar.gz https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.5.1.tar.gz')
       on host, puppet('module install c:/puppetlabs-stdlib-4.5.1.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
     else
       on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
     end
   end
 end
 
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'concat')
     end
   end
 
   c.before(:all) do
     shell('mkdir -p /tmp/concat')
   end
   c.after(:all) do
     shell('rm -rf /tmp/concat /var/lib/puppet/concat')
   end
 
   c.treat_symbols_as_metadata_keys_with_true_values = true
 end
 
diff --git a/spec/unit/classes/concat_setup_spec.rb b/spec/unit/classes/concat_setup_spec.rb
new file mode 100644
index 0000000..c6ff93e
--- /dev/null
+++ b/spec/unit/classes/concat_setup_spec.rb
@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe 'concat::setup', :type => :class do
+
+  shared_examples 'setup' do |concatdir|
+    concatdir = '/foo' if concatdir.nil?
+
+    let(:facts) do
+      {
+        :concat_basedir     => concatdir,
+        :caller_module_name => 'Test',
+        :osfamily           => 'Debian',
+        :id                 => 'root',
+        :is_pe              => false,
+      }
+    end
+
+    it do
+      should contain_file("#{concatdir}/bin/concatfragments.rb").with({
+        :mode   => '0755',
+        :owner  => 'root',
+        :group  => 0,
+        :source => 'puppet:///modules/concat/concatfragments.rb',
+      })
+    end
+
+    [concatdir, "#{concatdir}/bin"].each do |file|
+      it do
+        should contain_file(file).with({
+          :ensure => 'directory',
+          :mode   => '0755',
+          :owner  => 'root',
+          :group  => 0,
+        })
+      end
+    end
+  end
+
+  context 'facts' do
+    context 'concat_basedir =>' do
+      context '/foo' do
+        it_behaves_like 'setup', '/foo'
+      end
+    end
+  end # facts
+
+  context 'deprecated as a public class' do
+    it 'should create a warning' do
+      skip('rspec-puppet support for testing warning()')
+    end
+  end
+
+  context "on osfamily Solaris" do
+    concatdir = '/foo'
+    let(:facts) do
+      {
+        :concat_basedir     => concatdir,
+        :caller_module_name => 'Test',
+        :osfamily           => 'Solaris',
+        :id                 => 'root',
+        :is_pe              => false,
+      }
+    end
+
+    it do
+      should contain_file("#{concatdir}/bin/concatfragments.rb").with({
+        :ensure => 'file',
+        :owner  => 'root',
+        :group  => 0,
+        :mode   => '0755',
+        :source => 'puppet:///modules/concat/concatfragments.rb',
+      })
+    end
+  end # on osfamily Solaris
+
+  context "on osfamily windows" do
+    concatdir = '/foo'
+    let(:facts) do
+      {
+        :concat_basedir     => concatdir,
+        :caller_module_name => 'Test',
+        :osfamily           => 'windows',
+        :id                 => 'batman',
+        :is_pe              => false,
+      }
+    end
+
+    it do
+      should contain_file("#{concatdir}/bin/concatfragments.rb").with({
+        :ensure => 'file',
+        :owner  => nil,
+        :group  => nil,
+        :mode   => nil,
+        :source => 'puppet:///modules/concat/concatfragments.rb',
+      })
+    end
+  end # on osfamily windows
+end
diff --git a/spec/unit/defines/concat_fragment_spec.rb b/spec/unit/defines/concat_fragment_spec.rb
index 317b02c..40866a8 100644
--- a/spec/unit/defines/concat_fragment_spec.rb
+++ b/spec/unit/defines/concat_fragment_spec.rb
@@ -1,115 +1,338 @@
 require 'spec_helper'
 
 describe 'concat::fragment', :type => :define do
 
   shared_examples 'fragment' do |title, params|
     params = {} if params.nil?
 
     p = {
       :content => nil,
       :source  => nil,
       :order   => 10,
+      :ensure  => 'present',
     }.merge(params)
 
+    safe_name        = title.gsub(/[\/\n]/, '_')
+    safe_target_name = p[:target].gsub(/[\/\n]/, '_')
+    concatdir        = '/var/lib/puppet/concat'
+    fragdir          = "#{concatdir}/#{safe_target_name}"
     id               = 'root'
     gid              = 'root'
+    if p[:ensure] == 'absent'
+      safe_ensure = p[:ensure] 
+    else
+      safe_ensure = 'file'
+    end
 
     let(:title) { title }
+    let(:facts) do
+      {
+        :concat_basedir => concatdir,
+        :id             => id,
+        :gid            => gid,
+        :osfamily       => 'Debian',
+        :path           => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :is_pe          => false,
+      }
+    end
     let(:params) { params }
     let(:pre_condition) do
       "concat{ '#{p[:target]}': }"
     end
 
     it do
+      should contain_class('concat::setup')
       should contain_concat(p[:target])
-      should contain_concat_file(p[:target])
-      should contain_concat_fragment(title)
+      should contain_file("#{fragdir}/fragments/#{p[:order]}_#{safe_name}").with({
+        :ensure  => safe_ensure,
+        :owner   => id,
+        :mode    => '0640',
+        :source  => p[:source],
+        :content => p[:content],
+        :alias   => "concat_fragment_#{title}",
+        :backup  => 'puppet',
+      })
+      # The defined() function doesn't seem to work properly with puppet 3.4 and rspec.
+      # defined() works on its own, rspec works on its own, but together they
+      # determine that $gid is not defined and cause errors here. Work around
+      # it by ignoring this check for older puppet version.
+      if Puppet::Util::Package.versioncmp(Puppet.version, '3.5.0') >= 0
+        should contain_file("#{fragdir}/fragments/#{p[:order]}_#{safe_name}").with({
+          :group   => gid,
+        })
+      end
     end
   end
 
   context 'title' do
     ['0', '1', 'a', 'z'].each do |title|
       it_behaves_like 'fragment', title, {
         :target  => '/etc/motd',
-        :content => "content for #{title}"
       }
     end
   end # title
 
   context 'target =>' do
     ['./etc/motd', 'etc/motd', 'motd_header'].each do |target|
       context target do
         it_behaves_like 'fragment', target, {
           :target  => '/etc/motd',
-          :content => "content for #{target}"
         }
       end
     end
 
     context 'false' do
       let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
       let(:params) {{ :target => false }}
 
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string/)
       end
     end
   end # target =>
 
+  context 'ensure =>' do
+    ['present', 'absent'].each do |ens|
+      context ens do
+        it_behaves_like 'fragment', 'motd_header', {
+          :ensure => ens,
+          :target => '/etc/motd',
+        }
+      end
+    end
+
+    context 'any value other than \'present\' or \'absent\'' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :ensure => 'invalid', :target => '/etc/motd' }}
+
+      it 'should create a warning' do
+        skip('rspec-puppet support for testing warning()')
+      end
+    end
+  end # ensure =>
+
   context 'content =>' do
     ['', 'ashp is our hero'].each do |content|
       context content do
         it_behaves_like 'fragment', 'motd_header', {
           :content => content,
           :target  => '/etc/motd',
         }
       end
     end
 
     context 'false' do
       let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
       let(:params) {{ :content => false, :target => '/etc/motd' }}
 
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string/)
       end
     end
   end # content =>
 
   context 'source =>' do
     ['', '/foo/bar', ['/foo/bar', '/foo/baz']].each do |source|
       context source do
         it_behaves_like 'fragment', 'motd_header', {
           :source => source,
           :target => '/etc/motd',
         }
       end
     end
 
     context 'false' do
       let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
       let(:params) {{ :source => false, :target => '/etc/motd' }}
 
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string or an Array/)
       end
     end
   end # source =>
 
+  context 'order =>' do
+    ['', '42', 'a', 'z'].each do |order|
+      context '\'\'' do
+        it_behaves_like 'fragment', 'motd_header', {
+          :order  => order,
+          :target => '/etc/motd',
+        }
+      end
+    end
+
+    context 'false' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => false, :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /is not a string or integer/)
+      end
+    end
+
+    context '123:456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => '123:456', :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
+    context '123/456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => '123/456', :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
+    context '123\n456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => "123\n456", :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
+  end # order =>
+
   context 'more than one content source' do
+    error_msg = 'You cannot specify more than one of $content, $source, $ensure => /target'
+
+    context 'ensure => target and source' do
+      let(:title) { 'motd_header' }
+      let(:facts) do
+        {
+          :concat_basedir => '/tmp',
+          :osfamily       => 'Debian',
+          :id             => 'root',
+          :is_pe          => false,
+          :gid            => 'root',
+        }
+      end
+      let(:params) do
+        {
+          :target  => '/etc/motd',
+          :ensure  => '/foo',
+          :source  => '/bar',
+        }
+      end
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
+      end
+    end
+
+    context 'ensure => target and content' do
+      let(:title) { 'motd_header' }
+      let(:facts) do
+        {
+          :concat_basedir => '/tmp',
+          :osfamily       => 'Debian',
+          :id             => 'root',
+          :is_pe          => false,
+          :gid            => 'root',
+        }
+      end
+      let(:params) do
+        {
+          :target  => '/etc/motd',
+          :ensure  => '/foo',
+          :content => 'bar',
+        }
+      end
+
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
+      end
+    end
+
     context 'source and content' do
       let(:title) { 'motd_header' }
+      let(:facts) do
+        {
+          :concat_basedir => '/tmp',
+          :osfamily       => 'Debian',
+          :id             => 'root',
+          :is_pe          => false,
+          :gid            => 'root',
+        }
+      end
       let(:params) do
         {
-          :target => '/etc/motd', 
+          :target => '/etc/motd',
           :source => '/foo',
           :content => 'bar',
         }
       end
 
       it 'should fail' do
-        expect { catalogue }.to raise_error(Puppet::Error, /Can't use 'source' and 'content' at the same time/)
+        expect { catalogue }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
       end
     end
+
   end # more than one content source
+
+  describe 'deprecated parameter' do
+    context 'mode =>' do
+      context '1755' do
+        it_behaves_like 'fragment', 'motd_header', {
+          :mode   => '1755',
+          :target => '/etc/motd',
+        }
+
+        it 'should create a warning' do
+          skip('rspec-puppet support for testing warning()')
+        end
+      end
+    end # mode =>
+
+    context 'owner =>' do
+      context 'apenny' do
+        it_behaves_like 'fragment', 'motd_header', {
+          :owner  => 'apenny',
+          :target => '/etc/motd',
+        }
+
+        it 'should create a warning' do
+          skip('rspec-puppet support for testing warning()')
+        end
+      end
+    end # owner =>
+
+    context 'group =>' do
+      context 'apenny' do
+        it_behaves_like 'fragment', 'motd_header', {
+          :group  => 'apenny',
+          :target => '/etc/motd',
+        }
+
+        it 'should create a warning' do
+          skip('rspec-puppet support for testing warning()')
+        end
+      end
+    end # group =>
+
+    context 'backup =>' do
+      context 'foo' do
+        it_behaves_like 'fragment', 'motd_header', {
+          :backup => 'foo',
+          :target => '/etc/motd',
+        }
+
+        it 'should create a warning' do
+          skip('rspec-puppet support for testing warning()')
+        end
+      end
+    end # backup =>
+  end # deprecated params
+
 end
diff --git a/spec/unit/defines/concat_spec.rb b/spec/unit/defines/concat_spec.rb
index b2254f4..b5dd253 100644
--- a/spec/unit/defines/concat_spec.rb
+++ b/spec/unit/defines/concat_spec.rb
@@ -1,283 +1,417 @@
 require 'spec_helper'
 
 describe 'concat', :type => :define do
 
   shared_examples 'concat' do |title, params, id| 
     params = {} if params.nil?
     id = 'root' if id.nil?
 
     # default param values
     p = {
       :ensure         => 'present',
       :path           => title,
       :owner          => nil,
       :group          => nil,
       :mode           => '0644',
       :warn           => false,
+      :force          => false,
       :backup         => 'puppet',
       :replace        => true,
+      :order          => 'alpha',
+      :ensure_newline => false,
+      :validate_cmd   => nil,
     }.merge(params)
 
     safe_name            = title.gsub('/', '_')
+    concatdir            = '/var/lib/puppet/concat'
+    fragdir              = "#{concatdir}/#{safe_name}"
     concat_name          = 'fragments.concat.out'
-    default_warn_message = "# This file is managed by Puppet. DO NOT EDIT.\n"
+    default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
 
     file_defaults = {
       :backup  => p[:backup],
     }
 
     let(:title) { title }
     let(:params) { params }
     let(:facts) do
       {
+        :concat_basedir => concatdir,
         :id             => id,
         :osfamily       => 'Debian',
         :path           => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         :kernel         => 'Linux',
         :is_pe          => false,
       }
     end
 
     if p[:ensure] == 'present'
       it do
-        should contain_concat(title).with(file_defaults.merge({
+        should contain_file(fragdir).with(file_defaults.merge({
+          :ensure => 'directory',
+          :mode   => '0750',
+        }))
+      end
+
+      it do
+        should contain_file("#{fragdir}/fragments").with(file_defaults.merge({
+          :ensure  => 'directory',
+          :mode    => '0750',
+          :force   => true,
+          :ignore  => ['.svn', '.git', '.gitignore'],
+          :purge   => true,
+          :recurse => true,
+        }))
+      end
+
+      [
+        "#{fragdir}/fragments.concat",
+        "#{fragdir}/#{concat_name}",
+      ].each do |file|
+        it do
+          should contain_file(file).with(file_defaults.merge({
+            :ensure => 'present',
+            :mode   => '0640',
+          }))
+        end
+      end
+
+      it do
+        should contain_file(title).with(file_defaults.merge({
           :ensure       => 'present',
           :owner        => p[:owner],
           :group        => p[:group],
           :mode         => p[:mode],
+          :replace      => p[:replace],
           :path         => p[:path],
+          :alias        => "concat_#{title}",
+          :source       => "#{fragdir}/#{concat_name}",
+          :validate_cmd => p[:validate_cmd],
           :backup       => p[:backup],
-          :replace      => p[:replace],
         }))
       end
+
+      cmd = "#{concatdir}/bin/concatfragments.rb " +
+            "-o \"#{concatdir}/#{safe_name}/fragments.concat.out\" " +
+            "-d \"#{concatdir}/#{safe_name}\""
+
+      # flag order: fragdir, warnflag, forceflag, orderflag, newlineflag 
+      if p.has_key?(:warn)
+        case p[:warn]
+        when TrueClass
+          message = default_warn_message
+        when 'true', 'yes', 'on'
+          # should generate a stringified boolean warning
+          message = default_warn_message
+        when FalseClass
+          message = nil
+        when 'false', 'no', 'off'
+          # should generate a stringified boolean warning
+          message = nil
+        else
+          message = p[:warn]
+        end
+
+        unless message.nil?
+          cmd += " -w \'#{message}\'"
+        end
+      end
+
+      cmd += " -f" if p[:force]
+      cmd += " -n" if p[:order] == 'numeric'
+      cmd += " -l" if p[:ensure_newline] == true
+
+      it do
+        should contain_exec("concat_#{title}").with({
+          :alias   => "concat_#{fragdir}",
+          :command => cmd,
+          :unless  => "#{cmd} -t",
+        })
+      end
     else
+      [
+        fragdir,
+        "#{fragdir}/fragments",
+        "#{fragdir}/fragments.concat",
+        "#{fragdir}/#{concat_name}",
+      ].each do |file|
+        it do
+          should contain_file(file).with(file_defaults.merge({
+            :ensure => 'absent',
+            :force  => true,
+          }))
+        end
+      end
+
       it do
-        should contain_concat(title).with(file_defaults.merge({
+        should contain_file(title).with(file_defaults.merge({
           :ensure => 'absent',
           :backup => p[:backup],
         }))
       end
+
+      it do
+        should contain_exec("concat_#{title}").with({
+          :alias   => "concat_#{fragdir}",
+          :command => 'true',
+          :unless  => 'true',
+          :path    => '/bin:/usr/bin',
+        })
+      end
     end
   end
 
   context 'title' do
     context 'without path param' do
       # title/name is the default value for the path param. therefore, the
       # title must be an absolute path unless path is specified
       ['/foo', '/foo/bar', '/foo/bar/baz'].each do |title|
         context title do
           it_behaves_like 'concat', '/etc/foo.bar'
         end
       end
 
       ['./foo', 'foo', 'foo/bar'].each do |title|
         context title do
           let(:title) { title }
           it 'should fail' do
             expect { catalogue }.to raise_error(Puppet::Error, /is not an absolute path/)
           end
         end
       end
     end
 
     context 'with path param' do
-      ['/foo', 'foo', 'foo/bar'].each do |title|
+      ['./foo', 'foo', 'foo/bar'].each do |title|
         context title do
           it_behaves_like 'concat', title, { :path => '/etc/foo.bar' }
         end
       end
     end
   end # title =>
 
   context 'as non-root user' do
     it_behaves_like 'concat', '/etc/foo.bar', {}, 'bob'
   end
 
   context 'ensure =>' do
     ['present', 'absent'].each do |ens|
       context ens do
         it_behaves_like 'concat', '/etc/foo.bar', { :ensure => ens }
       end
     end
 
     context 'invalid' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :ensure => 'invalid' }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^present$|^absent$"')}/)
       end
     end
   end # ensure =>
 
   context 'path =>' do
     context '/foo' do
       it_behaves_like 'concat', '/etc/foo.bar', { :path => '/foo' }
     end
 
     ['./foo', 'foo', 'foo/bar', false].each do |path|
       context path do
         let(:title) { '/etc/foo.bar' }
         let(:params) {{ :path => path }}
         it 'should fail' do
           expect { catalogue }.to raise_error(Puppet::Error, /is not an absolute path/)
         end
       end
     end
   end # path =>
 
   context 'owner =>' do
     context 'apenney' do
       it_behaves_like 'concat', '/etc/foo.bar', { :owner => 'apenny' }
     end
 
     context 'false' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :owner => false }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string/)
       end
     end
   end # owner =>
 
   context 'group =>' do
     context 'apenney' do
       it_behaves_like 'concat', '/etc/foo.bar', { :group => 'apenny' }
     end
 
     context 'false' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :group => false }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string/)
       end
     end
   end # group =>
 
   context 'mode =>' do
     context '1755' do
       it_behaves_like 'concat', '/etc/foo.bar', { :mode => '1755' }
     end
 
     context 'false' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :mode => false }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string/)
       end
     end
   end # mode =>
 
   context 'warn =>' do
     [true, false, '# foo'].each do |warn|
       context warn do
         it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
       end
     end
 
     context '(stringified boolean)' do
       ['true', 'yes', 'on', 'false', 'no', 'off'].each do |warn|
         context warn do
           it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
 
           it 'should create a warning' do
             skip('rspec-puppet support for testing warning()')
           end
         end
       end
     end
 
     context '123' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :warn => 123 }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a string or boolean/)
       end
     end
   end # warn =>
 
+  context 'force =>' do
+    [true, false].each do |force|
+      context force do
+        it_behaves_like 'concat', '/etc/foo.bar', { :force => force }
+      end
+    end
+
+    context '123' do
+      let(:title) { '/etc/foo.bar' }
+      let(:params) {{ :force => 123 }}
+      it 'should fail' do
+        expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
+      end
+    end
+  end # force =>
+
   context 'backup =>' do
     context 'reverse' do
       it_behaves_like 'concat', '/etc/foo.bar', { :backup => 'reverse' }
     end
 
     context 'false' do
       it_behaves_like 'concat', '/etc/foo.bar', { :backup => false }
     end
 
     context 'true' do
       it_behaves_like 'concat', '/etc/foo.bar', { :backup => true }
     end
 
     context 'true' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :backup => [] }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /backup must be string or bool/)
       end
     end
   end # backup =>
 
   context 'replace =>' do
     [true, false].each do |replace|
       context replace do
         it_behaves_like 'concat', '/etc/foo.bar', { :replace => replace }
       end
     end
 
     context '123' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :replace => 123 }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
       end
     end
   end # replace =>
 
   context 'order =>' do
     ['alpha', 'numeric'].each do |order|
       context order do
         it_behaves_like 'concat', '/etc/foo.bar', { :order => order }
       end
     end
 
     context 'invalid' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :order => 'invalid' }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^alpha$|^numeric$"')}/)
       end
     end
   end # order =>
 
   context 'ensure_newline =>' do
     [true, false].each do |ensure_newline|
       context 'true' do
         it_behaves_like 'concat', '/etc/foo.bar', { :ensure_newline => ensure_newline}
       end
     end
 
     context '123' do
       let(:title) { '/etc/foo.bar' }
       let(:params) {{ :ensure_newline => 123 }}
       it 'should fail' do
         expect { catalogue }.to raise_error(Puppet::Error, /is not a boolean/)
       end
     end
   end # ensure_newline =>
 
   context 'validate_cmd =>' do
-    context '/usr/bin/test -e %' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :validate_cmd => '/usr/bin/test -e %' }
-    end
+    if Puppet::Util::Package::versioncmp(Puppet::version, '3.5.0') > 0
+      context '/usr/bin/test -e %' do
+        it_behaves_like 'concat', '/etc/foo.bar', { :validate_cmd => '/usr/bin/test -e %' }
+      end
 
-    [ 1234, true ].each do |cmd|
-      context cmd do
-        let(:title) { '/etc/foo.bar' }
-        let(:params) {{ :validate_cmd => cmd }}
-        it 'should fail' do
-          expect { catalogue }.to raise_error(Puppet::Error, /\$validate_cmd must be a string/)
+      [ 1234, true ].each do |cmd|
+        context cmd do
+          let(:title) { '/etc/foo.bar' }
+          let(:params) {{ :validate_cmd => cmd }}
+          it 'should fail' do
+            expect { catalogue }.to raise_error(Puppet::Error, /\$validate_cmd must be a string/)
+          end
         end
       end
     end
   end # validate_cmd =>
+
+  describe 'deprecated parameter' do
+    context 'gnu =>' do
+      context 'foo' do
+        it_behaves_like 'concat', '/etc/foo.bar', { :gnu => 'foo'}
+
+        it 'should create a warning' do
+          skip('rspec-puppet support for testing warning()')
+        end
+      end
+    end
+  end
+
 end
+
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/spec/unit/facts/concat_basedir_spec.rb b/spec/unit/facts/concat_basedir_spec.rb
new file mode 100644
index 0000000..41bc90f
--- /dev/null
+++ b/spec/unit/facts/concat_basedir_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'concat_basedir', :type => :fact do
+  before(:each) { Facter.clear }
+
+  context 'Puppet[:vardir] ==' do
+    it '/var/lib/puppet' do
+      Puppet.stubs(:[]).with(:vardir).returns('/var/lib/puppet')
+      Facter.fact(:concat_basedir).value.should == '/var/lib/puppet/concat'
+    end
+
+    it '/home/apenny/.puppet/var' do
+      Puppet.stubs(:[]).with(:vardir).returns('/home/apenny/.puppet/var')
+      Facter.fact(:concat_basedir).value.should == '/home/apenny/.puppet/var/concat'
+    end
+  end
+
+end
diff --git a/tests/init.pp b/tests/init.pp
index c7f1934..fd21427 100644
--- a/tests/init.pp
+++ b/tests/init.pp
@@ -1,6 +1,7 @@
 concat { '/tmp/concat':
   ensure => present,
+  force  => true,
   owner  => 'root',
   group  => 'root',
   mode   => '0644',
 }