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

399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hunter Haugen
f37805060f Correct syntax 2014-02-27 13:18:29 -08:00
Ashley Penney
947145ef66 Merge pull request #157 from hunner/fix_sol10_grep 
Avoid multi-line greps on solaris 10
 2014-02-27 16:07:28 -05:00
Hunter Haugen
1f61e9d122 Avoid multi-line greps on solaris 10 2014-02-27 13:01:13 -08:00
Phil
fe61ae6ca6 Merge pull request #156 from hunner/fix_aix 
Fix aix/windows ownership issues and vardir path
 2014-02-26 15:14:24 -08:00
Hunter Haugen
8b852e2b89 Fix aix/windows ownership issues and vardir path 2014-02-26 15:09:16 -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
Hunter Haugen
eaa84694b1 Merge pull request #154 from hunner/comment_newline_test 
This test is implemented incorrectly, and is testing an unimplemented feature.
 2014-02-22 17:18:17 -08:00
Hunter Haugen
3d625c9c28 This test is implemented incorrectly, and is testing an unimplemented feature. 
So commenting it out
 2014-02-22 17:15:56 -08:00
Hunter Haugen
2ccfd89d04 Merge pull request #153 from hunner/comment_test 
Disable test for unimplemented feature
 2014-02-21 15:36:10 -08:00
Hunter Haugen
600ddf0e43 Disable test for unimplemented feature 2014-02-21 15:35:36 -08:00
Hunter Haugen
a046e5f3d2 Merge pull request #148 from hunner/fix_port_test 
Fix test port from 596cec1
 2014-02-20 23:14:23 -08:00
Hunter Haugen
e0a7ca97f0 Fix test port from 596cec1 2014-02-20 16:59:08 -08: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
1404318e98 Merge pull request #145 from adreyer/fix-gid 
Switch test to use a much higher gid/uid
 2014-02-14 13:40:09 -08:00
Alex Dreyer
ccf5284b56 Switch test to use a much higher gid/uid 2014-02-14 12:54:48 -08:00
Hunter Haugen
74336bcab1 Merge pull request #143 from hunner/fix_rm 
Don't remove /tmp/concat in after :each
 2014-02-14 11:19:46 -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
1edafdcf42 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.
 2014-02-14 11:15:53 -08:00
Hunter Haugen
d404fc61a5 Merge pull request #142 from apenney/1.0.1-release 
Prepare 1.0.1 release.
 2014-02-12 17:05:44 -08:00
Ashley Penney
a2bf6e26a1 Prepare 1.0.1 release. 2014-02-12 20:01:00 -05:00
Hunter Haugen
facb7f4ab8 Merge pull request #140 from apenney/100-tests-test 
Port over acceptance tests from master.
 2014-02-12 16:02:52 -08:00
Ashley Penney
596cec14be Port over acceptance tests from master. 2014-02-12 17:47:43 -05:00
Hunter Haugen
ad57847f80 Merge pull request #139 from apenney/100-bugfixes 
Bugfixes
 2014-02-12 13:13:55 -08:00
Paul Chechetin
9e187ccf36 Replace LANG => LC_ALL 2014-02-12 15:52:55 -05:00
Aaron Blew
17431c02e7 Help message for pluginsync now references the correct section of the config 2014-02-12 15:00:17 -05:00
Ashley Penney
5c378174e3 Ensure that ::setup runs before ::fragment in all cases. 2014-02-12 14:59:37 -05: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