Skip to content

Commit 756b46b

Browse files
rendhalverrendhalver
authored
Merge pull request #19 from abstractitptyltd/release/1.2.2
Release version 1.2.2
2 parents a0a92f9 + 55fb89a commit 756b46b

8 files changed

Lines changed: 267 additions & 216 deletions

File tree

‎.fixtures.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ fixtures:
55
ref: "4.1.0"
66
concat:
77
repo: "puppetlabs/concat"
8-
ref: "1.2.0"
8+
ref: "1.2.1"
99
symlinks:
1010
sudo: "#{source_dir}"

‎.travis.yml‎

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,37 @@ language: ruby
22
sudo: false
33
bundler_args: --without development
44
before_install: rm Gemfile.lock || true
5-
rvm:
6-
- 1.9
7-
- 2.0
8-
- 2.1
95
script: bundle exec rake test
10-
env:
11-
- PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=true
12-
- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=true
13-
- PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=true
14-
- PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=true PARSER="future"
15-
- PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
16-
- PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
17-
- PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
186
matrix:
19-
exclude:
20-
- rvm: 1.9
21-
env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
22-
- rvm: 1.9
23-
env: PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
24-
- rvm: 1.9
25-
env: PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
26-
- rvm: 2.0
27-
env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
28-
- rvm: 2.0
29-
env: PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
30-
- rvm: 2.0
31-
env: PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
32-
notifications:
33-
slack:
34-
secure: Bgqq8f5Ej+g78Iy8o0HSexx4OyCrO2eNrSiev8O8FCB2zQSNZ82EUnuXwDq5LeHJZb3eTBM/6NcAYeXRNuHwgniQQef9xiHC8uBvV3pMstAe5pa+9l7OaXzKyMrVhbjUfqZUhnRYPHY+OYgUMb4UfotfxvRCduPj1YhMrSVXocs=
35-
deploy:
36-
provider: puppetforge
37-
user: abstractit
38-
password:
39-
secure: ZbtzOD15CmlaLJ0zK2qwLLaqXDk+Ile/2nGwZQ3pV5+cx6ILBVHN/cH0PaddVM9z2bV8k/sHN9ZCe5NXEyC54Vta8jCgLvIckS0tRqNICagn5BMhyEg5jSP7IIDhM9pWgF9KiJyMtx+8iWIt6h7v5+HbOylUuSUyhA0ewpFp2GA=
40-
on:
41-
tags: true
42-
rvm: 2.1
43-
condition:
44-
- $PUPPET_VERSION = '~> 4.2.0'
45-
- $STRICT_VARIABLES = true
7+
fast_finish: true
8+
include:
9+
- rvm: 1.9.3
10+
env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES=true
11+
- rvm: 1.9.3
12+
env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES=true
13+
- rvm: 1.9.3
14+
env: PUPPET_GEM_VERSION="~> 3.8.5" STRICT_VARIABLES=true
15+
- rvm: 2.1.9
16+
env: PUPPET_GEM_VERSION="~> 3.8.5" STRICT_VARIABLES=true FUTURE_PARSER="yes"
17+
- rvm: 2.1.9
18+
env: PUPPET_GEM_VERSION="~> 4.5.0" STRICT_VARIABLES=true
19+
- rvm: 2.1.9
20+
env: PUPPET_GEM_VERSION="~> 4.7.0" STRICT_VARIABLES=true
21+
- rvm: 2.1.9
22+
env: PUPPET_GEM_VERSION="~> 4.8.0" STRICT_VARIABLES=true
23+
- rvm: 2.1.9
24+
env: PUPPET_GEM_VERSION="~> 4.9.0" STRICT_VARIABLES=true
25+
- rvm: 2.1.9
26+
env: PUPPET_GEM_VERSION="~> 4.10.4" STRICT_VARIABLES=true
27+
28+
deploy:
29+
provider: puppetforge
30+
user: abstractit
31+
password:
32+
secure: ZbtzOD15CmlaLJ0zK2qwLLaqXDk+Ile/2nGwZQ3pV5+cx6ILBVHN/cH0PaddVM9z2bV8k/sHN9ZCe5NXEyC54Vta8jCgLvIckS0tRqNICagn5BMhyEg5jSP7IIDhM9pWgF9KiJyMtx+8iWIt6h7v5+HbOylUuSUyhA0ewpFp2GA=
33+
on:
34+
tags: true
35+
rvm: 2.1
36+
condition:
37+
- $PUPPET_VERSION = '~> 4.2.0'
38+
- $STRICT_VARIABLES = true

‎CHANGELOG.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
##2017-09-12 - Pete Brown <rendhalver@users.noreply.github.com> 1.2.2
2+
###Summary
3+
4+
Ability to insert free-text lines to sudoers #14
5+
6+
7+
8+
##2016-02-11 - Pete Brown <rendhalver@users.noreply.github.com> 1.2.0
9+
###Summary
10+
11+
####Bugfixes
12+
13+
Bugfixes: template variables (@bobtfish and @rfay)
14+
Bugfix: extra_shells wasn't adding a , for path separation (@rendhalver)
15+
Adding support for secure_path and env_reset (@bobtfish)
16+
Adding support for setenv in sudo::rule (@aholen)
17+
Adding support for sudoers.d (@rendhalver)
18+
Allowing an array of commands in sudo::rule
19+
Initial changes to move away from params being the primary API
20+
Adding metadata.json to work with newer versions of puppet module
21+
22+
23+
##2016-01-29 - Pete Brown <rendhalver@users.noreply.github.com> 1.1.3
24+
###Summary
25+
26+
updated documentation for sudo::rule
27+
fixed mode for /etc/sudoers file to stop constant changes
28+
29+
####Bugfixes
30+
31+
##2016-01-29 - Pete Brown <rendhalver@users.noreply.github.com> 1.1.2
32+
###Summary
33+
34+
moved `sudo_fullaccess_group` into class vars for sudo::params
35+
include sudo in sudo::register class to make sure it gets loaded
36+
37+
####Bugfixes

‎Gemfile‎

Lines changed: 65 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
source 'https://rubygems.org'
22

3+
def location_for(place, fake_version = nil)
4+
if place =~ /^(git:[^#]*)#(.*)/
5+
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
6+
elsif place =~ /^file:\/\/(.*)/
7+
['>= 0', { :path => File.expand_path($1), :require => false }]
8+
else
9+
[place, { :require => false }]
10+
end
11+
end
12+
313
group :test do
4-
gem 'rake'
5-
gem 'puppet', ENV['PUPPET_VERSION'] || '~> 4.2.0'
6-
gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint'
7-
gem 'puppet-lint-unquoted_string-check', :require => false
8-
gem 'puppet-lint-empty_string-check', :require => false
9-
gem 'puppet-lint-leading_zero-check', :require => false
10-
gem 'puppet-lint-variable_contains_upcase', :require => false
14+
gem "rspec-core", '3.5.4', :require => false
15+
gem "rspec-puppet", '2.5.0', :require => false
16+
gem 'puppetlabs_spec_helper', '2.1.0', :require => false
17+
gem 'rspec-puppet-facts', '1.7.1', :require => false
18+
gem "puppet-syntax", '2.1.0', :require => false
19+
gem 'metadata-json-lint', '1.1.0', :require => false
20+
gem 'simplecov', :require => false
21+
gem 'json', '1.8.5', :require => false
22+
gem "puppet-blacksmith", :require => false
23+
gem 'pry', '<= 0.9.8', :require => false
24+
gem 'puppet-lint', '2.0.2', :require => false
25+
gem 'puppet-lint-unquoted_string-check', :require => false
26+
gem 'puppet-lint-empty_string-check', :require => false
27+
gem 'puppet-lint-leading_zero-check', :require => false
28+
gem 'puppet-lint-variable_contains_upcase', :require => false
1129
gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
12-
gem 'puppet-lint-absolute_classname-check', :require => false
13-
gem 'puppet-lint-undef_in_function-check', :require => false
14-
gem 'puppet-lint-roles_and_profiles-check', :require => false
15-
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet'#'~> 2.1'
16-
gem 'rspec-puppet-facts', :git => 'https://github.com/mcanevet/rspec-puppet-facts',:require => false
17-
gem "puppet-syntax"
18-
gem 'metadata-json-lint', :require => false
19-
gem 'puppetlabs_spec_helper', :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper'
20-
gem "rspec", '< 3.2.0'
21-
# gem 'coveralls', require: false
22-
gem 'pry', '<= 0.9.8'
23-
gem "puppet-blacksmith"
30+
gem 'puppet-lint-absolute_classname-check', :require => false
31+
gem 'puppet-lint-undef_in_function-check', :require => false
32+
gem 'puppet-lint-roles_and_profiles-check', :require => false
33+
# gem "rspec-puppet", :require => false
34+
# gem 'ci_reporter', :require => false
2435
end
2536

2637
group :development do
@@ -29,3 +40,38 @@ group :development do
2940
# gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
3041
# gem "beaker-rspec"
3142
end
43+
44+
# group :system_tests do
45+
# if beaker_version = ENV['BEAKER_VERSION']
46+
# gem 'beaker', *location_for(beaker_version)
47+
# end
48+
# if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
49+
# gem 'beaker-rspec', *location_for(beaker_rspec_version)
50+
# else
51+
# gem 'beaker-rspec', :require => false
52+
# end
53+
# gem 'serverspec', :require => false
54+
# gem 'beaker-puppet_install_helper', :require => false
55+
# end
56+
57+
# puppet requires json_pure; json_pure > 2.0.1 requires Ruby 2
58+
# so force the older json_pure in the case of older ruby
59+
gem 'json_pure', '< 2.0.2', :require => false, :platforms => [:ruby_18, :ruby_19]
60+
61+
if puppetversion = ENV['PUPPET_GEM_VERSION']
62+
gem 'puppet', puppetversion, :require => false
63+
else
64+
gem 'puppet', :require => false
65+
end
66+
67+
if facterversion = ENV['FACTER_GEM_VERSION']
68+
gem 'facter', facterversion, :require => false
69+
else
70+
gem 'facter', :require => false
71+
end
72+
73+
if hieraversion = ENV['HIERA_GEM_VERSION']
74+
gem 'hiera', hieraversion, :require => false
75+
else
76+
gem 'hiera', :require => false
77+
end

0 commit comments

Comments
 (0)