Skip to content

Commit

Permalink
Enable AlignParameters cop
Browse files Browse the repository at this point in the history
  • Loading branch information
will-in-wi authored and William Johnston committed Mar 2, 2016
1 parent f057eb9 commit 7fd5a55
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ Style/BlockDelimiters:
Enabled: false
Style/ConditionalAssignment:
Enabled: false
Style/AlignParameters:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/Next:
Expand Down
10 changes: 5 additions & 5 deletions lib/capistrano/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/capistrano/tasks/deploy.rake
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,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."
Expand Down
2 changes: 1 addition & 1 deletion spec/support/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7fd5a55

Please sign in to comment.