optitron 0.0.2 → 0.0.3

data/lib/optitron/option.rb

@@ -1,7 +1,8 @@
 class Optitron
   class Option
-    attr_accessor :required, :name, :default, :parameterize, :type, :desc
+    attr_accessor :required, :name, :default, :parameterize, :type, :desc, :has_default
     alias_method :required?, :required
+    alias_method :has_default?, :has_default
     alias_method :parameterize?, :parameterize
 
     TRUE_BOOLEAN_VALUES = [true, 't', 'T', 'true', 'TRUE']
@@ -9,6 +10,7 @@ class Optitron
     BOOLEAN_VALUES = TRUE_BOOLEAN_VALUES + FALSE_BOOLEAN_VALUES
 
     def default=(default)
+      @has_default = true unless default.nil?
       interpolate_type(default)
       @default = default
     end
@@ -21,6 +23,10 @@ class Optitron
         :boolean
       when Numeric
         :numeric
+      when Array
+        :array
+      when Hash
+        :hash
       end
     end
 
@@ -40,7 +46,7 @@ class Optitron
         Array(val)
       when :hash
         val.is_a?(Hash) ? val : raise
-      when :greedy, nil
+      when :greedy, nil, :string
         val
       else
         raise
@@ -55,7 +61,7 @@ class Optitron
         end
         @name, @desc = name, desc
         @type = opts && opts[:type] || :boolean
-        self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? true : nil)
+        self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? false : nil)
       end
 
       def match?(tok)
@@ -73,7 +79,7 @@ class Optitron
             elsif opt_tok.name == name and tokens[opt_tok_index].respond_to?(:val) and BOOLEAN_VALUES.include?(tokens[opt_tok_index].val)
               tokens.delete_at(opt_tok_index).val
             end
-            response.params_array << [self, value.nil? ? default : value]
+            response.params_array << [self, value.nil? ? !default : value]
           when :numeric
             value = if opt_tok.name == name and opt_tok.respond_to?(:value)
               opt_tok.value

data/lib/optitron/parser.rb

@@ -32,6 +32,7 @@ class Optitron
 
     def parse_options(tokens, options, response)
       options.each do |opt|
+        response.params[opt.name] = opt.default if opt.has_default?
         if opt_tok = tokens.find { |tok| opt.match?(tok) }
           opt_tok_index = tokens.index(opt_tok)
           opt.consume(response, tokens)

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/default_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Optitron::Parser defaults" do
+  it "should always send defaults unless you override them" do
+    @parser = Optitron.new {
+      opt 'ten', :default => 10
+      opt 'string', :default => 'string'
+      opt 'list', :default => ['one', 'two', 'three']
+      opt 'hash', :default => {'hey' => 'you'}
+    }
+    @parser.parse([]).params.should == {"list"=>["one", "two", "three"], "hash"=>{"hey"=>"you"}, "ten"=>10, "string"=>"string"}
+    @parser.parse(%w(--ten=123)).params.should == {"list"=>["one", "two", "three"], "hash"=>{"hey"=>"you"}, "ten"=>123, "string"=>"string"}
+    @parser.parse(%w(--list=three two one)).params.should == {"list"=>["three", "two", "one"], "hash"=>{"hey"=>"you"}, "ten"=>10, "string"=>"string"}
+  end
+end

data/spec/short_name_spec.rb

@@ -23,13 +23,13 @@ describe "Optitron::Parser short_name generation" do
 
     it "should parse '-s'" do
       response = @parser.parse(%w(-s))
-      response.params.should == {'something' => true}
+      response.params.should == {'something' => true, 'something-else' => false}
       response.valid?.should be_true
     end
 
     it "should parse '-S'" do
       response = @parser.parse(%w(-S))
-      response.params.should == {'something-else' => true}
+      response.params.should == {'something' => false, 'something-else' => true}
       response.valid?.should be_true
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -59,6 +59,7 @@ files:
 - lib/optitron/version.rb
 - optitron.gemspec
 - spec/arg_spec.rb
+- spec/default_spec.rb
 - spec/dispatch_spec.rb
 - spec/errors_spec.rb
 - spec/other_spec.rb