From 7fed35a408b9ec37454169425823785b5fc8978b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 24 Aug 2017 02:22:17 +0200
Subject: Refactor base installation module

---
 modules/aur/manifests/aura.pp    | 16 ++++++----------
 modules/aur/manifests/init.pp    |  2 +-
 modules/aur/manifests/install.pp | 28 ----------------------------
 modules/aur/manifests/package.pp | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 modules/aur/manifests/install.pp
 create mode 100644 modules/aur/manifests/package.pp

(limited to 'modules/aur')

diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index 2dbcf39..1683cf8 100644
--- a/modules/aur/manifests/aura.pp
+++ b/modules/aur/manifests/aura.pp
@@ -6,12 +6,7 @@ class aur::aura(
     ensure => "present"
   }
 
-  exec { 'pacman-base-devel':
-    command   => '/usr/bin/pacman -Sy base-devel --needed --noconfirm',
-    unless    => '/usr/bin/pacman -Qo aura',
-    logoutput => 'on_failure',
-  }
-
+  ensure_packages(['base-devel'], { 'install_options'  => '--needed' })
   ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
 
   exec { 'aur::aura':
@@ -20,14 +15,15 @@ class aur::aura(
     command   => 'curl -o /tmp/aur.sh aur.sh && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin',
     user      => "aur-builder",
     unless    => '/usr/bin/pacman -Qo aura',
-    require   => Exec['pacman-base-devel'],
+    require   => Package['base-devel'],
     logoutput => 'on_failure',
   }
 
   package { 'aura-bin':
-    ensure => "present",
-    source => "/tmp/aura-bin-x86_64.pkg.tar.xz",
-    notify => Exec['aur::aura::cleanup']
+    ensure  => "present",
+    source  => "/tmp/aura-bin-x86_64.pkg.tar.xz",
+    require => Exec['aur::aura'],
+    notify  => Exec['aur::aura::cleanup']
   }
 
   exec { 'aur::aura::cleanup':
diff --git a/modules/aur/manifests/init.pp b/modules/aur/manifests/init.pp
index cdf9929..8c3faa1 100644
--- a/modules/aur/manifests/init.pp
+++ b/modules/aur/manifests/init.pp
@@ -1,4 +1,4 @@
 class aur {
-  class { 'aur::aura': }
+  contain 'aur::aura'
 }
 
diff --git a/modules/aur/manifests/install.pp b/modules/aur/manifests/install.pp
deleted file mode 100644
index 074088e..0000000
--- a/modules/aur/manifests/install.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-define aur::install (
-  $ensure = 'present',
-) {
-
-  case $ensure {
-    'present': {
-      exec { "pacman::aur::install::${name}":
-        require   => Class[aur::aura],
-        command   => "/usr/bin/aura -A ${name}",
-        unless    => "/usr/bin/aura -Qk ${name}",
-        logoutput => 'on_failure',
-        timeout   => 1800,
-      }
-    }
-    'absent': {
-      exec { "pacman::aur::remove::${name}":
-        require   => Class[aur::aura],
-        command   => "/usr/bin/aura -Rs ${name}",
-        onlyif    => "/usr/bin/aura -Qi ${name}",
-        logoutput => 'on_failure',
-      }
-    }
-    default: {
-      fail("Pacman::Aur[${name}] ensure parameter must be either 'present' or 'absent'")
-    }
-
-  }
-}
diff --git a/modules/aur/manifests/package.pp b/modules/aur/manifests/package.pp
new file mode 100644
index 0000000..2fd346e
--- /dev/null
+++ b/modules/aur/manifests/package.pp
@@ -0,0 +1,32 @@
+define aur::package (
+  $ensure = 'present',
+) {
+
+  case $ensure {
+    'present': {
+      exec { "pacman::aur::install::${name}":
+        cwd       => "/tmp",
+        require   => Class[aur::aura],
+        command   => "/usr/bin/aura -A ${name}",
+        user      => "aur-builder",
+        unless    => "/usr/bin/aura -Qk ${name}",
+        logoutput => 'on_failure',
+        timeout   => 1800,
+      }
+    }
+    'absent': {
+      exec { "pacman::aur::remove::${name}":
+        cwd       => "/tmp",
+        require   => Class[aur::aura],
+        command   => "/usr/bin/aura -Rs ${name}",
+        user      => "aur-builder",
+        onlyif    => "/usr/bin/aura -Qi ${name}",
+        logoutput => 'on_failure',
+      }
+    }
+    default: {
+      fail("Pacman::Aur[${name}] ensure parameter must be either 'present' or 'absent'")
+    }
+
+  }
+}
-- 
cgit v1.2.3