Skip to content

Commit

Permalink
Attr rvm/install_rubies now type string for metadata compat. Closes s…
Browse files Browse the repository at this point in the history
  • Loading branch information
fnichol committed May 14, 2011
1 parent d89afec commit 37ea3c7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Can enable or disable installation of a default ruby and additional rubies set
attribute metadata. The primary use case for this attribute is when you don't
want any rubies installed (but you want RVM installed). To do so:

node[:rvm][:install_rubies] = false
node[:rvm][:install_rubies] = "false"

The default is `true`.

Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
default['rvm']['upgrade'] = "none"

# a hook to disable installing any default/additional rubies
default['rvm']['install_rubies'] = true
default['rvm']['install_rubies'] = "true"

# ruby that will get installed and set to `rvm use default`.
default['rvm']['default_ruby'] = "ruby-1.9.2-p180"
Expand Down
3 changes: 1 addition & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
attribute "rvm/install_rubies",
:display_name => "Can enable or disable installation of a default ruby and additional rubies set attribute metadata.",
:description => "Can enable or disable installation of a default ruby and additional rubies set attribute metadata. The primary use case for this attribute is when you don't want any rubies installed (but you want RVM installed).",
:type => "boolean",
:default => true
:default => "true"

attribute "rvm/global_gems",
:display_name => "Global gems to be installed in all RVM rubies",
Expand Down
2 changes: 1 addition & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

include_recipe "rvm::system"

if node[:rvm][:install_rubies]
if node[:rvm][:install_rubies] == true || node[:rvm][:install_rubies] == "true"
# set a default ruby
rvm_default_ruby node[:rvm][:default_ruby]

Expand Down

0 comments on commit 37ea3c7

Please sign in to comment.