opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
270 commits 2 branches 0 tags 394 KiB
Commit graph

270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Geoff Williams
0ce713fd9c fix concat broken on windows due to case sensitive regexp -- made it case insensitive 2014-07-09 13:45:16 +10:00
Morgan Haskel
97f77f7459 Merge pull request #201 from chtitux/patch-1 
README.md : add missing ','
 2014-07-08 10:09:06 -04:00
Ashley Penney
a6fc85aa67 Merge pull request #203 from cmurphy/master 
Add validate and lint tasks to travis script
 2014-07-03 17:43:22 -04:00
Colleen Murphy
9c94193b3b Add validate and lint tasks to travis script 2014-07-03 09:53:38 -07:00
Hunter Haugen
c9e6ab7ed3 Merge pull request #202 from cmurphy/master 
Synchronize .travis.yml
 2014-06-30 11:03:24 -07:00
Colleen Murphy
ec789e11ad Update Gemfile for .travis.yml defaults 2014-06-30 10:57:48 -07:00
Hunter Haugen
c62dc5363a Merge pull request #197 from luisfdez/bug/quotes 
Add quotes to the ruby script location
 2014-06-27 12:44:06 -07:00
Colleen Murphy
d6a8ceeb1a Synchronize .travis.yml 2014-06-27 10:52:12 -07:00
Colleen Murphy
4b191654cb Update .sync.yml to support new .travis.yml configs 2014-06-27 09:29:18 -07:00
Morgan Haskel
bc996db7a8 Merge pull request #200 from cmurphy/master 
Start synchronizing module files
 2014-06-26 13:58:51 -04:00
Théophile Helleboid - chtitux
ad71982196 README.md : add missing ',' 
Small typo, a ',' was missing on the minimal exampel conf
 2014-06-26 10:45:35 +02:00
Colleen Murphy
2b51a83b9b Sync files 2014-06-25 17:23:15 -07:00
Colleen Murphy
551d8308c1 Add configuration file for modulesync 
https://github.com/puppetlabs/modulesync
 2014-06-25 08:19:44 -07:00
Joshua Hoblitt
56876f8ce6 Merge pull request #198 from igalic/patch-1 
small typo: missing closing '
 2014-06-21 15:44:29 -07:00
Igor Galić
222ecc020a small typo: missing losing ' 2014-06-21 14:16:47 +02:00
Luis Fernandez Alvarez
da59390ed2 Add quotes to the ruby script location 
Without this patch, if the ruby script is located in a path with
spaces, it will not work.
 2014-06-18 09:09:47 +02:00
Joshua Hoblitt
f70881fbfd Merge pull request #185 from jhoblitt/feature/fragment_order_validation 
Validate the concat::fragment order parameter as string||integer
 2014-05-29 14:38:02 -07:00
Joshua Hoblitt
5cdd051dea add .vagrant to .gitignore 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
6ca22bd99c raise the "low bar" travis puppet version to 2.7.6 
It appears that puppet 2.7.3 does not play nicely with stdlib 4.2.0.
 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
8dedb6bffb Validate the concat::fragment order parameter as string||integer 
This is to work around a validation issue that arises under the 3.x future
parser, as proper numeric types have been introduced (ie, not all scalar values
are strings).  Users have come to expect to to be able to pass in unquoted
integer values to the order parameter which will fail to validate as a string
when the future parser is enabled.
 2014-05-29 13:07:16 -07:00
Joshua Hoblitt
705071343b Merge pull request #186 from jhoblitt/feature/rb_concat_solaris 
enable the ruby concat script on Solaris
 2014-05-29 13:06:10 -07:00
Joshua Hoblitt
a4abf6f142 enable the ruby concat script on Solaris 
Per discussion on #174, Solaris 10 does not support the find/xargs
switches that were introduced in that PR (but Solaris 11 does).

+ add a shebang to concatfragments.rb
+ fix linter warnings/errors
 2014-05-29 12:52:38 -07:00
Joshua Hoblitt
ad11960250 Merge pull request #183 from misterdorm/order_string 
Change default 'order' parameter to be a string
 2014-05-21 16:59:50 -07:00
Mike Dorman
cd645a8360 Change default 'order' parameter to be a string 
Under Puppet 3.5.1 (and possibly earlier versions, too), the validate_string($order)
fails when $order is actaully a numeric type.  Apparently there is more strict type
checking now.  Can't just change validate_string to a is_numeric check, because it's
fairly common to use strings like '01' for the order parameter, which doesn't pass
the is_numeric test.  Additionally, there is nothing saying that $order must be a
number.  Ultimately the ordering gets implemented as filesystem directory list
sorting.
 2014-05-21 17:06:37 -06:00
Ashley Penney
9cd6fad9ae Merge pull request #181 from mhaskel/1.1.0-release 
Update CHANGELOG and Modulefile for 1.1.0 release.
 2014-05-14 17:52:27 -04:00
Morgan Haskel
a50226b4ec Update CHANGELOG and Modulefile for 1.1.0 release. 2014-05-14 17:31:04 -04:00
Ashley Penney
3f4165a106 Merge pull request #179 from mhaskel/add-ubuntu-nodeset 
Add nodeset for ubuntu trusty.
 2014-05-14 16:20:05 -04:00
Morgan Haskel
6b9e8ddc37 Add nodeset for ubuntu trusty. 2014-05-14 16:14:53 -04:00
mhaskel
7ede29bd8e Merge pull request #175 from apenney/fix-1404 
Improve this so it works on Ubuntu 14.04.
 2014-05-02 10:53:45 -07:00
Ashley Penney
8a1965ade9 Improve this so it works on Ubuntu 14.04. 2014-05-02 19:50:51 +02:00
Ashley Penney
6a3bdd03fa Merge pull request #174 from bdeak/fix_numeric_sorting 
fix numeric sorting
 2014-05-01 16:10:55 -04:00
mhaskel
fca35a0567 Merge pull request #152 from lweller/issue_151 
ignore mode and owner on windows
 2014-05-01 11:10:40 -07:00
Balint Deak
9590b7cb8a fix numeric sorting 2014-04-25 10:47:57 +02:00
Ashley Penney
a278e5063c Merge pull request #172 from apenney/fix-newlines 
Fix newlines.
 2014-04-21 19:24:09 -04:00
Ashley Penney
a2df44a967 Fix newlines. 
Previously the newline handling modified the actual fragments, causing
multiple runs to always update the newlines.  Handle this appropriately.
 2014-04-21 18:36:59 -04:00
Ashley Penney
ca37c46b39 Merge pull request #170 from acca301/master 
Proper quoting of quotes.
 2014-04-10 07:47:39 -04:00
Alexander Kuznetsov
c51b6598e3 Proper quoting of quotes. 2014-04-04 09:35:06 -04:00
Lucien Weller
e154e8d8f3 ignore mode an owner on windows 2014-04-04 11:03:25 +02:00
Ashley Penney
bd063dedac Merge pull request #121 from acca301/master 
[Most of] variables quoted to allow multi-word warning messages, spaces ...
 2014-04-03 13:09:11 -04:00
Ashley Penney
3b1bbb4873 Merge pull request #150 from lweller/issue_149 
added double quotes to paths in concat command
 2014-04-03 13:06:27 -04:00
Ashley Penney
482f18029f Merge pull request #147 from igalic/ignorance 
be more ignorant
 2014-03-27 14:00:48 -04:00
Ashley Penney
0b540dbb86 Merge pull request #155 from PierreR/patch-1 
Use explicit undef in else case
 2014-03-27 13:57:43 -04:00
Ashley Penney
cd2e1d97e9 Merge pull request #169 from hunner/remove_autorelease 
Remove autorelease
 2014-03-05 12:17:48 -05:00
Hunter Haugen
fee285a238 Remove autorelease 2014-03-05 09:15:45 -08:00
Pi3r
d6b11cd502 Use explicit undef in else case 
This is better than leaving it "unset".
 2014-02-25 14:54:09 +01:00
Lucien Weller
a2f625f385 Added double quotes to paths in concat command, so that it does not fail when path of target file contains some blanks. 2014-02-24 15:02:32 +01:00
Igor Galić
854a83ae4f be more ignorant 
ignore vim swp files. May be especially important when those sneak into
released packages, such as in the case of 1.0.1:

    concat/manifests/.setup.pp.swp
    concat/manifests/.init.pp.swp
    concat/manifests/.fragment.pp.swp
    concat/files/.concatfragments.sh.swp
    concat/spec/acceptance/.warn_spec.rb.swp
    concat/spec/acceptance/.symbolic_name_spec.rb.swp
    concat/spec/acceptance/.order_spec.rb.swp
    concat/spec/acceptance/.fragment_source_spec.rb.swp
    concat/spec/acceptance/.deprecation_warnings_spec.rb.swp
    concat/spec/acceptance/.empty_spec.rb.swp
    concat/spec/acceptance/.concat_spec.rb.swo
    concat/spec/acceptance/.replace_spec.rb.swp
    concat/spec/acceptance/.basic_spec.rb.swp
    concat/spec/acceptance/.deprecation_warnings_spec.rb.swo
    concat/spec/acceptance/.concat_spec.rb.swp
    concat/spec/acceptance/.backup_spec.rb.swp
 2014-02-18 16:57:09 +01:00
Hunter Haugen
24906d1bca Merge pull request #146 from hunner/fix_gid 
Switch test to use a much higher gid/uid
 2014-02-14 13:50:55 -08:00
Alex Dreyer
62795f8126 Switch test to use a much higher gid/uid 
(cherry picked from commit ccf5284b56)
 2014-02-14 13:42:10 -08:00
Hunter Haugen
8c610a27d8 Merge pull request #144 from hunner/fix_rm2 
Don't remove /tmp/concat in after :each
 2014-02-14 11:19:31 -08:00