config.rb in noe-1.4.0

- old
+ new
@@ -1,60 +1,88 @@
 module Noe
   class Config
     
+    # Path to the default configuration file
+    DEFAULT_CONFIG_FILE = File.expand_path('../default.yaml', __FILE__)
+    
     # Default configuration hash
-    DEFAULT_CONFIG = {
-      'version'       => Noe::VERSION,
-      'templates-dir' => File.expand_path('../../../templates', __FILE__),
-      'default'       => 'ruby'
-    }
+    DEFAULT_CONFIG = YAML::load(File.read(DEFAULT_CONFIG_FILE)).merge(
+      'config_file' => DEFAULT_CONFIG_FILE,
+      'version'     => Noe::VERSION)
     
-    # Path to the configuration file
-    attr_reader :file
-    
     # Loaded configuration hash
     attr_reader :config
     
+    # Creates a config instance with a loaded Hash
+    def initialize(config)
+      @config = DEFAULT_CONFIG.merge(config)
+    end
+    
     # Creates a config instance from some .noerc file
-    def initialize(file = nil)
-      @config = DEFAULT_CONFIG
-      @file = file
-      __load unless file.nil?
+    def self.new(arg = DEFAULT_CONFIG)
+      case arg
+      when Hash
+        super
+      when String
+        __load_from_file(arg)
+      when NilClass
+        super(DEFAULT_CONFIG)
+      else
+        raise ArgumentError, "Unable to load config from #{arg}"
+      end
     end
     
     # Loads configuration from YAML file
-    def __load
-      if File.file?(file) and File.readable?(file)
-        loaded = YAML::load(File.read(file))
-        if loaded.is_a?(Hash)
-          @config.merge!(loaded)
-        else
-          raise Noe::Error, "Corrupted or invalid config file: #{file}"
-        end
-      else
+    def self.__load_from_file(file)
+      # check loaded file
+      file = File.expand_path(file)
+      unless File.file?(file) and File.readable?(file)
         raise Noe::Error, "Not a file or not readable: #{file}"
       end
+
+      # load YAML
+      loaded = YAML::load(File.read(file))
+      unless loaded.is_a?(Hash)
+        raise Noe::Error, "Corrupted or invalid config file: #{file}"
+      end
+
+      # Build the config
+      config_hash = loaded.merge('config_file' => file)
+      config = Config.new(config_hash)
+      
+      # Some sanity check
+      templates_dir = config.templates_dir
+      unless File.directory?(templates_dir) and File.readable?(templates_dir)
+        raise Noe::Error, "Invalid noe config, not a directory or unreadable: #{templates_dir}"
+      end
+      
+      config
     end
     
-    # Returns folder where templates are located
+    # Returns the path of the config file itself
+    def file
+      config['config_file']
+    end
+    
+    # Returns folder where templates are located. Always returns an 
+    # absolute path.
     def templates_dir
-      dir = config['templates-dir']
-      if File.directory?(dir) and File.readable?(dir)
-        dir
-      else
-        raise Noe::Error, "Invalid noe config, not a directory or unreadable: #{dir}"
-      end
+      @templates_dir ||= File.expand_path(config['templates-dir'], File.dirname(file))
     end
     
+    # Returns expected noe's version
+    def noe_version
+      config['version']
+    end
+    
     # Returns the name of the default template to use
     def default
       config['default']
     end
     
     # Sets the name of the default template to use
     def default=(name)
       config['default'] = name
     end
      
-    private :__load
   end # class Config
-end # module Noe
\ No newline at end of file
+end # module Noe