Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(MODULES-7403) PDK Convert the module
This commit converts the module to PDK format. There are no code or test changes as part of this conversion.
- Loading branch information
1 parent
c5d4ee1
commit 044149d
Showing
12 changed files
with
258 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,24 @@ | ||
# This file is generated by ModuleSync, do not edit. | ||
*.iml | ||
.git/ | ||
.*.sw[op] | ||
.DS_Store | ||
.bundle/ | ||
.idea/ | ||
.metadata | ||
.vagrant/ | ||
.yardoc | ||
.yardwarns | ||
Gemfile.local | ||
Gemfile.lock | ||
bin/ | ||
coverage/ | ||
doc/ | ||
junit/ | ||
log/ | ||
pkg/ | ||
spec/fixtures/manifests/ | ||
spec/fixtures/modules/ | ||
tmp/ | ||
vendor/ | ||
|
||
*.iml | ||
/.bundle/ | ||
/.idea/ | ||
/.vagrant/ | ||
/coverage/ | ||
/bin/ | ||
/doc/ | ||
/Gemfile.local | ||
/Gemfile.lock | ||
/junit/ | ||
/log/ | ||
/pkg/ | ||
/spec/fixtures/manifests/ | ||
/spec/fixtures/modules/ | ||
/tmp/ | ||
/vendor/ | ||
/convert_report.txt | ||
/update_report.txt | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
.git/ | ||
.*.sw[op] | ||
.metadata | ||
.yardoc | ||
.yardwarns | ||
*.iml | ||
/.bundle/ | ||
/.idea/ | ||
/.vagrant/ | ||
/coverage/ | ||
/bin/ | ||
/doc/ | ||
/Gemfile.local | ||
/Gemfile.lock | ||
/junit/ | ||
/log/ | ||
/pkg/ | ||
/spec/fixtures/manifests/ | ||
/spec/fixtures/modules/ | ||
/tmp/ | ||
/vendor/ | ||
/convert_report.txt | ||
/update_report.txt | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,44 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
--- | ||
sudo: false | ||
dist: trusty | ||
language: ruby | ||
cache: bundler | ||
script: "bundle exec rake release_checks" | ||
before_install: | ||
- bundle -v | ||
- rm -f Gemfile.lock | ||
- gem update --system | ||
- gem --version | ||
- bundle -v | ||
script: | ||
- 'bundle exec rake $CHECK' | ||
bundler_args: --without system_tests | ||
rvm: | ||
- 2.4.1 | ||
env: | ||
global: | ||
- BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0" | ||
matrix: | ||
fast_finish: true | ||
include: | ||
- rvm: 2.4.1 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 5.0" | ||
- rvm: 2.1.9 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 4.0" | ||
- rvm: 2.1.9 | ||
script: bundle exec rake rubocop | ||
- | ||
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop" | ||
- | ||
env: CHECK=parallel_spec | ||
- | ||
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec | ||
rvm: 2.1.9 | ||
branches: | ||
only: | ||
- master | ||
- /^v\d/ | ||
notifications: | ||
email: false | ||
deploy: | ||
provider: puppetforge | ||
user: puppet | ||
password: | ||
secure: "" | ||
on: | ||
tags: true | ||
all_branches: true | ||
condition: "$DEPLOY_TO_FORGE = yes" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
--markup markdown |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,86 +1,90 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
source ENV['GEM_SOURCE'] || 'https://rubygems.org' | ||
|
||
source ENV['GEM_SOURCE'] || "https://rubygems.org" | ||
def location_for(place_or_version, fake_version = nil) | ||
if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)} | ||
[fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact | ||
elsif place_or_version =~ %r{\Afile:\/\/(.*)} | ||
['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }] | ||
else | ||
[place_or_version, { require: false }] | ||
end | ||
end | ||
|
||
# Determines what type of gem is requested based on place_or_version. | ||
def gem_type(place_or_version) | ||
if place_or_version =~ /^git:/ | ||
if place_or_version =~ %r{\Agit[:@]} | ||
:git | ||
elsif place_or_version =~ /^file:/ | ||
elsif !place_or_version.nil? && place_or_version.start_with?('file:') | ||
:file | ||
else | ||
:gem | ||
end | ||
end | ||
|
||
# Find a location or specific version for a gem. place_or_version can be a | ||
# version, which is most often used. It can also be git, which is specified as | ||
# `git://somewhere.git#branch`. You can also use a file source location, which | ||
# is specified as `file://some/location/on/disk`. | ||
def location_for(place_or_version, fake_version = nil) | ||
if place_or_version =~ /^(git[:@][^#]*)#(.*)/ | ||
[fake_version, { :git => $1, :branch => $2, :require => false }].compact | ||
elsif place_or_version =~ /^file:\/\/(.*)/ | ||
['>= 0', { :path => File.expand_path($1), :require => false }] | ||
else | ||
[place_or_version, { :require => false }] | ||
end | ||
end | ||
|
||
# Used for gem conditionals | ||
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments | ||
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" | ||
|
||
# The following gems are not included by default as they require DevKit on Windows. | ||
# You should probably include them in a Gemfile.local or a ~/.gemfile | ||
#gem 'pry' #this may already be included in the gemfile | ||
#gem 'pry-stack_explorer', :require => false | ||
#if RUBY_VERSION =~ /^2/ | ||
# gem 'pry-byebug' | ||
#else | ||
# gem 'pry-debugger' | ||
#end | ||
minor_version = ruby_version_segments[0..1].join('.') | ||
|
||
group :development do | ||
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" | ||
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] | ||
gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" | ||
gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] | ||
gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') | ||
gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') | ||
gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') | ||
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') | ||
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') | ||
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') | ||
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') | ||
gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4') | ||
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] | ||
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] | ||
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] | ||
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] | ||
end | ||
|
||
group :system_tests do | ||
gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby" | ||
gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] | ||
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') | ||
gem "beaker-pe", :require => false | ||
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) | ||
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) | ||
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] | ||
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] | ||
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13') | ||
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') | ||
gem "beaker-testmode_switcher", '~> 0.4', :require => false | ||
gem 'master_manipulator', :require => false | ||
gem "puppet-blacksmith", '~> 3.4', :require => false | ||
gem "beaker-pe", require: false | ||
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '>= 0.0') | ||
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 0.0') | ||
gem "beaker-testmode_switcher", '~> 0.4', require: false | ||
gem "master_manipulator", require: false | ||
gem "puppet-blacksmith", '~> 3.4', require: false | ||
end | ||
|
||
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) | ||
puppet_version = ENV['PUPPET_GEM_VERSION'] | ||
puppet_type = gem_type(puppet_version) | ||
facter_version = ENV['FACTER_GEM_VERSION'] | ||
hiera_version = ENV['HIERA_GEM_VERSION'] | ||
|
||
gems = {} | ||
|
||
gems['puppet'] = location_for(puppet_version) | ||
|
||
# Only explicitly specify Facter/Hiera if a version has been specified. | ||
# Otherwise it can lead to strange bundler behavior. If you are seeing weird | ||
# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable | ||
# to `1` and then run bundle install. | ||
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION'] | ||
gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION'] | ||
# If facter or hiera versions have been specified via the environment | ||
# variables | ||
|
||
# Evaluate Gemfile.local if it exists | ||
if File.exists? "#{__FILE__}.local" | ||
eval(File.read("#{__FILE__}.local"), binding) | ||
gems['facter'] = location_for(facter_version) if facter_version | ||
gems['hiera'] = location_for(hiera_version) if hiera_version | ||
|
||
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} | ||
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem | ||
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). | ||
gems['win32-dir'] = ['<= 0.4.9', require: false] | ||
gems['win32-eventlog'] = ['<= 0.6.5', require: false] | ||
gems['win32-process'] = ['<= 0.7.5', require: false] | ||
gems['win32-security'] = ['<= 0.2.5', require: false] | ||
gems['win32-service'] = ['0.8.8', require: false] | ||
end | ||
|
||
# Evaluate ~/.gemfile if it exists | ||
if File.exists?(File.join(Dir.home, '.gemfile')) | ||
eval(File.read(File.join(Dir.home, '.gemfile')), binding) | ||
gems.each do |gem_name, gem_params| | ||
gem gem_name, *gem_params | ||
end | ||
|
||
# vim:ft=ruby | ||
# Evaluate Gemfile.local and ~/.gemfile if they exist | ||
extra_gemfiles = [ | ||
"#{__FILE__}.local", | ||
File.join(Dir.home, '.gemfile'), | ||
] | ||
|
||
extra_gemfiles.each do |gemfile| | ||
if File.file?(gemfile) && File.readable?(gemfile) | ||
eval(File.read(gemfile), binding) | ||
end | ||
end | ||
# vim: syntax=ruby |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,6 @@ | ||
require 'puppetlabs_spec_helper/rake_tasks' | ||
require 'puppet-lint/tasks/puppet-lint' | ||
require 'puppet-syntax/tasks/puppet-syntax' | ||
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? | ||
begin | ||
require 'beaker/tasks/test' | ||
rescue LoadError | ||
puts "Unable to load beaker/tasks/test for rake tasks" | ||
end | ||
|
||
desc 'Run RSpec' | ||
RSpec::Core::RakeTask.new(:test) do |t| | ||
t.pattern = 'spec/{unit}/**/*.rb' | ||
# t.rspec_opts = ['--color'] | ||
end | ||
PuppetLint.configuration.send('disable_relative') | ||
|
||
desc 'Generate code coverage' | ||
RSpec::Core::RakeTask.new(:coverage) do |t| | ||
t.rcov = true | ||
t.rcov_opts = ['--exclude', 'spec'] | ||
end | ||
|
||
# These lint exclusions are in puppetlabs_spec_helper but needs a version above 0.10.3 | ||
# Line length test is 80 chars in puppet-lint 1.1.0 | ||
PuppetLint.configuration.send('disable_80chars') | ||
# Line length test is 140 chars in puppet-lint 2.x | ||
PuppetLint.configuration.send('disable_140chars') | ||
|
||
#Due to puppet-lint not ignoring tests folder or the ignore paths attribute | ||
#we have to ignore many things | ||
# #Due to bug in puppet-lint we have to clear and redo the lint tasks to achieve ignore paths | ||
Rake::Task[:lint].clear | ||
PuppetLint::RakeTask.new(:lint) do |config| | ||
config.pattern = 'manifests/**/*.pp' | ||
config.fail_on_warnings = true | ||
config.disable_checks = [ | ||
'80chars', | ||
'class_inherits_from_params_class', | ||
'class_parameter_defaults', | ||
'documentation', | ||
'single_quote_string_with_variables'] | ||
config.ignore_paths = ["tests/*.pp", "spec/**/*.pp", "pkg/**/*.pp"] | ||
end |
Oops, something went wrong.