capistrano-passenger 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ee8db6f8a9beab517c5f1eaa2faba15e74be5d
-  data.tar.gz: 2ba0636361cc9de6032b09e636bcd91c404dac91
+  metadata.gz: 2535cc27d1506dd866096d9b13ff57add4243abb
+  data.tar.gz: 261d81857ad00a73abfc9560860c4fd6c73013f3
 SHA512:
-  metadata.gz: 76c961c0c17ce58ba826ce79662a2fcb5500141d54aeb2cd18a2cf6903ed50c25f3bf263009c5807d16aefd223b8efbb1c5fa53b4ae3bfdc2569ae9e8741a47d
-  data.tar.gz: ff7bdc114ffef5d3f91726b860c04e0c12c370ff0864d5f838a700435a042fd3c677f4780bd14ab307c0dd8d82c8b4e5fd72f8591e63b290fbeea5551f5b75f9
+  metadata.gz: 58c3aa7ca421c0f758b6400c0f289522ca28c514420c55b77f3eb80d2a39cd874c42610abaed2d6c754277c032eaa7501d6f89701cd6a6798fbb6d0977599137
+  data.tar.gz: e2d97b9f9d61edee7a593b21d4ea0a5dc07985f116299ef23197fcfd60f05313e2f256e142b2323d4e6f50a061ebac9cd8fe75a57b2a75f6474bbc36868067e3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.1 (30 June 2015)
+* Bug fixes:
+  * When detecting passenger version, we account for the fact the the version may not be on the first line of the captured output (@pzgz, capistrano/passenger#20)
+  * When executing the restart command without sudo, we make sure the first argument to execute is still a Symbol so that the command is executed in the appropriate directory (@FooBarWidget, capistrano/passenger#27)
+
 # 0.1.0 (3 June 2015)
 
 * BREAKING CHANGES

data/lib/capistrano/passenger/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Passenger
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/capistrano/tasks/passenger.cap

@@ -12,7 +12,7 @@ namespace :passenger do
       with fetch(:passenger_environment_variables) do
         within(release_path) do
           if restart_with_touch.nil?
-            passenger_version = capture(:passenger, '-v').match(/\APhusion Passenger version (.*)$/)[1]
+            passenger_version = capture(:passenger, '-v').match(/^Phusion Passenger (Enterprise )?version (.*)$/)[2]
             restart_with_touch = Gem::Version.new(passenger_version) < Gem::Version.new('4.0.33')
           end
 
@@ -20,9 +20,12 @@ namespace :passenger do
             execute :mkdir, '-p', release_path.join('tmp')
             execute :touch, release_path.join('tmp/restart.txt')
           else
-            restart_with_sudo = fetch(:passenger_restart_with_sudo) ? :sudo : nil
-            arguments = SSHKit::Command.new(*[*fetch(:passenger_restart_command).split(" ").collect(&:to_sym), fetch(:passenger_restart_options)]).to_s
-            execute *[restart_with_sudo, arguments].compact
+            restart_command = fetch(:passenger_restart_command).split(" ").collect(&:to_sym) << fetch(:passenger_restart_options)
+            if fetch(:passenger_restart_with_sudo)
+              # We preprocess the command with SSHKit::Command to allow 'passenger-config' to be transformed with the command map.
+              restart_command = [:sudo, SSHKit::Command.new(*restart_command).to_s]
+            end
+            execute *restart_command
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-passenger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano