kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

Merge pull request #1608 from will-in-wi/rubocop_align_parameters

Browse source 
Enable AlignParameters cop
This commit is contained in:
Lee Hambley 2016-03-07 13:14:18 +01:00
commit fb82ecea53
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -41,8 +41,6 @@ Style/BlockDelimiters:
Enabled: false Enabled: false
Style/ConditionalAssignment: Style/ConditionalAssignment:
Enabled: false Enabled: false
Style/AlignParameters:
Enabled: false
Style/IfUnlessModifier: Style/IfUnlessModifier:
Enabled: false Enabled: false
Style/Lambda: Style/Lambda:

10
lib/capistrano/dsl.rb
View file

@ -29,11 +29,11 @@ module Capistrano
def revision_log_message def revision_log_message
fetch(:revision_log_message, fetch(:revision_log_message,
t(:revision_log_message, t(:revision_log_message,
:branch => fetch(:branch), :branch => fetch(:branch),
:user => local_user, :user => local_user,
:sha => fetch(:current_revision), :sha => fetch(:current_revision),
:release => fetch(:release_timestamp)) :release => fetch(:release_timestamp))
) )
end end

4
lib/capistrano/tasks/deploy.rake
View file

@ -177,8 +177,8 @@ namespace :deploy do
last_release_path = releases_path.join(last_release) last_release_path = releases_path.join(last_release)
if test "[ `readlink #{current_path}` != #{last_release_path} ]" if test "[ `readlink #{current_path}` != #{last_release_path} ]"
execute :tar, "-czf", execute :tar, "-czf",
deploy_path.join("rolled-back-release-#{last_release}.tar.gz"), deploy_path.join("rolled-back-release-#{last_release}.tar.gz"),
last_release_path last_release_path
execute :rm, "-rf", last_release_path execute :rm, "-rf", last_release_path
else else
debug "Last release is the current release, skip cleanup_rollback." debug "Last release is the current release, skip cleanup_rollback."

2
spec/support/Vagrantfile vendored
View file

@ -13,7 +13,7 @@ Vagrant.configure("2") do |config|
vagrantkey = open("https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub", "r",&:read) vagrantkey = open("https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub", "r",&:read)
primary.vm.provision :shell, primary.vm.provision :shell,
:inline => <<-INLINE :inline => <<-INLINE
install -d -m 700 /root/.ssh install -d -m 700 /root/.ssh
echo -e "#{vagrantkey}" > /root/.ssh/authorized_keys echo -e "#{vagrantkey}" > /root/.ssh/authorized_keys
chmod 0600 /root/.ssh/authorized_keys chmod 0600 /root/.ssh/authorized_keys