Commit graph

333 commits

Author SHA1 Message Date
Hunter Haugen
09b574ea1d Merge pull request #115 from johnsyweb/handle-quotation-marks-in-section-names
Handle quotation marks in section names
2014-07-07 14:49:22 -07:00
Hunter Haugen
07c4827f53 Merge remote-tracking branch 'puppetlabs/master' into temp
Conflicts:
	Gemfile
2014-07-07 14:23:33 -07:00
Pete Johns
b3fed85b57 Spec for MODULES-1194
Ini_file module does not recognize section names with forward slashes in them

https://tickets.puppetlabs.com/browse/MODULES-1194
2014-07-04 14:31:39 +10:00
Pete Johns
069aa56d5c Merge remote-tracking branch 'origin/master' into handle-quotation-marks-in-section-names 2014-07-04 14:11:04 +10:00
Ashley Penney
586207bfd2 Merge pull request #118 from cmurphy/master
Add validate and lint tasks to travis script
2014-07-03 17:43:07 -04:00
Colleen Murphy
6b21db8baf Add validate and lint tasks to travis script 2014-07-03 09:53:45 -07:00
Hunter Haugen
7a5f54de2d Merge pull request #117 from cmurphy/master
Synchronize .travis.yml
2014-06-30 11:04:03 -07:00
Colleen Murphy
d7f0353587 Update Gemfile for .travis.yml defaults 2014-06-30 10:57:55 -07:00
Pete Johns
bd99244353 Test allowing $ signs in section names
Verifying that this PR addresses https://github.com/puppetlabs/puppetlabs-inifile/pull/98
2014-06-28 13:22:01 +10:00
Colleen Murphy
3a4bfb921c Synchronize .travis.yml 2014-06-27 10:54:56 -07:00
Colleen Murphy
2a77cafaeb Update .sync.yml to support new .travis.yml configs 2014-06-27 09:33:10 -07:00
Ashley Penney
281d2f9e72 Merge pull request #114 from cmurphy/master
Start synchronizing module files
2014-06-26 13:58:33 -04:00
Pete Johns
cabc678131 Merge branch 'deprecation-warnings' into handle-quotation-marks-in-section-names
This should fix the build.

If this change isn't desired,
./spec/unit/puppet/provider/ini_setting/ruby_spec.rb:1044 could be
changed to:

```ruby
provider.exists?.should be_nil
```
2014-06-26 21:55:30 +10:00
Pete Johns
49960e1c5e Handle quotation marks in section names
The section name appears on a line by itself, in square brackets (`[` and
`]`), all characters between the opening `[` and the closing `]` should
be considered to form the section name.
2014-06-26 21:42:45 +10:00
Pete Johns
41fc8bfbf5 Failing spec to describe my problem 2014-06-26 21:42:06 +10:00
Pete Johns
961447dfdf be_true and be_false are deprecated
Replace with `be true` and `be false` and make predicate return a
boolean.

> Methods that don't return a boolean, shouldn't end in a question mark.
-- https://github.com/bbatsov/ruby-style-guide#naming
2014-06-26 20:04:33 +10:00
Colleen Murphy
269672552d Sync files 2014-06-25 17:23:22 -07:00
Colleen Murphy
e3468250ed Add configuration file for modulesync
https://github.com/puppetlabs/modulesync
2014-06-25 16:10:44 -07:00
Morgan Haskel
65d50f5e67 Merge pull request #112 from mhaskel/no_modulefile
Remove the Modulefile, use metadata.json.
2014-06-24 10:28:53 -04:00
Morgan Haskel
8f501f5ddf Remove the Modulefile, use metadata.json. 2014-06-24 10:27:25 -04:00
Hunter Haugen
5e73e734bc Merge pull request #111 from cyberious/1.1.x
Add windows support and testing nodesets
2014-06-23 16:59:54 -07:00
Travis Fields
acc9f43ce5 Add windows support and testing nodesets 2014-06-23 16:56:40 -07:00
Hunter Haugen
29ffe099dc Merge pull request #109 from mhaskel/osx-test-fixes
OSX doesn't support the -e flag to echo.
2014-06-12 08:33:50 -07:00
Morgan Haskel
842915d93f OSX doesn't support the -e flag to echo. 2014-06-12 11:04:09 -04:00
Hunter Haugen
1170a53ef5 Merge pull request #107 from mhaskel/beaker-rspec-pinning
Beaker rspec pinning
2014-06-10 09:10:58 -07:00
Morgan Haskel
be5fd63e4c Require beaker-rspec >= 2.2 2014-06-10 11:34:15 -04:00
Travis Fields
37cb6d4060 Merge pull request #106 from apenney/pin-rspec
Pin rspec
2014-06-09 08:39:15 -07:00
Ashley Penney
8ca578c1cf Pin rspec to 2.x. 2014-06-09 11:32:11 -04:00
Morgan Haskel
e21dc0c8ae Merge pull request #104 from hunner/release_1.1.0
Release 1.1.0
2014-06-04 16:37:10 -04:00
Hunter Haugen
521b2873ec Release 1.1.0
This is a compatibility and feature release.  This release adds one new
feature, the ability to control the quote character used.  This allows you to
do things like:

```puppet
  ini_subsetting { '-Xms':
    ensure     => present,
    path       => '/some/config/file',
    section    => '',
    setting    => 'JAVA_ARGS',
    quote_char => '"',
    subsetting => '-Xms'
    value      => '256m',
  }
```

Which builds:

```
JAVA_ARGS="-Xmx256m -Xms256m"
```
2014-06-04 13:32:32 -07:00
Morgan Haskel
0b9f9e2c42 Merge pull request #101 from hunner/remove_stderr
Remove stderr checks because of deprecations
2014-05-29 13:00:05 -04:00
Hunter Haugen
6fb89f5850 Remove stderr checks because of deprecations 2014-05-29 09:56:09 -07:00
Ashley Penney
6477d20202 Merge pull request #100 from mhaskel/1.1.0-prep
1.1.0 prep
2014-05-21 16:38:58 -07:00
Morgan Haskel
783fa4d074 Update PE version requirement.
Also fixes spec_helper_acceptance to use install_puppet.
2014-05-21 19:37:17 -04:00
Ashley Penney
027b7bc7c5 Prepare a 1.1.x release. 2014-05-19 08:42:42 -07:00
Ashley Penney
b36698162e Merge pull request #99 from apenney/typo-fix
Quick typo fix.
2014-05-16 12:58:11 -04:00
Ashley Penney
a5b34eac5a Quick typo fix. 2014-05-16 18:57:55 +02:00
Ashley Penney
d4a2b220ff Merge pull request #95 from mruzicka/feature/master/quote-char-parameter-for-subsetting
Add quote_char parameter to the ini_subsetting resource type
2014-05-16 12:57:11 -04:00
Ashley Penney
6656f0214c Merge pull request #97 from apenney/add-platforms
Add RHEL7 and Ubuntu 14.04 support.
2014-05-13 16:40:56 -04:00
Ashley Penney
61203df371 Add RHEL7 and Ubuntu 14.04 support. 2014-05-13 22:40:05 +02:00
Ashley Penney
85f00fe0a6 Merge pull request #96 from apenney/10xmerge
10xmerge
2014-05-13 16:38:04 -04:00
Ashley Penney
e24dd91522 Merge branch '1.0.x' into 10xmerge 2014-05-13 22:32:05 +02:00
Michal Růžička
77854d55f8 Tests for the quote_char parameter. 2014-05-07 23:52:07 +02:00
Michal Růžička
560bbc622f Add quote_char parameter to the ini_subsetting resource type
The quote_char is used to quote the entire setting when it is modified
as a result of changes to some subsettings.

For an example let's assume we have a setting of this form:
  JAVA_ARGS=-Xmx256m
and we want to add the '-Xms' parameter to the setting, for that purpose
we define a resource like this:
  ini_subsetting { '-Xms':
    ensure     => present,
    path       => '/some/config/file',
    section    => '',
    setting    => 'JAVA_ARGS',
    subsetting => '-Xms'
    value      => '256m',
  }
which results into the following setting:
  JAVA_ARGS=-Xmx256m -Xms256m
But this is not what we intended - if this setting is read by the bash
shell the '-Xms256m' parameter is interpreted as a command to be
executed rather than a value to be assigned to the JAVA_ARGS variable.

To fix this problem the quote_char parameter was added to the
ini_subsetting resource type, and we'll take advantage of it to fix the
problem in the above example like so:
  ini_subsetting { '-Xms':
    ensure     => present,
    path       => '/some/config/file',
    section    => '',
    setting    => 'JAVA_ARGS',
    quote_char => '"',
    subsetting => '-Xms'
    value      => '256m',
  }
which will result into:
  JAVA_ARGS="-Xmx256m -Xms256m"
which is what we intended.
2014-05-07 17:04:43 +02:00
Ashley Penney
790aa9cf86 Merge pull request #94 from igalic/igorance
be more ignorant
2014-04-23 09:47:46 -04:00
Igor Galić
77429f6961 be more igorant 2014-04-18 19:37:20 +02:00
Hunter Haugen
8ca8e12492 Merge pull request #90 from apenney/last-minute-metadata-fix
Add missing fields back to work around Puppet bug.
2014-03-03 14:03:01 -08:00
Ashley Penney
0a92f3277d Add missing fields back to work around Puppet bug. 2014-03-03 21:50:38 +00:00
Hunter Haugen
2376e7cf2c Merge pull request #89 from apenney/102-supported
Prepare supported module 1.0.3.
2014-03-03 12:00:35 -08:00
Ashley Penney
40217456b3 Prepare supported module 1.0.3. 2014-03-03 19:43:12 +00:00