Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Staging template cleanup. #938

Merged
merged 3 commits into from

2 participants

@richardkmichael

No description provided.

@leehambley leehambley merged commit 4c62998 into capistrano:master

1 check passed

Details default The Travis CI build passed
@miry miry referenced this pull request from a commit in miry/capistrano
@juanibiapina juanibiapina :panda_face: Added tests for after/before hooks
capistrano#1004

The changes of #938 affect the order the task executes. The "prerequisite" task seems to be running as
if it was defined in a after block, which makes sense, since it is now invoked by the task instead of being a prerequisite.

Since there were missed tests and @juanibiapina added simple tests in #1005, and were modified in this commit to cover
current business logic of the master.
e6f3526
@miry miry referenced this pull request from a commit in miry/capistrano
@juanibiapina juanibiapina :panda_face: Added tests for after/before hooks
capistrano#1004

The changes of #938 affect the order the task executes. The "prerequisite" task seems to be running as
if it was defined in a after block, which makes sense, since it is now invoked by the task instead of being a prerequisite.

Since there were missed tests and @juanibiapina added simple tests in #1005, and were modified in this commit to cover
current business logic of the master.
9da7eb5
@theunraveler theunraveler referenced this pull request from a commit
@juanibiapina juanibiapina :panda_face: Added tests for after/before hooks
#1004

The changes of #938 affect the order the task executes. The "prerequisite" task seems to be running as
if it was defined in a after block, which makes sense, since it is now invoked by the task instead of being a prerequisite.

Since there were missed tests and @juanibiapina added simple tests in #1005, and were modified in this commit to cover
current business logic of the master.
66ba132
@theunraveler theunraveler referenced this pull request from a commit
@juanibiapina juanibiapina :panda_face: Added tests for after/before hooks
#1004

The changes of #938 affect the order the task executes. The "prerequisite" task seems to be running as
if it was defined in a after block, which makes sense, since it is now invoked by the task instead of being a prerequisite.

Since there were missed tests and @juanibiapina added simple tests in #1005, and were modified in this commit to cover
current business logic of the master.
c4f6a6b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 20 additions and 14 deletions.
  1. +20 −14 lib/capistrano/templates/stage.rb.erb
View
34 lib/capistrano/templates/stage.rb.erb
@@ -1,31 +1,38 @@
# Simple Role Syntax
# ==================
-# Supports bulk-adding hosts to roles, the primary
-# server in each group is considered to be the first
-# unless any hosts have the primary property set.
-# Don't declare `role :all`, it's a meta role
+# Supports bulk-adding hosts to roles, the primary server in each group
+# is considered to be the first unless any hosts have the primary
+# property set. Don't declare `role :all`, it's a meta role.
+
role :app, %w{deploy@example.com}
role :web, %w{deploy@example.com}
role :db, %w{deploy@example.com}
+
# Extended Server Syntax
# ======================
-# This can be used to drop a more detailed server
-# definition into the server list. The second argument
-# something that quacks like a hash can be used to set
-# extended properties on the server.
+# This can be used to drop a more detailed server definition into the
+# server list. The second argument is a, or duck-types, Hash and is
+# used to set extended properties on the server.
+
server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
-# you can set custom ssh options
-# it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options
-# you can see them in [net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start)
-# set it globally
+
+# Custom SSH Options
+# ==================
+# You may pass any option but keep in mind that net/ssh understands a
+# limited set of options, consult[net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start).
+#
+# Global options
+# --------------
# set :ssh_options, {
# keys: %w(/home/rlisowski/.ssh/id_rsa),
# forward_agent: false,
# auth_methods: %w(password)
# }
-# and/or per server
+#
+# And/or per server (overrides global)
+# ------------------------------------
# server 'example.com',
# user: 'user_name',
# roles: %w{web app},
@@ -36,4 +43,3 @@ server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
# auth_methods: %w(publickey password)
# # password: 'please use keys'
# }
-# setting per server overrides global ssh_options
Something went wrong with that request. Please try again.