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

276 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ashley Penney
c135bafece Merge pull request #127 from 3flex/remove-rubygems-2.2.0-workaround 
remove workaround for Rubygems 2.2.0 bug
 2014-01-07 08:38:13 -08:00
Matthew Haughton
df36f0056b remove workaround for Rubygems 2.2.0 bug 
https://github.com/rubygems/rubygems/pull/763 is merged and released in
Rubygems 2.2.1. A forced downgrade is no longer required.
 2014-01-07 10:28:57 -05:00
Ashley Penney
facafd2430 Merge pull request #125 from apenney/200-release 
1.1.0 release.
 2014-01-03 16:42:02 -08:00
Ashley Penney
fad58dc50a Add information on deprecations. 2014-01-03 18:46:25 -05:00
Ashley Penney
a225075f9c 1.1.0 release. 2014-01-03 18:46:25 -05:00
Joshua Hoblitt
62b2e7a1de Merge pull request #126 from jhoblitt/rubygems_220_travis_workaround 
work around RubyGems 2.2.0 breaking ruby 1.8.7
 2014-01-03 15:45:33 -08:00
Joshua Hoblitt
acd15c913d work around RubyGems 2.2.0 breaking ruby 1.8.7 2014-01-03 16:34:28 -07:00
Ashley Penney
46afc2fda5 Merge pull request #114 from apenney/docs-change 
Rewrite the docs to fit the current best practices for Puppetlabs
 2014-01-03 14:57:15 -08:00
Ashley Penney
656c771ed5 Merge pull request #1 from jhoblitt/docs-change 
add README section on API deprecations since version 1.0.0
 2014-01-03 14:56:43 -08:00
Joshua Hoblitt
2583d85a42 add README section on API deprecations since version 1.0.0 2013-12-29 11:31:59 -07:00
Ashley Penney
39b807c840 Merge pull request #124 from jhoblitt/revert_warn_message 
revert concat $warn/$warn_message param split + add deprecation warnings
 2013-12-24 06:20:44 -08:00
Joshua Hoblitt
8a500af5ee revert concat $warn/$warn_message param split + add deprecation warnings 
Partially reverting the $warn/$warn_message param split from eaf8407 as this
change was unnecessarily API breaking.  Instead, we are adding string/bool type
validating to the $warn parameter and deprecation warnings for the usage of
stringified boolean values (eg, 'true', 'on', etc.). In a future major release,
the logic can be simplified to treating all string values as a warning message.
 2013-12-23 13:23:49 -08:00
Alexander Kuznetsov
00a8f4e736 [Most of] variables quoted to allow multi-word warning messages, spaces in file/directory names, etc. 2013-12-17 11:03:38 -05:00
Ashley Penney
63b5aba9fd Merge pull request #117 from jhoblitt/fragment_source 
fix regression preventing usage of fragment ensure => /target syntax
 2013-12-08 07:47:27 -08:00
Joshua Hoblitt
41d5d4ccd1 fix regression preventing usage of fragment ensure => /target syntax 
Also fix a historical bug that prevents a fragment from being converted
from a symlink to using a source or content parameter.
 2013-12-05 22:39:23 -07:00
Joshua Hoblitt
f1a57a6c7e add system tests for file fragments sourced from a single file 
In addition to checking for fragment sourcing from a 'list' of files.
 2013-12-05 10:12:29 -07:00
Joshua Hoblitt
f4c368ec2e Merge pull request #115 from hundredacres/master 
Cleaning up linting issues
 2013-12-04 20:45:11 -08:00
Matthew Schmitt
9bf4b7f350 Cleaning up linting error with ensure param 2013-12-04 20:40:05 -08:00
Ashley Penney
07a4f61af5 Rewrite the docs to fit the current best practices for Puppetlabs 
modules.
 2013-12-03 13:22:41 -05:00
Joshua Hoblitt
75cdbf4fc6 Merge pull request #110 from 3flex/patch-1 
Improve formatting of README code example
 2013-12-02 22:17:13 -08:00
Matthew Haughton
952b88b45b Improve formatting of code example 
* Puppet syntax highlighting
* Double-spaced indentation
* Aligned instances of =>
* Quoted strings
* Single-quoted some unnecessarily double-quoted strings
* Removed comma from the last variable
 2013-12-02 21:32:32 -05:00
Ashley Penney
68da185f4e Merge pull request #111 from haf/patch-1 
See #67
 2013-11-26 05:33:29 -08:00
Henrik Feldt
24e0cda13e See #67 2013-11-26 12:14:03 +01:00
Ashley Penney
afdda8622a Merge pull request #109 from jhoblitt/system_replacement_tests 
add system tests for replacing symlinks and directories
 2013-11-18 14:39:14 -08:00
Joshua Hoblitt
ae1e74cf36 add system tests for replacing symlinks and directories 2013-11-18 14:58:46 -07:00
Ashley Penney
b69c7f0c9b Merge pull request #107 from terrimonster/addtests 
adding basic manifest tests
 2013-11-18 10:49:12 -08:00
Terri Haber
7c702a5713 adding basic manifest tests 2013-11-15 15:51:37 -08:00
Ashley Penney
4ff6aa5716 Merge pull request #106 from jhoblitt/system_test_cleanups 
minor system test cleanups
 2013-11-14 09:59:11 -08:00
Ashley Penney
f9edb94b20 Merge pull request #105 from jhoblitt/system_test_isolation 
clean up between system spec files
 2013-11-14 09:58:53 -08:00