Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #88 from patcon/feature/fix-rubocop
Browse files Browse the repository at this point in the history
Fix minor rubocop style errors
  • Loading branch information
linc01n committed Jun 16, 2015
2 parents 081c882 + dc639ed commit 3d55bb7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme

# rubocop:disable RegexpLiteral
guard 'kitchen' do
watch(%r{test/.+})
watch(%r{^recipes/(.+)\.rb$})
Expand All @@ -11,4 +10,3 @@ guard 'kitchen' do
watch(%r{^providers/(.+)\.rb})
watch(%r{^resources/(.+)\.rb})
end
# rubocop:enable RegexpLiteral
6 changes: 3 additions & 3 deletions providers/hook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def whyrun_supported?
}

unless @current_resource.enabled
converge_by("Enable #{ @new_resource }") do
converge_by("Enable #{@new_resource}") do
enable(server, user, hook_opts)
end
new_resource.updated_by_last_action(true)
Expand All @@ -32,7 +32,7 @@ def whyrun_supported?
settings = @new_resource.settings

unless @current_resource.configured && settings.diff(@current_resource.settings).empty?
converge_by("Configure #{ @new_resource }") do
converge_by("Configure #{@new_resource}") do
configure(server, user, hook_opts, settings)
end
new_resource.updated_by_last_action(true)
Expand All @@ -49,7 +49,7 @@ def whyrun_supported?
}

if @current_resource.enabled
converge_by("Disable #{ @new_resource }") do
converge_by("Disable #{@new_resource}") do
disable(server, user, hook_opts)
end
new_resource.updated_by_last_action(true)
Expand Down
4 changes: 2 additions & 2 deletions providers/repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def whyrun_supported?
}

unless @current_resource.exists
converge_by("Creating #{ @new_resource }") do
converge_by("Creating #{@new_resource}") do
create(server, user, repo_opts)
end
new_resource.updated_by_last_action(true)
Expand All @@ -29,7 +29,7 @@ def whyrun_supported?
}

if @current_resource.exists
converge_by("Deleting #{ @new_resource }") do
converge_by("Deleting #{@new_resource}") do
delete(server, user, repo_opts)
end
new_resource.updated_by_last_action(true)
Expand Down

0 comments on commit 3d55bb7

Please sign in to comment.