From b4a4a8434616247156e59b860b47cc6256ead8d1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 29 Nov 2012 15:53:15 -0500 Subject: passing install_method => '' to chose the default package provider was a bit opaque in manifests, so allow for 'package' to be passed, which makes it more clear how it is being done --- README.md | 8 ++++---- manifests/install.pp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ad636c9..2abb1cf 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,12 @@ https://github.com/evanstachowiak/puppet-bundler bundler) By default this will install bundler with RVM, if you wish to use another method, you can pass any puppet package provider to the class as - 'install_method', or just use '' if you wish the puppet parser to + 'install_method', or just use 'package' if you wish the puppet parser to automatically chose the best method for your platform. - Examples: class { 'bundler::install': install_method => 'fink' }; - class { 'bundler::install': install_method => 'gem' }; - class { 'bundler::install': install_method => undef } + Examples: class { 'bundler::install': install_method => 'fink' } + class { 'bundler::install': install_method => 'gem' } + class { 'bundler::install': install_method => 'package' } 3. Set whatever config variables are necessary: bundler::config { 'linecache19': diff --git a/manifests/install.pp b/manifests/install.pp index 898cfea..1524de3 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -29,7 +29,7 @@ class bundler::install ( warning('$use_rvm is deprecated, please use $install_method instead') } - if $install_method == undef { + if ( $install_method == undef ) or ( $install_method == 'package' ) { $provider_method = undef } else { -- cgit v1.2.3