summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorRick Bradley <rick@rickbradley.com>2007-10-15 12:19:08 -0500
committerRick Bradley <rick@rickbradley.com>2007-10-15 12:19:08 -0500
commit9a179ec3a9df62c6179e7151831c4f07197cfbce (patch)
tree73db44481e976919ee57b98655e2c18a1310b4d7 /lib/puppet
parente56406f15086eb483c00a2904d8a75518412a905 (diff)
downloadpuppet-9a179ec3a9df62c6179e7151831c4f07197cfbce.tar.gz
puppet-9a179ec3a9df62c6179e7151831c4f07197cfbce.tar.xz
puppet-9a179ec3a9df62c6179e7151831c4f07197cfbce.zip
trivial: WEBRick -> WEBrick, to be more consistent with how the WEBrick ruby classes are named.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/http.rb2
-rw-r--r--lib/puppet/network/http/webrick.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/network/http.rb b/lib/puppet/network/http.rb
index 5dddad848..044310d8e 100644
--- a/lib/puppet/network/http.rb
+++ b/lib/puppet/network/http.rb
@@ -1,6 +1,6 @@
class Puppet::Network::HTTP
def self.server_class_by_type(kind)
- return Puppet::Network::HTTP::WEBRick if kind.to_sym == :webrick
+ return Puppet::Network::HTTP::WEBrick if kind.to_sym == :webrick
return Puppet::Network::HTTP::Mongrel if kind.to_sym == :mongrel
raise ArgumentError, "Unknown HTTP server name [#{kind}]"
end
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index ffea60eba..85a329454 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -1,21 +1,21 @@
require 'webrick'
require 'webrick/https'
-class Puppet::Network::HTTP::WEBRick < WEBrick::HTTPServer
+class Puppet::Network::HTTP::WEBrick < WEBrick::HTTPServer
def initialize(args = {})
@listening = false
end
def listen(args = {})
raise ArgumentError if args.keys.empty?
- raise "WEBRick server is already listening" if listening?
+ raise "WEBrick server is already listening" if listening?
# TODO / FIXME: this should be moved out of the wacky Puppet global namespace!
Puppet.start
@listening = true
end
def unlisten
- raise "WEBRick server is not listening" unless listening?
+ raise "WEBrick server is not listening" unless listening?
shutdown
@listening = false
end