diff options
author | Markus Roberts <Markus@reality.com> | 2010-07-09 18:12:17 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-09 18:12:17 -0700 |
commit | 3180b9d9b2c844dade1d361326600f7001ec66dd (patch) | |
tree | 98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /lib/puppet/util/log_paths.rb | |
parent | 543225970225de5697734bfaf0a6eee996802c04 (diff) | |
download | puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.gz puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.xz puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.zip |
Code smell: Two space indentation
Replaced 106806 occurances of ^( +)(.*$) with
The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people
who learned ruby in the 1900s) uses two-space indentation.
3 Examples:
The code:
end
# Tell getopt which arguments are valid
def test_get_getopt_args
element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
becomes:
end
# Tell getopt which arguments are valid
def test_get_getopt_args
element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
The code:
assert_equal(str, val)
assert_instance_of(Float, result)
end
# Now test it with a passed object
becomes:
assert_equal(str, val)
assert_instance_of(Float, result)
end
# Now test it with a passed object
The code:
end
assert_nothing_raised do
klass[:Yay] = "boo"
klass["Cool"] = :yayness
end
becomes:
end
assert_nothing_raised do
klass[:Yay] = "boo"
klass["Cool"] = :yayness
end
Diffstat (limited to 'lib/puppet/util/log_paths.rb')
-rw-r--r-- | lib/puppet/util/log_paths.rb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb index e09ceb7fa..f59197ed1 100644 --- a/lib/puppet/util/log_paths.rb +++ b/lib/puppet/util/log_paths.rb @@ -2,26 +2,26 @@ # Copyright (c) 2007. All rights reserved. module Puppet::Util::LogPaths - # return the full path to us, for logging and rollback - # some classes (e.g., FileTypeRecords) will have to override this - def path - @path ||= pathbuilder + # return the full path to us, for logging and rollback + # some classes (e.g., FileTypeRecords) will have to override this + def path + @path ||= pathbuilder - "/" + @path.join("/") - end - - def source_descriptors - descriptors = {} + "/" + @path.join("/") + end - descriptors[:tags] = tags + def source_descriptors + descriptors = {} - [:path, :file, :line, :version].each do |param| - next unless value = send(param) - descriptors[param] = value - end + descriptors[:tags] = tags - descriptors + [:path, :file, :line, :version].each do |param| + next unless value = send(param) + descriptors[param] = value end + descriptors + end + end |