Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and puppet versions #47

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/.yardopts
/spec/
/.vscode/
Expand Down
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# for the default values.
---
spec/spec_helper.rb:
mock_with: :mocha
mock_with: ":mocha"
38 changes: 22 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,31 @@ def location_for(place_or_version, fake_version = nil)
end
end

ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = ruby_version_segments[0..1].join('.')

group :development do
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.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false
gem 'fuubar', require: false
gem 'pry-byebug', require: false
gem 'pry-stack_explorer', require: false
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.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
gem "facterdb", '~> 1.18', require: false
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
gem "puppetlabs_spec_helper", '~> 5.0', require: false
gem "rspec-puppet-facts", '~> 2.0', require: false
gem "codecov", '~> 0.2', require: false
gem "dependency_checker", '~> 0.2', require: false
gem "parallel_tests", '= 3.12.1', require: false
gem "pry", '~> 0.10', require: false
gem "simplecov-console", '~> 0.5', require: false
gem "puppet-debugger", '~> 1.0', require: false
gem "rubocop", '= 1.6.1', require: false
gem "rubocop-performance", '= 1.9.1', require: false
gem "rubocop-rspec", '= 2.0.1', require: false
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
gem "serverspec", '~> 2.41', require: false
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
2 changes: 1 addition & 1 deletion manifests/prefix_list.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define quagga::prefix_list (
Hash $rules = {},
) {
$rules.reduce( {}) |Hash $rules, Tuple[Integer, Hash] $rule| {
$rules.reduce({}) |Hash $rules, Tuple[Integer, Hash] $rule| {
merge($rules, { "${name} ${rule[0]}" => $rule[1] })
}.each |String $prefix_list_name, Hash $prefix_list| {
quagga_prefix_list { $prefix_list_name:
Expand Down
2 changes: 1 addition & 1 deletion manifests/route_map.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define quagga::route_map (
Hash $rules = {},
) {
$rules.reduce( {}) |Hash $rules, Tuple[Integer, Hash] $rule| {
$rules.reduce({}) |Hash $rules, Tuple[Integer, Hash] $rule| {
merge($rules, { "${name} ${rule[0]}" => $rule[1] })
}.each |String $route_map_name, Hash $route_map| {
quagga_route_map { $route_map_name:
Expand Down
10 changes: 5 additions & 5 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bibigon812-quagga",
"version": "4.4.0",
"version": "4.5.0",
"author": "Dmitriy Yakovlev",
"summary": "Puppet module to manage Quagga",
"license": "Apache-2.0",
Expand All @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs-stdlib",
"version_requirement": ">= 4.10.0 < 7.0.0"
"version_requirement": ">= 4.10.0 < 10.0.0"
}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -40,7 +40,7 @@
"pim",
"zebra"
],
"pdk-version": "2.5.0",
"template-url": "pdk-default#2.5.0",
"template-ref": "tags/2.5.0-0-g369d483"
"pdk-version": "2.7.1",
"template-url": "pdk-default#2.7.4",
"template-ref": "tags/2.7.4-0-g58edf57"
}
6 changes: 3 additions & 3 deletions spec/unit/provider/quagga_logging/quagga_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
expect(described_class.instances[0].instance_variable_get('@property_hash')).to eq({
ensure: :present,
provider: :quagga,
name: 'file',
name: :file,
filename: '/tmp/file.log',
level: :warnings,
})
Expand All @@ -70,7 +70,7 @@
expect(described_class.instances[1].instance_variable_get('@property_hash')).to eq({
ensure: :present,
provider: :quagga,
name: 'stdout',
name: :stdout,
level: :errors,
})
end
Expand All @@ -79,7 +79,7 @@
expect(described_class.instances[2].instance_variable_get('@property_hash')).to eq({
ensure: :present,
provider: :quagga,
name: 'syslog',
name: :syslog,
level: :errors,
})
end
Expand Down