Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.

Commit 8f8c537

Browse files
committed
handle relationships outside of ensure_packages()
1 parent e29c48b commit 8f8c537

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

manifests/dev.pp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,18 @@
114114
# specify a version and it will just silently continue installing the
115115
# default version.
116116
if $ruby_dev {
117-
ensure_packages([$ruby_dev], {'ensure' => $ensure, 'before' => Package['rake', 'bundler'], 'require' => Package['ruby'] })
117+
ensure_packages([$ruby_dev], {'ensure' => $ensure})
118+
Package['ruby'] -> Package[$ruby_dev] -> Package['rake', 'bundler']
118119
}
119120

120121
if $rake_package {
121-
ensure_packages(['rake'], {'ensure' => $rake_ensure, 'name' => $rake_package, 'provider' => $rake_provider, 'require' => Package['ruby'] })
122+
ensure_packages(['rake'], {'ensure' => $rake_ensure, 'name' => $rake_package, 'provider' => $rake_provider })
123+
Package['ruby'] -> Package['rake']
122124
}
123125

124126
if $bundler_package {
125-
ensure_packages(['bundler'], {'ensure' => $bundler_ensure, 'name' => $bundler_package, 'provider' => $bundler_provider, 'require' => Package['ruby'] })
127+
ensure_packages(['bundler'], {'ensure' => $bundler_ensure, 'name' => $bundler_package, 'provider' => $bundler_provider})
128+
Package['ruby'] -> Package['bundler']
126129
}
127130

128131
if $ruby_dev_gems {

manifests/init.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,13 @@
171171
}
172172

173173
if $rubygems_package {
174-
ensure_packages(['rubygems'], {'ensure' => $rubygems_ensure, 'name' => $rubygems_package, 'require' => Package['ruby'] })
174+
ensure_packages(['rubygems'], {'ensure' => $rubygems_ensure, 'name' => $rubygems_package })
175+
Package['ruby'] -> Package['rubygems']
175176
}
176177

177178
if $rubygems_update {
178-
ensure_packages(['rubygems-update'], {'ensure' => $gems_version, 'provider' => 'gem', 'require' => Package['rubygems'], 'notify' => Exec['ruby::update_rubygems']})
179+
ensure_packages(['rubygems-update'], {'ensure' => $gems_version, 'provider' => 'gem'})
180+
Package['rubygems'] -> Package['rubygems-update'] ~> Exec['ruby::update_rubygems']
179181
exec { 'ruby::update_rubygems':
180182
path => '/usr/local/bin:/usr/bin:/bin',
181183
command => 'update_rubygems',

0 commit comments

Comments
 (0)