Commit graph

443 commits

Author SHA1 Message Date
Ashley Penney
2b2d9747bf Merge pull request #60 from apenney/rspec-system
Add rspec-system tests.
2013-08-08 08:52:28 -07:00
Ashley Penney
1d403b6763 Add rspec-system tests. 2013-08-08 08:44:31 -07:00
Ashley Penney
82de49bcd0 Merge pull request #46 from andir/warnmsg_fix
Allow WARNMSG to contain/start with '#'
2013-08-07 16:08:56 -07:00
R.I.Pienaar
fe537c0f4f Merge pull request #51 from duritong/lang_sort
sort always with LANG=C
2013-05-22 13:20:20 -07:00
mh
78e547025b sort always with LANG=C
somehowe puppet leaks then LANG into execs, which can give different
ordering depending with which LANG puppet is executed. Which is likely
different between a logged in admin and cron
2013-05-22 00:03:56 +02:00
R.I.Pienaar
c54a95f782 Merge pull request #50 from tremble/master
RDoc cleanup
2013-05-10 03:02:39 -07:00
Mark Chappell
688655eb7b RDoc cleanup 2013-05-10 11:58:02 +02:00
Andreas Rammhold
f1579e50ca Allow WARNMSG to contain/start with '#'
Previosuly this error was being displayed:
	108: [: x#: unexpected operator
2013-04-28 13:59:40 +02:00
R.I.Pienaar
57ce1c70c8 Merge pull request #44 from abohne/filenameescapes
Added -r flag to read so that filenames with \ will be read correctly
2013-04-11 02:00:37 -07:00
Andy Bohne
03650cc0ca Added -r flag to read so that filenames with \ will be read correctly 2013-04-08 10:42:53 -04:00
R.I.Pienaar
8c9615dd4e Merge pull request #43 from maxenced/master
Case don't require ',' between cases
2013-03-13 06:29:17 -07:00
Maxence Dunnewind
8e83e57a29 remove unneeded ',' 2013-03-13 14:25:47 +01:00
R.I.Pienaar
aa29b59cf6 Merge pull request #42 from tehmaze/master
Using the case statement does not properly notify the file resource about changes
2013-03-13 03:04:09 -07:00
Wijnand Modderman-Lenstra
4396d601d6 Move away from defining resource defaults, we can just pass $source and $content directly to the file resource
Using the case statement does not properly notify the file resource about
changes, leading to unexpected results when generating fragments from Puppet
templates. This patch fixes that issue.
2013-02-28 13:00:11 +01:00
R.I.Pienaar
6f4f617fd1 Merge pull request #41 from raphaabreu/master
Changing messages related to pluginsync to indicate where this setting should be put.
2013-02-24 04:27:54 -08:00
Raphael Lorenzeto
4ec1d5df0d Adding more helpful message for 'pluginsync = true'. 2013-02-24 08:28:19 -03:00
R.I.Pienaar
442bd08958 Merge pull request #40 from floatingatoll/patch-1
Style guideline fix for README example's mode
2013-01-22 16:19:50 -08:00
floatingatoll
85da0f7e2a Style guideline fix for README example's mode
puppet-lint reports that 644 should be '0644', per http://puppet-lint.com/checks/file_mode/
2013-01-22 12:27:16 -08:00
R.I.Pienaar
0fb347d401 Merge pull request #38 from jpoppe/master
added (file) $replace parameter to concat
2012-12-12 06:21:53 -08:00
Jasper Poppe
c854799c53 added description of replace in the comment block 2012-12-12 15:14:51 +01:00
Jasper Poppe
2f35c78a9e added (file) $replace parameter to concat 2012-12-12 14:33:47 +01:00
R.I.Pienaar
483edb52df Merge pull request #35 from Zugschlus/master
please consider pulling
2012-11-06 01:59:57 -08:00
Marc Haber
8b3397bdd4 gracefully handle \n in fragment resource name 2012-11-06 10:54:35 +01:00
Marc Haber
ab64af9dc5 refer to manifest files for option docs 2012-11-06 10:31:07 +01:00
R.I.Pienaar
aaf2eeb027 fix markup 2012-09-04 12:45:45 +01:00
R.I.Pienaar
e9f150c5af Prepare for version 0.2.0 2012-09-04 12:40:42 +01:00
R.I.Pienaar
e8e1282b6d Merge pull request #32 from UnifiedPost/develop
Fixes various puppet-lint warnings.
2012-08-30 03:39:47 -07:00
Jan Vansteenkiste
370e60280d Fixes various puppet-lint warnings.
* ./manifests/init.pp - WARNING: ensure found on line but it's not the first attribute on line 222
* ./manifests/setup.pp - WARNING: selector inside resource block on line 34
* ./manifests/fragment.pp - WARNING: case statement without a default case on line 28
2012-08-30 12:33:50 +02:00
R.I.Pienaar
7490f60302 Merge pull request #31 from UnifiedPost/develop
Allow using a custom name and provide a path to the file that needs to be created using concat.
2012-08-30 02:11:02 -07:00
Jan Vansteenkiste
6a0c1f9a39 Document the path parameter and provide a small use case. 2012-08-30 11:06:58 +02:00
Jan Vansteenkiste
1972a9b86b Add a second spec test for the name/path combination 2012-08-30 10:10:23 +02:00
Jan Vansteenkiste
3ac955e05d Allow overriding the target path of a (concat) file and use a custom name. 2012-08-30 10:09:28 +02:00
R.I.Pienaar
00259779ef Merge pull request #29 from x-way/master
Add puppet-lint and rspec-puppet gems to make Travis CI work again
2012-08-14 09:45:36 -07:00
Andreas Jaggi
fbf13c9711 Add puppet-lint and rspec-puppet gem for Travis CI 2012-08-14 18:23:44 +02:00
R.I.Pienaar
e7a8c16cdb Merge pull request #28 from x-way/master
Remove trailing whitespace to make puppet-lint happy
2012-08-14 08:27:52 -07:00
Andreas Jaggi
721ef012e2 Remove trailing whitespace in comment
puppet-lint does not like trailing whitespaces
2012-08-14 17:13:25 +02:00
R.I.Pienaar
a0661e1764 Merge pull request #27 from djmitche/auto-setup
Include concat::setup from concat, so users don't need to
2012-07-11 15:22:25 -07:00
Dustin J. Mitchell
0ba071858d Include concat::setup from concat, so users don't need to 2012-07-11 16:54:05 -05:00
R.I.Pienaar
a1f58957f2 Merge pull request #26 from djmitche/patch-1
Remove spurious 'e' character.
2012-07-11 14:49:17 -07:00
Dustin J. Mitchell
092afd4193 Remove spurious 'e' character. 2012-07-11 16:46:12 -05:00
R.I.Pienaar
4d1977b2c4 Merge pull request #25 from branan/module_package_name
Fix module name to make the PMT happier
2012-06-28 11:13:40 -07:00
Branan Purvine-Riley
6905d2ca91 Fix module name to make the PMT happier 2012-06-28 11:09:57 -07:00
R.I.Pienaar
6b725dd5e1 Merge pull request #24 from pabelanger/improvements
Improvements
2012-06-23 15:37:34 -07:00
Paul Belanger
534fd8b7a4 Reformatting for puppet-lint
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23 17:45:57 -04:00
Paul Belanger
ec1a465e50 Add Travis CI support
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23 17:15:47 -04:00
Paul Belanger
7d0b5709c9 Lets use puppetlabs_spec_helper
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23 17:13:08 -04:00
R.I.Pienaar
99f3eb83f7 Merge pull request #23 from sathlan/feature/add-basic-tests
Feature/add basic tests
2012-05-31 16:36:59 -07:00
sathlan
1fbe790b9a Cleanup. 2012-05-31 14:42:49 +02:00
sathlan
653444bd0a Adding basic tests.
Successfully tested inside rvm:
  - ruby 1.8.7-p302;
  - puppet (2.7.13)
  - facter (1.6.9)
  - bundler (1.1.3)
  - diff-lcs (1.1.3)
  - metaclass (0.0.1)
  - mocha (0.11.4)
  - puppet-lint (0.1.13)
  - rake (0.9.2.2)
  - rspec (2.8.0)
  - rspec-core (2.8.0)
  - rspec-expectations (2.8.0)
  - rspec-mocks (2.8.0)
  - rspec-puppet (0.1.3)
  - rubygems-bundler (1.0.2)
  - rvm (1.11.3.3)
2012-05-31 14:31:43 +02:00
R.I.Pienaar
52d5f36c75 Merge branch 'master' of github.com:ripienaar/puppet-concat 2012-05-29 19:30:35 +01:00