0
@@ -41,7 +41,7 @@ Webby is not limited to producing HTML. By no means! Do you ever get tired of re
0
 
0
 == EXAMPLE:
0
 
0
-   $ webby gen website my_site
0
+   $ webby-gen website my_site
0
    creating my_site
0
 
0
    $ cd my_site

0
@@ -48,7 +48,6 @@ depend_on 'directory_watcher'
0
 depend_on 'heel'
0
 depend_on 'hpricot', '= 0.6.0'
0
 depend_on 'logging'
0
-depend_on 'main'
0
 depend_on 'rake'
0
 depend_on 'rspec'
0
 

0
@@ -33,7 +33,11 @@ class Generator
0
   #
0
   def parse( args )
0
     opts = OptionParser.new
0
-    opts.banner = 'Usage: webby gen [options] template site'
0
+    opts.banner = 'Usage: webby-gen [options] template site'
0
+
0
+    opts.separator ''
0
+    opts.separator 'The webby-gen command is used to generate a site from a standard template.'
0
+    opts.separator 'A new site can be created, or an existing site can be added to or updated.'
0
 
0
     opts.separator ''
0
     opts.on('-f', '--force',
0
@@ -47,20 +51,18 @@ class Generator
0
 
0
     opts.separator ''
0
     opts.on('-t', '--templates', 'list available templates') {
0
-      @stdout.puts opts
0
       ary = templates.map {|t| ::File.basename(t)}
0
       ary.delete 'webby'
0
       @stdout.puts "\nAvailable Templates"
0
-      @stdout.puts "    #{ary.join(', ')}"
0
-      @stdout.puts
0
+      @stdout.puts "    #{ary.join(', ')}\n"
0
       exit
0
     }
0
 
0
     opts.separator ''
0
     opts.separator 'common options:'
0
 
0
-    opts.on_tail( '-h', '--help', 'show this message' ) {@stdout.puts opts; exit}
0
-    opts.on_tail( '--version', 'show version' ) do
0
+    opts.on( '-h', '--help', 'show this message' ) {@stdout.puts opts; exit}
0
+    opts.on( '--version', 'show version' ) do
0
       @stdout.puts "Webby #{::Webby::VERSION}"
0
       exit
0
     end
0
@@ -71,18 +73,18 @@ class Generator
0
 
0
     # if no site was given, see if there is a Sitefile in the current
0
     # directory
0
-    if @site.nil?
0
-      @site = '.' if test(?f, 'Sitefile')
0
+    if site.nil?
0
+      self.site = '.' if test(?f, 'Sitefile')
0
     end
0
 
0
     # exit if comand line args are missing
0
-    if @site.nil? or tmpl.nil?
0
+    if site.nil? or tmpl.nil?
0
       @stdout.puts opts
0
       exit 1
0
     end
0
 
0
     templates.each {|t| self.template = t if t =~ %r/\/#{tmpl}$/}
0
-    if @template.nil?
0
+    if template.nil?
0
       @stdout.puts opts
0
       abort "Could not find template '#{tmpl}'"
0
     end

0
@@ -18,9 +18,9 @@ Main = ::Main.create {
0
   }
0
 
0
   option('describe', 'D') {
0
+    desc 'describe the tasks (mathcing optional PATTERN)'
0
     argument :optional
0
     synopsis '--describe=[PATTERN], -D'
0
-    desc 'describe the tasks (mathcing optional PATTERN)'
0
   }
0
 
0
   option('prereqs', 'P') {
0
@@ -28,9 +28,9 @@ Main = ::Main.create {
0
   }
0
 
0
   option('tasks', 'T') {
0
+    desc 'display the tasks (mathcing optional PATTERN)'
0
     argument :optional
0
     synopsis '--tasks=[PATTERN], -T'
0
-    desc 'display the tasks (mathcing optional PATTERN)'
0
   }
0
 
0
   option('trace', 't') {

0
@@ -96,7 +96,7 @@ describe Webby::Apps::Generator do
0
       lambda{@generator.parse %w[website]}.
0
           should raise_error(SystemExit, 'exit')
0
       @strio.to_s.split("\n").first.
0
-          should == 'Usage: webby gen [options] template site'
0
+          should == 'Usage: webby-gen [options] template site'
0
     end
0
 
0
     it "should exit if an unknown template is given" do