Fixed ruby_rvm recipe

Author: andruby

Vagrantfile.centos

@@ -43,6 +43,7 @@ Vagrant.configure("2") do |config|
       }
     }
 
+    chef.add_recipe "rvm::vagrant" # Resolves "rvm: command not found" and "Could not find chef"
     chef.add_recipe "gitlab::ruby_rvm"
     chef.add_recipe "gitlab::default"
     chef.add_recipe "gitlab::nginx"

attributes/rvm.rb

@@ -0,0 +1,2 @@
+# Set a higher default ruby version
+default['rvm']['default_ruby'] = "ruby-1.9.3-p429"

metadata.rb

@@ -6,7 +6,7 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          "0.2.1"
 
-%w{git mysql database redisio build-essential python readline perl xml zlib apt nginx ruby_build}.each do |cookbook|
+%w{git mysql database redisio build-essential python readline perl xml zlib apt nginx rvm ruby_build}.each do |cookbook|
   depends(cookbook)
 end
 

recipes/gitlab_shell.rb

@@ -13,11 +13,11 @@
   user        node['gitlab']['user']
   group       node['gitlab']['group']
   source      "gitlab_shell_config.yml.erb"
-  notifies    :run, "execute[gitlab install]", :immediately
+  notifies    :run, "execute[gitlab shell install]", :immediately
 end
 
-execute "gitlab install" do
-  if platform?("amazon")
+execute "gitlab shell install" do
+  if node['gitlab']['rvm_ruby']
     command "source /etc/profile.d/rvm.sh && rvm use 1.9.3 && ./bin/install"
   else
     command  "./bin/install"

recipes/redhat.rb

@@ -2,6 +2,5 @@
 
 include_recipe "yum::epel"
 
-%w{libicu-devel patch gcc-c++ readline-devel zlib-devel libffi-devel openssl-devel make autoconf automake libtool bison libxml2-devel libxslt-devel libyaml-devel}.each do |pkg|
-  package pkg
-end
+package "libicu-devel"
+package "openssl-devel"

recipes/ruby_rvm.rb

@@ -1,10 +1,13 @@
 # Optional recipe to build a system wide ruby
 # with https://github.com/fnichol/chef-rvm
 
-include_recipe "rvm::default"
-
-rvm_default_ruby "1.9.3" do
-  action :create
+# Otherwise libyaml-devel is unavailable
+if platform?("redhat", "centos", "fedora", "amazon")
+  include_recipe "yum::epel"
 end
 
+include_recipe "rvm::system"
+rvm_gem "chef"
 rvm_gem "bundler"
+
+node.set['gitlab']['rvm_ruby'] = true

templates/default/init_gitlab.erb

@@ -17,7 +17,9 @@
 <% if node.platform?("centos","redhat","fedora","amazon") -%>
 # Include RedHat function library
 . /etc/rc.d/init.d/functions
-# Source RVM as the yum-installable ruby is too old
+<% end -%>
+<% if node['gitlab']['rvm_ruby'] -%>
+# Source RVM
 source /etc/profile.d/rvm.sh
 rvm use 1.9.3
 <% end -%>