Commit graph

1233 commits

Author SHA1 Message Date
Morgan Haskel
79e79e8bba Merge pull request #394 from cmurphy/master
Add IntelliJ files to the ignore list
2014-12-29 11:22:11 -08:00
Colleen Murphy
9077bfef1e Add IntelliJ files to the ignore list 2014-12-29 10:41:22 -08:00
Hunter Haugen
dcc9605a84 Merge pull request #391 from petems/update_readme
Update README
2014-12-20 19:00:10 -08:00
Peter Souter
c125a08994 README fixes for recent merges
* (MODULES-444) Update README for concat changes
* (MODULES-1582) Update `validate_cmd` readme
* Plus some Whitespace fixes
2014-12-20 21:10:20 +00:00
Hunter Haugen
88e0e24d2b Merge pull request #393 from cyberious/DeleteDocUpdates
Update docs to reflect new behavior of delete function taking array in second argument
2014-12-19 11:27:13 -08:00
Travis Fields
f6e20d2068 Update docs to reflect new behavior of delete function taking array in second argument 2014-12-19 10:41:07 -08:00
Hunter Haugen
69c42b7eef Merge pull request #392 from cyberious/MOD-1606
MODULES-1606 add ability to pass array to delete for items to delete
2014-12-19 10:31:58 -08:00
Travis Fields
8ec6f8dbfd MODULES-1606 add ability to pass array to delete for items to delete 2014-12-19 10:26:01 -08:00
Travis Fields
9febb8b262 Merge pull request #389 from mhaskel/fix_test_374
Fix bad check in test
2014-12-18 16:26:42 -08:00
Morgan Haskel
31a6d89410 Fix bad check in test 2014-12-18 16:20:02 -08:00
Hunter Haugen
1ae0a10707 Merge pull request #388 from mhaskel/merge_4.5.x_into_master
Merge 4.5.x into master
2014-12-18 15:55:33 -08:00
Hunter Haugen
be46f0ea32 Merge pull request #377 from petems/MODULES-1582-improve_validate_cmd
(MODULES-1582) File location placeholder
2014-12-18 15:45:42 -08:00
Peter Souter
b3d007f1da (MODULES-1582) Improve % detection
Avoids any validate commands that have %'s in them other than "... % ..."
2014-12-18 23:35:24 +00:00
Peter Souter
cc8b147b5d (MODULES-1582) Specs for the new % placeholder
These specs are pretty much the same as the originals, but now check that the output has the correct replacement for file location
2014-12-18 23:08:33 +00:00
Peter Souter
165caa8be1 (MODULES-1582) Initial spike for % placeholder
This simply `gsub`'s the file path into where the % placeholder is.
2014-12-18 23:08:33 +00:00
Morgan Haskel
696c89de99 Merge pull request #372 from poikilotherm/feature/master/validate_absolute_path_allow_arrays
Allow array of pathes in validate_absolute_path
2014-12-17 14:19:30 -08:00
Morgan Haskel
841b0df210 Merge pull request #368 from rfugina/basename
Basename implementation
2014-12-17 11:00:23 -08:00
Rob Fugina
2a3babc348 Added type checks for dirname(), and additional tests 2014-12-17 12:55:48 -06:00
Rob Fugina
ef3d42f7bb Added basename() based on Ruby's File.basename
Based on dirname code.  Includes RSpec tests and docs.
2014-12-17 12:39:40 -06:00
Hunter Haugen
8726caf996 Merge pull request #374 from petems/MODULES-444-add_concat_multiple
MODULES-444-Add concat multiple
2014-12-17 09:24:51 -08:00
Morgan Haskel
49acade831 Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_master
Conflicts:
	metadata.json
2014-12-16 17:32:40 -08:00
Morgan Haskel
80f09623b6 Merge pull request #387 from hunner/remove_match_line
Remove line match validation
2014-12-16 15:07:02 -08:00
Morgan Haskel
0e84232503 Merge pull request #386 from jbondpdx/4.5.x
DOC-1095: edit file_line resource, match parameter
2014-12-16 15:06:13 -08:00
Hunter Haugen
c6c203fca8 Remove line match validation
The `match` attribute was validated to match `line`, except that in many
cases (even the example given in the docs) a user would want to match a
line entirely different from the new line.

See comments on the original commit
a06c0d8115
and ask
https://ask.puppetlabs.com/question/14366/file_line-resource-match-problems/
for further examples of confusion.
2014-12-16 15:05:31 -08:00
jbondpdx
44596dcf3c DOC-1095: edit file_line resource, match parameter
Was unclear and not accurate; rewrote the parameter, moved file_line from function list to resource section, added missing parameters for this resource.
2014-12-16 14:33:42 -08:00
Colleen Murphy
1493b212f2 Merge pull request #384 from mhaskel/doc_fixes_from_master
Doc fixes from master
2014-12-16 10:17:24 -08:00
jbondpdx
cff7645648 Added a note that stdlib no longer ships with PE 3.7+
Users didn't realize we stopped shipping stdlib module with PE. I added this information to the stdlib readme.
2014-12-16 10:15:14 -08:00
jbondpdx
c54de9498f FM-1523: Added module summary to metadata.json 2014-12-16 10:14:40 -08:00
Morgan Haskel
6237446582 Merge pull request #373 from jbondpdx/stdlib-readme-fix
Add to Readme: Stdlib no longer ships with PE
2014-12-16 10:09:08 -08:00
Morgan Haskel
8e9fa0ca43 Merge pull request #370 from jbondpdx/master
FM-1523: Added module summary to metadata.json
2014-12-16 10:08:50 -08:00
Travis Fields
64c9840949 Merge pull request #383 from mhaskel/doc_update
Update README for updated member() functionality
2014-12-15 16:23:14 -08:00
Morgan Haskel
ec08c60749 Update README for updated member() functionality 2014-12-15 16:21:28 -08:00
Travis Fields
3f9617fef0 Merge pull request #381 from mhaskel/4.5.0-prep
4.5.0 prep
2014-12-15 16:12:34 -08:00
Morgan Haskel
145eb08b1f 4.5.0 prep 2014-12-15 16:09:24 -08:00
Morgan Haskel
46ce05e4a5 Merge pull request #376 from cmurphy/master
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
2014-12-09 08:23:39 -08:00
Colleen Murphy
a99971827f Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md 2014-12-08 10:33:35 -08:00
Oliver Bertuch
3053427829 Fixing ruby 1.8 support. 2014-12-05 08:51:40 +01:00
Oliver Bertuch
260c1f4b92 Add new functions validate_numeric() and validate_integer(). 2014-12-04 22:33:15 +01:00
Peter Souter
84bd98645f (MODULES-444) - Real meat of the change
This is the core change, we now go through the array and add it to the first element, instead of just two arguments.
2014-12-04 14:34:25 +00:00
Peter Souter
594c2dd38d (MODULES-444) Change argument restriction to < 2 2014-12-04 14:33:23 +00:00
Peter Souter
75a6186512 (MODULES-444) Update docs with new functionality 2014-12-04 14:32:39 +00:00
Peter Souter
368c97f080 (MODULES-444) - Check for accepting > 2 args 2014-12-04 14:27:55 +00:00
Peter Souter
7a1c4a6d9e (MODULES-444) Change test to > 2 arguments
Also add extra test for just 1 argument
2014-12-04 14:27:38 +00:00
Peter Souter
5e49c50458 (MODULES-444) Acceptance for multiple arrays
Acceptance test to take multiple arrays for concatenation
2014-12-04 14:15:33 +00:00
Peter Souter
7c570f75a5 (MODULES-444) Acceptance test for primitives
`concat` should be able to concat arrays and primitives
2014-12-04 14:15:03 +00:00
Peter Souter
ed192a0464 (MODULES-444) Add specs for new behaviour
`concat` can now take multiple arguments
2014-12-04 14:12:55 +00:00
jbondpdx
294b8b572d Added a note that stdlib no longer ships with PE 3.7+
Users didn't realize we stopped shipping stdlib module with PE. I added this information to the stdlib readme.
2014-11-25 11:32:12 -08:00
jbondpdx
22bfa50cb9 FM-1523: Added module summary to metadata.json 2014-11-25 10:56:44 -08:00
Oliver Bertuch
89995e4db0 Allow array of pathes in validate_absolute_path 2014-11-25 12:45:23 +01:00
Morgan Haskel
4ebea40e08 Merge pull request #371 from cyberious/SLESSupport
FM-2020 SLES Support verified
2014-11-21 16:18:27 -05:00