lib/yowl/optionsparser.rb in yowl-0.4.pre vs lib/yowl/optionsparser.rb in yowl-0.4

@@ -1,22 +1,28 @@
 module YOWL
-  
   class OptionsParser
-  
     def self.parse(args_)
-      
+
+      if args_.size == 0
+        args_[0] = '--help'
+      end
+
       options = Options.new
-  
+
       opts = OptionParser.new do |opts|
         #
         # Set a banner, displayed at the top of the help screen.
         #
-        opts.banner = "Usage: YOWL [<options>]"
-  
-        opts.separator ""
+        opts.banner = <<-EOF
+#{YOWL::NAME_AND_VERSION}
+
+Usage: #{YOWL::NAME} [<options>]
+        
+EOF
+
         opts.separator "Specific options:"
-  
+
         opts.on('-i', '--ontology FILES', String, 'Read input FILES') do |ontology|
           options.ontology_file_names << ontology
           if args_.size > 0
             for index in 0..(args_.size - 1)
               arg = args_[index]
@@ -25,47 +31,50 @@
               end
               options.ontology_file_names << arg
             end
           end
         end
-   
+
         opts.on('-o', '--output DIR', 'Write HTML output to DIR') do |dir|
           options.output_dir = dir
         end
 
         opts.on('-t', '--template DIR', 'Use ERB templates in DIR') do |dir|
           options.template_dir = dir
         end
-        
+
         opts.on('--no-vann', 'Skip looking for vann:preferedNamespacePrefix') do |value|
           options.noVann = true
         end
 
         opts.separator ""
         opts.separator "Common options:"
-  
-        opts.on_tail("-?", "-h", "--help", "Show this message") do
+
+        opts.on("-?", "-h", "--help", "Show this message") do
           puts opts
-          return nil
+          exit
         end
-  
-        opts.on_tail("-V", "--version", "Show version") do
-          puts OptionParser::Version.join('.')
+
+        opts.on("-V", "--version", "Show version") do
+          puts YOWL::NAME_AND_VERSION
           exit
         end
 
-        opts.on_tail("-v", "--verbose", "Show verbose logging") do
+        opts.on("-v", "--verbose", "Show verbose logging") do
           options.verbose = true
         end
 
-        opts.on_tail("-q", "--quiet", "Suppress most logging") do
+        opts.on("-q", "--quiet", "Suppress most logging") do
           options.quiet = true
         end
-        
+
+        opts.separator ""
+        opts.separator "For more help refer to https://github.com/jgeluk/yowl"
+
       end
-  
+
       opts.parse!(args_)
-      
+
       if ! options.validate()
         puts opts
         return nil
       end
       return options
\ No newline at end of file