(maint) Update for PDK templates
This commit updates the module as per PDK-Templates commit 0b5b39b
This commit is contained in:
@@ -14,7 +14,6 @@ AllCops:
|
|||||||
- "**/Rakefile"
|
- "**/Rakefile"
|
||||||
- pkg/**/*
|
- pkg/**/*
|
||||||
- spec/fixtures/**/*
|
- spec/fixtures/**/*
|
||||||
- spec/**/*
|
|
||||||
- vendor/**/*
|
- vendor/**/*
|
||||||
- "**/Puppetfile"
|
- "**/Puppetfile"
|
||||||
- "**/Vagrantfile"
|
- "**/Vagrantfile"
|
||||||
@@ -28,6 +27,7 @@ GetText/DecorateString:
|
|||||||
Description: We don't want to decorate test output.
|
Description: We don't want to decorate test output.
|
||||||
Exclude:
|
Exclude:
|
||||||
- spec/**/*
|
- spec/**/*
|
||||||
|
Enabled: false
|
||||||
RSpec/BeforeAfterAll:
|
RSpec/BeforeAfterAll:
|
||||||
Description: Beware of using after(:all) as it may cause state to leak between tests.
|
Description: Beware of using after(:all) as it may cause state to leak between tests.
|
||||||
A necessary evil in acceptance testing.
|
A necessary evil in acceptance testing.
|
||||||
@@ -89,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
|
|||||||
Enabled: true
|
Enabled: true
|
||||||
Style/StringMethods:
|
Style/StringMethods:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
GetText/DecorateFunctionMessage:
|
||||||
|
Enabled: false
|
||||||
|
GetText/DecorateStringFormattingUsingInterpolation:
|
||||||
|
Enabled: false
|
||||||
|
GetText/DecorateStringFormattingUsingPercent:
|
||||||
|
Enabled: false
|
||||||
Layout/EndOfLine:
|
Layout/EndOfLine:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
Layout/IndentHeredoc:
|
Layout/IndentHeredoc:
|
||||||
|
|||||||
3
Gemfile
3
Gemfile
@@ -24,6 +24,7 @@ group :development do
|
|||||||
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
|
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::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||||
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))
|
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))
|
||||||
|
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||||
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
|
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
|
||||||
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
|
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
|
||||||
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||||
@@ -70,4 +71,4 @@ extra_gemfiles.each do |gemfile|
|
|||||||
eval(File.read(gemfile), binding)
|
eval(File.read(gemfile), binding)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
# vim: syntax=ruby
|
# vim: syntax=ruby
|
||||||
|
|||||||
13
Rakefile
13
Rakefile
@@ -15,8 +15,17 @@ end
|
|||||||
|
|
||||||
def changelog_project
|
def changelog_project
|
||||||
return unless Rake.application.top_level_tasks.include? "changelog"
|
return unless Rake.application.top_level_tasks.include? "changelog"
|
||||||
returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
|
|
||||||
raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
|
returnVal = nil
|
||||||
|
returnVal ||= begin
|
||||||
|
metadata_source = JSON.load(File.read('metadata.json'))['source']
|
||||||
|
metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
|
||||||
|
|
||||||
|
metadata_source_match && metadata_source_match[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
|
||||||
|
|
||||||
puts "GitHubChangelogGenerator project:#{returnVal}"
|
puts "GitHubChangelogGenerator project:#{returnVal}"
|
||||||
returnVal
|
returnVal
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -80,6 +80,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"template-url": "https://github.com/puppetlabs/pdk-templates/#master",
|
"template-url": "https://github.com/puppetlabs/pdk-templates/#master",
|
||||||
"template-ref": "heads/master-0-gb096033",
|
"template-ref": "1.14.1-0-g0b5b39b",
|
||||||
"pdk-version": "1.11.1"
|
"pdk-version": "1.14.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,6 @@
|
|||||||
# Facts specified here will override the values provided by rspec-puppet-facts.
|
# Facts specified here will override the values provided by rspec-puppet-facts.
|
||||||
---
|
---
|
||||||
ipaddress: "172.16.254.254"
|
ipaddress: "172.16.254.254"
|
||||||
|
ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
|
||||||
is_pe: false
|
is_pe: false
|
||||||
macaddress: "AA:AA:AA:AA:AA:AA"
|
macaddress: "AA:AA:AA:AA:AA:AA"
|
||||||
|
|||||||
Reference in New Issue
Block a user