parseargs 0.2.0 → 0.3.0

data/lib/{parseargs-0.2.0.rb → parseargs-0.3.0.rb}

@@ -4,7 +4,7 @@ unless defined? $__parseargs__
     ParseArgs::LIBDIR = File::dirname(File::expand_path(__FILE__)) + File::SEPARATOR unless
       defined? ParseArgs::LIBDIR
 
-    ParseArgs::VERSION = '0.1.0' unless
+    ParseArgs::VERSION = '0.3.0' unless
       defined? ParseArgs::VERSION
 
     require 'enumerator'
@@ -173,22 +173,27 @@ unless defined? $__parseargs__
         instance_eval &b
 #--}}}
       end
-      def define_arguments(list, required, *descs)
+      def define(what, list, required, *descs)
 #--{{{
         unless descs.empty?
           metadata = descs.size >= 2 && Hash === descs.last ? descs.pop : {}
           descs.flatten!
-          mdefault ||= get_kw('default', metadata)
+          mdefault = get_kw('default', metadata)
           descs.each do |desc|
             names, default = Hash === desc ? desc.to_a.first : [desc, mdefault]
             req = default ? false : required
             names = [ names ] unless names.respond_to? :each
             names.each do |name|
-              list << Argument::new(name, metadata.merge('required'=>req,'default'=>default)) 
+              list << what::new(name, metadata.merge('required' => req,'default' => default)) 
             end
           end
         end
         list
+#--}}}
+      end
+      def define_arguments(list, required, *descs)
+#--{{{
+        define Argument, list, required, *descs
 #--}}}
       end
       def required_arguments(*descs)
@@ -233,20 +238,7 @@ unless defined? $__parseargs__
       alias oa optional_arguments
       def define_keywords(list, required, *descs)
 #--{{{
-        unless descs.empty?
-          metadata = descs.size >= 2 && Hash === descs.last ? descs.pop : {}
-          descs.flatten!
-          mdefault ||= get_kw('default', metadata)
-          descs.each do |desc|
-            names, default = Hash === desc ? desc.to_a.first : [desc, mdefault]
-            req = default ? false : required
-            names = [ names ] unless names.respond_to? :each
-            names.each do |name|
-              list << Keyword::new(name, metadata.merge('required'=>req,'default'=>default)) 
-            end
-          end
-        end
-        list
+        define Keyword, list, required, *descs
 #--}}}
       end
       def required_keywords(*descs)
@@ -272,7 +264,7 @@ unless defined? $__parseargs__
       def optional_keywords(*descs)
 #--{{{
         if descs.empty?
-          @required_keywords
+          @optional_keywords
         else
           define_keywords(@optional_keywords, false, *descs)
         end

data/lib/parseargs.rb

@@ -4,7 +4,7 @@ unless defined? $__parseargs__
     ParseArgs::LIBDIR = File::dirname(File::expand_path(__FILE__)) + File::SEPARATOR unless
       defined? ParseArgs::LIBDIR
 
-    ParseArgs::VERSION = '0.1.0' unless
+    ParseArgs::VERSION = '0.3.0' unless
       defined? ParseArgs::VERSION
 
     require 'enumerator'
@@ -173,22 +173,27 @@ unless defined? $__parseargs__
         instance_eval &b
 #--}}}
       end
-      def define_arguments(list, required, *descs)
+      def define(what, list, required, *descs)
 #--{{{
         unless descs.empty?
           metadata = descs.size >= 2 && Hash === descs.last ? descs.pop : {}
           descs.flatten!
-          mdefault ||= get_kw('default', metadata)
+          mdefault = get_kw('default', metadata)
           descs.each do |desc|
             names, default = Hash === desc ? desc.to_a.first : [desc, mdefault]
             req = default ? false : required
             names = [ names ] unless names.respond_to? :each
             names.each do |name|
-              list << Argument::new(name, metadata.merge('required'=>req,'default'=>default)) 
+              list << what::new(name, metadata.merge('required' => req,'default' => default)) 
             end
           end
         end
         list
+#--}}}
+      end
+      def define_arguments(list, required, *descs)
+#--{{{
+        define Argument, list, required, *descs
 #--}}}
       end
       def required_arguments(*descs)
@@ -233,20 +238,7 @@ unless defined? $__parseargs__
       alias oa optional_arguments
       def define_keywords(list, required, *descs)
 #--{{{
-        unless descs.empty?
-          metadata = descs.size >= 2 && Hash === descs.last ? descs.pop : {}
-          descs.flatten!
-          mdefault ||= get_kw('default', metadata)
-          descs.each do |desc|
-            names, default = Hash === desc ? desc.to_a.first : [desc, mdefault]
-            req = default ? false : required
-            names = [ names ] unless names.respond_to? :each
-            names.each do |name|
-              list << Keyword::new(name, metadata.merge('required'=>req,'default'=>default)) 
-            end
-          end
-        end
-        list
+        define Keyword, list, required, *descs
 #--}}}
       end
       def required_keywords(*descs)
@@ -272,7 +264,7 @@ unless defined? $__parseargs__
       def optional_keywords(*descs)
 #--{{{
         if descs.empty?
-          @required_keywords
+          @optional_keywords
         else
           define_keywords(@optional_keywords, false, *descs)
         end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: parseargs
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-10-23 00:00:00.000000 -06:00
+  version: 0.3.0
+date: 2005-10-24 00:00:00.000000 -06:00
 summary: parseargs
 require_paths: 
   - lib
@@ -30,7 +30,7 @@ authors:
   - Ara T. Howard
 files: 
   - lib/parseargs.rb
-  - lib/parseargs-0.2.0.rb
+  - lib/parseargs-0.3.0.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []