Skip to content

Commit

Permalink
Update inifile to e132445
Browse files Browse the repository at this point in the history
e132445 Merge pull request redhat-openstack#168 from hunner/fix_helper_name
3c92a35 Correct the name of the require
e89bf76 Merge pull request redhat-openstack#167 from puppetlabs/update_gemfile
034233f Update the gemfile for puppet install helper
62a31ba Merge pull request redhat-openstack#166 from hunner/add_helper
6acf750 Add helper to install puppet/pe/puppet-agent
485c839 Merge pull request redhat-openstack#165 from mhaskel/merge_1.3.x_to_master
30ee205 Correct the date and metadata ordering
bb67906 Merge pull request redhat-openstack#164 from justinstoller/maint/master/set-puppet-version
9a7c0f3 (maint) allow setting PUPPET_VERSION in acceptance
9858f5b Merge pull request redhat-openstack#161 from tphoney/1.3.0_prep
461174d prep 1.3.0

Change-Id: I694955f04731c474b94f5d91584e0866793b036d
  • Loading branch information
xbezdick committed Jun 15, 2015
1 parent cff0d37 commit 2516fbc
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
17 changes: 17 additions & 0 deletions inifile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions inifile/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion inifile/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
8 changes: 4 additions & 4 deletions inifile/metadata.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -97,8 +100,5 @@
"name": "puppet",
"version_requirement": "3.x"
}
],
"dependencies": [

]
}
20 changes: 2 additions & 18 deletions inifile/spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 2516fbc

Please sign in to comment.