diff --git a/.rubocop.yml b/.rubocop.yml index 08d72ab9d..a1f53aed6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -41,8 +41,6 @@ Style/BlockDelimiters: Enabled: false Style/ConditionalAssignment: Enabled: false -Style/AlignParameters: - Enabled: false Style/IfUnlessModifier: Enabled: false Style/Lambda: diff --git a/lib/capistrano/dsl.rb b/lib/capistrano/dsl.rb index 28dc557fb..f56dbfaf9 100644 --- a/lib/capistrano/dsl.rb +++ b/lib/capistrano/dsl.rb @@ -29,11 +29,11 @@ def sudo(*args) def revision_log_message fetch(:revision_log_message, - t(:revision_log_message, - :branch => fetch(:branch), - :user => local_user, - :sha => fetch(:current_revision), - :release => fetch(:release_timestamp)) + t(:revision_log_message, + :branch => fetch(:branch), + :user => local_user, + :sha => fetch(:current_revision), + :release => fetch(:release_timestamp)) ) end diff --git a/lib/capistrano/tasks/deploy.rake b/lib/capistrano/tasks/deploy.rake index 720d780db..f6faa02c9 100644 --- a/lib/capistrano/tasks/deploy.rake +++ b/lib/capistrano/tasks/deploy.rake @@ -177,8 +177,8 @@ namespace :deploy do last_release_path = releases_path.join(last_release) if test "[ `readlink #{current_path}` != #{last_release_path} ]" execute :tar, "-czf", - deploy_path.join("rolled-back-release-#{last_release}.tar.gz"), - last_release_path + deploy_path.join("rolled-back-release-#{last_release}.tar.gz"), + last_release_path execute :rm, "-rf", last_release_path else debug "Last release is the current release, skip cleanup_rollback." diff --git a/spec/support/Vagrantfile b/spec/support/Vagrantfile index b7fca544f..cd26710f9 100644 --- a/spec/support/Vagrantfile +++ b/spec/support/Vagrantfile @@ -13,7 +13,7 @@ Vagrant.configure("2") do |config| vagrantkey = open("https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub", "r",&:read) primary.vm.provision :shell, - :inline => <<-INLINE + :inline => <<-INLINE install -d -m 700 /root/.ssh echo -e "#{vagrantkey}" > /root/.ssh/authorized_keys chmod 0600 /root/.ssh/authorized_keys