capistrano-foreman 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5938a6e7555b79410d32279c0634bb3319e3d668
-  data.tar.gz: e0b9fb4b1b2f787f6d093f0408643ad723fcc00e
+  metadata.gz: a074314158aaf705130e0fc22a91fe9cd598e70b
+  data.tar.gz: 30cf5f1dc0b200c517247310b4de12a05e800ffe
 SHA512:
-  metadata.gz: c0f04d9f7fa93dde0c3950fb6ba97b99ae4c825f144fff7e24031555e9391a662bbf46b9513b961eab36172b7ce18f3649f9a728dacef2ff3d14b8063c20275b
-  data.tar.gz: b8bcc2cf08aec5edebfd61304f97006d273e43f43ba3b4819ec199644a193aa20b618dc487d0633e65fbf648dd7e1328bb02d30e13566cc0623caf0cfad428bc
+  metadata.gz: 4f093dd032f43b9114beeee3939d6fce1dbef4cd33bd9e41ba9be5e8a506d972693ff45766257d96fdca7c7147af76fde745178127e88c787c036ea3c9dc5f2f
+  data.tar.gz: 9f4997e77dd54fc68614c980b9b58ea182f4d3cbfb9e75ed40a9a62b31954d2557a256c3a19e6df0471fad2c3e8a83079129d38f3bbb9270e97a9d2b592cc44b

data/README.md

@@ -14,7 +14,7 @@ Add this to your `Capfile`:
 require 'capistrano/foreman'
 
 # Default settings
-set :foreman_use_sudo, false
+set :foreman_use_sudo, false # Set to :rbenv for rbenv sudo, :rvm for rvmsudo or true for normal sudo
 set :foreman_roles, :all
 set :foreman_template, 'upstart'
 set :foreman_export_path, File.join(Dir.home, '.init')

data/capistrano-foreman.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "capistrano-foreman"
   gem.require_paths = ["lib"]
-  gem.version       = '1.1.0'
+  gem.version       = '1.2.0'
 
   gem.add_dependency 'capistrano', '~> 3.1'
   gem.add_dependency 'capistrano-bundler', '~> 1.1'

data/lib/capistrano/tasks/foreman.rb

@@ -7,16 +7,18 @@ namespace :foreman do
   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(:mkdir, "-p", opts[:log])
 
-        execute :foreman, 'export',
+      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
@@ -24,31 +26,51 @@ namespace :foreman do
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-foreman
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Johannes Gorset
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano