summaryrefslogtreecommitdiff
path: root/lib/chef/util
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-09-03 14:13:46 -0400
committeradamedx <adamed@getchef.com>2014-09-10 20:29:00 -0700
commitd075af59c69f34f22369624da150bed8e863cff3 (patch)
tree0e55f6a65219a83329b6cde38881e43a2bd920a2 /lib/chef/util
parent058b9a4cbf3883fb4b3bb3f1c8d3d7bf850176ba (diff)
downloadchef-d075af59c69f34f22369624da150bed8e863cff3.tar.gz
Switch fileformat to unix, clean up whitespace.
Converts a few files from CRLF->LF. Removes some trailing whitespace as well.
Diffstat (limited to 'lib/chef/util')
-rw-r--r--lib/chef/util/dsc/configuration_generator.rb2
-rw-r--r--lib/chef/util/dsc/lcm_output_parser.rb10
-rw-r--r--lib/chef/util/powershell/cmdlet.rb2
-rw-r--r--lib/chef/util/powershell/cmdlet_result.rb4
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/util/dsc/configuration_generator.rb b/lib/chef/util/dsc/configuration_generator.rb
index 9f8c0e7309..12cd5dc3a2 100644
--- a/lib/chef/util/dsc/configuration_generator.rb
+++ b/lib/chef/util/dsc/configuration_generator.rb
@@ -37,7 +37,7 @@ class Chef::Util::DSC
def configuration_document_from_script_path(script_path, configuration_name, configuration_flags, shellout_flags)
validate_configuration_name!(configuration_name)
-
+
document_generation_cmdlet = Chef::Util::Powershell::Cmdlet.new(
@node,
configuration_document_generation_code(script_path, configuration_name))
diff --git a/lib/chef/util/dsc/lcm_output_parser.rb b/lib/chef/util/dsc/lcm_output_parser.rb
index 6532d79d6f..91181b3089 100644
--- a/lib/chef/util/dsc/lcm_output_parser.rb
+++ b/lib/chef/util/dsc/lcm_output_parser.rb
@@ -64,7 +64,7 @@ class Chef
# Parses the output from LCM and returns a list of Chef::Util::DSC::ResourceInfo objects
# that describe how the resources affected the system
- #
+ #
# Example:
# parse <<-EOF
# What if: [Machine]: LCM: [Start Set ]
@@ -80,11 +80,11 @@ class Chef
#
# [
# Chef::Util::DSC::ResourceInfo.new(
- # '[[File]FileToNotBeThere]',
- # true,
+ # '[[File]FileToNotBeThere]',
+ # true,
# [
- # '[[File]FileToNotBeThere]',
- # '[C:\Shouldnotexist.txt]',
+ # '[[File]FileToNotBeThere]',
+ # '[C:\Shouldnotexist.txt]',
# '[[File]FileToNotBeThere] in 0.1 seconds'
# ]
# )
diff --git a/lib/chef/util/powershell/cmdlet.rb b/lib/chef/util/powershell/cmdlet.rb
index f99812dc24..40edbb13c6 100644
--- a/lib/chef/util/powershell/cmdlet.rb
+++ b/lib/chef/util/powershell/cmdlet.rb
@@ -131,6 +131,6 @@ class Chef::Util::Powershell
command_switches.join(' ')
end
- end
+ end
end
diff --git a/lib/chef/util/powershell/cmdlet_result.rb b/lib/chef/util/powershell/cmdlet_result.rb
index 696013e684..af7b3607cd 100644
--- a/lib/chef/util/powershell/cmdlet_result.rb
+++ b/lib/chef/util/powershell/cmdlet_result.rb
@@ -20,13 +20,13 @@ require 'json'
class Chef::Util::Powershell
class CmdletResult
- attr_reader :output_format
+ attr_reader :output_format
def initialize(status, output_format)
@status = status
@output_format = output_format
end
-
+
def stderr
@status.stderr
end