capistrano-exts 1.1.4 → 1.1.5

data/examples/php_fpm/deploy/development.rb

@@ -23,10 +23,9 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/php_fpm/deploy/production.rb

@@ -23,10 +23,9 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/php_fpm/deploy/staging.rb

@@ -23,10 +23,9 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_passenger/deploy/development.rb

@@ -23,10 +23,9 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_passenger/deploy/production.rb

@@ -23,10 +23,9 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_passenger/deploy/staging.rb

@@ -23,10 +23,9 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -23,10 +23,9 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -23,10 +23,9 @@ set :branch, "production"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -23,10 +23,10 @@ set :branch, "staging"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
+
 # How should we deploy?
 # Valid options:
 # => checkout: this deployment strategy does an SCM checkout on each target

data/lib/capistrano-exts/receipts/contao.rb

@@ -74,6 +74,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :fix_links, :roles => :app, :except => { :no_release => true } do
       contents_path = fetch :contents_path, "#{fetch :public_path}/tl_files/contents"
 
+      # At this point, the current_path does not exists and by running an mkdir
+      # later, we're actually breaking stuff.
+      # So replace current_path with latest_release in the contents_path string
+      contents_path.gsub!(%r{#{current_path}}, fetch(:latest_release))
+
       # Remove files
       run <<-CMD
         #{try_sudo} rm -f #{contents_path} &&

data/lib/capistrano-exts/receipts/servers/web_server.rb

@@ -46,17 +46,21 @@ Capistrano::Configuration.instance(:must_exist).load do
           if exists?(:web_server_auth_credentials)
             web_server_auth_credentials = fetch :web_server_auth_credentials
             contents = Array.new
+            unencrypted_contents = Array.new
 
             web_server_auth_credentials.each do |credentials|
               if credentials[:password].is_a?(Proc)
-                password = credentials[:password].call.crypt(gen_pass(8))
+                password = credentials[:password].call
               else
-                password = credentials[:password].crypt(gen_pass(8))
+                password = credentials[:password]
               end
-              contents << "#{credentials[:user]}:#{password}"
+
+              unencrypted_contents << "#{credentials[:user]}:#{password}"
+              contents << "#{credentials[:user]}:#{password.crypt(gen_pass(8))}"
             end
 
             set :web_server_auth_file_contents, contents.join("\n")
+            set :web_server_auth_file_unencrypted_contents, unencrypted_contents.join("\n")
           end
         end
 
@@ -70,6 +74,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           if exists?(:web_server_auth_file)
             web_server_auth_file = fetch :web_server_auth_file
             web_server_auth_file_contents = fetch :web_server_auth_file_contents
+            web_server_auth_file_unencrypted_contents = fetch :web_server_auth_file_unencrypted_contents
             random_file = random_tmp_file web_server_auth_file_contents
 
             run <<-CMD
@@ -81,6 +86,11 @@ Capistrano::Configuration.instance(:must_exist).load do
             run <<-CMD
               #{try_sudo} mv #{random_file} #{web_server_auth_file}
             CMD
+
+            # Store the unencrypted version of the contents
+            put web_server_auth_file_unencrypted_contents, "#{fetch :deploy_to}/.http_basic_auth"
+            puts "This site uses http basic auth, the credentials are:"
+            puts web_server_auth_file_unencrypted_contents
           end
         end
 

data/lib/capistrano-exts/templates/multistage.rb

@@ -20,10 +20,9 @@ set :branch, "master"
 set :use_sudo, false
 
 # Define deployments options
-# NOTE: Do not use current_path here but use latest_release instead.
 set :deploy_to,   -> { "/home/vhosts/#{fetch :stage}/#{fetch :application}" }
 set :logs_path,   -> { "#{fetch :deploy_to}/logs" }
-set :public_path, -> { "#{fetch :latest_release}/public" }
+set :public_path, -> { "#{fetch :current_path}/public" }
 
 # How should we deploy?
 # Valid options:

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 1
-      TINY = 4
+      TINY = 5
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153020120 !ruby/object:Gem::Requirement
+  requirement: &2157484500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153020120
+  version_requirements: *2157484500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153019620 !ruby/object:Gem::Requirement
+  requirement: &2157484000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153019620
+  version_requirements: *2157484000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153019160 !ruby/object:Gem::Requirement
+  requirement: &2157483540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153019160
+  version_requirements: *2157483540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152407080 !ruby/object:Gem::Requirement
+  requirement: &2157483080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152407080
+  version_requirements: *2157483080
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152404880 !ruby/object:Gem::Requirement
+  requirement: &2157482620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152404880
+  version_requirements: *2157482620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2160295640 !ruby/object:Gem::Requirement
+  requirement: &2157482160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2160295640
+  version_requirements: *2157482160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160295180 !ruby/object:Gem::Requirement
+  requirement: &2157481700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2160295180
+  version_requirements: *2157481700
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com