lib/capistrano/tasks/foreman.rb in capistrano-foreman-1.1.0 vs lib/capistrano/tasks/foreman.rb in capistrano-foreman-1.2.0

@@ -5,50 +5,72 @@
   end
 
   desc 'Export the Procfile'
   task :export do
     on roles fetch(:foreman_roles) do
-      within release_path do
-        opts = {
-          app: fetch(:application),
-          log: File.join(shared_path, 'log'),
-        }.merge fetch(:foreman_options, {})
+      opts = {
+        app: fetch(:application),
+        log: File.join(shared_path, 'log'),
+      }.merge fetch(:foreman_options, {})
 
-        execute :foreman, 'export',
+      execute(:mkdir, "-p", opts[:log])
+
+      within release_path do
+        foreman_exec :foreman, 'export',
           fetch(:foreman_template),
           fetch(:foreman_export_path),
-          opts.map { |opt, value| "--#{opt}='#{value}'" }.join(' ')
+          opts.map { |opt, value| "--#{opt}=\"#{value}\"" }.join(' ')
       end
     end
   end
 
   desc 'Start the application services'
   task :start do
     on roles fetch(:foreman_roles) do
-      sudo :start, fetch(:foreman_app)
+      foreman_exec :start, fetch(:foreman_app)
     end
   end
 
   desc 'Stop the application services'
   task :stop do
     on roles fetch(:foreman_roles) do
-      sudo :stop, fetch(:foreman_app)
+      foreman_exec :stop, fetch(:foreman_app)
     end
   end
 
   desc 'Restart the application services'
   task :restart do
     on roles fetch(:foreman_roles) do
-      sudo :restart, fetch(:foreman_app)
+      foreman_exec :restart, fetch(:foreman_app)
     end
   end
+
+  def foreman_exec(*args)
+    sudo_type = fetch(:foreman_use_sudo)
+    case sudo_type.to_s
+    when 'rbenv'
+      # this is required because 'rbenv sudo'
+      # is not recognized by bundle_bins
+      args.unshift(:bundle, :exec) if args[0].to_s == "foreman"
+      execute(:rbenv, :sudo, *args)
+    when 'rvm'
+      execute(:rvmsudo, *args)
+    else
+      sudo_type ? sudo(*args) : execute(*args)
+    end
+  end
 end
 
 namespace :load do
   task :defaults do
-    set :bundle_bins, fetch(:bundle_bins, []).push(%w(foreman))
+    set :bundle_bins, fetch(:bundle_bins, []).push(:foreman)
+    set :foreman_use_sudo, false
     set :foreman_template, 'upstart'
     set :foreman_export_path, '/etc/init/sites'
     set :foreman_roles, :all
     set :foreman_app, -> { fetch(:application) }
+
+    if !fetch(:rvm_map_bins).nil?
+      set :rvm_map_bins, fetch(:rvm_map_bins).push('foreman')
+    end
   end
 end