Skip to content

Commit f1ace96

Browse files
committed
(PDKSync) Removal of puppet_module_gems
1 parent 8d9f205 commit f1ace96

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

Gemfile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,28 @@ 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
28-
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 "github_changelog_generator", require: false
2934
end
3035
group :system_tests do
31-
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
32-
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
36+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
37+
gem "serverspec", '~> 2.41', require: false
3338
end
3439

3540
puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ end
4343

4444
PuppetLint.configuration.send('disable_relative')
4545
PuppetLint.configuration.send('disable_anchor_resource')
46+
PuppetLint.configuration.send('disable_140chars')
4647

4748

4849
if Bundler.rubygems.find_name('github_changelog_generator').any?

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
}
9191
],
9292
"description": "Module for Apache configuration",
93-
"pdk-version": "2.4.0",
93+
"pdk-version": "2.5.0",
9494
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
95-
"template-ref": "2.5.0-0-g369d483"
95+
"template-ref": "tags/2.6.0-0-gd0490b9"
9696
}

0 commit comments

Comments
 (0)