summaryrefslogtreecommitdiffstats
path: root/lib/puppet/indirector/certificate_request
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/certificate_request
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/certificate_request')
-rw-r--r--lib/puppet/indirector/certificate_request/ca.rb14
-rw-r--r--lib/puppet/indirector/certificate_request/file.rb4
-rw-r--r--lib/puppet/indirector/certificate_request/rest.rb6
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/puppet/indirector/certificate_request/ca.rb b/lib/puppet/indirector/certificate_request/ca.rb
index 25680fb9b..f4c924fe1 100644
--- a/lib/puppet/indirector/certificate_request/ca.rb
+++ b/lib/puppet/indirector/certificate_request/ca.rb
@@ -2,13 +2,13 @@ require 'puppet/indirector/ssl_file'
require 'puppet/ssl/certificate_request'
class Puppet::SSL::CertificateRequest::Ca < Puppet::Indirector::SslFile
- desc "Manage the CA collection of certificate requests on disk."
+ desc "Manage the CA collection of certificate requests on disk."
- store_in :csrdir
+ store_in :csrdir
- def save(request)
- result = super
- Puppet.notice "#{request.key} has a waiting certificate request"
- result
- end
+ def save(request)
+ result = super
+ Puppet.notice "#{request.key} has a waiting certificate request"
+ result
+ end
end
diff --git a/lib/puppet/indirector/certificate_request/file.rb b/lib/puppet/indirector/certificate_request/file.rb
index 274311e2c..9510e362b 100644
--- a/lib/puppet/indirector/certificate_request/file.rb
+++ b/lib/puppet/indirector/certificate_request/file.rb
@@ -2,7 +2,7 @@ require 'puppet/indirector/ssl_file'
require 'puppet/ssl/certificate_request'
class Puppet::SSL::CertificateRequest::File < Puppet::Indirector::SslFile
- desc "Manage the collection of certificate requests on disk."
+ desc "Manage the collection of certificate requests on disk."
- store_in :requestdir
+ store_in :requestdir
end
diff --git a/lib/puppet/indirector/certificate_request/rest.rb b/lib/puppet/indirector/certificate_request/rest.rb
index eb9e8a9ce..81810551f 100644
--- a/lib/puppet/indirector/certificate_request/rest.rb
+++ b/lib/puppet/indirector/certificate_request/rest.rb
@@ -2,8 +2,8 @@ require 'puppet/ssl/certificate_request'
require 'puppet/indirector/rest'
class Puppet::SSL::CertificateRequest::Rest < Puppet::Indirector::REST
- desc "Find and save certificate requests over HTTP via REST."
+ desc "Find and save certificate requests over HTTP via REST."
- use_server_setting(:ca_server)
- use_port_setting(:ca_port)
+ use_server_setting(:ca_server)
+ use_port_setting(:ca_port)
end