cri 2.0a1 → 2.0a2

data/lib/cri.rb

@@ -3,7 +3,7 @@
 module Cri
 
   # The current Cri version.
-  VERSION = '2.0a1'
+  VERSION = '2.0a2'
 
   autoload 'Command',           'cri/command'
   autoload 'CommandDSL',        'cri/command_dsl'

data/lib/cri/command.rb

@@ -215,7 +215,12 @@ module Cri
       text = ''
 
       # Append usage
-      text << usage + "\n"
+      if usage
+        path = [ self.supercommand ]
+        path.unshift(path[0].supercommand) until path[0].nil?
+        full_usage = path[1..-1].map { |c| c.name + ' ' }.join + usage
+        text << "usage: #{full_usage}\n"
+      end
 
       # Append aliases
       unless aliases.empty?
@@ -224,12 +229,16 @@ module Cri
       end
 
       # Append short description
-      text << "\n"
-      text << short_desc + "\n"
+      if short_desc
+        text << "\n"
+        text << short_desc + "\n"
+      end
 
       # Append long description
-      text << "\n"
-      text << long_desc.wrap_and_indent(78, 4) + "\n"
+      if long_desc
+        text << "\n"
+        text << long_desc.wrap_and_indent(78, 4) + "\n"
+      end
 
       # Append subcommands
       unless self.commands.empty?

data/test/test_command.rb

@@ -29,10 +29,19 @@ class Cri::CommandTestCase < Cri::TestCase
     end
   end
 
+  def bare_cmd
+    Cri::Command.define do
+      name        'moo'
+
+      run do |opts, args|
+      end
+    end
+  end
+
   def nested_cmd
     super_cmd = Cri::Command.define do
       name        'super'
-      usage       'does something super'
+      usage       'super [command] [options] [arguments]'
       summary     'does super stuff'
       description 'This command does super stuff.'
 
@@ -48,7 +57,7 @@ class Cri::CommandTestCase < Cri::TestCase
     super_cmd.define_command do
       name        'sub'
       aliases     'sup'
-      usage       'does something subby'
+      usage       'sub [options]'
       summary     'does subby stuff'
       description 'This command does subby stuff.'
 
@@ -201,6 +210,16 @@ class Cri::CommandTestCase < Cri::TestCase
     assert_equal [ ], lines(err)
   end
 
+  def test_help_nested
+    help = nested_cmd.subcommands.to_a[0].help
+
+    assert_match /^usage: super sub \[options\]/, help
+  end
+
+  def test_help_for_bare_cmd
+    bare_cmd.help
+  end
+
   def test_modify
     cmd = Cri::Command.define do
       name 'build'

metadata

@@ -2,7 +2,7 @@
 name: cri
 version: !ruby/object:Gem::Version 
   prerelease: 3
-  version: 2.0a1
+  version: 2.0a2
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 Z
+date: 2011-06-20 00:00:00 Z
 dependencies: []
 
 description: Cri allows building easy-to-use commandline interfaces with support for subcommands.