gli 2.19.2 → 2.20.0

data/test/{tc_command_finder.rb → unit/command_finder_test.rb}

@@ -1,6 +1,6 @@
-require 'test_helper'
+require_relative "test_helper"
 
-class TC_testCommandFinder < Clean::Test::TestCase
+class CommandFinderTest < MiniTest::Test
   include TestHelper
 
   def setup
@@ -14,13 +14,13 @@ class TC_testCommandFinder < Clean::Test::TestCase
   end
 
   def test_unknown_command_name
-    assert_raise(GLI::UnknownCommand) do
+    assert_raises(GLI::UnknownCommand) do
       GLI::CommandFinder.new(@app.commands, :default_command => :status).find_command(:unfindable_command)
     end
   end
 
   def test_no_command_name_without_default
-    assert_raise(GLI::UnknownCommand) do
+    assert_raises(GLI::UnknownCommand) do
       GLI::CommandFinder.new(@app.commands).find_command(nil)
     end
   end
@@ -33,7 +33,7 @@ class TC_testCommandFinder < Clean::Test::TestCase
   end
 
   def test_ambigous_command
-    assert_raise(GLI::AmbiguousCommand) do
+    assert_raises(GLI::AmbiguousCommand) do
       GLI::CommandFinder.new(@app.commands, :default_command => :status).find_command(:some)
     end
   end
@@ -46,7 +46,7 @@ class TC_testCommandFinder < Clean::Test::TestCase
   end
 
   def test_partial_name_with_autocorrect_disabled
-    assert_raise(GLI::UnknownCommand) do
+    assert_raises(GLI::UnknownCommand) do
       GLI::CommandFinder.new(@app.commands, :default_command => :status, :autocomplete => false)
         .find_command(:deploy)
     end

data/test/{tc_command.rb → unit/command_test.rb}

@@ -1,7 +1,7 @@
-require 'test_helper'
-require 'tempfile'
+require_relative "test_helper"
+require_relative "support/fake_std_out"
 
-class TC_testCommand < Clean::Test::TestCase
+class CommandTest < MiniTest::Test
   include TestHelper
   def setup
     @fake_stdout = FakeStdOut.new
@@ -436,7 +436,7 @@ class TC_testCommand < Clean::Test::TestCase
   private
 
   def assert_contained(output,regexp)
-    assert_not_nil output.contained?(regexp),
+    refute_nil output.contained?(regexp),
       "Expected output to contain #{regexp.inspect}, output was:\n#{output}"
   end
 

data/test/unit/compound_command_test.rb

@@ -0,0 +1,17 @@
+require_relative "test_helper"
+
+class CompoundCommandFinderTest < MiniTest::Test
+  include TestHelper
+
+  def test_exception_for_missing_commands
+    @name = "new"
+    @unknown_name = "create"
+    @existing_command = OpenStruct.new(:name => @name)
+    @base = OpenStruct.new( :commands => { @name => @existing_command })
+
+    @code = lambda { GLI::Commands::CompoundCommand.new(@base,{:foo => [@name,@unknown_name]}) }
+
+    ex = assert_raises(RuntimeError,&@code)
+    assert_match /#{Regexp.escape(@unknown_name)}/,ex.message
+  end
+end

data/test/{tc_doc.rb → unit/doc_test.rb}

@@ -1,5 +1,4 @@
-require 'test_helper'
-require 'pp'
+require_relative "test_helper"
 
 class String
   def blank?
@@ -19,7 +18,7 @@ class Object
   end
 end
 
-class TC_testDoc < Clean::Test::TestCase
+class DocTest < MiniTest::Test
   include TestHelper
 
   class TestApp
@@ -112,42 +111,30 @@ class TC_testDoc < Clean::Test::TestCase
     @@counter = -1 # we pre-increment so this makes 0 first
   end
 
-  test_that "a GLI app with documentation gets the callbacks for each element" do
-    Given :the_test_app
-    And :the_expected_output
-    And {
-      @documenter = GLI::Commands::Doc.new(@app)
-      @listener = TestListener.new
-    }
-    When {
-      @documenter.document(@listener)
-    }
-    Then {
-      lines_expected = @string.split(/\n/)
-      lines_got = @listener.to_s.split(/\n/)
-      lines_expected.zip(lines_got).each_with_index do |(expected,got),index|
-        assert_equal expected,got,"At index #{index}"
-      end
-    }
+  def test_app_without_docs_gets_callbacks_for_each_element
+    setup_test_app
+    construct_expected_output
+    @documenter = GLI::Commands::Doc.new(@app)
+    @listener = TestListener.new
+    @documenter.document(@listener)
+    lines_expected = @string.split(/\n/)
+    lines_got = @listener.to_s.split(/\n/)
+    lines_expected.zip(lines_got).each_with_index do |(expected,got),index|
+      assert_equal expected,got,"At index #{index}"
+    end
   end
 
-  test_that "the doc command works as a GLI command" do
-    Given :the_test_app
-    And :the_expected_output
-    And {
-      @documenter = GLI::Commands::Doc.new(@app)
-      @listener = TestListener.new
-    }
-    When {
-      @documenter.execute({},{:format => "TC_testDoc::TestListener"},[])
-    }
-    Then {
-      lines_expected = @string.split(/\n/)
-      lines_got = TestListener.last.to_s.split(/\n/)
-      lines_expected.zip(lines_got).each_with_index do |(expected,got),index|
-        assert_equal expected,got,"At index #{index}"
-      end
-    }
+  def test_doc_command_works_as_GLI_command
+    setup_test_app
+    construct_expected_output
+    @documenter = GLI::Commands::Doc.new(@app)
+    @listener = TestListener.new
+    @documenter.execute({},{:format => "DocTest::TestListener"},[])
+    lines_expected = @string.split(/\n/)
+    lines_got = TestListener.last.to_s.split(/\n/)
+    lines_expected.zip(lines_got).each_with_index do |(expected,got),index|
+      assert_equal expected,got,"At index #{index}"
+    end
   end
 
 private
@@ -158,36 +145,36 @@ private
     @@counter
   end
 
-  def the_test_app
+  def setup_test_app
     @app = TestApp.new
     @app.instance_eval do
       program_desc "program desc"
       program_long_desc "program long desc"
       version "1.3.4"
 
-      TC_testDoc.flag_with_everything_specified(self)
-      TC_testDoc.flag_with_everything_omitted(self)
-      TC_testDoc.switch_with_everything_specified(self)
-      TC_testDoc.switch_with_everything_omitted(self)
+      DocTest.flag_with_everything_specified(self)
+      DocTest.flag_with_everything_omitted(self)
+      DocTest.switch_with_everything_specified(self)
+      DocTest.switch_with_everything_omitted(self)
 
       desc      "command desc"
       long_desc "command long desc"
       arg_name  "cmd_arg_name"
       command [:command1,:com1] do |c|
-        TC_testDoc.flag_with_everything_specified(c)
-        TC_testDoc.flag_with_everything_omitted(c)
-        TC_testDoc.switch_with_everything_specified(c)
-        TC_testDoc.switch_with_everything_omitted(c)
+        DocTest.flag_with_everything_specified(c)
+        DocTest.flag_with_everything_omitted(c)
+        DocTest.switch_with_everything_specified(c)
+        DocTest.switch_with_everything_omitted(c)
 
         c.desc      "subcommand desc"
         c.long_desc "subcommand long desc"
         c.arg_name  "subcmd_arg_name"
         c.action { |g,o,a| }
         c.command [:sub,:subcommand] do |sub|
-          TC_testDoc.flag_with_everything_specified(sub,:subflag)
-          TC_testDoc.flag_with_everything_omitted(sub,:subflag2)
-          TC_testDoc.switch_with_everything_specified(sub,:subswitch)
-          TC_testDoc.switch_with_everything_omitted(sub,:subswitch2)
+          DocTest.flag_with_everything_specified(sub,:subflag)
+          DocTest.flag_with_everything_omitted(sub,:subflag2)
+          DocTest.switch_with_everything_specified(sub,:subswitch)
+          DocTest.switch_with_everything_omitted(sub,:subswitch2)
           sub.action { |g,o,a| }
         end
         c.command [:default] do |sub|
@@ -227,7 +214,7 @@ private
   def self.switch_with_everything_omitted(on,name=[:S,:switch2])
     on.switch name
   end
-  def the_expected_output
+  def construct_expected_output
     # Oh yeah.  Creating a string representing the structure of the calls.
     @string =<<EOS
 BEGIN

data/test/{tc_flag.rb → unit/flag_test.rb}

@@ -1,39 +1,36 @@
-require 'test_helper'
+require_relative "test_helper"
 
-class TC_testFlag < Clean::Test::TestCase
+class FlagTest < MiniTest::Test
   include TestHelper
 
   def test_basics_simple
-    Given flag_with_names(:f)
-    Then attributes_should_be_set
-    And name_should_be(:f)
-    And aliases_should_be(nil)
+    setup_for_flag_with_names(:f)
+    assert_attributes_set
+    assert_equal(:f,@cli_option.name)
+    assert_nil @cli_option.aliases
   end
 
   def test_basics_kinda_complex
-    Given flag_with_names([:f])
-    Then attributes_should_be_set
-    And name_should_be(:f)
-    And aliases_should_be(nil)
+    setup_for_flag_with_names([:f])
+    assert_attributes_set
+    assert_equal(:f,@cli_option.name)
+    assert_nil @cli_option.aliases
   end
 
   def test_basics_complex
-    Given flag_with_names([:f,:file,:filename])
-    Then attributes_should_be_set
-    And name_should_be(:f)
-    And aliases_should_be([:file,:filename])
-    And {
-      assert_equal ["-f VAL","--file VAL","--filename VAL",/foobar/,Float],@flag.arguments_for_option_parser
-    }
+    setup_for_flag_with_names([:f,:file,:filename])
+    assert_attributes_set
+    assert_equal(:f,@cli_option.name)
+    assert_equal [:file,:filename], @cli_option.aliases
+    assert_equal ["-f VAL","--file VAL","--filename VAL",/foobar/,Float],@flag.arguments_for_option_parser
   end
 
   def test_flag_can_mask_its_value
-    Given flag_with_names(:password, :mask => true)
-    Then attributes_should_be_set(:safe_default_value => "********")
+    setup_for_flag_with_names(:password, :mask => true)
+    assert_attributes_set(:safe_default_value => "********")
   end
 
-  def flag_with_names(names,options = {})
-    lambda do
+  def setup_for_flag_with_names(names,options = {})
       @options = {
         :desc => 'Filename',
         :long_desc => 'The Filename',
@@ -45,11 +42,9 @@ class TC_testFlag < Clean::Test::TestCase
       }.merge(options)
       @flag = GLI::Flag.new(names,@options)
       @cli_option = @flag
-    end
   end
 
-  def attributes_should_be_set(override={})
-    lambda {
+  def assert_attributes_set(override={})
       expected = @options.merge(override)
       assert_equal(expected[:desc],@flag.description)
       assert_equal(expected[:long_desc],@flag.long_description)
@@ -57,6 +52,5 @@ class TC_testFlag < Clean::Test::TestCase
       assert_equal(expected[:safe_default_value],@flag.safe_default_value)
       assert_equal(expected[:must_match],@flag.must_match)
       assert_equal(expected[:type],@flag.type)
-    }
   end
 end

data/test/{tc_gli.rb → unit/gli_test.rb}

@@ -1,18 +1,7 @@
-# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
-# have this method, so we add it so we get resolved symlinks
-# and compatibility
-unless File.respond_to? :realpath
-  class File
-    def self.realpath path
-      return realpath(File.readlink(path)) if symlink?(path)
-      path
-    end
-  end
-end
+require_relative "test_helper"
+require_relative "support/fake_std_out"
 
-require 'test_helper'
-
-class TC_testGLI < Clean::Test::TestCase
+class GLITest < MiniTest::Test
   include TestHelper
 
   def setup
@@ -24,7 +13,7 @@ class TC_testGLI < Clean::Test::TestCase
     $stderr = @fake_stderr
     @app = CLIApp.new
 
-    @config_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/new_config.yaml')
+    @config_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/support/new_config.yml')
     @gli_debug = ENV['GLI_DEBUG']
     @app.error_device=@fake_stderr
     ENV.delete('GLI_DEBUG')
@@ -141,7 +130,7 @@ class TC_testGLI < Clean::Test::TestCase
   def test_init_from_config
     failure = nil
     @app.reset
-    @app.config_file(File.expand_path(File.dirname(File.realpath(__FILE__)) + '/config.yaml'))
+    @app.config_file(File.expand_path(File.dirname(File.realpath(__FILE__)) + '/support/gli_test_config.yml'))
     @app.flag :f
     @app.switch :s
     @app.flag :g
@@ -175,7 +164,7 @@ class TC_testGLI < Clean::Test::TestCase
   def test_command_line_overrides_config
     failure = nil
     @app.reset
-    @app.config_file(File.expand_path(File.dirname(File.realpath(__FILE__)) + '/config.yaml'))
+    @app.config_file(File.expand_path(File.dirname(File.realpath(__FILE__)) + '/support/gli_test_config.yml'))
     @app.flag :f
     @app.switch :s
     @app.flag :g
@@ -207,7 +196,7 @@ class TC_testGLI < Clean::Test::TestCase
   end
 
   def test_no_overwrite_config
-    config_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/config.yaml')
+    config_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/support/gli_test_config.yml')
     config_file_contents = File.read(config_file)
     @app.reset
     @app.config_file(config_file)
@@ -680,7 +669,11 @@ class TC_testGLI < Clean::Test::TestCase
       end
     end
 
-    assert_nothing_raised(GLI::CustomExit) { @app.run(['multiply', '--help']) }
+    begin
+      @app.run(['multiply', '--help'])
+    rescue GLI::CustomExit
+      assert false, "Expected no exception"
+    end
   end
 
   class ConvertMe
@@ -810,38 +803,26 @@ class TC_testGLI < Clean::Test::TestCase
     do_test_switch_create_compact(object)
   end
 
-  def some_descriptions
-    lambda {
-      @description = 'this is a description'
-      @long_description = 'this is a very long description'
-    }
-  end
-
-  def assert_switch_was_made(object,switch)
-    lambda {
-      assert object.switches[switch]
-      assert_equal @description,object.switches[switch].description,"For switch #{switch}"
-      assert_equal @long_description,object.switches[switch].long_description,"For switch #{switch}"
-      assert(object.usage != nil) if object.respond_to? :usage
-    }
-  end
-
   def do_test_switch_create_classic(object)
-    Given some_descriptions
-    When {
-      object.desc @description
-      object.long_desc @long_description
-      object.switch :f
-    }
-    Then assert_switch_was_made(object,:f)
+    @description = 'this is a description'
+    @long_description = 'this is a very long description'
+    object.desc @description
+    object.long_desc @long_description
+    object.switch :f
+    assert object.switches[:f]
+    assert_equal @description,object.switches[:f].description,"For switch #{:f}"
+    assert_equal @long_description,object.switches[:f].long_description,"For switch #{:f}"
+    assert(object.usage != nil) if object.respond_to? :usage
   end
 
   def do_test_switch_create_compact(object)
-    Given some_descriptions
-    When {
-      object.switch :g, :desc => @description, :long_desc => @long_description
-    }
-    Then assert_switch_was_made(object,:g)
+    @description = 'this is a description'
+    @long_description = 'this is a very long description'
+    object.switch :g, :desc => @description, :long_desc => @long_description
+    assert object.switches[:g]
+    assert_equal @description,object.switches[:g].description,"For switch #{:g}"
+    assert_equal @long_description,object.switches[:g].long_description,"For switch #{:g}"
+    assert(object.usage != nil) if object.respond_to? :usage
   end
 
   def do_test_switch_create_twice(object)

data/test/{tc_help.rb → unit/help_test.rb}

@@ -1,6 +1,6 @@
-require 'test_helper'
+require_relative "test_helper"
 
-class TC_testHelp < Clean::Test::TestCase
+class HelpTest < MiniTest::Test
   include TestHelper
 
   def setup
@@ -24,86 +24,61 @@ class TC_testHelp < Clean::Test::TestCase
     include GLI::App
   end
 
-  test_that "the help command is configured properly when created" do
-    Given {
-      app = TestApp.new
-      app.subcommand_option_handling :normal
-      @command = GLI::Commands::Help.new(app,@output,@error)
-    }
-    Then {
-      assert_equal   'help',@command.name.to_s
-      assert_nil     @command.aliases
-      assert_equal   'command',@command.arguments_description
-      assert_not_nil @command.description
-      assert_not_nil @command.long_description
-      assert         @command.skips_pre
-      assert         @command.skips_post
-      assert         @command.skips_around
-    }
+  def test_help_command_configured_properly_when_created
+    app = TestApp.new
+    app.subcommand_option_handling :normal
+    @command = GLI::Commands::Help.new(app,@output,@error)
+    assert_equal   'help',@command.name.to_s
+    assert_nil     @command.aliases
+    assert_equal   'command',@command.arguments_description
+    refute_nil @command.description
+    refute_nil @command.long_description
+    assert         @command.skips_pre
+    assert         @command.skips_post
+    assert         @command.skips_around
   end
 
-  test_that "the help command can be configured to skip things declaratively" do
-    Given {
+  def test_the_help_command_can_be_configured_to_skip_things_declaratively
       app = TestApp.new
       app.subcommand_option_handling :normal
       @command = GLI::Commands::Help.new(app,@output,@error)
       GLI::Commands::Help.skips_pre    = false
       GLI::Commands::Help.skips_post   = false
       GLI::Commands::Help.skips_around = false
-    }
-    Then {
       assert !@command.skips_pre
       assert !@command.skips_post
       assert !@command.skips_around
-    }
   end
 
-  test_that "the help command can be configured to skip things declaratively regardless of when the object was created" do
-    Given {
+  def test_the_help_command_can_be_configured_to_skip_things_declaratively_regardless_of_when_the_object_was_created
       GLI::Commands::Help.skips_pre    = false
       GLI::Commands::Help.skips_post   = false
       GLI::Commands::Help.skips_around = false
       app = TestApp.new
       app.subcommand_option_handling :normal
       @command = GLI::Commands::Help.new(app,@output,@error)
-    }
-    Then {
       assert !@command.skips_pre
       assert !@command.skips_post
       assert !@command.skips_around
-    }
   end
 
-  test_that "invoking help with no arguments results in listing all commands and global options" do
-    Given a_GLI_app
-    And {
+  def test_invoking_help_with_no_arguments_results_in_listing_all_commands_and_global_options
+    setup_GLI_app
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[])
-    }
-    Then {
       assert_top_level_help_output
-    }
   end
 
-  test_that "invoking help with a command that doesn't exist shows an error" do
-    Given a_GLI_app
-    And {
+  def test_invoking_help_with_a_command_that_doesnt_exist_shows_an_error
+    setup_GLI_app
       @command = GLI::Commands::Help.new(@app,@output,@error)
       @unknown_command_name = any_command_name
-    }
-    When {
       @command.execute({},{},[@unknown_command_name])
-    }
-    Then {
       assert_error_contained(/error: Unknown command '#{@unknown_command_name}'./)
-    }
   end
 
-  test_that "invoking help with a known command shows help for that command" do
-    Given a_GLI_app
-    And {
+  def test_invoking_help_with_a_known_command_shows_help_for_that_command
+    setup_GLI_app
       @command_name = cm = any_command_name
       @desc         = d  = any_desc
       @long_desc    = ld = any_desc
@@ -127,11 +102,7 @@ class TC_testHelp < Clean::Test::TestCase
         end
       end
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[@command_name])
-    }
-    Then {
       assert_output_contained(@command_name,"Name of the command")
       assert_output_contained(@desc,"Short description")
       assert_output_contained(@long_desc,"Long description")
@@ -139,27 +110,19 @@ class TC_testHelp < Clean::Test::TestCase
       assert_output_contained(@switch_desc,"switch description")
       assert_output_contained("-" + @flag,"command flag")
       assert_output_contained(@flag_desc,"flag description")
-    }
   end
 
-  test_that 'invoking help for an app with no global options omits [global options] from the usage string' do
-    Given a_GLI_app(:no_options)
-    And {
+  def test_invoking_help_with_no_global_options_omits_the_global_options_placeholder_from_usage
+    setup_GLI_app(:no_options)
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[])
-    }
-    Then {
       refute_output_contained(/\[global options\] command \[command options\] \[arguments\.\.\.\]/)
       refute_output_contained('GLOBAL OPTIONS')
       assert_output_contained(/command \[command options\] \[arguments\.\.\.\]/)
-    }
   end
 
-  test_that "invoking help with a known command when no global options are present omits [global options] from the usage string" do
-    Given a_GLI_app(:no_options)
-    And {
+  def test_invoking_help_with_a_known_command_when_no_global_options_are_present_omits_placeholder_from_the_usage_string
+    setup_GLI_app(:no_options)
       @command_name = cm = any_command_name
       @desc         = d  = any_desc
       @long_desc    = ld = any_desc
@@ -183,20 +146,14 @@ class TC_testHelp < Clean::Test::TestCase
         end
       end
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[@command_name])
-    }
-    Then {
       refute_output_contained(/\[global options\]/)
       assert_output_contained(/\[command options\]/)
       assert_output_contained('COMMAND OPTIONS')
-    }
   end
 
-  test_that "invoking help with a known command when no global options nor command options are present omits [global options] and [command options] from the usage string" do
-    Given a_GLI_app(:no_options)
-    And {
+  def test_omits_both_placeholders_when_no_options_present
+    setup_GLI_app(:no_options)
       @command_name = cm = any_command_name
       @desc         = d  = any_desc
       @long_desc    = ld = any_desc
@@ -209,20 +166,14 @@ class TC_testHelp < Clean::Test::TestCase
         end
       end
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[@command_name])
-    }
-    Then {
       refute_output_contained(/\[global options\]/)
       refute_output_contained(/\[command options\]/)
       refute_output_contained('COMMAND OPTIONS')
-    }
   end
 
-  test_that "invoking help with a known command that has no command options omits [command options] from the usage string" do
-    Given a_GLI_app
-    And {
+  def test_no_command_options_omits_command_options_placeholder
+    setup_GLI_app
       @command_name = cm = any_command_name
       @desc         = d  = any_desc
       @long_desc    = ld = any_desc
@@ -235,19 +186,13 @@ class TC_testHelp < Clean::Test::TestCase
         end
       end
       @command = GLI::Commands::Help.new(@app,@output,@error)
-    }
-    When {
       @command.execute({},{},[@command_name])
-    }
-    Then {
       assert_output_contained(/\[global options\]/)
       refute_output_contained(/\[command options\]/)
       refute_output_contained('COMMAND OPTIONS')
-    }
   end
 
-  test_that "omitting default_description doesn't blow up" do
-    Given {
+  def test_omitting_default_description_doesnt_blow_up
       app = TestApp.new
       app.instance_eval do
         subcommand_option_handling :normal
@@ -266,23 +211,20 @@ class TC_testHelp < Clean::Test::TestCase
         end
       end
       @command = GLI::Commands::Help.new(app,@output,@error)
-    }
-    When {
-      @code = lambda { @command.execute({},{},['top']) }
-    }
-    Then {
-      assert_nothing_raised(&@code)
-    }
+      begin
+        @command.execute({},{},['top'])
+      rescue => ex
+        assert false, "Expected no exception, got: #{ex.message}"
+      end
   end
 
 private
 
-  def a_GLI_app(omit_options=false)
-    lambda {
+  def setup_GLI_app(omit_options=false)
       @program_description = program_description = any_desc
       @flags = flags = [
-        [any_desc.strip,any_arg_name,[any_option]],
-        [any_desc.strip,any_arg_name,[any_option,any_long_option]],
+        [any_desc.strip,:foo,[any_option]],
+        [any_desc.strip,:bar,[any_option,any_long_option]],
       ]
       @switches = switches = [
         [any_desc.strip,[any_option]],
@@ -319,7 +261,6 @@ private
           end
         end
       end
-    }
   end
 
   def assert_top_level_help_output
@@ -357,7 +298,7 @@ private
 
   def refute_output_contained(string_or_regexp,desc='')
     string_or_regexp = /#{string_or_regexp}/ if string_or_regexp.kind_of?(String)
-    assert_no_match string_or_regexp,@output.string,desc
+    refute_match string_or_regexp,@output.string,desc
   end
 
   def any_option
@@ -365,21 +306,21 @@ private
   end
 
   def any_long_option
-    Faker::Lorem.words(10)[rand(10)]
-  end
-
-  def any_arg_name
-    any_string :max => 20
+    ["foo","bar","blah"].sample
   end
 
   def any_desc
-    Faker::Lorem.words(10).join(' ')[0..30].gsub(/\s*$/,'')
+    [
+      "This command does some stuff",
+      "Do things and whatnot",
+      "Behold the power of this command"
+    ].sample
   end
 
   def any_command_name
-    command_name = Faker::Lorem.words(10)[rand(10)]
+    command_name = ["new","edit","delete","create","update"].sample
     while @command_names_used.include?(command_name)
-      command_name = Faker::Lorem.words(10)[rand(10)]
+      command_name = ["new","edit","delete","create","update"].sample
     end
     @command_names_used << command_name
     command_name