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

Commit 4ff53a4

Browse files
committed
Merge pull request #29 from DarkHorseComics/ensure-packages
Use ensure_packages to install dependencies
2 parents e2817de + 4d11af0 commit 4ff53a4

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Requires the following boxen modules:
66

77
* `boxen`
88
* `homebrew`
9+
* `stdlib`
910
* `wget`
1011
* `autoconf`
1112
* `libtool`

manifests/init.pp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
require php::config
1111
require homebrew
1212
include wget
13+
include stdlib
1314
include autoconf
1415
include libtool
1516
include pkgconfig
@@ -60,16 +61,7 @@
6061
}
6162

6263
# Resolve dependencies
63-
64-
package { [
65-
'gmp',
66-
'icu4c',
67-
'jpeg',
68-
'libevent',
69-
'mcrypt',
70-
]:
71-
provider => homebrew,
72-
}
64+
ensure_packages( [ 'libevent', 'gmp', 'icu4c', 'jpeg', 'mcrypt', ] )
7365

7466
# Install freetype version 2.4.11 due to conflict with GD
7567
# See https://github.com/boxen/puppet-php/issues/25

spec/classes/php_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
it do
88
should include_class("php::config")
99
should include_class("homebrew")
10+
should include_class("stdlib")
1011
should include_class("wget")
1112
should include_class("autoconf")
1213
should include_class("libtool")
@@ -63,7 +64,7 @@
6364
"libevent",
6465
"mcrypt"
6566
].each do |pkg|
66-
should contain_package(pkg).with_provider("homebrew")
67+
should contain_package(pkg)
6768
end
6869

6970
should contain_homebrew__formula("autoconf213").with({

0 commit comments

Comments
 (0)