lib/hyla/configuration.rb in hyla-1.0.7.pre.8 vs lib/hyla/configuration.rb in hyla-1.0.7.pre.9

@@ -11,11 +11,10 @@
         'watch_dir' => '.',
         'watch_ext' => %w(ad adoc asc asciidoc txt index),
 
         # Asciidoctor
         'backend' => 'html5',
-        'eruby' => 'erb',
         'doctype' => 'article',
         'compact' => false,
         'to_dir' => '.',
         'to_file' => '',
         'attributes' => {
@@ -152,34 +151,38 @@
       override[:attributes] = extracted_attributes if extracted_attributes
 
       extracted_email_attributes = self.extract_attributes(override[:email_attributes]) if override[:email_attributes]
       override[:email_attributes] = extracted_email_attributes if extracted_email_attributes
 
-      # Stringify keys of the hash that we receive from Hyla
+      # Stringify keys of the hash
       override = Configuration[override].stringify_keys
       Hyla::logger2.debug("OVERRIDE Keys: #{override.inspect}")
-
-      # Clone DEFAULTS
+      
+      # Config 
       config = DEFAULTS
       Hyla::logger2.debug("DEFAULTS Keys: #{config.inspect}")
 
       #
-      # Read the config file passed as parameter if it exists
-      # otherwise read default _config.yaml file if it exists and
-      # merge content with DEFAULT config
+      # Check if config parameter was passed and split content which is a list of files
+      # Read each config file and merge content with DEFAULTS
+      # Otherwise, check if there is a _config.yaml
       #
-      alt_config = read_config_file(override['config']) if override['config']
-      if !alt_config.nil?
-        config = config.deep_merge(alt_config)
+      configs = override['config'].split(",").map(&:strip) if override['config']
+      if !configs.nil? && !configs.empty?
+        configs.each do |cfg_file|
+          cfg = read_config_file(cfg_file)
+          config = config.deep_merge(cfg)
+        end
       else
         new_config = read_config_file(YAML_CONFIG_FILE_NAME)
         Hyla::logger2.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
-        config = config.deep_merge(new_config) if !new_config.nil?
+        config = config.deep_merge(new_config) if !new_config.nil? && !new_config.empty?
       end
 
-      # Merge DEFAULTS < _config.yaml or your_config.yaml file < override
+      # Merge files with parameters  coming from the cmd line
       config = config.deep_merge(override)
+      Hyla::logger2.debug("DEFAULTS Keys: #{config.inspect}")
       # Convert String Keys to Symbols Keys
       config = Configuration[].transform_keys_to_symbols(config)
       Hyla::logger2.debug("Merged Keys: #{config.inspect}")
       return config
     end
@@ -190,11 +193,12 @@
     def self.read_config_file(filename)
       f = File.expand_path(filename)
       Hyla::logger2.info("Config file to be parsed : #{f}")
       safe_load_file(f)
     rescue SystemCallError
-      Hyla::logger2.error "No configuration file retrieved for the name : #{filename}"
+      Hyla::logger2.error "No configuration file retrieved for : #{filename}"
+      exit
     end
 
     #
     # Load Safely YAML File
     #
@@ -248,11 +252,11 @@
                     end
         result[new_key] = new_value
         result
       }
     end
-    
+
     ASSETS = '../../lib/resources/assets'
 
     FONTS = '../../lib/resources/assets/fonts'
 
     STYLES = '../../lib/resources/assets/styles'
@@ -268,28 +272,28 @@
     SAMPLES = '../../lib/templates/sample'
 
     BACKENDS = '../../lib/resources/backends'
 
     COVER_TEMPLATE = '../../lib/resources/assets/cover/cover.slim'
-    
+
     NEW_COVER_TEMPLATE = '../../lib/resources/assets/cover/new_cover.slim'
 
-    ASSESSMENT_TXT = File.open(self.templates + '/course/assessment.txt','r').read
+    ASSESSMENT_TXT = File.open(self.templates + '/course/assessment.txt', 'r').read
 
-    LABS_TXT = File.open(self.templates + '/course/labinstructions.txt','r').read
+    LABS_TXT = File.open(self.templates + '/course/labinstructions.txt', 'r').read
 
-    INDEX = File.open(self.templates + '/course/index.txt','r').read
+    INDEX = File.open(self.templates + '/course/index.txt', 'r').read
 
-    HEADER_INDEX = File.open(self.templates + '/course/header_index.txt','r').read
+    HEADER_INDEX = File.open(self.templates + '/course/header_index.txt', 'r').read
 
-    FOOTER_TXT = File.open(self.templates + '/course/footer.txt','r').read
+    FOOTER_TXT = File.open(self.templates + '/course/footer.txt', 'r').read
 
-    COVER_TXT = File.open(self.templates + '/course/cover.txt','r').read
+    COVER_TXT = File.open(self.templates + '/course/cover.txt', 'r').read
 
-    OBJECTIVES_TXT = File.open(self.templates + '/course/objectives.txt','r').read
+    OBJECTIVES_TXT = File.open(self.templates + '/course/objectives.txt', 'r').read
 
-    SUMMARY_TXT = File.open(self.templates + '/course/summary.txt','r').read
+    SUMMARY_TXT = File.open(self.templates + '/course/summary.txt', 'r').read
 
-    AUDIO_TXT = File.open(self.templates + '/course/audio.txt','r').read
+    AUDIO_TXT = File.open(self.templates + '/course/audio.txt', 'r').read
 
   end # Class Configuration
 end # module Hyla
\ No newline at end of file