From 24f6f12f838374d850a8543c623f0b227caadff9 Mon Sep 17 00:00:00 2001
From: Lex Rivera <me@lex.io>
Date: Wed, 26 Nov 2014 15:08:07 +0300
Subject: [PATCH 1/3] install gpg key before installing rvm

---
 manifests/install.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manifests/install.pp b/manifests/install.pp
index 661430c..2d656d7 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -90,6 +90,14 @@
 
   $install_command = "su -c 'curl -L https://get.rvm.io | bash -s ${version}' - ${user}"
 
+  #execute gpg key installation before installing rvm
+  #key needs to be installed in user gpg keychain
+  exec { 'install-gpg':
+    command     => 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
+    user        => ${user},
+    unless      => 'gpg2 --list-keys D39DC0E3',
+  } ->
+
   exec { $install_command:
     path    => '/usr/bin:/usr/sbin:/bin',
     creates => "${homedir}/.rvm/bin/rvm",

From 9394a75481a728ac8220aa66edfcb3344b44979e Mon Sep 17 00:00:00 2001
From: Lex Rivera <me@lex.io>
Date: Wed, 26 Nov 2014 15:30:47 +0300
Subject: [PATCH 2/3] fix gnupg installation and command execution

---
 manifests/dependencies.pp | 2 ++
 manifests/install.pp      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp
index 6a42674..89440a7 100644
--- a/manifests/dependencies.pp
+++ b/manifests/dependencies.pp
@@ -19,6 +19,7 @@
   if ! defined(Package['bzip2'])           { package { 'bzip2':           ensure => present } }
   if ! defined(Package['ca-certificates']) { package { 'ca-certificates': ensure => present } }
   if ! defined(Package['gawk'])            { package { 'gawk':            ensure => present } }
+  if ! defined(Package['gnupg2'])          { package { 'gnupg2':           ensure => present } }
 
   # Generic Ruby dependencies
   if ! defined(Package['g++'])              { package { 'g++':              ensure => present } }
@@ -46,4 +47,5 @@
   if ! defined(Package['pkg-config'])       { package { 'pkg-config':       ensure => present } }
   if ! defined(Package['libffi-dev'])       { package { 'libffi-dev':       ensure => present } }
 
+
 }
diff --git a/manifests/install.pp b/manifests/install.pp
index 2d656d7..f4dd6bc 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -93,9 +93,11 @@
   #execute gpg key installation before installing rvm
   #key needs to be installed in user gpg keychain
   exec { 'install-gpg':
+    path        => '/usr/bin:/usr/sbin:/bin',
     command     => 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
-    user        => ${user},
+    user        => "${user}",
     unless      => 'gpg2 --list-keys D39DC0E3',
+    require     => Package['gnupg2'],
   } ->
 
   exec { $install_command:

From e4d628c24e937d79b2a4f3cf9bba9b05e1cdbbc3 Mon Sep 17 00:00:00 2001
From: Lex Rivera <me@lex.io>
Date: Thu, 27 Nov 2014 22:36:45 +0300
Subject: [PATCH 3/3] Update install.pp

---
 manifests/install.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/install.pp b/manifests/install.pp
index f4dd6bc..f6af9b8 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -92,18 +92,18 @@
 
   #execute gpg key installation before installing rvm
   #key needs to be installed in user gpg keychain
-  exec { 'install-gpg':
+  exec { 'install-gpg-key':
     path        => '/usr/bin:/usr/sbin:/bin',
     command     => 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
     user        => "${user}",
     unless      => 'gpg2 --list-keys D39DC0E3',
     require     => Package['gnupg2'],
-  } ->
+  }
 
   exec { $install_command:
     path    => '/usr/bin:/usr/sbin:/bin',
     creates => "${homedir}/.rvm/bin/rvm",
-    require => [ Package['curl'], Package['bash'], User[$user] ],
+    require => [ Package['curl'], Package['bash'], User[$user], Exec['install-gpg-key'] ],
   }
 
   $rvm_executable = "${homedir}/.rvm/bin/rvm"