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

Commit

Permalink
use ensure_package from stdlib instead of raw package type
Browse files Browse the repository at this point in the history
  • Loading branch information
scarybot authored and James Denness committed Jul 20, 2017
1 parent 0ec4833 commit dc09277
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
17 changes: 8 additions & 9 deletions manifests/dev.pp
Original file line number Diff line number Diff line change
Expand Up @@ -114,31 +114,30 @@
# 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_dev:
ensure_packages([$ruby_dev], {
ensure => $ensure,
before => Package['rake', 'bundler'],
require => Package['ruby'],
}
})

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

package { 'bundler':
ensure_packages(['bundler'], {
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,
}
})
}

}
16 changes: 8 additions & 8 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,19 +173,19 @@
$rubygems_ensure = $gems_version
}

package { 'rubygems':
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 @@ -291,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

0 comments on commit dc09277

Please sign in to comment.