Support ruby installed by RVM on user-land (cooperate with rvm-capist…

…rano)
tk0miya · Feb 7, 2013 · 41a510a · 41a510a
1 parent db0fd6e
commit 41a510a
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lib/roundsman/capistrano.rb b/lib/roundsman/capistrano.rb
@@ -194,15 +194,27 @@ def ensure_supported_distro
 
       desc "Installs chef"
       task :install, :except => { :no_release => true } do
-        sudo "gem uninstall -xaI chef || true"
-        sudo "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
-        sudo "gem install ruby-shadow --quiet --no-ri --no-rdoc"
+        if rvm_type == :user
+          run "gem uninstall -xaI chef || true"
+          run "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
+          run "gem install ruby-shadow --quiet --no-ri --no-rdoc"
+        else
+          sudo "gem uninstall -xaI chef || true"
+          sudo "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
+          sudo "gem install ruby-shadow --quiet --no-ri --no-rdoc"
+        end
       end
 
       desc "Runs the existing chef configuration"
       task :chef_solo, :except => { :no_release => true } do
         logger.info "Now running #{fetch(:run_list).join(', ')}"
+        if rvm_type == :user
+          old_sudo = self[:sudo]
+          self[:sudo] = "rvmsudo_secure_path=1 #{File.join(rvm_bin_path, "rvmsudo")}"
+        end
+
         sudo "chef-solo -c #{roundsman_working_dir("solo.rb")} -j #{roundsman_working_dir("solo.json")}#{' -l debug' if fetch(:debug_chef)}"
+        self[:sudo] = old_sudo
       end
 
       def ensure_cookbooks_exists