codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3081 from edgibbs/fix_vagrant_ruby_version

Browse source 
FIX: Issue with Vagrant image failing specs.
This commit is contained in:
Sam 2015-01-06 14:36:22 +11:00
commit f2b0115453
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
chef/cookbooks/discourse/recipes/default.rb
View file

@ -1,42 +1,26 @@
# Upgrade ruby. I don't know chef, so this is probably more complicated than it needs to be:
# execute "upgrade-rvm" do
# command "rvm get stable && rvm reload"
# action :nothing
# end
execute "upgrade-rvm" do
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
command "rvm get stable && rvm reload"
action :nothing
end
# execute "upgrade-ruby" do
# command "yes | rvm install 2.0.0-p247-turbo"
# action :nothing
# end
execute "upgrade-ruby" do
command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
action :nothing
end
execute "set-ruby" do
command "rvm use ruby-2.1.5"
user "vagrant"
action :nothing
end
# TODO: set-default-ruby SUCCEEDS BY DOES NOTHING. HOW TO GET THIS TO WORK??
# execute "set-default-ruby" do
# command "rvm --default use ruby-2.0.0-p247-turbo"
# user "vagrant"
# action :nothing
# end
# execute "install-gems" do
# command "gem install bundler && bundle install"
# user "vagrant"
# cwd "/vagrant"
# action :nothing
# end
# ruby_block "ruby-upgrade-message" do
# block do
# Chef::Log.info "Upgrading ruby. This will take a while."
# end
# only_if { `ruby -v`.include?('2.0.0p0') }
# notifies :run, "execute[upgrade-rvm]", :immediately
# notifies :run, "execute[upgrade-ruby]", :immediately
# notifies :run, "execute[set-default-ruby]", :immediately
# notifies :run, "execute[install-gems]", :immediately
# action :create
# end
ruby_block "ruby-upgrade-message" do
block do
Chef::Log.info "Upgrading ruby. This will take a while."
end
notifies :run, "execute[upgrade-rvm]", :immediately
notifies :run, "execute[upgrade-ruby]", :immediately
notifies :run, "execute[set-ruby]", :immediately
action :create
end