Skip to content

Commit 94c0bd1

Browse files
authored
Merge pull request #410 from puppetlabs/pdksync_pdksync/remove_puppet_module_gems
pdksync - (PDKSync) Removal of puppet_module_gems
2 parents 34f94e7 + 096ef8e commit 94c0bd1

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

.devcontainer/README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
1313

1414
// Set *default* container specific settings.json values on container create.
1515
"settings": {
16-
"terminal.integrated.shell.linux": "/bin/bash"
16+
"terminal.integrated.profiles.linux": {
17+
"bash": {
18+
"path": "bash",
19+
}
20+
}
1721
},
1822

1923
// Add the IDs of extensions you want installed when the container is created.
2024
"extensions": [
2125
"puppet.puppet-vscode",
2226
"rebornix.Ruby"
23-
]
27+
],
2428

2529
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2630
"forwardPorts": [],

Gemfile

+20-15
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,29 @@ def location_for(place_or_version, fake_version = nil)
1313
end
1414
end
1515

16-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17-
minor_version = ruby_version_segments[0..1].join('.')
18-
1916
group :development do
20-
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
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))
22-
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))
23-
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
24-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
25-
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
26-
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
28-
gem "ruby-pwsh", require: false
29-
gem "github_changelog_generator", require: false
17+
gem "json", '~> 2.0', require: false
18+
gem "voxpupuli-puppet-lint-plugins", '~> 3.0', require: false
19+
gem "facterdb", '~> 1.18', require: false
20+
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
21+
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
22+
gem "rspec-puppet-facts", '~> 2.0', require: false
23+
gem "codecov", '~> 0.2', require: false
24+
gem "dependency_checker", '~> 0.2', require: false
25+
gem "parallel_tests", '~> 3.4', require: false
26+
gem "pry", '~> 0.10', require: false
27+
gem "simplecov-console", '~> 0.5', require: false
28+
gem "puppet-debugger", '~> 1.0', require: false
29+
gem "rubocop", '= 1.6.1', require: false
30+
gem "rubocop-performance", '= 1.9.1', require: false
31+
gem "rubocop-rspec", '= 2.0.1', require: false
32+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
33+
gem "ruby-pwsh", require: false
34+
gem "github_changelog_generator", require: false
3035
end
3136
group :system_tests do
32-
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
33-
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
38+
gem "serverspec", '~> 2.41', require: false
3439
end
3540

3641
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"tsql",
4949
"database"
5050
],
51-
"pdk-version": "2.4.0",
51+
"pdk-version": "2.5.0",
5252
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
53-
"template-ref": "2.5.0-0-g806810b"
53+
"template-ref": "tags/2.6.0-0-gd0490b9"
5454
}

0 commit comments

Comments
 (0)