svutil 0.0.13 → 0.1.2

data/lib/svutil.rb

@@ -6,5 +6,5 @@ require 'svutil/log'
 require 'svutil/process_manager'
 
 module SVUtil
-  VERSION = '0.0.13'
+  VERSION = '0.1.2'
 end

data/lib/svutil/config.rb

@@ -7,10 +7,32 @@ module SVUtil
   def self.config
     Config.config_class
   end
- 
+
+  class Defaults
+    def initialize
+      @attrs = {}
+    end
+
+    def default_for(name)
+      @attrs[name]
+    end
+
+    private
+      def method_missing(method_id, *args)
+        @attrs ||= {}
+        if method_id.to_s =~ /=$/
+          @attrs[method_id.to_s[0...-1]] = args.first
+        end
+      end
+  end
+
   class Config
     class << self
       attr_writer :config_file
+      attr_reader :attrs
+      attr_reader :defaults
+      # Used mainly for testing
+      attr_accessor :option_source
 
       def config_class
       	subclasses_of(self).first || self
@@ -20,47 +42,17 @@ module SVUtil
 	      @config_file || 'settings'
       end
 
-      def load_and_parse
-        process_options
-        load_config_file
-        set_defaults
-        apply_all
-        validate
-      end
-
-      def set_defaults
-        # Overide this method in subclasses
-      end
-
-      def default(name, value)
-      	@temp_hash ||= {}
-        if !@temp_hash.has_key?(name) || @temp_hash[name].nil?
-          set(name, value)
+      def set(options = {})
+        @attrs ||= {}
+        if block_given?
+          yield self
         end
+        self.validate
       end
 
-      def set(name, value)
-      	@temp_hash ||= {}
-	      @temp_hash[name.to_s] = value
-      end
-
-      def apply(name, value)
-      	@hash ||= {}
-	      @hash[name.to_s] = value
-      end
-
-      def apply_all
-	      @hash ||= {}
-	      @hash.merge!(@temp_hash) if @temp_hash
-      end
-
-      def method_missing(method_id, *args)
-        return nil unless @hash
-        if method_id.to_s =~ /=$/
-          @hash[method_id.to_s[0...-1]] = args.first
-        else
-          @hash[method_id.to_s]
-        end
+      def defaults(&block)
+        @defaults ||= Defaults.new
+        yield @defaults
       end
 
       def validate
@@ -72,29 +64,52 @@ module SVUtil
         true
       end
 
-      def process_options
-        parse_options
-      end
-  
-      def parse_options
-        OptionParser.new do |opts|
-          opts.on("-f", "--config [filename]", "Config file to use (default 'settings')") do |filename|
-      	    self.config_file = filename
-    	    end
-          opts.on("-d", "--daemon", "Run in the background as a daemon") do
-            self.set(:daemon, true)
-          end
-          opts.on("-l", "--debug-log [log-file]", "Debug Log File") do |log|
-            self.set(log_file, log)
-          end
-          opts.on("-T", "--trace", "Display backtrace on errors") do
-            self.set(:trace, true)
-          end
-	        yield opts if block_given?
-	      end.parse!
+      def init
+        self.set do |c|
+          process_options
+          load_config_file
+        end
       end
 
+      protected
+        # Overide in subclasses for additional options
+        def process_options
+          parse_options
+        end
+
+        def parse_options(&block)
+          OptionParser.new do |opts|
+            opts.on("-f", "--config [filename]", "Config file to use (default 'settings')") do |filename|
+              self.config_file = filename.strip
+            end
+            opts.on("-d", "--daemon", "Run in the background as a daemon") do
+              self.daemon = true
+            end
+            opts.on("-l", "--debug-log [log-file]", "Debug Log File") do |log|
+              self.log_file = log
+            end
+            opts.on("-T", "--trace", "Display backtrace on errors") do
+              self.trace = true
+            end
+            yield opts if block_given?
+          end.parse!(self.option_source || ARGV)
+        end
+
       private
+        def method_missing(method_id, *args)
+          @attrs ||= {}
+          if method_id.to_s =~ /=$/
+            @attrs[method_id.to_s[0...-1]] = args.first
+          else
+            value = @attrs[method_id.to_s]
+            if !value && @defaults
+              @defaults.default_for(method_id.to_s)
+            else
+              value
+            end
+          end
+        end
+
         def load_config_file
           contents = ""
           File.open(config_file, "r") { |file| contents << file.read }
@@ -104,7 +119,7 @@ module SVUtil
               STDERR.puts "Invalid config file '#{config_file}'. Syntax error at line #{index + 1}"
               exit 1
             end
-            config_class.apply(pair[0].strip, pair[1].strip)
+            self.send("#{pair[0].strip}=", pair[1].strip)
           end
         end
 

data/test/test_config.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class CustomConfig < SVUtil::Config
+  defaults do |c|
+    c.foo = 'bar'
+  end
+end
+
+class TestConfig < Test::Unit::TestCase
+  include SVUtil
+
+  def setup
+  end
+  
+  def test_set
+    assert !Config.my_symbol
+    Config.my_symbol = 'abc'
+    assert_equal 'abc', Config.my_symbol
+    Config.my_var = 10
+    assert_equal 10, Config.my_var
+  end
+
+  def test_set_with_block
+    Config.expects(:validate).times(1)
+    Config.set do |c|
+      c.another = 'abc'
+      c.some_var = 123
+      c.foobar = true
+    end
+    assert_equal 'abc', Config.another
+    assert_equal 123, Config.some_var
+    assert Config.foobar
+  end
+
+  def test_standard_cli_options
+    Config.expects(:validate).times(1)
+    Config.option_source = [ "-f", "test/settings", "-d", "-l", "debug", "-T" ]
+    Config.init
+    assert_equal "test/settings", Config.config_file
+    assert_equal "debug", Config.log_file
+    assert Config.daemon
+    assert Config.trace
+  end
+
+  def test_config_file
+    Config.expects(:validate).times(1)
+    Config.config_file = "test/settings"
+    Config.init
+    assert_equal 'bar', Config.foo
+  end
+
+  # Command Line loses!
+  def test_file_overide
+    Config.expects(:validate).times(1)
+    Config.config_file = "test/settings"
+    Config.option_source = [ "-l", "logfile_set_on_cli" ]
+    Config.init
+    assert_equal "logfile_set_in_config_file", Config.log_file
+
+  end
+
+  def test_defaults
+    Config.defaults do |c|
+      c.manager = 'daniel'
+    end
+    assert_equal 'daniel', Config.manager
+    Config.manager = 'james'
+    assert_equal 'james', Config.manager
+  end
+
+  def test_validations
+
+  end
+
+  def test_custom_defaults
+    assert_equal 'bar', CustomConfig.foo
+  end
+end

data/test/test_defaults.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestDefaults < Test::Unit::TestCase
+  include SVUtil
+
+  def test_set
+    defaults = Defaults.new
+    assert !defaults.default_for('person')
+    defaults.person = 'daniel'
+    assert_equal 'daniel', defaults.default_for('person')
+  end
+end
+

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'stringio'
 require 'test/unit'
+require 'mocha'
 require File.dirname(__FILE__) + '/../lib/svutil'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 13
-  version: 0.0.13
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +10:30
+date: 2011-02-08 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 6
+        - 4
         - 0
-        version: 2.6.0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 description: A simple managed process builder for Ruby projects
@@ -100,5 +100,7 @@ signing_key:
 specification_version: 3
 summary: Simple Process Builder for Ruby
 test_files: 
+- test/test_config.rb
+- test/test_defaults.rb
 - test/test_helper.rb
 - test/test_svutil.rb