Skip to content
Browse files

rvm -> rbenv

  • Loading branch information...
1 parent e2570f8 commit 9d6c33d49fd0175152e11711904b52e055b6155c @dougm committed
View
9 .gitmodules
@@ -1,12 +1,15 @@
[submodule "cookbooks/java"]
path = cookbooks/java
url = https://github.com/opscode-cookbooks/java.git
-[submodule "cookbooks/rvm"]
- path = cookbooks/rvm
- url = https://github.com/fnichol/chef-rvm.git
[submodule "cookbooks/sudo"]
path = cookbooks/sudo
url = https://github.com/opscode-cookbooks/sudo.git
[submodule "cookbooks/homesick"]
path = cookbooks/homesick
url = https://github.com/dougm/chef-homesick.git
+[submodule "cookbooks/rbenv"]
+ path = cookbooks/rbenv
+ url = https://github.com/fnichol/chef-rbenv.git
+[submodule "cookbooks/ruby_build"]
+ path = cookbooks/ruby_build
+ url = https://github.com/fnichol/chef-ruby_build.git
1 cookbooks/rbenv
@@ -0,0 +1 @@
+Subproject commit ce5082bd7e388298c991782436d74193fa2f950d
1 cookbooks/ruby_build
@@ -0,0 +1 @@
+Subproject commit a809ead78dadd9cd3e8926d2efebac01d6bf93fa
1 cookbooks/rvm
@@ -1 +0,0 @@
-Subproject commit 39390a4a1b92ea2785d2155525a5e276e3b677e3
View
9 roles/dougm-ubuntu.rb
@@ -1,10 +1,11 @@
name "ubuntu"
user = "dougm"
-rubies = ['1.9.2', '1.8.7']
override_attributes \
-:rvm => { :user_installs => [{'user' => user, 'default_ruby' => 'system', 'rubies' => rubies}] },
-:authorization => { :sudo => { :groups => ["admin"], :passwordless => true } }
+:authorization => { :sudo => { :groups => ["admin"], :passwordless => true } },
+:rbenv => { :rubies => ['1.9.2-p290'] }
+
+run_list "packages", "emacs::source24", "java", "go", "tmux", \
+user, "sudo", "ruby_build", "rbenv::system", "drain"
-run_list "packages", "emacs::source24", "java", "go", "tmux", user, "sudo", "rvm::user"
View
2 site-cookbooks/dougm/recipes/default.rb
@@ -47,3 +47,5 @@
user uid
group grp
end
+
+rbenv_global node[:rbenv][:rubies].first
View
8 site-cookbooks/drain/recipes/default.rb
@@ -0,0 +1,8 @@
+#cleanup the kitchen sink
+
+%w(ruby-build).each do |dir|
+ directory ::File.join(Chef::Config['file_cache_path'], dir) do
+ action :delete
+ recursive true
+ end
+end
View
2 site-cookbooks/packages/recipes/gems.rb
@@ -1,4 +1,4 @@
-gems = %w{rvc ffi bundler homesick ostructer transmission-simple}
+gems = %w{rvc ffi bundler homesick}
gems.each do |name|
gem_package name

0 comments on commit 9d6c33d

Please sign in to comment.
Something went wrong with that request. Please try again.