@@ -47,21 +47,18 @@ class MSpecMain < MSpecScript ENV['OUTPUT_WARNINGS'] = '1' end options.add_version - options.on("-h", "--help", <<-EOH) do -Show this message - - where COMMAND is one of: - - run - Run the specified specs (default) - ci - Run the known good specs - tag - Add or remove tags - - mspec COMMAND -h for more options -EOH + options.on("-h", "--help", "Show this message") do puts options.parser exit end + # The rest of the help output + options.separator "\n where COMMAND is one of:\n" + options.separator " run - Run the specified specs (default)" + options.separator " ci - Run the known good specs" + options.separator " tag - Add or remove tags\n" + options.separator " mspec COMMAND -h for more options\n" + config[:options] += options.parser.filter! argv options.parse argv end mspec/bin/mspec @@ -82,7 +82,7 @@ class MSpecOptions def add_targets on("-t", "--target TARGET", String, - "Implementation to run the specs: r:ruby|r19:ruby19|x:rbx|j:jruby") do |t| + "Implementation to run the specs, where:") do |t| case t when 'r', 'ruby' @config[:target] = 'ruby' @@ -99,6 +99,14 @@ class MSpecOptions @config[:target] = t end end + + separator "" + separator " 'r' or 'ruby' invokes ruby in PATH" + separator " 'r19' or 'ruby19' invokes ruby19 in PATH" + separator " 'x' or 'rubinius' invokes ./shotgun/rubinius" + separator " 'X' or 'rbx' invokes rbx in PATH" + separator " 'j' or 'jruby' invokes jruby in PATH\n" + on("-T", "--target-opt OPT", String, "Pass OPT as a flag to the target implementation") do |t| @config[:flags] << t mspec/bin/options.rb 1b91113c3e8fb46a0d355cae9000ee4c82f95ac3 Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/36f5a592fe4b2c9e53b7b848b8abd158dc1776c8 36f5a592fe4b2c9e53b7b848b8abd158dc1776c8 2008-04-07T20:35:30-07:00 2008-04-07T20:33:13-07:00 Make mspec help more explicit about target options. 85809562833e1cc9e36cc36b7b09e12de699fda2 Brian Ford bford@engineyard.com