Commit graph

255 commits

Author SHA1 Message Date
Igor Galić
222ecc020a small typo: missing losing ' 2014-06-21 14:16: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
Hunter Haugen
35c0d2354f Don't remove /tmp/concat in after :each
If the spec files are run in a random order, removing /tmp/concat after
certain tests could cause the next tests to fail if they do not recreate
this directory.

(cherry picked from commit 1edafdcf42)
2014-02-14 11:18:34 -08:00
Hunter Haugen
dfb06479df Merge pull request #138 from hunner/dynamic_gemsource
Allow custom gemsource
2014-02-11 16:50:01 -08:00
Hunter Haugen
a9eba26ab7 Allow custom gemsource 2014-02-11 16:33:52 -08:00
Joshua Hoblitt
41e13ff8a6 Merge pull request #136 from maxamg/patch-1
Update README.md
2014-02-05 08:40:18 -07:00
Max Griffiths
f076743464 Update README.md
pass order to concat::fragment
2014-02-05 14:53:02 +00:00
Hunter Haugen
3c9ce05eb8 Merge pull request #135 from ghoneycutt/travis_enable_fast_finish
Enable fast finish in Travis
2014-01-23 10:03:50 -08:00
Garrett Honeycutt
7c473b8de0 Enable fast finish in Travis
http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2014-01-23 13:01:05 -05:00
Ashley Penney
b592726dc2 Merge pull request #134 from apenney/fix-absent
Fix ensure => absent with path => set.
2014-01-23 09:28:59 -08:00
Ashley Penney
78e9d34670 Fix the tests by switching to stdlib 4.x instead of 3.x.
getparam() unfortunately only arrived in 4.x, so switch.
2014-01-21 17:51:26 -05:00
Ashley Penney
b07f338f29 Fix ensure => absent with path => set.
The current code doesn't correctly account for an absent with a
path set, incorrectly trying to remove $name instead.  Fixing this
raised the issue that fragments left with no ensure will fail when
absent is set as the fragdir is deleted.

As a workaround for this we check the `ensure` parameter from the
concat{} resource with getparam() and then pass that to the fragment
if no specific ensure was passed in.  This effectively ensures
fragments inherit their parents ensure status.
2014-01-21 16:28:42 -05:00
Ashley Penney
fd8ca0fb8b Merge pull request #131 from hunner/update_specs
Convert specs to beaker and increase coverage
2014-01-21 11:20:59 -08:00
Hunter Haugen
20e8d6e4f6 Convert specs to beaker and increase coverage 2014-01-16 16:49:30 -08:00
Ashley Penney
650a73244d Merge pull request #128 from apenney/110-rc1-release
Correct the version we're releasing.
2014-01-07 09:05:10 -08:00
Ashley Penney
162048133d Add workaround back in, problems still happening. 2014-01-07 11:56:08 -05:00
Ashley Penney
8e268be6f0 Correct the version we're releasing. 2014-01-07 11:38:28 -05:00