aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-01-06 14:41:07 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-01-06 14:41:07 +0000
commitf090ac12bcc1b1c5541983a87ba5fed9d9b60b83 (patch)
tree39cfec22f3952199c0931f07b75f3d7cb47a7c79 /lib
parent1cda480143fd0ab6b7d743cba470f2ac65e46194 (diff)
parent11958b7b4fa9da53ac27729bd95df8d9db525435 (diff)
merge
Diffstat (limited to 'lib')
-rw-r--r--lib/object_builder.rb87
1 files changed, 55 insertions, 32 deletions
diff --git a/lib/object_builder.rb b/lib/object_builder.rb
index e012b5a..26dd1a5 100644
--- a/lib/object_builder.rb
+++ b/lib/object_builder.rb
@@ -66,6 +66,13 @@ class ObjectBuilder
"anon.#{Time.now.to_i}.#{@@sequence}"
end
+ def set_directory_if_not_set(file_or_directory)
+ if File.file?(file_or_directory)
+
+
+ end
+ end
+
#
# Merge a file into self. If the file is a relative path, it is relative to
# the file from which it has been included.
@@ -80,40 +87,34 @@ class ObjectBuilder
# @returns [ObjectBuilder] self
def include_file(file)
#
- # Share the current directory with all instances of this class.
+ # Set the configuration directory just once. All config files are
+ # relative to this dir, unless otherwise specified.
#
- @@directory ||= nil
-
- #
- # Do we have an absolute path?
- #
- file = File.join(@@directory, file) if !@@directory.nil? and '/' != file[0,1]
- #
- # Resolve the filename.
- #
- file = File.expand_path(file)
+ unless defined? @@directory
+ #
+ # Resolve the filename.
+ #
+ file = File.expand_path(file)
- #
- # Save the current wd
- #
- oldwd = @@directory
+ #
+ # Set the new one
+ #
+ @@directory = File.dirname(file)
+ else
+ #
+ # Do we have an absolute path?
+ #
+ file = File.join(@@directory, file) if '/' != file[0,1]
- #
- # Set the new one
- #
- @@directory = File.dirname(file)
+ file = File.expand_path(file)
+ end
#
# Read the file and eval it.
#
instance_eval(File.read(file), file)
- #
- # Reset back to where we were.
- #
- @@directory = oldwd
-
self
rescue NameError, NoMethodError => ex
#
@@ -126,7 +127,7 @@ class ObjectBuilder
else
raise ex
end
- rescue SyntaxError, ArgumentError => ex
+ rescue Errno::ENOENT, SyntaxError, ArgumentError => ex
if ex.backtrace.find{|l| l =~ /^#{file}:(\d+):/}
build_ex = BuildException.new "#{ex.message} in #{file} at line #{$1}"
build_ex.set_backtrace ex.backtrace
@@ -143,23 +144,45 @@ class ObjectBuilder
# @params [Regexp] regexp Regular expression for filename to include.
#
# @returns [ObjectBuilder] self
- def include_directory(dir, regex = /^[a-zA-Z0-9_-]+\.conf$/)
+ def include_directory(dir)
files = []
+
+ if defined? @@directory
+ #
+ # Do we have an absolute path?
+ #
+ dir = File.join(@@directory, dir) if '/' != dir[0,1]
+ end
+
#
- # Exceptions are caught by #include_file
+ # Resolve the filename.
#
- Dir.entries(dir).sort.each do |entry|
- next unless entry =~ regex
+ dir = File.expand_path(dir)
- file = File.join(dir,entry)
- next unless File.file?(file)
+ #
+ # Exceptions are caught by #include_file
+ #
+ Dir.glob(dir).sort.each do |entry|
+ #file = File.join(dir,entry)
+ #pp file
+ #next unless File.file?(file)
- include_file(file)
+ self.include(entry)
end
self
end
+ def include(file_or_directory)
+
+
+ if File.file?(file_or_directory)
+ include_file(file_or_directory)
+ else
+ include_directory(file_or_directory)
+ end
+ end
+
class << self
# Defines a new builder