summaryrefslogtreecommitdiffstats
path: root/lib/puppet/indirector/report
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
commit3180b9d9b2c844dade1d361326600f7001ec66dd (patch)
tree98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /lib/puppet/indirector/report
parent543225970225de5697734bfaf0a6eee996802c04 (diff)
downloadpuppet-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/indirector/report')
-rw-r--r--lib/puppet/indirector/report/processor.rb68
-rw-r--r--lib/puppet/indirector/report/rest.rb6
2 files changed, 37 insertions, 37 deletions
diff --git a/lib/puppet/indirector/report/processor.rb b/lib/puppet/indirector/report/processor.rb
index 2f8e9f3c1..88fe4b487 100644
--- a/lib/puppet/indirector/report/processor.rb
+++ b/lib/puppet/indirector/report/processor.rb
@@ -3,46 +3,46 @@ require 'puppet/indirector/code'
require 'puppet/reports'
class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
- desc "Puppet's report processor. Processes the report with each of
- the report types listed in the 'reports' setting."
+ desc "Puppet's report processor. Processes the report with each of
+ the report types listed in the 'reports' setting."
- def initialize
- Puppet.settings.use(:main, :reporting, :metrics)
- end
+ def initialize
+ Puppet.settings.use(:main, :reporting, :metrics)
+ end
- def save(request)
- process(request.instance)
- end
+ def save(request)
+ process(request.instance)
+ end
- private
+ private
- # Process the report with each of the configured report types.
- # LAK:NOTE This isn't necessarily the best design, but it's backward
- # compatible and that's good enough for now.
- def process(report)
- return if Puppet[:reports] == "none"
+ # Process the report with each of the configured report types.
+ # LAK:NOTE This isn't necessarily the best design, but it's backward
+ # compatible and that's good enough for now.
+ def process(report)
+ return if Puppet[:reports] == "none"
- reports.each do |name|
- if mod = Puppet::Reports.report(name)
- # We have to use a dup because we're including a module in the
- # report.
- newrep = report.dup
- begin
- newrep.extend(mod)
- newrep.process
- rescue => detail
- puts detail.backtrace if Puppet[:trace]
- Puppet.err "Report #{name} failed: #{detail}"
- end
- else
- Puppet.warning "No report named '#{name}'"
- end
+ reports.each do |name|
+ if mod = Puppet::Reports.report(name)
+ # We have to use a dup because we're including a module in the
+ # report.
+ newrep = report.dup
+ begin
+ newrep.extend(mod)
+ newrep.process
+ rescue => detail
+ puts detail.backtrace if Puppet[:trace]
+ Puppet.err "Report #{name} failed: #{detail}"
end
+ else
+ Puppet.warning "No report named '#{name}'"
+ end
end
+ end
- # Handle the parsing of the reports attribute.
- def reports
- # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com]
- x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/)
- end
+ # Handle the parsing of the reports attribute.
+ def reports
+ # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com]
+ x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/)
+ end
end
diff --git a/lib/puppet/indirector/report/rest.rb b/lib/puppet/indirector/report/rest.rb
index f92d1edd3..601da9edb 100644
--- a/lib/puppet/indirector/report/rest.rb
+++ b/lib/puppet/indirector/report/rest.rb
@@ -1,7 +1,7 @@
require 'puppet/indirector/rest'
class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
- desc "Get server report over HTTP via REST."
- use_server_setting(:report_server)
- use_port_setting(:report_port)
+ desc "Get server report over HTTP via REST."
+ use_server_setting(:report_server)
+ use_port_setting(:report_port)
end