capistrano-passenger 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7f72b6bfcdc40bbbd10af5c56e00ba964a56b0
-  data.tar.gz: bc39916c2642aa4126fc48b1df4bc1571391066c
+  metadata.gz: b5ee8db6f8a9beab517c5f1eaa2faba15e74be5d
+  data.tar.gz: 2ba0636361cc9de6032b09e636bcd91c404dac91
 SHA512:
-  metadata.gz: 8d6135fa823c59892880fd81721df36ffde57b6001bb4b583d1cc901bea290bea5b7d3b48421b3a171b699c4f2138d266d4c5f9dd713040d0861ee7540a16af3
-  data.tar.gz: 16559f6fa7ab2e0dea172615dc49b891ede80016051ea936f9b9c4ca267fdf3cbe8691bdb46a7a872b70af4f581be656421374d22d025aea0e8a8d84ffffc0ba
+  metadata.gz: 76c961c0c17ce58ba826ce79662a2fcb5500141d54aeb2cd18a2cf6903ed50c25f3bf263009c5807d16aefd223b8efbb1c5fa53b4ae3bfdc2569ae9e8741a47d
+  data.tar.gz: ff7bdc114ffef5d3f91726b860c04e0c12c370ff0864d5f838a700435a042fd3c677f4780bd14ab307c0dd8d82c8b4e5fd72f8591e63b290fbeea5551f5b75f9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.1.0 (3 June 2015)
+
+* BREAKING CHANGES
+  * On version of passenger that support both restarting by touch and restarting with passenger-config, the default is to use passenger-config.  set :passenger_restart_with_touch to true to opt out of this.
+* Bug fixes:
+  * Restored support for CHRuby (@aeons, capistrano/passenger#16)
+  * Restored support for passenger installed by bundle (@betesh, capistrano/passenger#10)
+
 # 0.0.5 (12 Apr 2015)
 
 * Bug fixes:

data/README.md

@@ -89,13 +89,19 @@ set :passenger_environment_variables, { :path => '/your/path/to/passenger/bin:$P
 
 https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#_when_the_system_has_multiple_ruby_interpreters descibes how "Once installed, you can run Phusion Passenger’s Ruby parts under any Ruby interpreter you want, even if that Ruby interpreter was not the one you originally installed Phusion Passenger with. [...] There is however one caveat if you happen to be using RVM or RVM gemsets. When you gem install Phusion Passenger using RVM," it is available only to the Ruby version where it was installed.  Therefore, if you are using RVM **AND** passenger was installed via RVM **AND** it was installed under a different version of RVM than `fetch(:rvm_ruby_version)`, you need to `set :passenger_rvm_ruby_version` in your `config/deploy.rb`.
 
-### Restarting Passenger 5 (and above) Applications
+### Note for Standalone Passenger users
 
-Passenger 5 introduced a new way to restart your application, and thus has some additional configuration options to accomodate for various server environments.
+If you are running passenger in standalone mode, it is possible for you to put passenger in your Gemfile and rely on capistrano-bundler to install it with the rest of your bundle.  If you are installing passenger during your deployment **AND** you are using the new restart method (see below), you need to set `:passenger_in_gemfile` to `true` in your `config/deploy.rb`.
+
+### Restarting Passenger >= 4.0.33 Applications
+
+Passenger 4.0.33 introduced a new way to restart your application, and thus has some additional configuration options to accomodate for various server environments.
 
 If you need to pass additional/different options to `:passenger_restart_command`, simply override `:passenger_restart_options`.
 
-If you require `sudo` when restarting passenger, set `:passenger_restart_with_sudo` to `true`. **Note**: This option has no effect when restarting Passenger 4 (and lower) applications.
+If you require `sudo` when restarting passenger, set `:passenger_restart_with_sudo` to `true`. **Note**: This option has no effect when restarting Passenger <= 4.0.32 applications.
+
+To opt out of the new way to restart, and use the deprecated approach instead, set `:passenger_restart_with_touch` to `true`.
 
 ## Contributing
 

data/capistrano-passenger.gemspec

@@ -21,4 +21,32 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.post_install_message = <<PIM
+==== Release notes for capistrano-passenger ====
+passenger once had only one way to restart: `touch tmp/restart.txt`
+Beginning with passenger v4.0.33, a new way was introduced: `passenger-config restart-app`
+
+The new way to restart is not so practical for everyone, since it may require your deployment user to have sudo access.
+While we eagerly await the release of passenger v5.0.10, which will make the new method possible without sudo access,
+we recognize that not everyone is ready for this change yet.
+
+capistrano-passenger gives you the flexibility to choose your restart approach, or to rely on reasonable defaults.
+
+If you want to restart using `touch tmp/restart.txt`, add this to your config/deploy.rb:
+
+    set :passenger_restart_with_touch, true
+
+If you want to restart using `passenger-config restart-app`, add this to your config/deploy.rb:
+
+    set :passenger_restart_with_touch, false # Note that `nil` is NOT the same as `false` here
+
+If you don't set `:passenger_restart_with_touch`, capistrano-passenger will check what version of passenger you are running
+and use `passenger-config restart-app` if it is available in that version.
+
+If you are running passenger in standalone mode, it is possible for you to put passenger in your
+Gemfile and rely on capistrano-bundler to install it with the rest of your bundle.
+If you are installing passenger during your deployment AND you want to restart using `passenger-config restart-app`,
+you need to set `:passenger_in_gemfile` to `true` in your `config/deploy.rb`.
+================================================
+PIM
 end

data/lib/capistrano/passenger/version.rb

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

data/lib/capistrano/tasks/deploy_passenger.cap

@@ -5,5 +5,5 @@ namespace :deploy do
   task :restart do
     invoke('passenger:restart')
   end
-  after :publishing, :restart
+  after :publishing, :'deploy:restart'
 end

data/lib/capistrano/tasks/passenger.cap

@@ -1,29 +1,43 @@
 namespace :passenger do
   desc 'Restart your Passenger application'
   task :restart do
+    restart_with_touch = fetch(:passenger_restart_with_touch, nil)
+    if restart_with_touch.nil? && fetch(:sshkit_backend) == SSHKit::Backend::Printer
+      run_locally do
+        fatal "In a dry run, we cannot check the passenger version, and therefore can't guess which passenger restart method to use.  Therefore, using --dry-run without setting `passenger_restart_with_touch` to either `true` or `false` is not supported."
+      end
+      exit
+    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
-        passenger_version = capture(:passenger, '-v').match(/\APhusion Passenger version (.*)$/)[1].to_i
+        within(release_path) do
+          if restart_with_touch.nil?
+            passenger_version = capture(:passenger, '-v').match(/\APhusion Passenger version (.*)$/)[1]
+            restart_with_touch = Gem::Version.new(passenger_version) < Gem::Version.new('4.0.33')
+          end
 
-        if passenger_version > 4
-          restart_with_sudo = fetch(:passenger_restart_with_sudo) ? :sudo : nil
-          arguments = [restart_with_sudo, *fetch(:passenger_restart_command).split(" ").collect(&:to_sym), fetch(:passenger_restart_options)].compact
-          execute *arguments
-        else
-          execute :mkdir, '-p', release_path.join('tmp')
-          execute :touch, release_path.join('tmp/restart.txt')
+          if restart_with_touch
+            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
+          end
         end
       end
     end
   end
 
+  task :test_which_passenger do
+    on roles(fetch(:passenger_roles)) do
+      set(:passenger_in_path, test(:which, :passenger))
+    end
+  end
+
   namespace :rvm do
-    task :hook do
-      passenger_installed_via_rvm = false
-      on roles(fetch(:passenger_roles)) do
-        passenger_installed_via_rvm = !(test :which, :passenger)
-      end
-      if passenger_installed_via_rvm
+    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']
         else
@@ -42,13 +56,24 @@ namespace :passenger do
   end
 
   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)
+    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)
+    end
+  end
+
+  namespace :bundler do
     task :hook do
-      set :rbenv_map_bins, fetch(:rbenv_map_bins) + [:passenger, :'passenger-config']
+      set :bundle_bins, fetch(:bundle_bins) + [:passenger, :'passenger-config'] if fetch(:passenger_in_gemfile, false)
     end
   end
 end
 
-
 namespace :load do
   task :defaults do
     set :passenger_roles, :app
@@ -60,11 +85,16 @@ namespace :load do
     set :passenger_restart_command, 'passenger-config restart-app'
     set :passenger_restart_options, -> { "#{deploy_to} --ignore-app-not-running" }
     set :passenger_rvm_ruby_version, ->{ fetch(:rvm_ruby_version) }
-    if Rake.application.tasks.collect(&:to_s).include?("rvm:hook")
-      before :'rvm:hook', :'passenger:rvm:hook'
+    _tasks = Rake.application.tasks.collect(&:to_s)
+    if _tasks.include?("bundler:map_bins")
+      before :'bundler:map_bins', :'passenger:bundler:hook'
     end
-    if Rake.application.tasks.collect(&:to_s).include?("rbenv:map_bins")
+    if _tasks.include?("rvm:hook")
+      before :'rvm:hook', :'passenger:rvm:hook'
+    elsif _tasks.include?("rbenv:map_bins")
       before :'rbenv:map_bins', :'passenger:rbenv:hook'
+    elsif _tasks.include?("chruby:map_bins")
+      before :'chruby:map_bins', :'passenger:chruby:hook'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-passenger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -76,7 +76,33 @@ homepage: https://github.com/capistrano/passenger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  ==== Release notes for capistrano-passenger ====
+  passenger once had only one way to restart: `touch tmp/restart.txt`
+  Beginning with passenger v4.0.33, a new way was introduced: `passenger-config restart-app`
+
+  The new way to restart is not so practical for everyone, since it may require your deployment user to have sudo access.
+  While we eagerly await the release of passenger v5.0.10, which will make the new method possible without sudo access,
+  we recognize that not everyone is ready for this change yet.
+
+  capistrano-passenger gives you the flexibility to choose your restart approach, or to rely on reasonable defaults.
+
+  If you want to restart using `touch tmp/restart.txt`, add this to your config/deploy.rb:
+
+      set :passenger_restart_with_touch, true
+
+  If you want to restart using `passenger-config restart-app`, add this to your config/deploy.rb:
+
+      set :passenger_restart_with_touch, false # Note that `nil` is NOT the same as `false` here
+
+  If you don't set `:passenger_restart_with_touch`, capistrano-passenger will check what version of passenger you are running
+  and use `passenger-config restart-app` if it is available in that version.
+
+  If you are running passenger in standalone mode, it is possible for you to put passenger in your
+  Gemfile and rely on capistrano-bundler to install it with the rest of your bundle.
+  If you are installing passenger during your deployment AND you want to restart using `passenger-config restart-app`,
+  you need to set `:passenger_in_gemfile` to `true` in your `config/deploy.rb`.
+  ================================================
 rdoc_options: []
 require_paths:
 - lib
@@ -92,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Passenger support for Capistrano 3.x