lib/settings.rb in capucine-0.2.5 vs lib/settings.rb in capucine-0.2.9

@@ -45,38 +45,47 @@
 
       if self.user_config_file
         additional = YAML::load_file(self.user_config_file)
       end
 
-
       if additional
+        blocs = %w{compass}
+
         additional.each do |k, v|
-          self.conf[k] = v
+
+          if blocs.include?(k)
+            for k2, v2 in v
+              self.conf[k][k2] = v2
+            end
+          else
+            self.conf[k] = v
+          end
         end
       end
 
       check_valid
       return self
     end
 
     def check_valid
+      # puts self.conf['use_compass']
 
-      expand_coffee_out = File.join self.working_dir, self.conf['coffeescript_output_dir']
-      expand_coffee_in = File.join self.working_dir, self.conf['coffeescript_files_dir']
+      # expand_coffee_out = File.join self.working_dir, self.conf['coffeescript_output_dir']
+      # expand_coffee_in = File.join self.working_dir, self.conf['coffeescript_files_dir']
 
-      expand_sass_out = File.join self.working_dir, self.conf['sass_output_dir']
-      expand_sass_in = File.join self.working_dir, self.conf['sass_files_dir']
+      # expand_sass_out = File.join self.working_dir, self.conf['compass']
+      # expand_sass_in = File.join self.working_dir, self.conf['compass']
 
-      if expand_coffee_out == self.working_dir or expand_coffee_in == self.working_dir or expand_coffee_in == expand_coffee_out
-        puts 'Illegal path for CoffeeScript'
-        Process.exit
-      end
+      # if expand_coffee_out == self.working_dir or expand_coffee_in == self.working_dir or expand_coffee_in == expand_coffee_out
+      #   puts 'Illegal path for CoffeeScript'
+      #   Process.exit
+      # end
 
 
-      if expand_sass_out == self.working_dir or expand_sass_in == self.working_dir or expand_sass_in == expand_sass_out
-        puts 'Illegal path for Sass'
-        Process.exit
-      end
+      # if expand_sass_out == self.working_dir or expand_sass_in == self.working_dir or expand_sass_in == expand_sass_out
+      #   puts 'Illegal path for Sass'
+      #   Process.exit
+      # end
     end
 
   end
 end