Try to avoid inherits

Jianwei Han
1 parent d7ba16de2b
Showing 5 changed files with 29 additions and 8 deletions Side-by-side Diff
modules/people/manifests/hanjianwei.pp
modules/people/manifests/hanjianwei/applications.pp
modules/people/manifests/hanjianwei/mirrors.pp
modules/people/manifests/hanjianwei/osx.pp
modules/people/manifests/hanjianwei/repositories.pp
-class people::hanjianwei {
+class people::hanjianwei (
+  $home     = $people::hanjianwei::config::home,
+  $dotfiles = $people::hanjianwei::config::dotfiles,
+  $srcdir   = $people::hanjianwei::config::srcdir
+) inherits people::hanjianwei::config {
   include people::hanjianwei::osx
   include people::hanjianwei::repositories
   include people::hanjianwei::applications
-class people::hanjianwei::applications inherits people::hanjianwei::config {
-  notify { "${homebrew::config::cachedir}": }
+class people::hanjianwei::applications(
+  $home     = $people::hanjianwei::config::home,
+  $dotfiles = $people::hanjianwei::config::dotfiles
+) {
  
   # Declare all Homebrew packages
   package {
@@ -53,7 +55,7 @@
       'welly',
       'xmind'
     ]:
-    provider => 'brewcask'
+      provider => 'brewcask'
   }
  
   # Taps
-class people::hanjianwei::mirrors inherits people::hanjianwei::config {
+class people::hanjianwei::mirrors(
+  $home     = $people::hanjianwei::config::home,
+  $dotfiles = $people::hanjianwei::config::dotfiles
+) {
   include boxen::gemrc
  
-  File <| title == "/Users/${::boxen_user}/.gemrc" |> {
+  File <| title == "${home}/.gemrc" |> {
     source  => "${dotfiles}/Gem/gemrc",
     require => Repository["${dotfiles}"]
   }
-class people::hanjianwei::osx inherits people::hanjianwei::config {
+class people::hanjianwei::osx(
+  $home     = $people::hanjianwei::config::home,
+  $dotfiles = $people::hanjianwei::config::dotfiles
+) {
   # Zsh
   osx_chsh { $boxen_user:
     shell => '/bin/zsh'
-class people::hanjianwei::repositories inherits people::hanjianwei::config {
+class people::hanjianwei::repositories(
+  $home     = $people::hanjianwei::config::home,
+  $dotfiles = $people::hanjianwei::config::dotfiles,
+  $srcdir   = $people::hanjianwei::config::srcdir
+) {
+
   # Git
   file { "${home}/.gitconfig":
     target  => "${dotfiles}/Git/gitconfig",
@@ -8,6 +13,10 @@
   # Repos
   repository { "${dotfiles}":
     source => 'hanjianwei/dotfiles'
+  }
+
+  repository { "${srcdir}/diyao/web":
+    source => 'hanjianwei/diyao-web'
   }
 }
1		-class people::hanjianwei {
	1	+class people::hanjianwei (
	2	+ $home = $people::hanjianwei::config::home,
	3	+ $dotfiles = $people::hanjianwei::config::dotfiles,
	4	+ $srcdir = $people::hanjianwei::config::srcdir
	5	+) inherits people::hanjianwei::config {
2	6	include people::hanjianwei::osx
3	7	include people::hanjianwei::repositories
4	8	include people::hanjianwei::applications
1		-class people::hanjianwei::applications inherits people::hanjianwei::config {
2		- notify { "${homebrew::config::cachedir}": }
	1	+class people::hanjianwei::applications(
	2	+ $home = $people::hanjianwei::config::home,
	3	+ $dotfiles = $people::hanjianwei::config::dotfiles
	4	+) {
3	5
4	6	# Declare all Homebrew packages
5	7	package {
...	...	@@ -53,7 +55,7 @@
53	55	'welly',
54	56	'xmind'
55	57	]:
56		- provider => 'brewcask'
	58	+ provider => 'brewcask'
57	59	}
58	60
59	61	# Taps
1		-class people::hanjianwei::mirrors inherits people::hanjianwei::config {
	1	+class people::hanjianwei::mirrors(
	2	+ $home = $people::hanjianwei::config::home,
	3	+ $dotfiles = $people::hanjianwei::config::dotfiles
	4	+) {
2	5	include boxen::gemrc
3	6
4		- File <\| title == "/Users/${::boxen_user}/.gemrc" \|> {
	7	+ File <\| title == "${home}/.gemrc" \|> {
5	8	source => "${dotfiles}/Gem/gemrc",
6	9	require => Repository["${dotfiles}"]
7	10	}
1		-class people::hanjianwei::osx inherits people::hanjianwei::config {
	1	+class people::hanjianwei::osx(
	2	+ $home = $people::hanjianwei::config::home,
	3	+ $dotfiles = $people::hanjianwei::config::dotfiles
	4	+) {
2	5	# Zsh
3	6	osx_chsh { $boxen_user:
4	7	shell => '/bin/zsh'
1		-class people::hanjianwei::repositories inherits people::hanjianwei::config {
	1	+class people::hanjianwei::repositories(
	2	+ $home = $people::hanjianwei::config::home,
	3	+ $dotfiles = $people::hanjianwei::config::dotfiles,
	4	+ $srcdir = $people::hanjianwei::config::srcdir
	5	+) {
	6	+
2	7	# Git
3	8	file { "${home}/.gitconfig":
4	9	target => "${dotfiles}/Git/gitconfig",
...	...	@@ -8,6 +13,10 @@
8	13	# Repos
9	14	repository { "${dotfiles}":
10	15	source => 'hanjianwei/dotfiles'
	16	+ }
	17	+
	18	+ repository { "${srcdir}/diyao/web":
	19	+ source => 'hanjianwei/diyao-web'
11	20	}
12	21	}