(╯°□°)╯︵┻━┻ the 2.0.x rewrite

.fixtures.yml

@@ -2,6 +2,6 @@ fixtures:
   repositories:
     'stdlib':
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.5.1'
+      ref: '4.2.0'
   symlinks:
     'concat': '#{source_dir}'

CHANGELOG.md

@@ -1,27 +1,3 @@
-=======
-##2015-06-02 - Supported Release 2.0.1
-###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
-###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
 

README.md

@@ -9,9 +9,9 @@
     * [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)
 
@@ -21,7 +21,14 @@ The concat module lets you construct files from multiple ordered fragments of te
 
 ##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
 
@@ -116,17 +123,15 @@ When you're finished, the motd file will look something like this:
 
 ##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.
 
@@ -138,13 +143,14 @@ Specifies whether (and how) to back up the destination file before overwriting i
 
 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`
 
@@ -162,10 +168,12 @@ You can override this setting for individual fragments by adjusting the `order`
 
 #####`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`
@@ -178,19 +186,17 @@ Specifies a validation command to apply to the destination file. Requires Puppet
 
 #####`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.
 
@@ -200,7 +206,7 @@ Supplies the content of the fragment. **Note**: You must supply either a `conten
 
 #####`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`
 
@@ -214,91 +220,51 @@ Specifies a file to read into the content of the fragment. **Note**: You must su
 
 *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
 
@@ -314,8 +280,4 @@ For more information, see our [module contribution guide.](https://docs.puppetla
 
 ###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)