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

103 commits

Author SHA1 Message Date
Morgan Haskel
7eb14b7768 Remove shell script 
The ruby script works just as well and works on all supported platforms. No need to maintain both.
 2015-02-13 13:16:59 -08:00
Morgan Haskel
36ff0ea613 The validation acceptance test is very Linux specific 2015-02-12 16:05:33 -08:00
Morgan Haskel
3a634af4aa Merge pull request #243 from jmkeyes/add-validation-command 
Support running a validation command on the destination file.
 2015-02-11 16:49:16 -08:00
Travis Fields
520287fd05 Fix Solaris 10 errors in tests and more issues with Windows checks of owner 2015-02-10 22:36:14 -08:00
Hunter Haugen
88869c6aed Merge pull request #260 from cyberious/master 
MODULES-1764 Fix missing method for check_is_owned_by for windows
 2015-02-10 17:59:41 -08:00
Travis Fields
7bc211ceba MODULES-1764 Fix missing method for check_is_owned_by for windows 
Fix tests to use its(:content) instead of deprecated should contain
 2015-02-10 16:38:47 -08:00
Morgan Haskel
3b2e37ab1e MODULES-1456 - make sure ruby is in path on PE 
Ruby is not in the path for all PE installations, so make sure the
concat script is run with ruby in the path.
 2015-02-10 12:05:12 -08:00
Hunter Haugen
cff25a8b60 Fix pending tests 
With rspec 3, pending() started inverting the logic so that if a
pending tests succeeds then it fails (so you can block on a future
change). These tests have no body so will always succeed.

Anyway, pending -> skip reverts the logic to the usual.
 2015-01-09 16:53:09 -08:00
Colleen Murphy
440a6b7be3 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md 2014-12-08 10:23:21 -08:00
Morgan Haskel
dc9f4b3f6f Use a path that works on both 32 and 64-bit windows 2014-11-17 10:28:43 -08:00
Joshua M. Keyes
0133d3ac49 Add acceptance test for validate_cmd parameter. 2014-11-15 16:52:38 -08:00
Joshua M. Keyes
79c5e45a24 Add unit tests for validate_cmd parameter. 2014-11-15 16:49:00 -08:00
Morgan Haskel
c79d81a8fe Work around cert issues on solaris and windows 
This should allow the tests to work.
 2014-11-14 14:38:01 -08:00
Travis Fields
8cb4c2447a Use apply manifest instead of timeout transaction if it does hang 2014-10-27 16:03:36 -07:00
Morgan Haskel
624ae75baa Install certs on windows 
This should allow the install of stdlib to succeed.
 2014-10-24 16:16:20 -05:00
Morgan Haskel
0138787610 Strict variables test updates 2014-10-08 18:06:15 -04:00
Morgan Haskel
9ece566992 This *should* make tests pass on windows 2014-10-07 15:19:22 -04:00
Morgan Haskel
006eccc9bc Typo fixes 2014-10-03 15:22:37 -04:00
Morgan Haskel
bc727a7a62 Don't test mode and symlinks on windows 2014-10-03 15:01:20 -04:00
Morgan Haskel
6f86a98066 Windows fixes 2014-09-11 15:41:41 -04:00
Morgan Haskel
d45f1e60d7 Windows and solaris fixes 
Solaris doesn't support multi-line grep. More fixes for install on
windows.
 2014-09-11 14:03:07 -04:00
Morgan Haskel
0cb0b1ab0b Work-around. 2014-09-11 12:46:42 -04:00
Morgan Haskel
344f6adb36 Try to remove all the platform dependent stuff 
And updated the tests to work as planned
 2014-09-11 12:18:05 -04:00
Morgan Haskel
64a19f4d48 Merge pull request #222 from cyberious/CopyModuleTo 
Remove deprecated puppet_module_install in favor of copy_module_to
 2014-09-11 11:33:13 -04:00
Morgan Haskel
f81ef495e3 Fixing up tests 2014-09-10 19:11:28 -04:00
Morgan Haskel
5f17a26256 Merge branch '1.0.x' into test_merge 
Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	README.markdown
	Rakefile
	files/concatfragments.sh
	manifests/setup.pp
	metadata.json
	spec/acceptance/backup_spec.rb
	spec/acceptance/concat_spec.rb
	spec/acceptance/empty_spec.rb
	spec/acceptance/fragment_source_spec.rb
	spec/acceptance/newline_spec.rb
	spec/acceptance/nodesets/centos-64-x64.yml
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/fedora-18-x64.yml
	spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
	spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
	spec/acceptance/order_spec.rb
	spec/acceptance/replace_spec.rb
	spec/acceptance/symbolic_name_spec.rb
	spec/acceptance/warn_spec.rb
	spec/spec_helper_acceptance.rb
 2014-09-10 15:03:35 -04:00
Travis Fields
968dac5a31 Remove deprecated puppet_module_install in favor of copy_module_to 2014-09-10 10:07:24 -07:00
Morgan Haskel
a6590ba98d There are no UNSUPPORTED_PLATFORMS defined for 1.1 2014-09-10 12:26:28 -04:00
Morgan Haskel
98d70da9fd 'wheel' is the root group for osx. 
Conflicts:
	spec/acceptance/concat_spec.rb
	spec/acceptance/fragment_source_spec.rb
 2014-09-09 23:34:08 -04:00
Morgan Haskel
166189dc25 Missed two stderr checks 2014-09-08 16:03:22 -04:00
Morgan Haskel
0acefbb79d Stop checking for empty stderr 2014-09-08 15:01:30 -04:00
Morgan Haskel
e015a1fdf7 Lack of idempotency with ensure => 'absent' 
Need to add an unless to the exec in the case we have `ensure =>
'absent'` for the concat, otherwise the exec (of true) runs every time.
 2014-09-08 14:24:29 -04:00
Morgan Haskel
52a75bc10c Update spec_helper for consistency 2014-08-28 11:26:34 -04:00
Axel Bock
b4e1c0c387 fix: permitting $backup to be a boolean value 2014-08-18 09:09:20 +02:00
Neil Prockter
ca8e036bac ensure concat file fragments are always replaced 2014-08-02 00:18:16 +01:00
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
Colleen Murphy
2b51a83b9b Sync files 2014-06-25 17:23:15 -07:00
Morgan Haskel
90f70e86a3 'wheel' is the root group for osx. 2014-06-11 17:25:08 -04:00
Ashley Penney
f66ca3c1b7 Remove all the eq() checks as this breaks in PE3.3. 2014-06-02 16:10:29 -04: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
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
Morgan Haskel
6b9e8ddc37 Add nodeset for ubuntu trusty. 2014-05-14 16:14:53 -04:00
Morgan Haskel
33b90b4fbc Fixes to get tests running on trusty. 2014-05-14 16:10:03 -04:00
Ashley Penney
8a1965ade9 Improve this so it works on Ubuntu 14.04. 2014-05-02 19:50:51 +02: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
b4ba7dde50 Add in missing files to work around Puppet bug. 2014-03-03 21:45:21 +00:00
Hunter Haugen
1577ec78e1 Add windows as unsupported 2014-02-28 08:39:09 -08:00
Hunter Haugen
495619794e Correct the incorrect quotes 2014-02-27 16:07:01 -08:00
Hunter Haugen
d887c3b5f5 Lets can't be used outside of a test context 2014-02-27 15:50:18 -08:00
Hunter Haugen
f0b6187f76 Use tmpdir instead of /tmp for windows compatability 2014-02-27 14:52:53 -08:00