Skip to content

Commit

Permalink
Style fix - indentation
Browse files Browse the repository at this point in the history
Signed-off-by: Salim Afiune <[email protected]>
  • Loading branch information
Salim Afiune committed Dec 9, 2016
1 parent 12bc00a commit f2defd9
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion lib/kitchen/configurable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def expand_paths!
config[key].map { |path| File.expand_path(path, root_path) }
else
File.expand_path(config[key], root_path)
end
end
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/driver/ssh_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def env_cmd(cmd)
(!config[:https_proxy] && https_proxy) ||
(!config[:ftp_proxy] && ftp_proxy)
ENV["no_proxy"] || ENV["NO_PROXY"]
end
end
env << " http_proxy=#{http_proxy}" if http_proxy
env << " https_proxy=#{https_proxy}" if https_proxy
env << " ftp_proxy=#{ftp_proxy}" if ftp_proxy
Expand Down
4 changes: 1 addition & 3 deletions lib/kitchen/errors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def self.formatted_trace(exception, title = "Exception")
formatted_exception(exception.original, "Nested Exception"),
formatted_backtrace(exception),
].flatten
end
end
end
arr.flatten
end
Expand Down Expand Up @@ -181,8 +181,6 @@ def self.with_friendly_errors
exit 20
end

private

# Writes an array of lines to the common Kitchen logger's file device at the
# given severity level. If the Kitchen logger is set to debug severity, then
# the array of lines will also be written to the console output.
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/instance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def login
legacy_ssh_base_login(state)
else
transport.connection(state).login_command
end
end

debug(%{Login command: #{lc.command} #{lc.arguments.join(' ')} } \
"(Options: #{lc.options})")
Expand Down Expand Up @@ -259,7 +259,7 @@ def diagnose_plugins
obj.diagnose_plugin
else
:unknown
end
end
end
result
end
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/loader/yaml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def combined_hash
normalize(global_yaml).rmerge(normalize(yaml))
else
normalize(yaml)
end
end
@process_local ? y.rmerge(normalize(local_yaml)) : y
end

Expand Down Expand Up @@ -311,7 +311,7 @@ def normalize_hash(hash, key, value)
{ default_key => value }
else
normalize(value)
end
end
else
hash[key] = normalize(value)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def initialize(options = {})
default_log_overwrite
else
options[:log_overwrite]
end
end

@logdev = logdev_logger(options[:logdev], log_overwrite) if options[:logdev]

Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/chef/common_sandbox.rb
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def prepare_json
update_dna_for_policyfile
else
config[:attributes].merge(run_list: config[:run_list])
end
end

info("Preparing dna.json")
debug("Creating dna.json from #{dna.inspect}")
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/chef_apply.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def init_command
init_command_vars_for_powershell(dirs)
else
init_command_vars_for_bourne(dirs)
end
end

prefix_command(shell_code_from_file(vars, "chef_base_init_command"))
end
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/chef_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def init_command
init_command_vars_for_powershell(dirs)
else
init_command_vars_for_bourne(dirs)
end
end

prefix_command(shell_code_from_file(vars, "chef_base_init_command"))
end
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/shell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def init_command
POWERSHELL
else
"#{sudo('rm')} -rf #{data} ; mkdir -p #{root}"
end
end

wrap_shell_code(code)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/transport/ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def retry_connection(opts)
else
"[SSH] connection failed, retrying in #{opts[:delay]} seconds " \
"(#{e.inspect})"
end
end
logger.info(message)
sleep(opts[:delay])
retry
Expand Down
2 changes: 1 addition & 1 deletion spec/kitchen/transport/winrm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ def self.common_failed_command_specs
klass.new("dang", 200)
else
klass
end
end

options[:connection_retries] = 3
options[:connection_retry_sleep] = 7
Expand Down

0 comments on commit f2defd9

Please sign in to comment.