Skip to content

Commit

Permalink
Update inifile to 6b399c2
Browse files Browse the repository at this point in the history
6b399c2 Merge pull request redhat-openstack#137 from cmurphy/master
7e6eba5 Add json gem
113cb70 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
19ddca4 Merge pull request redhat-openstack#134 from johnsyweb/less-restrictive-setting-names
792d35c Merge pull request redhat-openstack#135 from johnsyweb/The-Puppet-Labs-Issue-Tracker-has-Moved
d2d9ed9 Merge pull request redhat-openstack#136 from mhaskel/merge_1.2.x
927d879 The Puppet Labs Issue Tracker has Moved
3e46c13 Fix Ruby 1.9.3 build
efeb174 Add spec for redhat-openstack#123
c6dcad2 Simplify COMMENTED_SETTING_REGEX to match SETTING_REGEX
e65be6f Simplify SECTION_REGEX
d98e9bc Add failing spec for KDE Configuration with braces in setting names
91c1708 Merge pull request redhat-openstack#133 from mhaskel/1.2.0-prep
5bc9ebc 1.2.0 prep
3f4ad49 Merge pull request redhat-openstack#126 from huan/master
12a4271 Merge pull request redhat-openstack#132 from mhaskel/test
8db122c Merge pull request redhat-openstack#124 from cmurphy/master
d5164a9 Merge pull request redhat-openstack#130 from jbondpdx/update-readme
4e3f602 DOC-1100: old inifile causes agent run failure in PE 3.3
db28fa2 Merge pull request redhat-openstack#128 from mhaskel/1.1.4-prep
3d3a2cf 1.1.4-prep
58883cd Merge pull request redhat-openstack#127 from mhaskel/1.1.x-merged-into-master
8621dfe Merge remote-tracking branch 'upstream/1.1.x' into test
f343c41 modify test to compare to a hash which better tests the state of each setting also update @@COMMENTED_SETTING_REGEX to be roughly equal to "(\s*)[#;]+" + @@SETTING_REGEX
681f5c0 fix issue where single characters settings were not being saved.
8aeddc8 Merge pull request redhat-openstack#125 from mhaskel/spec_updates
7f54eb1 Update spec_helper for consistency.
90f88ec Merge pull request redhat-openstack#122 from jbondpdx/new-readme
c916aca Synchronize with modulesync
4c94689 Docs: fixed code formatting
9f9e1d4 Docs: New inifile readme
41e2ddb Merge pull request redhat-openstack#121 from apenney/113-release
62434bb Prepare a 1.1.3 release.
0e8abb9 Merge pull request redhat-openstack#120 from mhaskel/1.1.2-prep
33147cb 1.1.2-prep.
d6335f5 Merge pull request redhat-openstack#119 from hunner/release_1.1.1
f08a394 Release 1.1.1
09b574e Merge pull request redhat-openstack#115 from johnsyweb/handle-quotation-marks-in-section-names
07c4827 Merge remote-tracking branch 'puppetlabs/master' into temp
b3fed85 Spec for MODULES-1194
069aa56 Merge remote-tracking branch 'origin/master' into handle-quotation-marks-in-section-names
586207b Merge pull request redhat-openstack#118 from cmurphy/master
6b21db8 Add validate and lint tasks to travis script
7a5f54d Merge pull request redhat-openstack#117 from cmurphy/master
d7f0353 Update Gemfile for .travis.yml defaults
bd99244 Test allowing $ signs in section names
3a4bfb9 Synchronize .travis.yml
2a77caf Update .sync.yml to support new .travis.yml configs
281d2f9 Merge pull request redhat-openstack#114 from cmurphy/master
cabc678 Merge branch 'deprecation-warnings' into handle-quotation-marks-in-section-names
49960e1 Handle quotation marks in section names
41fc8bf Failing spec to describe my problem
961447d `be_true` and `be_false` are deprecated
2696725 Sync files
e346825 Add configuration file for modulesync
65d50f5 Merge pull request redhat-openstack#112 from mhaskel/no_modulefile
8f501f5 Remove the Modulefile, use metadata.json.
5e73e73 Merge pull request redhat-openstack#111 from cyberious/1.1.x
acc9f43 Add windows support and testing nodesets
29ffe09 Merge pull request redhat-openstack#109 from mhaskel/osx-test-fixes
842915d OSX doesn't support the -e flag to echo.
1170a53 Merge pull request redhat-openstack#107 from mhaskel/beaker-rspec-pinning
be5fd63 Require beaker-rspec >= 2.2
37cb6d4 Merge pull request redhat-openstack#106 from apenney/pin-rspec
8ca578c Pin rspec to 2.x.
e21dc0c Merge pull request redhat-openstack#104 from hunner/release_1.1.0
521b287 Release 1.1.0
0b9f9e2 Merge pull request redhat-openstack#101 from hunner/remove_stderr
6fb89f5 Remove stderr checks because of deprecations
6477d20 Merge pull request redhat-openstack#100 from mhaskel/1.1.0-prep
783fa4d Update PE version requirement.
027b7bc Prepare a 1.1.x release.
b366981 Merge pull request redhat-openstack#99 from apenney/typo-fix
a5b34ea Quick typo fix.
d4a2b22 Merge pull request redhat-openstack#95 from mruzicka/feature/master/quote-char-parameter-for-subsetting
6656f02 Merge pull request redhat-openstack#97 from apenney/add-platforms
61203df Add RHEL7 and Ubuntu 14.04 support.
85f00fe Merge pull request redhat-openstack#96 from apenney/10xmerge
e24dd91 Merge branch '1.0.x' into 10xmerge
77854d5 Tests for the quote_char parameter.
560bbc6 Add quote_char parameter to the ini_subsetting resource type
790aa9c Merge pull request redhat-openstack#94 from igalic/igorance
77429f6 be more igorant
8ca8e12 Merge pull request redhat-openstack#90 from apenney/last-minute-metadata-fix
0a92f32 Add missing fields back to work around Puppet bug.
2376e7c Merge pull request redhat-openstack#89 from apenney/102-supported
4021745 Prepare supported module 1.0.3.
0c27288 Merge pull request redhat-openstack#88 from apenney/metadata
6c63184 Add AIX and remove fields copied from Modulefile.
6b0a200 Merge pull request redhat-openstack#87 from laurenrother/1.0.x
f791521 Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
1edd2d5 Merge pull request redhat-openstack#86 from apenney/fix-tmpdir
2aceaef Convert to using .tmpdir instead of a hardcoded /tmp, so this works on Windows too.
ca7e441 Merge pull request redhat-openstack#84 from hunner/grep_sol
eda726f It is actually all solaris
f271580 Merge pull request redhat-openstack#83 from hunner/grep_sol10
7de1e3d Correct syntax
698e632 Merge pull request redhat-openstack#82 from hunner/grep_sol10
49433d0 Avoid multi-line grep on Solaris 10
5ec46f6 Merge pull request redhat-openstack#81 from hunner/release_1.0.2
3757c71 Release 1.0.2
d17dcfb Merge pull request redhat-openstack#80 from hunner/fix_aix
17a59b2 AIX exits with 2 on file doesn't exist.
5e841a9 Merge branch 'missing_comma' into 1.0.x
6999ab0 Fix missing comma in metadata.json
08346e9 Merge pull request redhat-openstack#77 from hunner/add_metadata
5c2cb37 Add supported OS/PE/Puppet
b77ef8d Merge pull request redhat-openstack#78 from hunner/remove_autopublish
f5e607a Remove travis autopublish stuff
c1bc9d0 Merge pull request redhat-openstack#75 from justinstoller/maint/1.0.x/dont_use_hardcoded_modpath
25e7c28 Remove basic spec
48a4e08 Merge pull request redhat-openstack#74 from hunner/release_1.0.1
5b6de57 Release 1.0.1
a0c3b82 Merge pull request redhat-openstack#73 from hunner/dynamic_gemsource
ab21bd3 Allow custom gemsource
467c4c5 Merge pull request redhat-openstack#66 from hunner/update_specs
eda78ab (FM-161) Add beaker tests for parameter coverage
664051c Merge pull request redhat-openstack#70 from ghoneycutt/fix_travis_link_in_readme
4e1bc1e Fix link to travis in README
38f260c Merge pull request redhat-openstack#68 from ghoneycutt/test_puppet_v3_4
17cba2f Merge pull request redhat-openstack#67 from ghoneycutt/enable_travis_fast_finish
4c1d651 Test against Puppet v3.4
9e6b0c4 Enable fast finish in Travis
a0b63eb Merge pull request redhat-openstack#65 from shrug/master
76ad4c4 Fix the regex t fix a bad match
6870dfe Add tests to cover settings with square brackets and quotes in the name
e779d12 Update settings regexes to support settings with "[", "]" in them
ae23a4d Merge pull request redhat-openstack#58 from jnewland/spaces-in-sections
c058ee5 support spaces in sections
2b45293 Merge pull request redhat-openstack#59 from antroy/master
10f270f Merge pull request redhat-openstack#63 from JHaals/master
ff98e78 make ensure => present the first attribute
d75ce1c Merge pull request redhat-openstack#61 from apenney/metadata
cd9bb11 Add empty dependencies section.
85cfc93 FM-103: Add metadata.json to all modules.
0a1dea4 Merge pull request redhat-openstack#60 from apenney/metadata
86c57aa Adding whitespace capability to section header regex
  • Loading branch information
xbezdick committed Dec 16, 2014
1 parent 9ef5e18 commit 62e379f
Show file tree
Hide file tree
Showing 45 changed files with 1,920 additions and 284 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ mod 'horizon',
:git => 'https://github.com/stackforge/puppet-horizon.git'

mod 'inifile',
:commit => 'fe9b0d5229ea37179a08c4b49239da9bc950acd1',
:commit => '6b399c2bc6b34fd01c704dd5836c61935cf9e4f1',
:git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'

mod 'ipa',
Expand Down
2 changes: 1 addition & 1 deletion inifile/.fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fixtures:
symlinks:
inifile: '#{source_dir}'
inifile: "#{source_dir}"
9 changes: 6 additions & 3 deletions inifile/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
spec/fixtures/modules/inifile
spec/fixtures/manifests/site.pp
spec/fixtures/tmp/*
pkg/
Gemfile.lock
vendor/
spec/fixtures/
.vagrant/
.bundle/
coverage/
3 changes: 3 additions & 0 deletions inifile/.sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
spec/spec_helper.rb:
unmanaged: true
47 changes: 12 additions & 35 deletions inifile/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,17 @@
---
branches:
only:
- master
language: ruby
bundler_args: --without development
script: bundle exec rake spec SPEC_OPTS='--format documentation'
after_success:
- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
- .forge-releng/publish
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
env:
matrix:
- PUPPET_GEM_VERSION="~> 2.7.0"
- PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
global:
- PUBLISHER_LOGIN=puppetlabs
- secure: |-
mEqZt84gUpTwozeWT4ra2NIQID4CHkvcDcL/8+ItnS3ahbZ4EOj4NLnEWcNt\nxtOjs6pxn
GVND1/gy/1+7w81DpXpJQ6CGloEwP58x86icvrgp8E+ZXeAoYe4\nfqtSE190FMq5FWaPyx
wZisaT2OcrpeqvBPQnaGUg4uz/H3djgUo=
bundler_args: --without system_tests
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
exclude:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.2.0"
fast_finish: true
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
notifications:
email: false
89 changes: 0 additions & 89 deletions inifile/CHANGELOG

This file was deleted.

194 changes: 194 additions & 0 deletions inifile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
##2014-11-11 - Supported Releases 1.2.0
###Summary

This is primarily a bugfix release, but also includes documentation updates and synchronization of files with modulesync.

####Features
- Synchronized files using modulesync
- Improved documentation with a warning about old, manually installed inifile with PE3.3+

####Bugfixes
- Fix issue where single character settings were not being saved

##2014-09-30 - Supported Releases 1.1.4
###Summary

This release includes documentation and test updates.

##2014-07-15 - Supported Release 1.1.3
###Summary

This release merely updates metadata.json so the module can be uninstalled and
upgraded via the puppet module command.

##2014-07-10 - Supported Release 1.1.2
###Summary

This is a re-packaging release.

##2014-07-07 - Release 1.1.1
###Summary

This supported bugfix release corrects the inifile section header detection
regex (so you can use more characters in your section titles).

####Bugfixes
- Correct section regex to allow anything other than ]
- Correct `exists?` to return a boolean
- Lots of test updates
- Add missing CONTRIBUTING.md

##2014-06-04 - Release 1.1.0
###Summary

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:

```
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"
```

####Features
- Add quote_char parameter to the ini_subsetting resource type

####Bugfixes

####Known Bugs
* No known bugs

##2014-03-04 - Supported Release 1.0.3
###Summary

This is a supported release. It has only test changes.

####Features

####Bugfixes

####Known Bugs
* No known bugs


##2014-02-26 - Version 1.0.2
###Summary
This release adds supported platforms to metadata.json and contains spec fixes


##2014-02-12 - Version 1.0.1
###Summary
This release is a bugfix for handling whitespace/[]'s better, and adding a
bunch of tests.

####Bugfixes
- Handle whitespace in sections
- Handle square brances in values
- Add metadata.json
- Update some travis testing
- Tons of beaker-rspec tests


##2013-07-16 - Version 1.0.0
####Features
- Handle empty values.
- Handle whitespace in settings names (aka: server role = something)
- Add mechanism for allowing ini_setting subclasses to override the
formation of the namevar during .instances, to allow for ini_setting
derived types that manage flat ini-file-like files and still purge
them.

---
##2013-05-28 - Chris Price <[email protected]> - 0.10.3
* Fix bug in subsetting handling for new settings (cbea5dc)

##2013-05-22 - Chris Price <[email protected]> - 0.10.2
* Better handling of quotes for subsettings (1aa7e60)

##2013-05-21 - Chris Price <[email protected]> - 0.10.1
* Change constants to class variables to avoid ruby warnings (6b19864)

##2013-04-10 - Erik Dalén <[email protected]> - 0.10.1
* Style fixes (c4af8c3)

##2013-04-02 - Dan Bode <[email protected]> - 0.10.1
* Add travisfile and Gemfile (c2052b3)

##2013-04-02 - Chris Price <[email protected]> - 0.10.1
* Update README.markdown (ad38a08)

##2013-02-15 - Karel Brezina <[email protected]> - 0.10.0
* Added 'ini_subsetting' custom resource type (4351d8b)

##2013-03-11 - Dan Bode <[email protected]> - 0.10.0
* guard against nil indentation values (5f71d7f)

##2013-01-07 - Dan Bode <[email protected]> - 0.10.0
* Add purging support to ini file (2f22483)

##2013-02-05 - James Sweeny <[email protected]> - 0.10.0
* Fix test to use correct key_val_parameter (b1aff63)

##2012-11-06 - Chris Price <[email protected]> - 0.10.0
* Added license file w/Apache 2.0 license (5e1d203)

##2012-11-02 - Chris Price <[email protected]> - 0.9.0
* Version 0.9.0 released

##2012-10-26 - Chris Price <[email protected]> - 0.9.0
* Add detection for commented versions of settings (a45ab65)

##2012-10-20 - Chris Price <[email protected]> - 0.9.0
* Refactor to clarify implementation of `save` (f0d443f)

##2012-10-20 - Chris Price <[email protected]> - 0.9.0
* Add example for `ensure=absent` (e517148)

##2012-10-20 - Chris Price <[email protected]> - 0.9.0
* Better handling of whitespace lines at ends of sections (845fa70)

##2012-10-20 - Chris Price <[email protected]> - 0.9.0
* Respect indentation / spacing for existing sections and settings (c2c26de)

##2012-10-17 - Chris Price <[email protected]> - 0.9.0
* Minor tweaks to handling of removing settings (cda30a6)

##2012-10-10 - Dan Bode <[email protected]> - 0.9.0
* Add support for removing lines (1106d70)

##2012-10-02 - Dan Bode <[email protected]> - 0.9.0
* Make value a property (cbc90d3)

##2012-10-02 - Dan Bode <[email protected]> - 0.9.0
* Make ruby provider a better parent. (1564c47)

##2012-09-29 - Reid Vandewiele <[email protected]> - 0.9.0
* Allow values with spaces to be parsed and set (3829e20)

##2012-09-24 - Chris Price <[email protected]> - 0.0.3
* Version 0.0.3 released

##2012-09-20 - Chris Price <[email protected]> - 0.0.3
* Add validation for key_val_separator (e527908)

##2012-09-19 - Chris Price <[email protected]> - 0.0.3
* Allow overriding separator string between key/val pairs (8d1fdc5)

##2012-08-20 - Chris Price <[email protected]> - 0.0.2
* Version 0.0.2 released

##2012-08-17 - Chris Price <[email protected]> - 0.0.2
* Add support for "global" section at beginning of file (c57dab4)
Loading

0 comments on commit 62e379f

Please sign in to comment.