djinn 0.1.2 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/djinn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djinn}
-  s.version = "0.1.2"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Paterson"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-10-13}
   s.description = %q{Helper for creating simple custom daemons}
   s.email = %q{darksavant@gmail.com}
   s.extra_rdoc_files = [

data/lib/djinn/base/dsl.rb

@@ -73,9 +73,14 @@ module Djinn
           end
           yield options if block_given?
           options.parse!
+          #Apply defaults
+          @config_items.each do |ci|
+            config[ci.key] = ci.default_value if ci.has_default? unless config.include?(ci.key)
+          end
+          # Check for missing arguments
           @config_items.each do |ci|
             if ci.required?
-              puts "Missing argument: #{ci.key}\n\n#{opts}"
+              puts "Missing argument: #{ci.key}\n\n#{options}"
               exit(1)
             end unless config.include?(ci.key) or config.include?(:__stop)
           end
@@ -122,6 +127,16 @@ module Djinn
         def required?
           @required
         end
+        
+        def default d
+          @default = d
+        end
+        
+        def default_value; @default; end
+        
+        def has_default?
+          !@default.nil?
+        end
                 
         # Parse the individual configuration option
         def parse! opts, config
@@ -130,6 +145,7 @@ module Djinn
           switches = []
           switches << (defined?(@short_switch) && @short_switch) ? @short_switch : nil
           switches << (defined?(@long_switch) && @long_switch) ? @long_switch : nil
+          @description = "#{@description} (Default: #{@default})" if @default
           opts.on(switches[0], switches[1], @description) do |o|
             config[@key] = o
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djinn
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Craig Paterson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency