Skip to content

Commit

Permalink
sacrificing more white space to the style gods
Browse files Browse the repository at this point in the history
  • Loading branch information
mwrock authored and fnichol committed Jan 20, 2015
1 parent 1311bf1 commit 1e6ea36
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/kitchen/busser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def setup_cmd
CMD
when "powershell"
ruby_bindir = config[:ruby_bindir].gsub('/opt/','/opscode/')

cmd = <<-CMD.gsub(/^ {10}/, "")
#{busser_setup_env}
if ((gem list busser -i) -eq \"false\") {
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/provisioner/chef_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def init_command
cmd = "if ( Test-Path #{path} ) { rm -r #{path} };"
end
cmd = <<-CMD.gsub(/^ {10}/, "")
if (-Not (Test-Path #{config[:root_path]})) {
mkdir #{config[:root_path]} | Out-Null
if (-Not (Test-Path #{config[:root_path]})) {
mkdir #{config[:root_path]} | Out-Null
}
CMD
lines = [dirs, cmd]
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/transport/winrm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def env_command(command)
# (see Base#test_connection)
def test_connection
exitcode, _error_msg = execute_with_exit(
"Write-Host '[Server] Reachable...\n'",
"Write-Host '[Server] Reachable...\n'",
:powershell
)
exitcode.zero?
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/transport/winrm_file_transfer/remote_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def powershell_batch(&block)
end
commands << <<-EOH
"{"
$result.keys | % {
$result.keys | % {
write-output "`"$_`": `"$($result[$_])`",".Replace('\\','\\\\')
}
"}"
Expand Down
6 changes: 3 additions & 3 deletions lib/kitchen/transport/winrm_file_transfer/remote_zip_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def add_file(path)
Dir.glob(glob).each do |file|
logger.debug("adding zip entry for '#{file}'")
entry = Zip::Entry.new(
archive,
file.sub(File.dirname(path)+'/',''),
nil, nil, nil, nil, nil, nil,
archive,
file.sub(File.dirname(path)+'/',''),
nil, nil, nil, nil, nil, nil,
::Zip::DOSTime.new(2000)
)
zipfile.add(entry,file)
Expand Down

0 comments on commit 1e6ea36

Please sign in to comment.