Skip to content

Commit b3565f1

Browse files
committed
Update inifile to d31803cce628b1a7994b61158b627c88cab83ee4
d31803cce628b1a7994b61158b627c88cab83ee4 Merge pull request #200 from hunner/fix_test f77ab455425aef6bd2ca1909df35c0c8e6e4f85a Fix acceptance test for removed section af9de61afc9fcc7125b080c2fcf6dba4965bc5e0 Merge pull request #199 from hunner/remove_empty_section 2027a0b2ab5d2a2c71220617fc7331c3d13e3c29 Remove empty sections after last setting is removed fbb7050e4b70a0ffee5bb0794e3d9f61c2102563 Merge pull request #198 from DavidS/debian-8-support ba8ca0ddf2369225269f175c88d9cfaa7e85bd87 Update metadata to note Debian 8 support 8cb51cd85645ac00b3c14bf743808f3568eacb0a Merge pull request #197 from DavidS/fm-4046-update-msync 57bb3fe4389c0bac4e754f225bed6651d81ec178 (FM-4046) Update to current msync configs [006831f] b79dd27ac530a25627351e653447d432061ddaab Merge pull request #196 from domcleal/pup-4709-workaround-master b425fe5a492a7eb9049ff4c5d111a10b6c8d1219 Remove brackets from ini_setting titles to workaround PUP-4709 1635b843779f68dd63b59ce8457621628776c9bc Merge pull request #152 from stepanstipl/feature-keep_secret2 f7eabdeaf215b1512cf447d1a725e54c8d19df94 Merge pull request #194 from DavidS/fm-4049-update-msync 2c76f60cf2f3eda8bb769d88fcd92fd44a1a4028 (FM-4049) Update to current msync configs [2c99161] 4b8336ad23534506df7ea6a54bde8ad31bdaf271 Convert boolean to :true & :false PR #152 af4b3f287a61d20b7bdfe5007eebd38220eafac1 Acceptance tests for show_diff 4853927093f2b8550c22f6b91fa48cc5c5c685f2 Implemented show_diff parameter, with similar behaviour as show_diff on type file 35b5dfc04cc465cc17045181db6c65eaac59a04d Merge pull request #156 from ghoneycutt/cr-patch d83f3011f90baf91742032bd26933807bf718a84 Add ability to specify a hash of ini_settings and ini_subsettings. d6621631710750cc551e668eb66b1b1dd71dcf89 Merge pull request #193 from puppetlabs/1.4.x 3863d9a Merge pull request #192 from tphoney/1.4.3_release_prep 5eb4c7a 1.4.3 release prep Change-Id: I7763ad7262d891fc4715e58490d04cb3506522e9
1 parent 7e179c6 commit b3565f1

30 files changed

+761
-82
lines changed

Puppetfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mod 'horizon',
7979
:git => 'https://github.com/openstack/puppet-horizon.git'
8080

8181
mod 'inifile',
82-
:commit => '27857c28fc760a6010960226a4777f7b9bcf239e',
82+
:commit => 'd31803cce628b1a7994b61158b627c88cab83ee4',
8383
:git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'
8484

8585
mod 'ironic',

inifile/.fixtures.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
fixtures:
2+
repositories:
3+
stdlib:
4+
repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
5+
ref: '4.2.0'
26
symlinks:
37
inifile: "#{source_dir}"

inifile/.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#This file is generated by ModuleSync, do not edit.
2+
*.rb eol=lf
3+
*.erb eol=lf
4+
*.pp eol=lf
5+
*.sh eol=lf

inifile/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
#This file is generated by ModuleSync, do not edit.
12
pkg/
23
Gemfile.lock
34
vendor/
45
spec/fixtures/
56
.vagrant/
67
.bundle/
78
coverage/
9+
log/
810
.idea/
911
*.iml

inifile/.rspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--color
2+
--format documentation

inifile/.sync.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

inifile/.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
#This file is generated by ModuleSync, do not edit.
12
---
23
sudo: false
34
language: ruby
5+
cache: bundler
46
bundler_args: --without system_tests
5-
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
7+
script: "bundle exec rake validate lint spec"
68
matrix:
79
fast_finish: true
810
include:
9-
- rvm: 1.8.7
11+
- rvm: 2.1.6
12+
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
13+
- rvm: 2.1.5
14+
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
15+
- rvm: 2.1.5
1016
env: PUPPET_GEM_VERSION="~> 3.0"
1117
- rvm: 1.9.3
1218
env: PUPPET_GEM_VERSION="~> 3.0"
13-
- rvm: 2.1.5
14-
env: PUPPET_GEM_VERSION="~> 3.0"
15-
- rvm: 2.1.5
16-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
17-
- rvm: 2.1.6
18-
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
1919
notifications:
2020
email: false

inifile/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Supported Release 1.4.3
2+
###Summary
3+
4+
Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
5+
16
## 2015-09-01 - Supported Release 1.4.2
27
### Summary
38
This release adds some bugfixes.

inifile/Gemfile

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,39 @@
1+
#This file is generated by ModuleSync, do not edit.
2+
13
source ENV['GEM_SOURCE'] || "https://rubygems.org"
24

3-
def location_for(place, fake_version = nil)
4-
if place =~ /^(git:[^#]*)#(.*)/
5-
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
5+
def location_for(place, version = nil)
6+
if place =~ /^(git[:@][^#]*)#(.*)/
7+
[version, { :git => $1, :branch => $2, :require => false}].compact
68
elsif place =~ /^file:\/\/(.*)/
7-
['>= 0', { :path => File.expand_path($1), :require => false }]
9+
['>= 0', { :path => File.expand_path($1), :require => false}]
810
else
9-
[place, { :require => false }]
11+
[place, version, { :require => false}].compact
1012
end
1113
end
1214

1315
group :development, :unit_tests do
14-
gem 'rspec-core', '3.1.7', :require => false
15-
gem 'puppetlabs_spec_helper', :require => false
16-
gem 'simplecov', :require => false
17-
gem 'puppet_facts', :require => false
18-
gem 'json', :require => false
16+
gem 'json', :require => false
17+
gem 'metadata-json-lint', :require => false
18+
gem 'puppet_facts', :require => false
19+
gem 'puppet-blacksmith', :require => false
20+
gem 'puppetlabs_spec_helper', :require => false
21+
gem 'rspec-puppet', '>= 2.3.2', :require => false
22+
gem 'simplecov', :require => false
1923
end
20-
2124
group :system_tests do
22-
if beaker_version = ENV['BEAKER_VERSION']
23-
gem 'beaker', *location_for(beaker_version)
24-
end
25-
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
26-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
27-
else
28-
gem 'beaker-rspec', :require => false
29-
end
25+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
26+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'])
3027
gem 'serverspec', :require => false
3128
gem 'beaker-puppet_install_helper', :require => false
29+
gem 'master_manipulator', :require => false
30+
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
3231
end
3332

33+
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
34+
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
3435

3536

36-
if facterversion = ENV['FACTER_GEM_VERSION']
37-
gem 'facter', facterversion, :require => false
38-
else
39-
gem 'facter', :require => false
40-
end
41-
42-
if puppetversion = ENV['PUPPET_GEM_VERSION']
43-
gem 'puppet', puppetversion, :require => false
44-
else
45-
gem 'puppet', :require => false
37+
if File.exists? "#{__FILE__}.local"
38+
eval(File.read("#{__FILE__}.local"), binding)
4639
end
47-
48-
# vim:ft=ruby

inifile/LICENSE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -180,13 +181,13 @@
180181
To apply the Apache License to your work, attach the following
181182
boilerplate notice, with the fields enclosed by brackets "[]"
182183
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184+
the brackets!) The text should be enclosed in the appropriate
184185
comment syntax for the file format. We also recommend that a
185186
file or class name and description of purpose be included on the
186187
same "printed page" as the copyright notice for easier
187188
identification within third-party archives.
188189

189-
Copyright 2012 Chris Price
190+
Copyright [yyyy] [name of copyright owner]
190191

191192
Licensed under the Apache License, Version 2.0 (the "License");
192193
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)