capistrano-passenger 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8eaaca0849681346e54a3c3f8493a8ed5fb1ea1e
-  data.tar.gz: aea16ce711de02fa7d99633c5307b8ef04809d8c
+SHA256:
+  metadata.gz: e2ad7cbc81a6b3ba09065f752e9d3f0d5dc0d082d0f728d6b47211c494d92442
+  data.tar.gz: 22793cd5dc2245698ded45b556472f93c41ffb7bb9e08f8339c1adc28e3dc6bd
 SHA512:
-  metadata.gz: 57b95a5e474df67cc5432ff62466c7418fa0724aeea1dfaa82cc56210220de94b55cbee66d0d6910acfdb612c216c56439cc08ae89f4a870e42675d510e05577
-  data.tar.gz: 4037ad3f64af60cac4acd83c36257ff79105d6cc9c0a7cc7cf9cf6ef72e92083a5c5849817900a3a4a61f8d400d389395bdaa74f93970f494fa84c9ad67c9627
+  metadata.gz: 26633fb785143309de16735414d4d9e5c895a46e7fd6b8a721658a5159c291f4f0238176b7e7d129cc6fedfb11b6b57f3cf8d0f0c801fdad0f55f7609a6947dc
+  data.tar.gz: c2078c3c341b4f7adbf5a231ceae1968ff7c131d2730159a81fde57e05d62e758bf95f0fcd666e9788a65b115f01065f7d6b4bb90f151b4400311838592fc5f9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Not released yet
+
+# 0.2.1 (5 Apr 2021)
+* Made passenger-status use the same Command Map prefixes as passenger and passenger-config.
+  Even though it's not used in this project by default, it may be useful in some cases,
+  such as when someone needs to determine the passenger instance ID
+* Only run passenger commands from the release_path if passenger is in the Gemfile.
+  Otherwise, it may be in a gemset that conflicts with a .ruby-gemset file in release_path.
+
+# 0.2.0 (8 Dec 2015)
+* Added support for passenger versions > 5.0.20
+
 # 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)

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano::Passenger
 
-Adds a task to restart your application after deployment via Capistrano. Supports Passenger versions 5 and lower.
+Adds a task to restart your application after deployment via Capistrano. Supports Passenger versions 6 and lower.
 
 ## Installation
 
@@ -77,7 +77,7 @@ on roles(fetch(:passenger_roles)), in: fetch(:passenger_restart_runner), wait: f
 end
 ```
 
-Note that `passenger_restart_limit` has no effect if you are using the default `passenger_restart_runner` of `:sequence`.  sshkit only looks at it when the runner is `:group`.
+Note that `passenger_restart_limit` has no effect if you are using the default `passenger_restart_runner` of `:sequence`.  sshkit only looks at it when the runner is `:groups`.
 
 `:passenger_environment_variables` is available if anything about your environment is not available to the user deploying your application. One use-case for this is when `passenger-config` isn't available in your user's `PATH` on the server. You could override it like so:
 

data/lib/capistrano/passenger/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Passenger
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/capistrano/tasks/passenger.cap

@@ -10,14 +10,15 @@ namespace :passenger do
     end
     on roles(fetch(:passenger_roles)), in: fetch(:passenger_restart_runner), wait: fetch(:passenger_restart_wait), limit: fetch(:passenger_restart_limit) do
       with fetch(:passenger_environment_variables) do
-        within(release_path) do
+        within(fetch(:passenger_in_gemfile, false) ? release_path : capture(:pwd)) do
           if restart_with_touch.nil?
             # 'passenger -v' may output one of the following depending on the version:
             # Phusion Passenger version x.x.x
             # Phusion Passenger Enterprise version x.x.x
             # Phusion Passenger x.x.x
             # Phusion Passenger Enterprise x.x.x
-            passenger_version = capture(:passenger, '-v').match(/^Phusion Passenger (Enterprise )?(version )?(.*)$/)[3]
+            # and it may have a (R) after Passenger
+            passenger_version = capture(:passenger, '-v').match(/^Phusion Passenger(\(R\))? (Enterprise )?(version )?(.*)$/)[4]
             restart_with_touch = Gem::Version.new(passenger_version) < Gem::Version.new('4.0.33')
           end
 
@@ -47,7 +48,7 @@ namespace :passenger do
     task hook: :"passenger:test_which_passenger" do
       unless fetch(:passenger_in_path)
         if fetch(:passenger_rvm_ruby_version) == fetch(:rvm_ruby_version)
-          set :rvm_map_bins, fetch(:rvm_map_bins) + [:passenger, :'passenger-config']
+          set :rvm_map_bins, fetch(:rvm_map_bins) + [:passenger, :'passenger-config', :'passenger-status']
         else
           after :'rvm:hook', :'passenger:rvm:after_rvm_path_is_set'
         end
@@ -57,7 +58,7 @@ namespace :passenger do
     task :after_rvm_path_is_set do
       # This is very similar to code in capistrano-rvm.  Ideally, there would be a way to hook into that code instead of duplicating it with only minor changes.
       passenger_rvm_prefix = "#{fetch(:rvm_path)}/bin/rvm #{fetch(:passenger_rvm_ruby_version)} do"
-      [:passenger, :'passenger-config'].each do |command|
+      [:passenger, :'passenger-config', :'passenger-status'].each do |command|
         SSHKit.config.command_map.prefix[command.to_sym].unshift(passenger_rvm_prefix)
       end
     end
@@ -65,19 +66,19 @@ namespace :passenger do
 
   namespace :rbenv do
     task hook: :"passenger:test_which_passenger" do
-      set :rbenv_map_bins, fetch(:rbenv_map_bins) + [:passenger, :'passenger-config'] unless fetch(:passenger_in_path)
+      set :rbenv_map_bins, fetch(:rbenv_map_bins) + [:passenger, :'passenger-config', :'passenger-status'] unless fetch(:passenger_in_path)
     end
   end
 
   namespace :chruby do
     task hook: :"passenger:test_which_passenger" do
-      set :chruby_map_bins, fetch(:chruby_map_bins) + [:passenger, :'passenger-config'] unless fetch(:passenger_in_path)
+      set :chruby_map_bins, fetch(:chruby_map_bins) + [:passenger, :'passenger-config', :'passenger-status'] unless fetch(:passenger_in_path)
     end
   end
 
   namespace :bundler do
     task :hook do
-      set :bundle_bins, fetch(:bundle_bins) + [:passenger, :'passenger-config'] if fetch(:passenger_in_gemfile, false)
+      set :bundle_bins, fetch(:bundle_bins) + [:passenger, :'passenger-config', :'passenger-status'] if fetch(:passenger_in_gemfile, false)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-passenger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -117,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Passenger support for Capistrano 3.x