0
@@ -28,5 +28,4 @@ Spec::Rake::SpecTask.new("specs") do |t|
0
   t.spec_files = Dir["spec/**/*_spec.rb"].sort
0
 end
0
 
0
-desc "Generate documentation"
0
 YARD::Rake::YardocTask.new
0
\ No newline at end of file

0
@@ -26,6 +26,14 @@ module YARD
0
       
0
       def optparse(*args)
0
         opts = OptionParser.new
0
+
0
+        opts.separator ""
0
+        opts.separator "General Options:"
0
+
0
+        opts.on('-b', '--db FILE', 'Use a specified .yardoc db to load from or save to. (defaults to .yardoc)') do |yfile|
0
+          YARD::Registry.yardoc_file = yfile
0
+        end
0
+
0
         opts.on('--full', 'Full class diagrams (show methods and attributes).') do
0
           options[:full] = true
0
         end
0
@@ -34,32 +42,32 @@ module YARD
0
           options[:dependencies] = true
0
         end
0
         
0
-        opts.on('--dot [OPTIONS]', 'Send the results direclty to `dot` with optional arguments.') do |dotopts|
0
-          options[:serializer] = Serializers::ProcessSerializer.new('dot ' + dotopts.to_s)
0
-        end
0
-        
0
-        opts.on('-f', '--file [FILE]', 'Writes output to a file instead of stdout.') do |file|
0
-          options[:serializer] = Serializers::FileSystemSerializer.new(:basepath => '.', :extension => nil)
0
-          options[:serializer].instance_eval "def serialized_path(object) #{file.inspect} end"
0
+        opts.on('--no-public', "Don't show public methods. (default shows public)") do 
0
+          options[:visibility].delete(:public)
0
         end
0
 
0
-        opts.on('--[no-]public', "Show or don't show public methods (default shows public)") do |value|
0
-          options[:visibility].send(value ? :push : :delete, :public) 
0
+        opts.on('--protected', "Show or don't show protected methods. (default hides protected)") do
0
+          options[:visibility].push(:protected)
0
         end
0
 
0
-        opts.on('--[no-]protected', "Show or don't show protected methods (default hides protected)") do |value|
0
-          options[:visibility].send(value ? :push : :delete, :protected) 
0
+        opts.on('--private', "Show or don't show private methods. (default hides private)") do 
0
+          options[:visibility].push(:private) 
0
         end
0
 
0
-        opts.on('--[no-]private', "Show or don't show private methods (default hides private)") do |value|
0
-          options[:visibility].send(value ? :push : :delete, :private) 
0
-        end
0
+        opts.separator ""
0
+        opts.separator "Output options:"
0
 
0
-        opts.on('-t', '--template [TEMPLATE]', 
0
-                'The template to use (defaults to "default")') do |template|
0
-          options[:template] = template.to_sym
0
+        opts.on('--dot [OPTIONS]', 'Send the results direclty to `dot` with optional arguments.') do |dotopts|
0
+          options[:serializer] = Serializers::ProcessSerializer.new('dot ' + dotopts.to_s)
0
+        end
0
+        
0
+        opts.on('-f', '--file [FILE]', 'Writes output to a file instead of stdout.') do |file|
0
+          options[:serializer] = Serializers::FileSystemSerializer.new(:basepath => '.', :extension => nil)
0
+          options[:serializer].instance_eval "def serialized_path(object) #{file.inspect} end"
0
         end
0
         
0
+        opts.separator ""
0
+        opts.separator "Other options:"
0
         opts.on_tail('-q', '--quiet', 'Show no warnings') { log.level = Logger::ERROR }
0
         opts.on_tail('--verbose', 'Show debugging information') { log.level = Logger::DEBUG }
0
         opts.on_tail('-v', '--version', 'Show version.') { puts "yard #{YARD::VERSION}"; exit }

0
@@ -22,6 +22,7 @@ module YARD
0
       end
0
       
0
       def define
0
+        desc "Generate YARD Documentation"
0
         task(name) { YARD::CLI::Yardoc.run *(options + files) }
0
       end
0
     end

0
@@ -1,7 +1,7 @@
0
 SPEC = Gem::Specification.new do |s|
0
   s.name          = "yard"
0
   s.version       = "0.2.2"
0
-  s.date          = "2008-05-20"
0
+  s.date          = "2008-05-16"
0
   s.author        = "Loren Segal"
0
   s.email         = "lsegal@soen.ca"
0
   s.homepage      = "http://yard.soen.ca"
0
@@ -12,5 +12,5 @@ SPEC = Gem::Specification.new do |s|
0
   s.executables   = [ 'yardoc', 'yri', 'yard-graph' ]
0
   s.has_rdoc      = false
0
   s.rubyforge_project = 'yard'
0
-  s.add_dependency 'tadpole' 
0
+  #s.add_dependency 'tadpole' 
0
 end
0
\ No newline at end of file