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

use ensure_package from stdlib instead of raw package type #78

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
19 changes: 9 additions & 10 deletions manifests/dev.pp
Original file line number Diff line number Diff line change
Expand Up @@ -114,36 +114,35 @@
# specify a version and it will just silently continue installing the
# default version.
if $ruby_dev {
package { $ruby_dev:
ensure_packages([$ruby_dev], {
ensure => $ensure,
before => Package['rake', 'bundler'],
before => Package[$rake_package, $bundler_package],
require => Package['ruby'],
}
})
}

if $rake_package {
package { 'rake':
ensure_packages([$rake_package], {
ensure => $rake_ensure,
name => $rake_package,
provider => $rake_provider,
require => Package['ruby'],
}
})
}

if $bundler_package {
package { 'bundler':
ensure_packages([$bundler_package], {
ensure => $bundler_ensure,
name => $bundler_package,
provider => $bundler_provider,
require => Package['ruby'],
}
})
}

if $ruby_dev_gems {
package { $ruby_dev_gems:
ensure_packages([$ruby_dev_gems], {
ensure => $ensure,
provider => gem,
}
})
}

}
24 changes: 11 additions & 13 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@
# available. It's a bit misleading for the user, though, since they can
# specify a version and it will just silently continue installing the
# default version.
package { 'ruby':
ensure_packages(['ruby'], {
ensure => $ruby_package_ensure,
name => $real_ruby_package,
}
})

# if rubygems_update is set to true then we only need to make the package
# resource for rubygems ensure to installed, we'll let rubygems-update
Expand All @@ -173,21 +173,19 @@
$rubygems_ensure = $gems_version
}

if $rubygems_package {
package { 'rubygems':
ensure => $rubygems_ensure,
name => $rubygems_package,
require => Package['ruby'],
}
}
ensure_packages(['rubygems'], {
ensure => $rubygems_ensure,
name => $rubygems_package,
require => Package['ruby'],
})

if $rubygems_update {
package { 'rubygems-update':
ensure_packages(['rubygems-update'], {
ensure => $gems_version,
provider => 'gem',
require => Package['rubygems'],
notify => Exec['ruby::update_rubygems'],
}
})

exec { 'ruby::update_rubygems':
path => '/usr/local/bin:/usr/bin:/bin',
Expand Down Expand Up @@ -293,11 +291,11 @@
if ! $suppress_warnings and $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.04') < 0 {
warning('No package for rubygems_integration available from default repositories')
}
package{'rubygems_integration':
ensure_packages(['rubygems_integration'], {
ensure => $ruby_package_ensure,
name => $gem_integration_package,
require => Package['rubygems'],
}
})
}
default: {
notice("The gem_integration parameter for the ruby class does not work for ${::operatingsystem}, no action taken.")
Expand Down