Skip to content

Commit 37dd499

Browse files
authored
Merge pull request #284 from jpogran/maint-update-pdk-template-url
(maint) Update pdk template
2 parents cb0b912 + 17ba7e2 commit 37dd499

File tree

9 files changed

+379
-287
lines changed

9 files changed

+379
-287
lines changed

.gitattributes

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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
1+
*.rb eol=lf
2+
*.erb eol=lf
3+
*.pp eol=lf
4+
*.sh eol=lf
5+
*.epp eol=lf

.pdkignore

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,37 @@
1-
.git/
2-
.*.sw[op]
3-
.metadata
4-
.yardoc
5-
.yardwarns
6-
*.iml
7-
/.bundle/
8-
/.idea/
9-
/.vagrant/
10-
/coverage/
11-
/bin/
12-
/doc/
13-
/Gemfile.local
14-
/Gemfile.lock
15-
/junit/
16-
/log/
17-
/pkg/
18-
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
20-
/tmp/
21-
/vendor/
22-
/convert_report.txt
23-
/update_report.txt
24-
.DS_Store
1+
.git/
2+
.*.sw[op]
3+
.metadata
4+
.yardoc
5+
.yardwarns
6+
*.iml
7+
/.bundle/
8+
/.idea/
9+
/.vagrant/
10+
/coverage/
11+
/bin/
12+
/doc/
13+
/Gemfile.local
14+
/Gemfile.lock
15+
/junit/
16+
/log/
17+
/pkg/
18+
/spec/fixtures/manifests/
19+
/spec/fixtures/modules/
20+
/tmp/
21+
/vendor/
22+
/convert_report.txt
23+
/update_report.txt
24+
.DS_Store
25+
/appveyor.yml
26+
/.fixtures.yml
27+
/Gemfile
28+
/.gitattributes
29+
/.gitignore
30+
/.gitlab-ci.yml
31+
/.pdkignore
32+
/Rakefile
33+
/.rspec
34+
/.rubocop.yml
35+
/.travis.yml
36+
/.yardopts
37+
/spec/

.puppet-lint.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

.travis.yml

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,49 @@
1-
---
2-
sudo: false
3-
dist: trusty
4-
language: ruby
5-
cache: bundler
6-
before_install:
7-
- bundle -v
8-
- rm -f Gemfile.lock
9-
- gem update --system
10-
- gem --version
11-
- bundle -v
12-
script:
13-
- 'bundle exec rake $CHECK'
14-
bundler_args: --without system_tests
15-
rvm:
16-
- 2.4.1
17-
env:
18-
global:
19-
- BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
20-
matrix:
21-
fast_finish: true
22-
include:
23-
-
24-
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
25-
-
26-
env: CHECK=parallel_spec
27-
-
28-
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
29-
rvm: 2.1.9
30-
branches:
31-
only:
32-
- master
33-
- /^v\d/
34-
notifications:
35-
email: false
36-
deploy:
37-
provider: puppetforge
38-
user: puppet
39-
password:
40-
secure: ""
41-
on:
42-
tags: true
43-
all_branches: true
44-
condition: "$DEPLOY_TO_FORGE = yes"
1+
---
2+
dist: trusty
3+
language: ruby
4+
cache: bundler
5+
before_install:
6+
- if [ $BUNDLER_VERSION ]; then
7+
gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
8+
fi
9+
- bundle -v
10+
- rm -f Gemfile.lock
11+
- gem update --system $RUBYGEMS_VERSION
12+
- gem --version
13+
- bundle -v
14+
script:
15+
- 'bundle exec rake $CHECK'
16+
bundler_args: --without system_tests
17+
rvm:
18+
- 2.5.1
19+
env:
20+
global:
21+
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
22+
matrix:
23+
fast_finish: true
24+
include:
25+
-
26+
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
27+
-
28+
env: CHECK=parallel_spec
29+
-
30+
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
31+
rvm: 2.4.4
32+
-
33+
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
34+
rvm: 2.1.9
35+
branches:
36+
only:
37+
- master
38+
- /^v\d/
39+
notifications:
40+
email: false
41+
deploy:
42+
provider: puppetforge
43+
user: puppet
44+
password:
45+
secure: ""
46+
on:
47+
tags: true
48+
all_branches: true
49+
condition: "$DEPLOY_TO_FORGE = yes"

Gemfile

Lines changed: 78 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,78 @@
1-
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2-
3-
def location_for(place_or_version, fake_version = nil)
4-
if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)}
5-
[fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact
6-
elsif place_or_version =~ %r{\Afile:\/\/(.*)}
7-
['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }]
8-
else
9-
[place_or_version, { require: false }]
10-
end
11-
end
12-
13-
def gem_type(place_or_version)
14-
if place_or_version =~ %r{\Agit[:@]}
15-
:git
16-
elsif !place_or_version.nil? && place_or_version.start_with?('file:')
17-
:file
18-
else
19-
:gem
20-
end
21-
end
22-
23-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
24-
minor_version = ruby_version_segments[0..1].join('.')
25-
26-
group :development do
27-
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
28-
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
29-
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
30-
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
31-
gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
32-
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
33-
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
34-
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
35-
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
36-
end
37-
group :system_tests do
38-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
39-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
40-
gem "beaker-testmode_switcher", '~> 0.4', require: false
41-
gem "master_manipulator", require: false
42-
gem "puppet-blacksmith", '~> 3.4', require: false
43-
end
44-
45-
puppet_version = ENV['PUPPET_GEM_VERSION']
46-
puppet_type = gem_type(puppet_version)
47-
facter_version = ENV['FACTER_GEM_VERSION']
48-
hiera_version = ENV['HIERA_GEM_VERSION']
49-
50-
gems = {}
51-
52-
gems['puppet'] = location_for(puppet_version)
53-
54-
# If facter or hiera versions have been specified via the environment
55-
# variables
56-
57-
gems['facter'] = location_for(facter_version) if facter_version
58-
gems['hiera'] = location_for(hiera_version) if hiera_version
59-
60-
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
61-
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
62-
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
63-
gems['win32-dir'] = ['<= 0.4.9', require: false]
64-
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
65-
gems['win32-process'] = ['<= 0.7.5', require: false]
66-
gems['win32-security'] = ['<= 0.2.5', require: false]
67-
gems['win32-service'] = ['0.8.8', require: false]
68-
end
69-
70-
gems.each do |gem_name, gem_params|
71-
gem gem_name, *gem_params
72-
end
73-
74-
# Evaluate Gemfile.local and ~/.gemfile if they exist
75-
extra_gemfiles = [
76-
"#{__FILE__}.local",
77-
File.join(Dir.home, '.gemfile'),
78-
]
79-
80-
extra_gemfiles.each do |gemfile|
81-
if File.file?(gemfile) && File.readable?(gemfile)
82-
eval(File.read(gemfile), binding)
83-
end
84-
end
85-
# vim: syntax=ruby
1+
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2+
3+
def location_for(place_or_version, fake_version = nil)
4+
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
5+
file_url_regex = %r{\Afile:\/\/(?<path>.*)}
6+
7+
if place_or_version && (git_url = place_or_version.match(git_url_regex))
8+
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
9+
elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
10+
['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
11+
else
12+
[place_or_version, { require: false }]
13+
end
14+
end
15+
16+
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17+
minor_version = ruby_version_segments[0..1].join('.')
18+
19+
group :development do
20+
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
21+
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
22+
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
23+
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
24+
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
25+
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
26+
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
27+
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
28+
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
29+
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
30+
end
31+
group :system_tests do
32+
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
33+
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
34+
gem "beaker-testmode_switcher", '~> 0.4', require: false
35+
gem "master_manipulator", require: false
36+
gem "puppet-blacksmith", '~> 3.4', require: false
37+
end
38+
39+
puppet_version = ENV['PUPPET_GEM_VERSION']
40+
facter_version = ENV['FACTER_GEM_VERSION']
41+
hiera_version = ENV['HIERA_GEM_VERSION']
42+
43+
gems = {}
44+
45+
gems['puppet'] = location_for(puppet_version)
46+
47+
# If facter or hiera versions have been specified via the environment
48+
# variables
49+
50+
gems['facter'] = location_for(facter_version) if facter_version
51+
gems['hiera'] = location_for(hiera_version) if hiera_version
52+
53+
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
54+
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
55+
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
56+
gems['win32-dir'] = ['<= 0.4.9', require: false]
57+
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
58+
gems['win32-process'] = ['<= 0.7.5', require: false]
59+
gems['win32-security'] = ['<= 0.2.5', require: false]
60+
gems['win32-service'] = ['0.8.8', require: false]
61+
end
62+
63+
gems.each do |gem_name, gem_params|
64+
gem gem_name, *gem_params
65+
end
66+
67+
# Evaluate Gemfile.local and ~/.gemfile if they exist
68+
extra_gemfiles = [
69+
"#{__FILE__}.local",
70+
File.join(Dir.home, '.gemfile'),
71+
]
72+
73+
extra_gemfiles.each do |gemfile|
74+
if File.file?(gemfile) && File.readable?(gemfile)
75+
eval(File.read(gemfile), binding)
76+
end
77+
end
78+
# vim: syntax=ruby

0 commit comments

Comments
 (0)