(PDKSync) Removal of puppet_module_gems

diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index cc4675e5ddb912f2284a6741ec440ed812730d37..a719361689897b67e53c12da1c50e68c5b8c7dc8 100644 (file)
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
 
        // Set *default* container specific settings.json values on container create.
        "settings": {
-               "terminal.integrated.shell.linux": "/bin/bash"
+               "terminal.integrated.profiles.linux": {
+                       "bash": {
+                               "path": "bash",
+                       }
+               }
        },
 
        // Add the IDs of extensions you want installed when the container is created.
        "extensions": [
                "puppet.puppet-vscode",
                "rebornix.Ruby"
-       ]
+       ],
 
        // Use 'forwardPorts' to make a list of ports inside the container available locally.
        "forwardPorts": [],

diff --git a/Gemfile b/Gemfile
index a14223db65c34bc6a873d2bc3f854bd6c8c27839..26dd2db9ce316fa801e42a972bdf9c9f3b5c0818 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -13,23 +13,28 @@ 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, platforms: [:ruby]
-  gem "github_changelog_generator",                              require: false
+  gem "json", '~> 2.0',                                require: false
+  gem "voxpupuli-puppet-lint-plugins", '~> 3.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", '>= 3.0.0', '< 5.0.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.4',                      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]
+  gem "github_changelog_generator",                    require: false
 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]
+  gem "serverspec", '~> 2.41',    require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

diff --git a/Rakefile b/Rakefile
index 4ce129ff64937607a984b5b11da838b21032d84b..8fdf11b99809ef23b728d16eb2e6b638888dbc25 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -44,6 +44,7 @@ end
 PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.send('disable_anchor_resource')
 
+
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?

diff --git a/metadata.json b/metadata.json
index a1fa5edd3be3ca9588378e3ba274ef6cb1933c1e..f90d8e4b088505760d7536d2c4cdcf54bba08a14 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -37,6 +37,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g806810b",
-  "pdk-version": "2.4.0"
+  "template-ref": "tags/2.6.0-0-gd0490b9",
+  "pdk-version": "2.5.0"
 }