capistrano-unicorn-sic 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d6128d5c24e1992b1b1503d5a7f01448982cb8
-  data.tar.gz: 966af9c999cc456398f8d7ba2888d08d41c30f3c
+  metadata.gz: 23365d07b9e41ca769eeb2379de1bd6b7b7ba5b6
+  data.tar.gz: 6050914f50ff37133e0fae16046267aa3d68681d
 SHA512:
-  metadata.gz: 91d4d5871c57a3ce4765053b7438b6fa608c641d04ffcb104318c182ddad02aeda8fe06aac9175af84d10a01e687affd7112875f088dcff2974fc1ec1cbaa280
-  data.tar.gz: f0df97b6bfa10077361abd4386f364244be93fb02d1ef5ec898186750077faf8518cf3be928ad28683c16495bd2c564f8465ef53dc753dad423c362d85de0d93
+  metadata.gz: 2d0cd9ee1e1dc56463c394df188fb1c3d111dd4f7060cd6f2f4eed117bac1017b412c9f0ffcb0eefdfc18f36a583c0982f30344c8a14dabb4341c2abe2688220
+  data.tar.gz: e32cfd248a7a80a43ef9909d8c81eb9af778d40d60a4f02a4e1ddcca3e28b4252d9b684e56198585c17ac873fe9e16e153e2a06e70c4e7743041ba5df3b306c6

data/lib/capistrano/tasks/unicorn.cap

@@ -6,6 +6,8 @@ include CapistranoUnicorn::Utility
 # See https://github.com/capistrano/capistrano/pull/605
 namespace :load do
   task :defaults do
+    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(unicorn))
+    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(unicorn))
 
     # Environments
     set :unicorn_env     , Proc.new{ fetch(:rails_env, 'production') }

data/lib/capistrano/unicorn/utility.rb

@@ -86,11 +86,11 @@ module CapistranoUnicorn
     def unicorn_execute(*args)
       options = args.extract_options!
 
-      command = "bash -l -c \"#{args.join(' ')}\""
+      command = [:bash, '-l', '-c', "\"#{args.join(' ')}\""]
       if unicorn_user = fetch(:unicorn_user)
         execute :sudo, '-u', unicorn_user, command, options
       else
-        execute command, options
+        execute *command, options
       end
     end
 
@@ -127,9 +127,9 @@ module CapistranoUnicorn
 
       puts 'Starting unicorn...'
 
-      within fetch(:app_path) do
+      within release_path do
         with rails_env: fetch(:rails_env) do
-          unicorn_execute fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
+          unicorn_execute *unicorn_bin, '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
         end
       end
     end
@@ -145,5 +145,9 @@ module CapistranoUnicorn
     def unicorn_roles
       fetch(:unicorn_roles, :app)
     end
+
+    def unicorn_bin
+      fetch(:unicorn_bin).split(/\s+/)
+    end
   end
 end

data/lib/capistrano/unicorn/version.rb

@@ -1,5 +1,5 @@
 module CapistranoUnicorn
   unless defined?(::CapistranoUnicorn::VERSION)
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-sic
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sebastian Gassner, Dan Sosedoff, Florian Schwab