summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/file_bucket/dipper.rb2
-rw-r--r--lib/puppet/interface/action_manager.rb3
-rwxr-xr-xlib/puppet/network/handler/fileserver.rb4
-rw-r--r--lib/puppet/parser/functions/fqdn_rand.rb3
-rw-r--r--lib/puppet/parser/functions/md5.rb4
-rw-r--r--lib/puppet/parser/functions/sha1.rb4
-rw-r--r--lib/puppet/parser/functions/template.rb2
-rw-r--r--lib/puppet/parser/type_loader.rb3
-rw-r--r--lib/puppet/rails/benchmark.rb4
-rw-r--r--lib/puppet/resource/type_collection.rb3
-rw-r--r--lib/puppet/ssl/base.rb3
-rw-r--r--lib/puppet/util/autoload.rb8
-rw-r--r--lib/puppet/util/checksums.rb11
-rw-r--r--lib/puppet/util/diff.rb3
-rwxr-xr-xlib/puppet/util/filetype.rb4
-rw-r--r--lib/puppet/util/run_mode.rb3
-rw-r--r--lib/puppet/util/suidmanager.rb2
-rw-r--r--lib/puppet/util/windows/user.rb3
18 files changed, 31 insertions, 38 deletions
diff --git a/lib/puppet/file_bucket/dipper.rb b/lib/puppet/file_bucket/dipper.rb
index 4adab5df0..8e35bde67 100644
--- a/lib/puppet/file_bucket/dipper.rb
+++ b/lib/puppet/file_bucket/dipper.rb
@@ -1,3 +1,4 @@
+require 'pathname'
require 'puppet/file_bucket'
require 'puppet/file_bucket/file'
require 'puppet/indirector/request'
@@ -99,7 +100,6 @@ class Puppet::FileBucket::Dipper
private
def absolutize_path( path )
- require 'pathname'
Pathname.new(path).realpath
end
diff --git a/lib/puppet/interface/action_manager.rb b/lib/puppet/interface/action_manager.rb
index 5c9af4f96..1226507f5 100644
--- a/lib/puppet/interface/action_manager.rb
+++ b/lib/puppet/interface/action_manager.rb
@@ -1,11 +1,10 @@
require 'puppet/interface/action'
+require 'puppet/interface/action_builder'
module Puppet::Interface::ActionManager
# Declare that this app can take a specific action, and provide
# the code to do so.
def action(name, &block)
- require 'puppet/interface/action_builder'
-
@actions ||= {}
raise "Action #{name} already defined for #{self}" if action?(name)
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index 5548f40fb..c0d5756f1 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -645,9 +645,9 @@ class Puppet::Network::Handler
nil
end
+ require 'puppet/file_serving'
+ require 'puppet/file_serving/fileset'
def reclist(abspath, recurse, ignore)
- require 'puppet/file_serving'
- require 'puppet/file_serving/fileset'
if recurse.is_a?(Fixnum)
args = { :recurse => true, :recurselimit => recurse, :links => :follow }
else
diff --git a/lib/puppet/parser/functions/fqdn_rand.rb b/lib/puppet/parser/functions/fqdn_rand.rb
index 93ab98bcd..dd8d56800 100644
--- a/lib/puppet/parser/functions/fqdn_rand.rb
+++ b/lib/puppet/parser/functions/fqdn_rand.rb
@@ -1,3 +1,5 @@
+require 'digest/md5'
+
Puppet::Parser::Functions::newfunction(:fqdn_rand, :type => :rvalue, :doc =>
"Generates random numbers based on the node's fqdn. Generated random values
will be a range from 0 up to and excluding n, where n is the first parameter.
@@ -5,7 +7,6 @@ Puppet::Parser::Functions::newfunction(:fqdn_rand, :type => :rvalue, :doc =>
$random_number = fqdn_rand(30)
$random_number_seed = fqdn_rand(30,30)") do |args|
- require 'digest/md5'
max = args.shift
srand(Digest::MD5.hexdigest([lookupvar('::fqdn'),args].join(':')).hex)
rand(max).to_s
diff --git a/lib/puppet/parser/functions/md5.rb b/lib/puppet/parser/functions/md5.rb
index f7a4f7222..864aae048 100644
--- a/lib/puppet/parser/functions/md5.rb
+++ b/lib/puppet/parser/functions/md5.rb
@@ -1,5 +1,5 @@
-Puppet::Parser::Functions::newfunction(:md5, :type => :rvalue, :doc => "Returns a MD5 hash value from a provided string.") do |args|
- require 'md5'
+require 'md5'
+Puppet::Parser::Functions::newfunction(:md5, :type => :rvalue, :doc => "Returns a MD5 hash value from a provided string.") do |args|
Digest::MD5.hexdigest(args[0])
end
diff --git a/lib/puppet/parser/functions/sha1.rb b/lib/puppet/parser/functions/sha1.rb
index 1e7d5abe4..c52df4d28 100644
--- a/lib/puppet/parser/functions/sha1.rb
+++ b/lib/puppet/parser/functions/sha1.rb
@@ -1,5 +1,5 @@
-Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc => "Returns a SHA1 hash value from a provided string.") do |args|
- require 'digest/sha1'
+require 'digest/sha1'
+Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc => "Returns a SHA1 hash value from a provided string.") do |args|
Digest::SHA1.hexdigest(args[0])
end
diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb
index 8105e2cac..5e4b00e1e 100644
--- a/lib/puppet/parser/functions/template.rb
+++ b/lib/puppet/parser/functions/template.rb
@@ -5,8 +5,6 @@ Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
Note that if multiple templates are specified, their output is all
concatenated and returned as the output of the function.") do |vals|
- require 'erb'
-
vals.collect do |file|
# Use a wrapper, so the template can't get access to the full
# Scope object.
diff --git a/lib/puppet/parser/type_loader.rb b/lib/puppet/parser/type_loader.rb
index 65579a820..861a098a5 100644
--- a/lib/puppet/parser/type_loader.rb
+++ b/lib/puppet/parser/type_loader.rb
@@ -1,3 +1,4 @@
+require 'find'
require 'puppet/node/environment'
class Puppet::Parser::TypeLoader
@@ -93,8 +94,6 @@ class Puppet::Parser::TypeLoader
end
def import_all
- require 'find'
-
module_names = []
# Collect the list of all known modules
environment.modulepath.each do |path|
diff --git a/lib/puppet/rails/benchmark.rb b/lib/puppet/rails/benchmark.rb
index e1e92bb79..741b6d5bd 100644
--- a/lib/puppet/rails/benchmark.rb
+++ b/lib/puppet/rails/benchmark.rb
@@ -1,4 +1,6 @@
require 'benchmark'
+require 'yaml'
+
module Puppet::Rails::Benchmark
$benchmarks = {:accumulated => {}}
@@ -50,8 +52,6 @@ module Puppet::Rails::Benchmark
file = "/tmp/time_debugging.yaml"
- require 'yaml'
-
if FileTest.exist?(file)
data = YAML.load_file(file)
else
diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb
index 89b0a16ed..e432d52a0 100644
--- a/lib/puppet/resource/type_collection.rb
+++ b/lib/puppet/resource/type_collection.rb
@@ -1,3 +1,5 @@
+require 'puppet/parser/type_loader'
+
class Puppet::Resource::TypeCollection
attr_reader :environment
attr_accessor :parse_failed
@@ -68,7 +70,6 @@ class Puppet::Resource::TypeCollection
end
def loader
- require 'puppet/parser/type_loader'
@loader ||= Puppet::Parser::TypeLoader.new(environment)
end
diff --git a/lib/puppet/ssl/base.rb b/lib/puppet/ssl/base.rb
index f9bbcac64..a5a94a7a1 100644
--- a/lib/puppet/ssl/base.rb
+++ b/lib/puppet/ssl/base.rb
@@ -1,3 +1,4 @@
+require 'openssl/digest'
require 'puppet/ssl'
# The base class for wrapping SSL instances.
@@ -55,8 +56,6 @@ class Puppet::SSL::Base
end
def fingerprint(md = :MD5)
- require 'openssl/digest'
-
# ruby 1.8.x openssl digest constants are string
# but in 1.9.x they are symbols
mds = md.to_s.upcase
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb
index 8051d01af..246ff5fc3 100644
--- a/lib/puppet/util/autoload.rb
+++ b/lib/puppet/util/autoload.rb
@@ -128,9 +128,11 @@ class Puppet::Util::Autoload
end
def module_directories(env=nil)
- # We have to require this late in the process because otherwise we might have
- # load order issues.
- require 'puppet/node/environment'
+ # We have to require this late in the process because otherwise we might
+ # have load order issues. Since require is much slower than defined?, we
+ # can skip that - and save some 2,155 invocations of require in my real
+ # world testing. --daniel 2012-07-10
+ require 'puppet/node/environment' unless defined?(Puppet::Node::Environment)
real_env = Puppet::Node::Environment.new(env)
diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb
index dd90caa5f..a505bfc72 100644
--- a/lib/puppet/util/checksums.rb
+++ b/lib/puppet/util/checksums.rb
@@ -1,3 +1,6 @@
+require 'digest/md5'
+require 'digest/sha1'
+
# A stand-alone module for calculating checksums
# in a generic way.
module Puppet::Util::Checksums
@@ -24,7 +27,6 @@ module Puppet::Util::Checksums
# Calculate a checksum using Digest::MD5.
def md5(content)
- require 'digest/md5'
Digest::MD5.hexdigest(content)
end
@@ -35,8 +37,6 @@ module Puppet::Util::Checksums
# Calculate a checksum of a file's content using Digest::MD5.
def md5_file(filename, lite = false)
- require 'digest/md5'
-
digest = Digest::MD5.new
checksum_file(digest, filename, lite)
end
@@ -47,7 +47,6 @@ module Puppet::Util::Checksums
end
def md5_stream(&block)
- require 'digest/md5'
digest = Digest::MD5.new
yield digest
digest.hexdigest
@@ -74,7 +73,6 @@ module Puppet::Util::Checksums
# Calculate a checksum using Digest::SHA1.
def sha1(content)
- require 'digest/sha1'
Digest::SHA1.hexdigest(content)
end
@@ -85,8 +83,6 @@ module Puppet::Util::Checksums
# Calculate a checksum of a file's content using Digest::SHA1.
def sha1_file(filename, lite = false)
- require 'digest/sha1'
-
digest = Digest::SHA1.new
checksum_file(digest, filename, lite)
end
@@ -97,7 +93,6 @@ module Puppet::Util::Checksums
end
def sha1_stream
- require 'digest/sha1'
digest = Digest::SHA1.new
yield digest
digest.hexdigest
diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb
index b8bbbe6af..fa20de1b9 100644
--- a/lib/puppet/util/diff.rb
+++ b/lib/puppet/util/diff.rb
@@ -1,3 +1,5 @@
+require 'tempfile'
+
# Provide a diff between two strings.
module Puppet::Util::Diff
include Puppet::Util
@@ -64,7 +66,6 @@ module Puppet::Util::Diff
end
def string_file_diff(path, string)
- require 'tempfile'
tempfile = Tempfile.new("puppet-diffing")
tempfile.open
tempfile.print string
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index fdc6ccd9b..51b0d9175 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -2,6 +2,7 @@
# to see here.
require 'puppet/util/selinux'
+require 'tempfile'
require 'fileutils'
class Puppet::Util::FileType
@@ -103,7 +104,6 @@ class Puppet::Util::FileType
# Overwrite the file.
def write(text)
- require "tempfile"
tf = Tempfile.new("puppet")
tf.print text; tf.flush
FileUtils.cp(tf.path, @path)
@@ -223,7 +223,6 @@ class Puppet::Util::FileType
# and the text with which to create the cron tab.
def write(text)
puts text
- require "tempfile"
output_file = Tempfile.new("puppet")
fh = output_file.open
fh.print text
@@ -262,7 +261,6 @@ class Puppet::Util::FileType
# Overwrite a specific @path's cron tab; must be passed the @path name
# and the text with which to create the cron tab.
def write(text)
- require "tempfile"
output_file = Tempfile.new("puppet")
fh = output_file.open
fh.print text
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
index 6028aef29..5395a8ef9 100644
--- a/lib/puppet/util/run_mode.rb
+++ b/lib/puppet/util/run_mode.rb
@@ -1,3 +1,5 @@
+require 'etc'
+
module Puppet
module Util
class RunMode
@@ -71,7 +73,6 @@ module Puppet
end
def expand_path( dir )
- require 'etc'
ENV["HOME"] ||= Etc.getpwuid(Process.uid).dir
File.expand_path(dir)
end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index f270c40e2..513078d34 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -1,3 +1,4 @@
+require 'facter'
require 'puppet/util/warnings'
require 'forwardable'
require 'etc'
@@ -17,7 +18,6 @@ module Puppet::Util::SUIDManager
def osx_maj_ver
return @osx_maj_ver unless @osx_maj_ver.nil?
- require 'facter'
# 'kernel' is available without explicitly loading all facts
if Facter.value('kernel') != 'Darwin'
@osx_maj_ver = false
diff --git a/lib/puppet/util/windows/user.rb b/lib/puppet/util/windows/user.rb
index 6722a0e2e..0f3232369 100644
--- a/lib/puppet/util/windows/user.rb
+++ b/lib/puppet/util/windows/user.rb
@@ -1,14 +1,13 @@
require 'puppet/util/windows'
require 'win32/security'
+require 'facter'
module Puppet::Util::Windows::User
include Windows::Security
extend Windows::Security
def admin?
- require 'facter'
-
majversion = Facter.value(:kernelmajversion)
return false unless majversion
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-28 19:20:54 +0000