Make configuration a singleton and add new settings.

Author: expez

hatterrc

@@ -8,3 +8,9 @@ maildir = /path/to/maildir
 
 # The format of the maildir, e.g maildir or mbox
 maildir_format = maildir
+
+# Hatter relies on Termbox for the terminal UI
+termbox_library_path = /usr/lib/libtermbox.so
+
+# All the colors i Hatter can be customized:
+colors = {foreground => green, background => black}

lib/configuration.rb

@@ -1,18 +1,25 @@
 require 'configtoolkit'
 require 'configtoolkit/keyvaluereader'
+require 'relative'
 
 class Configuration < ConfigToolkit::BaseConfig
 
-  # Reads a configuration from file.
-  #
-  # @param [String] configPath the path to a configuration file.
-  #
-  # @return [Configuration] with values loaded from file.
-  def self.from_file configPath
-    reader = ConfigToolkit::KeyValueReader.new configPath
+  include Singleton
+
+  CONFIG_FILE = File.expand_path_relative_to_caller("../hatterrc")
+
+  def initialize config_file = CONFIG_FILE
+    reader = ConfigToolkit::KeyValueReader.new config_file
     load reader
   end
 
+  class Colors < ConfigToolkit::BaseConfig
+  add_required_param(:foreground, String)
+  add_required_param(:background, String)
+  end
+
   add_required_param(:maildir, String)
   add_required_param(:maildir_format, String)
+  add_required_param(:termbox_library_path, String)
+  add_required_param(:colors, Colors)
 end

spec/configuration_spec.rb

@@ -5,36 +5,37 @@
 describe 'Configuration' do
 
   before :all do
+    CONFIG_FILE = File.expand_path_relative_to_caller("../hatterrc")
     @maildir_path = "/path/to/maildir"
-    CONFIG_FILE = File.expand_path_relative_to_caller("../.hatterrc")
     @maildir_format = "maildir"
-    @config = Configuration.new() do |config|
-      config.maildir = @maildir_path
-      config.maildir_format = @maildir_format
-    end
+    @termbox_library_path = "/usr/lib/libtermbox.so"
   end
 
-  it "contains all the required configuration settings" do
-    @config.maildir?.should be_true
-    @config.maildir_format?.should be_true
+  it "barfs when required values are missing" do
+    config = File.read CONFIG_FILE
+    config.gsub!(/maildir/, 'asdf')
+    File.open("invalid_config", "w") {|file| file.write config}
+    expect {Configuration.instance "invalid_config"}.to raise_error
+    FileUtils::rm("invalid_config")
   end
 
-  it "the settings have the correct values" do
-    @config.maildir.should eq @maildir_path
-    @config.maildir_format.should eq @maildir_format
+  it "reads the configuration values from file" do
+    config = Configuration.instance
+    config.maildir.should eq @maildir_path
+    config.maildir_format.should eq @maildir_format
   end
 
-  it "reads the configuration values from file" do
-    config = Configuration.from_file CONFIG_FILE
+  it "the settings have the correct values" do
+    config = Configuration.instance
     config.maildir.should eq @maildir_path
     config.maildir_format.should eq @maildir_format
+    config.termbox_library_path.should eq @termbox_library_path
   end
 
-  it "barfs when required values are missing" do
-    config = File.read CONFIG_FILE
-    config.gsub!(/maildir/, 'asdf')
-    File.open("invalid_config", "w") {|file| file.write config}
-    expect {Configuration.from_file("invalid_config")}.to raise_error
-    FileUtils::rm("invalid_config")
+  it "contains a nested config with colors" do
+    config = Configuration.instance
+    config.colors.foreground.should eq "green"
+    config.colors.foreground.should eq "green"
   end
+
 end