diff --git a/Puppetfile b/Puppetfile index 1ac0c5b2e..12df8ebd0 100644 --- a/Puppetfile +++ b/Puppetfile @@ -67,7 +67,7 @@ mod 'horizon', :git => 'https://github.com/stackforge/puppet-horizon.git' mod 'inifile', - :commit => 'c72bfbb9b1df49ec66a4899e84ea869a1c18426c', + :commit => 'e132445690c21cef314d926bbc5975843c14951e', :git => 'https://github.com/puppetlabs/puppetlabs-inifile.git' mod 'ipa', diff --git a/inifile/CHANGELOG.md b/inifile/CHANGELOG.md index ab0263868..375e910f0 100644 --- a/inifile/CHANGELOG.md +++ b/inifile/CHANGELOG.md @@ -1,3 +1,20 @@ +##2015-06-09 - Supported Releases 1.3.0 +###Summary + +This is primarily a feature release, but also includes test fixes, documentation updates and synchronization of files with modulesync. + +####Features +- Synchronized files using modulesync +- Improved documentation +- Allow changing key value separator beyond indentation +- Adding the ability to change regex match for $section in inifile + +####Bugfixes +- pin beaker-rspec for windows testing +- pin rspec gems for testing +- Adds default values for section +- Fixed names containing spaces + ##2014-11-11 - Supported Releases 1.2.0 ###Summary diff --git a/inifile/CONTRIBUTING.md b/inifile/CONTRIBUTING.md index f1cbde4bb..bfeaa701c 100644 --- a/inifile/CONTRIBUTING.md +++ b/inifile/CONTRIBUTING.md @@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date: With all dependencies in place and up-to-date we can now run the tests: ```shell -% rake spec +% bundle exec rake spec ``` This will execute all the [rspec tests](http://rspec-puppet.com/) tests @@ -178,8 +178,8 @@ installed on your system. You can run them by issuing the following command ```shell -% rake spec_clean -% rspec spec/acceptance +% bundle exec rake spec_clean +% bundle exec rspec spec/acceptance ``` This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), diff --git a/inifile/Gemfile b/inifile/Gemfile index 2b1b7cd8d..04f8667df 100644 --- a/inifile/Gemfile +++ b/inifile/Gemfile @@ -27,7 +27,8 @@ group :system_tests do else gem 'beaker-rspec', :require => false end - gem 'serverspec', :require => false + gem 'serverspec', :require => false + gem 'beaker-puppet_install_helper', :require => false end diff --git a/inifile/metadata.json b/inifile/metadata.json index 9f96ceb01..b4bff409c 100644 --- a/inifile/metadata.json +++ b/inifile/metadata.json @@ -1,12 +1,15 @@ { "name": "puppetlabs-inifile", - "version": "1.2.0", + "version": "1.3.0", "author": "Puppet Labs", "summary": "Resource types for managing settings in INI files", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-inifile", "project_page": "https://github.com/puppetlabs/puppetlabs-inifile", "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", + "dependencies": [ + + ], "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -97,8 +100,5 @@ "name": "puppet", "version_requirement": "3.x" } - ], - "dependencies": [ - ] } diff --git a/inifile/spec/spec_helper_acceptance.rb b/inifile/spec/spec_helper_acceptance.rb index 80a6b6257..dd1f1f0f5 100644 --- a/inifile/spec/spec_helper_acceptance.rb +++ b/inifile/spec/spec_helper_acceptance.rb @@ -1,24 +1,8 @@ require 'beaker-rspec/spec_helper' require 'beaker-rspec/helpers/serverspec' +require 'beaker/puppet_install_helper' -unless ENV['RS_PROVISION'] == 'no' - # This will install the latest available package on el and deb based - # systems fail on windows and osx, and install via gem on other *nixes - foss_opts = {:default_action => 'gem_install'} - - if default.is_pe?; then - install_pe; - else - install_puppet(foss_opts); - end - - hosts.each do |host| - if host['platform'] =~ /debian/ - on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc' - on host, "mkdir -p #{host['distmoduledir']}" - end - end -end +run_puppet_install_helper RSpec.configure do |c| # Project root