Merge tag 'refs/tags/0.10.0' into stable

Release 0.10.0

1 files changed, 12 insertions, 4 deletions

diff --git a/puppet/modules/leap/manifests/cli/install.pp b/puppet/modules/leap/manifests/cli/install.pp
index 25e87033..d009316b 100644
--- a/puppet/modules/leap/manifests/cli/install.pp
+++ b/puppet/modules/leap/manifests/cli/install.pp
@@ -1,13 +1,20 @@
 # installs leap_cli on node
 class leap::cli::install ( $source = false ) {
+
+  # nokogiri is a dependency gem of leap_cli and
+  # needs build tools in order to get compiled
+  ensure_packages (['gcc', 'make', 'zlib1g-dev'])
+  class { '::ruby':
+    install_dev => true,
+    require     => [ Package['gcc'], Package['make'], Package['zlib1g-dev'] ]
+  }
+
+
   if $source {
     # needed for building leap_cli from source
     include ::git
     include ::rubygems
 
-    class { '::ruby':
-      install_dev => true
-    }
 
     class { 'bundler::install': install_method => 'package' }
 
@@ -40,7 +47,8 @@ class leap::cli::install ( $source = false ) {
   else {
     package { 'leap_cli':
       ensure   => installed,
-      provider => gem
+      provider => gem,
+      require  => Class['ruby']
     }
   }
 }