drydock 0.5.4 → 0.5.5

data/drydock.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.5.4"
-  s.date = %q{2009-04-15}
+  s.version = "0.5.5"
+  s.date = %q{2009-04-19}
   s.specification_version = 1 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/lib/drydock.rb

@@ -40,7 +40,7 @@ module Drydock
       @msg = args.shift if args.size == 1
       @arg, @cmd, @msg = *args
       @cmd ||= 'COMMAND'
-      @msg = nil if @msg.empty?
+      @msg = nil if @msg && @msg.empty?
     end
     def message; @msg || "Error: No #{@arg} provided"; end
     def usage; "See: #{$0} #{@cmd} -h"; end
@@ -98,6 +98,8 @@ module Drydock
     attr_accessor :argv  
       # Either an IO handle to STDIN or the output of the Drydock#stdin handler. 
     attr_reader :stdin
+      # The basename of the executable or script: File.basename($0)
+    attr_reader :executable
     
     # The default constructor sets the short name of the command
     # and stores a reference to the block (if supplied).
@@ -114,7 +116,7 @@ module Drydock
       @stdin = STDIN
       @option = OpenStruct.new
       @global = OpenStruct.new
-      
+      @executable = File.basename($0)
       @global.verbose = 0
       @global.quiet = false
     end
@@ -241,11 +243,15 @@ module Drydock
     # "default" command unless another default commands is supplied. You 
     # can also write your own Drydock::Command#show_commands to override
     # this default behaviour. 
+    #
+    # The output was worked on here:
+    # http://etherpad.com/SXjqQGRr8M
+    #
     def show_commands
       project = " for #{Drydock.project}" if Drydock.project?
-      puts "Available commands#{project}:", ""
       cmds = {}
       Drydock.commands.keys.each do |cmd|
+        next if cmd == :show_commands
         pretty = Drydock.decanonize(cmd)
         # Out to sea
         cmds[Drydock.commands[cmd].cmd] ||= {}
@@ -254,19 +260,52 @@ module Drydock
           next
         end
         cmds[cmd][:desc] = Drydock.commands[cmd].desc
+        cmds[cmd][:desc] = nil if cmds[cmd][:desc] && cmds[cmd][:desc].empty?
         cmds[cmd][:pretty] = pretty
       end
+    
+      cmd_names_sorted = cmds.keys.sort{ |a,b| a.to_s <=> b.to_s }
       
-      cmds.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |cmd|
-        p = cmds[cmd]
-        puts " %16s: %s" % [p[:pretty], p[:desc]]
-        puts " %17s (%s: %s)" % ['', "aliases", cmds[cmd][:aliases].join(', ')] if cmds[cmd][:aliases]
+      
+      if @global.quiet
+        puts "Commands: "
+        line = []
+        cmd_names_sorted.each_with_index do |cmd,i|
+          line << cmd
+          if (line.size % 4 == 0) || i == (cmd_names_sorted.size - 1)
+            puts "  %s" % line.join(', ')
+            line.clear
+          end
+        end
+        return
       end
       
-      puts 
-      puts "%6s: %s" % ["Try", "#{$0} -h"] 
-      puts "%6s  %s" % ["", "#{$0} COMMAND -h"]
+      puts "%5s: %s" % ["Usage", "#{@executable} [global options] COMMAND [command options]"]
+      puts "%5s: %s" % ["Try", "#{@executable} -h"] 
+      puts "%5s  %s" % ["", "#{@executable} COMMAND -h"]
       puts
+      
+      puts "Commands: "
+      if @global.verbose > 0
+        puts # empty line
+        cmd_names_sorted.each do |cmd|
+          puts "%s %s" % [@executable, cmds[cmd][:pretty]]
+          puts "%10s: %s" % ["About", cmds[cmd][:desc]] if cmds[cmd][:desc]
+          if cmds[cmd][:aliases]
+            cmds[cmd][:aliases].sort!{ |a,b| a.size <=> b.size }
+            puts "%10s: %s" % ["Aliases", cmds[cmd][:aliases].join(', ')]
+          end
+          puts
+        end
+
+      else
+        cmd_names_sorted.each do |cmd|
+          aliases = cmds[cmd][:aliases] || []
+          aliases.sort!{ |a,b| a.size <=> b.size }
+          aliases = aliases.empty? ? '' : "(aliases: #{aliases.join(', ')})"
+          puts "  %-16s %s" % [cmds[cmd][:pretty], aliases]
+        end
+      end
     end
     
     # The name of the command
@@ -565,7 +604,9 @@ module Drydock
     # Default Usage Banner. 
     # Without this, there's no help displayed for the command. 
     option_parser = get_option_parser(@@command_index)
-    usage "#{$0} #{c.cmd}" if option_parser.is_a?(OptionParser) && option_parser.banner !~ /^USAGE/
+    if option_parser.is_a?(OptionParser) && option_parser.banner !~ /^USAGE/
+      usage "#{c.executable} #{c.cmd}"
+    end
     
     @@commands[c.cmd] = c
     @@command_index_map[c.cmd] = @@command_index
@@ -835,8 +876,8 @@ module Drydock
   #
   # These are the "reel" defaults
   #
-  @@global_opts_parser.banner = "USAGE: #{$0} [global options] COMMAND [command options]"
-  @@global_opts_parser.on "  TRY: #{$0} show-commands #{$/}"
+  @@global_opts_parser.banner = "  Try: #{$0} show-commands"
+  @@global_opts_parser.on "Usage: #{$0} [global options] COMMAND [command options] #{$/}"
   @@command_descriptions = ["Display available commands with descriptions"]
   @@default_command = Drydock.command(:show_commands).cmd
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drydock
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -04:00
+date: 2009-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,8 @@ files:
 - lib/drydock.rb
 has_rdoc: true
 homepage: http://github.com/delano/drydock
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -57,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: drydock
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
 specification_version: 1
 summary: A seaworthy DSL for writing command line apps