optitron 0.0.7 → 0.0.8

data/lib/optitron/dsl.rb

@@ -2,7 +2,18 @@ class Optitron
   class Dsl
 
     def initialize(parser, &blk)
-      RootParserDsl.new(parser).configure_with(blk)
+      root = RootParserDsl.new(parser)
+      root.configure_with(blk)
+      root.unclaimed_opts.each do |opt_option|
+        name = opt_option.name
+        if !root.short_opts.key?(name[0].chr)
+          opt_option.short_name = name[0].chr
+          root.short_opts[name[0].chr] = opt_option
+        elsif !root.short_opts.key?(name.upcase[0].chr)
+          opt_option.short_name = name.upcase[0].chr
+          root.short_opts[name.upcase[0].chr] = opt_option
+        end
+      end
     end
 
     class AbstractDsl
@@ -12,13 +23,12 @@ class Optitron
       
       def opt(name, description = nil, opts = nil)
         opt_option = Option::Opt.new(name, description, opts)
-        if !short_opts.include?(name[0])
-          opt_option.short_name = name[0].chr
-          short_opts << name[0]
-        elsif !short_opts.include?(name.upcase[0])
-          opt_option.short_name = name.upcase[0].chr
-          short_opts << name.upcase[0]
+        if opt_option.short_name
+          short_opts[opt_option.short_name] = opt_option
+        else
+          unclaimed_opts << opt_option
         end
+        
         @target.options << opt_option
       end
       
@@ -33,6 +43,10 @@ class Optitron
       def short_opts
         @root_dsl.short_opts
       end
+      
+      def unclaimed_opts
+        @root_dsl.unclaimed_opts
+      end
     end
 
     class CmdParserDsl < AbstractDsl
@@ -43,12 +57,16 @@ class Optitron
     end
     
     class RootParserDsl < AbstractDsl
-      attr_reader :short_opts
+      attr_reader :unclaimed_opts
       def initialize(parser)
-        @short_opts = []
         @target = parser
+        @unclaimed_opts = []
       end
-      
+
+      def short_opts
+        @target.short_opts
+      end
+
       def cmd(name, description = nil, opts = nil, &blk)
         command_option = Option::Cmd.new(name, description, opts)
         CmdParserDsl.new(self, command_option).configure_with(blk) if blk

data/lib/optitron/option.rb

@@ -68,6 +68,7 @@ class Optitron
         end
         @name, @desc = name, desc
         @type = opts && opts[:type] || :boolean
+        self.short_name = opts[:short_name] if opts && opts[:short_name]
         self.inclusion_test = opts[:in] if opts && opts[:in]
         self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? false : nil)
       end

data/lib/optitron/parser.rb

@@ -1,11 +1,13 @@
 class Optitron
   class Parser
     attr_accessor :target
-    attr_reader :commands, :options, :args
+    attr_reader :commands, :options, :args, :short_opts
+    
     def initialize
       @options = []
       @commands = {}
       @args = []
+      @short_opts = {}
       @help = Help.new(self)
     end
 
@@ -14,7 +16,7 @@ class Optitron
     end
 
     def parse(args = ARGV)
-      tokens = Tokenizer.new(args).tokens
+      tokens = Tokenizer.new(self, args).tokens
       response = Response.new(self, tokens)
       options = @options 
       args = @args

data/lib/optitron/tokenizer.rb

@@ -1,8 +1,8 @@
 class Optitron
   class Tokenizer
     attr_reader :tokens
-    def initialize(opts)
-      @opts = opts
+    def initialize(parser, opts)
+      @parser, @opts = parser, opts
       tokenize
     end
 
@@ -16,12 +16,26 @@ class Optitron
           case t
           when /^--([^=]+)=([^=]+)$/ then NamedWithValue.new($1, $2)
           when /^--([^=]+)$/         then NamedWithValue.new($1, nil)
-          when /^-(.*)/              then $1.split('').map{|letter| Named.new(letter)}
+          when /^-(.*)/              then find_names_values($1)
           else                            Value.new(t)
           end
         }
         @tokens.flatten!
       end
     end
+    
+    def find_names_values(short)
+      toks = []
+      letters = short.split('')
+      while !letters.empty?
+        let = letters.shift
+        toks << Named.new(let)
+        if @parser.short_opts[let] && @parser.short_opts[let].type != :boolean && !letters.empty?
+          toks << Value.new(letters.join)
+          letters.clear
+        end
+      end
+      toks
+    end
   end
 end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/option_spec.rb

@@ -53,6 +53,22 @@ describe "Optitron::Parser options" do
     end
   end
 
+  context "auto assingment of short names" do
+    before(:each) do
+      @parser = Optitron.new {
+        opt "verbose", :short_name => 'v'
+        opt "vicious", :type => :string
+        opt "vendetta", :short_name => 'V'
+      }
+    end
+    
+    it "should parse '-Vv --vicious=what'" do
+      response = @parser.parse(%w(-Vv --vicious=what))
+      response.valid?.should be_true
+      response.params
+    end
+  end
+
   context "multiple options" do
     before(:each) do
       @parser = Optitron.new {
@@ -63,6 +79,10 @@ describe "Optitron::Parser options" do
       }
     end
     
+    it "should parse '-otest'" do
+      @parser.parse(%w(-otest)).params.should == {'option' => 'test', '1' => false, '2' => false, '3' => false}
+    end
+
     it "should parse '-123o test'" do
       @parser.parse(%w(-123o test)).params.should == {'option' => 'test', '1' => true, '2' => true, '3' => true}
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Joshua Hull