cri 2.0a3 → 2.0b1

data/lib/cri.rb

@@ -2,8 +2,20 @@
 
 module Cri
 
+  # @todo Document
+  class Error < ::StandardError
+  end
+
+  # @todo Document
+  class NotImplementedError < Error
+  end
+
+  # @todo Document
+  class NoHelpAvailableError < Error
+  end
+
   # The current Cri version.
-  VERSION = '2.0a3'
+  VERSION = '2.0b1'
 
   autoload 'Command',           'cri/command'
   autoload 'CommandDSL',        'cri/command_dsl'

data/lib/cri/command.rb

@@ -197,7 +197,8 @@ module Cri
 
         # Execute
         if @block.nil?
-          raise "No implementation available for '#{self.name}'"
+          raise NotImplementedError,
+            "No implementation available for '#{self.name}'"
         end
         block.call(global_opts, args, self)
       else

data/lib/cri/commands/basic_help.rb

@@ -10,13 +10,18 @@ commandline options. When a command is given, a command description as well as
 command-specific commandline options are shown.
 EOS
 
-run do |opts, args|
+run do |opts, args, cmd|
+  if cmd.supercommand.nil?
+    raise NoHelpAvailableError,
+      "No help available because the help command has no supercommand"
+  end
+
   if args.empty?
-    puts self.supercommand.help
+    puts cmd.supercommand.help
   elsif args.size == 1
-    puts self.supercommand.command_named(args[0]).help
+    puts cmd.supercommand.command_named(args[0]).help
   else
-    $stderr.puts self.usage
+    $stderr.puts cmd.usage
     exit 1
   end
 end

data/lib/cri/option_parser.rb

@@ -5,17 +5,13 @@ module Cri
   # Cri::OptionParser is used for parsing commandline options.
   class OptionParser
 
-    # Superclass for generic option parser errors.
-    class GenericError < StandardError
-    end
-
     # Error that will be raised when an unknown option is encountered.
-    class IllegalOptionError < Cri::OptionParser::GenericError
+    class IllegalOptionError < Cri::Error
     end
 
     # Error that will be raised when an option without argument is
     # encountered.
-    class OptionRequiresAnArgumentError < Cri::OptionParser::GenericError
+    class OptionRequiresAnArgumentError < Cri::Error
     end
 
     # The delegate to which events will be sent. The following methods will

data/test/helper.rb

@@ -4,23 +4,41 @@ require 'stringio'
 
 class Cri::TestCase < MiniTest::Unit::TestCase
 
-  def capture_io_while(&block)
-    $orig_stdout = $stdout
-    $orig_stderr = $stderr
+  def setup
+    @orig_io = capture_io
+  end
 
-    $stdout = StringIO.new
-    $stderr = StringIO.new
+  def teardown
+    uncapture_io(*@orig_io)
+  end
 
+  def capture_io_while(&block)
+   orig_io = capture_io
     block.call
-
     [ $stdout.string, $stderr.string ]
   ensure
-    $stdout = $orig_stdout
-    $stderr = $orig_stderr
+    uncapture_io(*orig_io)
   end
 
   def lines(string)
     string.scan(/^.*\n/).map { |s| s.chomp }
   end
 
+private
+
+  def capture_io
+    orig_stdout = $stdout
+    orig_stderr = $stderr
+
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    [ orig_stdout, orig_stderr ]
+  end
+
+  def uncapture_io(orig_stdout, orig_stderr)
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
+
 end

data/test/test_basic_help.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+class Cri::BasicHelpTestCase < Cri::TestCase
+
+  def test_run_without_supercommand
+    cmd = Cri::Command.new_basic_help
+
+    assert_raises Cri::NoHelpAvailableError do
+      cmd.run([])
+    end
+  end
+
+  def test_run_with_supercommand
+    cmd = Cri::Command.define do
+      name 'meh'
+    end
+
+    help_cmd = Cri::Command.new_basic_help
+    cmd.add_command(help_cmd)
+
+    help_cmd.run([])
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: cri
 version: !ruby/object:Gem::Version 
   prerelease: 3
-  version: 2.0a3
+  version: 2.0b1
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 Z
+date: 2011-06-22 00:00:00 Z
 dependencies: []
 
 description: Cri allows building easy-to-use commandline interfaces with support for subcommands.
@@ -40,6 +40,7 @@ files:
 - lib/cri.rb
 - test/helper.rb
 - test/test_base.rb
+- test/test_basic_help.rb
 - test/test_command.rb
 - test/test_command_dsl.rb
 - test/test_core_ext.rb