teaspoon 0.7.9 → 0.8.0

data/lib/generators/teaspoon/install/templates/mocha/spec_helper.coffee

@@ -4,13 +4,13 @@
 # require support/chai
 # require support/your-support-file
 #
-# PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion. Use
-# this polyfill to avoid the confusion.
+# PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+# Use this polyfill to avoid the confusion.
 #= require support/bind-poly
 #
 # Deferring execution
-# If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
-# after everything has been loaded. Simple example of a timeout:
+# If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+# Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
 #
 # Teaspoon.defer = true
 # setTimeout(Teaspoon.execute, 1000)
@@ -24,16 +24,16 @@
 # If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 # the configuration and use this file as a manifest.
 #
-# Chai
-# If you're using Chai, you probably want to initialize your preferred assertion style here.
-# For more information see: http://chaijs.com/guide/styles
-# Examples:
+# For more information: http://github.com/modeset/teaspoon
 #
-#   window.assert = chai.assert
-#   window.expect = chai.expect
-#   window.should = chai.should()
+# Chai
+# If you're using Chai, you'll probably want to initialize your preferred assertion style. You can read more about Chai
+# at: http://chaijs.com/guide/styles
 #
-# For more information: http://github.com/modeset/teaspoon
+# window.assert = chai.assert
+# window.expect = chai.expect
+# window.should = chai.should()
 #
-# You can require javascript files here. A good place to start is by requiring your application.js.
+# You can require your own javascript files here. By default this will include everything in application, however you
+# may get better load performance if you require the specific files that are being used in the spec that tests them.
 #= require application

data/lib/generators/teaspoon/install/templates/mocha/spec_helper.js

@@ -4,13 +4,13 @@
 // require support/chai
 // require support/your-support-file
 //
-// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion. Use
-// this polyfill to avoid the confusion.
+// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+// Use this polyfill to avoid the confusion.
 //= require support/bind-poly
 //
 // Deferring execution
-// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
-// after everything has been loaded. Simple example of a timeout:
+// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+// Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
 //
 // Teaspoon.defer = true
 // setTimeout(Teaspoon.execute, 1000)
@@ -24,16 +24,16 @@
 // If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 // the configuration and use this file as a manifest.
 //
-// Chai
-// If you're using Chai, you probably want to initialize your preferred assertion style here.
-// For more information see: http://chaijs.com/guide/styles
-// Examples:
+// For more information: http://github.com/modeset/teaspoon
 //
-//   window.assert = chai.assert();
-//   window.expect = chai.expect();
-//   window.should = chai.should();
+// Chai
+// If you're using Chai, you'll probably want to initialize your preferred assertion style. You can read more about Chai
+// at: http://chaijs.com/guide/styles
 //
-// For more information: http://github.com/modeset/teaspoon
+// window.assert = chai.assert;
+// window.expect = chai.expect;
+// window.should = chai.should();
 //
-// You can require javascript files here. A good place to start is by requiring your application.js.
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the spec that tests them.
 //= require application

data/lib/generators/teaspoon/install/templates/qunit/env.rb

@@ -0,0 +1,11 @@
+# Set RAILS_ROOT and load the environment if it's not already loaded.
+unless defined?(Rails)
+  ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
+  require File.expand_path("../../config/environment", __FILE__)
+end
+
+Teaspoon.configure do |config|
+  config.suite do |suite|
+    suite.use_framework :qunit
+  end
+end

data/lib/generators/teaspoon/install/templates/qunit/env_comments.rb

@@ -0,0 +1,182 @@
+# Set RAILS_ROOT and load the environment if it's not already loaded.
+unless defined?(Rails)
+  ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
+  require File.expand_path("../../config/environment", __FILE__)
+end
+
+Teaspoon.configure do |config|
+
+  # Determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
+  # `http://localhost:3000/jasmine` to run your tests.
+  #config.mount_at = "/teaspoon"
+
+  # Specifies the root where Teaspoon will look for files. If you're testing an engine using a dummy application it can
+  # be useful to set this to your engines root (e.g. `Teaspoon::Engine.root`).
+  # Note: Defaults to `Rails.root` if nil.
+  #config.root = nil
+
+  # Paths that will be appended to the Rails assets paths
+  # Note: Relative to `config.root`.
+  #config.asset_paths = ["test/javascripts", "test/javascripts/stylesheets"]
+
+  # Fixtures are rendered through a controller, which allows using HAML, RABL/JBuilder, etc. Files in these paths will
+  # be rendered as fixtures.
+  #config.fixture_paths = ["test/javascripts/fixtures"]
+
+  # SUITES
+  #
+  # You can modify the default suite configuration and create new suites here. Suites are isolated from one another.
+  #
+  # When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed. You can
+  # omit various directives and the ones defined in the default suite will be used.
+  #
+  # To run a specific suite
+  # - in the browser: http://localhost/teaspoon/[suite_name]
+  # - with the rake task: rake teaspoon suite=[suite_name]
+  # - with the cli: teaspoon --suite=[suite_name]
+  config.suite do |suite|
+
+    # Specify the framework you would like to use. This allows you to specify version, and will do some basic setup for
+    # you -- which you can override with the directives below. This should be specified first, as it can override other
+    # directives.
+    # Note: If no version is specified, the latest is assumed.
+    #
+    # Available: jasmine[1.3.1, 2.0.0], mocha[1.10.0, 1.17.1] qunit[1.12.0, 1.14.0]
+    suite.use_framework :qunit
+
+    # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
+    # files need to be within an asset path. You can add asset paths using the `config.asset_paths`.
+    #suite.matcher = "{test/javascripts,app/assets}/**/*_test.{js,js.coffee,coffee}"
+
+    # This suites spec helper, which can require additional support files. This file is loaded before any of your test
+    # files are loaded.
+    #suite.helper = "test_helper"
+
+    # The core Teaspoon javascripts. It's recommended to include only the base files here, as you can require support
+    # libraries from your spec helper.
+    # Note: For CoffeeScript files use `"teaspoon/jasmine"` etc.
+    #
+    # Available: teaspoon-jasmine, teaspoon-mocha, teaspoon-qunit
+    #suite.javascripts = ["qunit/1.14.0", "teaspoon-qunit"]
+
+    # You can include your own stylesheets if you want to change how Teaspoon looks.
+    # Note: Spec related CSS can and should be loaded using fixtures.
+    #suite.stylesheets = ["teaspoon"]
+
+    # Partial to be rendered in the head tag of the runner. You can use the provided ones or define your own by creating
+    # a `_boot.html.erb` in your fixtures path, and adjust the config to `"/boot"` for instance.
+    #
+    # Available: boot, boot_require_js
+    #suite.boot_partial = "boot"
+
+    # Partial to be rendered in the body tag of the runner. You can define your own to create a custom body structure.
+    #suite.body_partial = "body"
+
+    # Assets to be ignored when generating coverage reports. Accepts an array of filenames or regular expressions. The
+    # default excludes assets from vendor, gems and support libraries.<br/><br/>
+    #suite.no_coverage = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
+
+    # Hooks allow you to use `Teaspoon.hook("fixtures")` before, after, or during your spec run. This will make a
+    # synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
+    #suite.hook :fixtures, proc{ }
+
+  end
+
+  # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
+  # be run in the default suite -- but can be focused into a more specific suite.
+  #config.suite :targeted do |suite|
+  #  suite.matcher = "test/javascripts/targeted/*_test.{js,js.coffee,coffee}"
+  #end
+
+  # CONSOLE RUNNER SPECIFIC
+  #
+  # These configuration directives are applicable only when running via the rake task or command line interface. These
+  # directives can be overridden using the command line interface arguments or with ENV variables when using the rake
+  # task.
+  #
+  # Command Line Interface:
+  # teaspoon --driver=phantomjs --server-port=31337 --fail-fast=true --format=junit --suite=my_suite /spec/file_spec.js
+  #
+  # Rake:
+  # teaspoon DRIVER=phantomjs SERVER_PORT=31337 FAIL_FAST=true FORMATTERS=junit suite=my_suite
+
+  # Specify which headless driver to use. Supports PhantomJS and Selenium Webdriver.
+  #
+  # Available: phantomjs, selenium
+  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
+  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
+  #config.driver = "phantomjs"
+
+  # Specify additional options for the driver.
+  #
+  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
+  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
+  #config.driver_options = nil
+
+  # Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be
+  # considered a failure. This is to avoid issues that can arise where tests stall.
+  #config.driver_timeout = 180
+
+  # Specify a server to use with Rack (e.g. thin, mongrel). If nil is provided Rack::Server is used.
+  #config.server = nil
+
+  # Specify a port to run on a specific port, otherwise Teaspoon will use a random available port.
+  #config.server_port = nil
+
+  # Timeout for starting the server in seconds. If your server is slow to start you may have to bump this, or you may
+  # want to lower this if you know it shouldn't take long to start.
+  #config.server_timeout = 20
+
+  # Force Teaspoon to fail immediately after a failing suite. Can be useful to make Teaspoon fail early if you have
+  # several suites, but in environments like CI this may not be desirable.
+  #config.fail_fast = true
+
+  # Specify the formatters to use when outputting the results.
+  # Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
+  #
+  # Available: dot, documentation, clean, json, junit, pride, snowday, swayze_or_oprah, tap, tap_y, teamcity
+  #config.formatters = ["dot"]
+
+  # Specify if you want color output from the formatters.
+  #config.color = true
+
+  # Teaspoon pipes all console[log/debug/error] to $stdout. This is useful to catch places where you've forgotten to
+  # remove them, but in verbose applications this may not be desirable.
+  #config.suppress_log = false
+
+  # COVERAGE REPORTS / THRESHOLD ASSERTIONS
+  #
+  # Coverage reports requires Istanbul (https://github.com/gotwarlost/istanbul) to add instrumentation to your code and
+  # display coverage statistics.
+  #
+  # Coverage configurations are similar to suites. You can define several, and use different ones under different
+  # conditions.
+  #
+  # To run with a specific coverage configuration
+  # - with the rake task: rake teaspoon USE_COVERAGE=[coverage_name]
+  # - with the cli: teaspoon --coverage=[coverage_name]
+
+  # Specify that you always want a coverage configuration to be used.
+  #config.use_coverage = nil
+
+  config.coverage do |coverage|
+
+    # Which coverage reports Instanbul should generate. Correlates directly to what Istanbul supports.
+    #
+    # Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
+    #coverage.reports = ["text-summary", "html"]
+
+    # The path that the coverage should be written to - when there's an artifact to write to disk.
+    # Note: Relative to `config.root`.
+    #coverage.output_dir = "coverage"
+
+    # Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
+    # aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.
+    #coverage.statements = nil
+    #coverage.functions = nil
+    #coverage.branches = nil
+    #coverage.lines = nil
+
+  end
+
+end

data/lib/generators/teaspoon/install/templates/qunit/test_helper.coffee

@@ -2,13 +2,13 @@
 # require support/sinon
 # require support/your-support-file
 #
-# PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion. Use
-# this polyfill to avoid the confusion.
+# PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+# Use this polyfill to avoid the confusion.
 #= require support/bind-poly
 #
 # Deferring execution
-# If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
-# after everything has been loaded. Simple example of a timeout:
+# If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+# Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
 #
 # Teaspoon.defer = true
 # setTimeout(Teaspoon.execute, 1000)
@@ -24,5 +24,6 @@
 #
 # For more information: http://github.com/modeset/teaspoon
 #
-# You can require javascript files here. A good place to start is by requiring your application.js.
+# You can require your own javascript files here. By default this will include everything in application, however you
+# may get better load performance if you require the specific files that are being used in the test that tests them.
 #= require application

data/lib/generators/teaspoon/install/templates/qunit/test_helper.js

@@ -2,13 +2,13 @@
 // require support/sinon
 // require support/your-support-file
 //
-// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion. Use
-// this polyfill to avoid the confusion.
+// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+// Use this polyfill to avoid the confusion.
 //= require support/bind-poly
 //
 // Deferring execution
-// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
-// after everything has been loaded. Simple example of a timeout:
+// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+// Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
 //
 // Teaspoon.defer = true
 // setTimeout(Teaspoon.execute, 1000)
@@ -24,6 +24,7 @@
 //
 // For more information: http://github.com/modeset/teaspoon
 //
-// You can require javascript files here. A good place to start is by requiring your application.js.
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the test that tests them.
 //= require application
 

data/lib/tasks/teaspoon.rake

@@ -1,6 +1,13 @@
 desc "Run the javascript specs"
 task :teaspoon => :environment do |t, args|
   require "teaspoon/console"
-  files = ENV['files'].nil? ? [] : ENV['files'].split(',')
-  fail if Teaspoon::Console.new({suite: ENV["suite"], driver_cli_options: ENV["driver_cli_options"]}, files ).execute
+
+  options = {
+    files: ENV["files"].nil? ? [] : ENV["files"].split(","),
+    suite: ENV["suite"],
+    coverage: ENV["coverage"],
+    driver_options: ENV["driver_options"],
+  }
+
+  abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
 end

data/lib/teaspoon.rb

@@ -1,10 +1,8 @@
 require "teaspoon/version"
 require "teaspoon/exceptions"
-require "teaspoon/configuration"
-require "teaspoon/suite"
 require "teaspoon/utility"
-require "teaspoon/check_coverage"
-require "teaspoon/coverage"
-require "teaspoon/instrumentation"
+require "teaspoon/configuration"
+
+require "teaspoon/engine" if defined?(Rails)
 
-require "teaspoon/engine"
+require "teaspoon/deprecated"

data/lib/teaspoon/command_line.rb

@@ -1,156 +1,138 @@
 require "optparse"
 require "teaspoon/version"
+require "teaspoon/exceptions"
 
 module Teaspoon
   class CommandLine
 
     def initialize
       @options = {}
-      @files = opt_parser.parse!
-
-      begin
-        require_console
-        abort if Teaspoon::Console.new(@options, @files).execute
-      rescue Teaspoon::EnvironmentNotFound => e
-        STDOUT.print "Unable to load Teaspoon environment in {#{Teaspoon::Environment.standard_environments.join(', ')}}.\n"
-        STDOUT.print "Consider using -r path/to/teaspoon_env\n"
-        abort
-      end
+      @options[:files] = opt_parser.parse!
+
+      require_console
+      abort if Teaspoon::Console.new(@options).failures?
+    rescue Teaspoon::EnvironmentNotFound => e
+      abort("#{e.message}\nConsider using -r path/to/teaspoon_env\n")
     end
 
     def opt_parser
       OptionParser.new do |parser|
-        parser.banner = "Usage: teaspoon [options] [files]\n\n"
-
-        parser.on("-r", "--require FILE", "Require Teaspoon environment file.") do |file|
-          @options[:environment] = file
-        end
-
-        #parser.on("-O", "--options PATH", "Specify the path to a custom options file.") do |path|
-        #  @options[:custom_options_file] = path
-        #end
-
-        parser.on("-d", "--driver DRIVER", "Specify driver:",
-                  "  phantomjs (default)",
-                  "  selenium") do |driver|
-          @options[:driver] = driver
-        end
-
-        parser.on("-o", "--driver-cli-options OPTIONS", "Specify driver-specific options string to pass into the driver, e.g.",
-                        "  '--ssl-protocol=any --ssl-certificates-path=/path/to/certs' could be used for phantomjs",
-                        "  Currently driver CLI options are only supported for phantomjs. It will be ignored if using the selenium driver.") do |driver_cli_options|
-          @options[:driver_cli_options] = driver_cli_options
-        end
-
-        parser.on("--server SERVER", "Sets server to use with Rack.") do |server|
-          @options[:server] = server
-        end
-
-        parser.on("--server-timeout SECONDS", "Sets the timeout for the server to start.") do |seconds|
-          @options[:server_timeout] = seconds
-        end
-
-        parser.on("--server-port PORT", "Sets the server to use a specific port.") do |port|
-          @options[:server_port] = port
-        end
-
-        parser.on("--[no-]fail-fast", "Abort after the first failing suite.") do |bool|
-          @options[:fail_fast] = bool
-        end
-
-        parser.separator("\n  **** Filtering ****\n\n")
-
-        parser.on("-s", "--suite SUITE", "Focus to a specific suite.") do |suite|
-          @options[:suite] = suite
-        end
-
-        parser.on("-g", "--filter FILTER", "Filter tests matching a specific filter.") do |filter|
-          @options[:filter] = filter
-        end
-
-        parser.separator("\n  **** Output ****\n\n")
-
-        parser.on("-f", "--format FORMATTERS", "Specify formatters (comma separated)",
-                  "  dot (default) - dots",
-                  "  tap_y - format used by tapout",
-                  "  swayze_or_oprah - random quote from Patrick Swayze or Oprah Winfrey") do |formatters|
-          @options[:formatters] = formatters
-        end
-
-        parser.on("-q", "--[no-]suppress-log", "Suppress logs coming from console[log/debug/error].") do |bool|
-          @options[:suppress_log] = bool
-        end
-
-        parser.on("-c", "--[no-]colour", "Enable/Disable color output.") do |bool|
-          @options[:color] = bool
-        end
-
-        parser.separator("\n  **** Coverage ****\n\n")
-
-        parser.on("-C", "--coverage", "Generate coverage report (requires Istanbul).") do |bool|
-          @options[:coverage] = bool
-        end
-
-        parser.on("-R", "--coverage-reports FORMATS", "Specify which coverage reports to generate (comma separated)",
-                  "  text-summary (default) - compact text summary in results",
-                  "  text - text table with coverage for all files in results",
-                  "  html - HTML files with annotated source code",
-                  "  lcov - html + lcov files",
-                  "  lcovonly - an lcov.info file",
-                  "  cobertura - cobertura-coverage.xml used by Hudson") do |reports|
-          @options[:coverage] = true
-          @options[:coverage_reports] = reports
-        end
-
-        parser.on("-O", "--coverage-output-dir DIR", "Specify directory where coverage reports should be generated.") do |dir|
-          @options[:coverage_output_dir] = dir
-        end
-
-        parser.separator("\n  **** Coverage Thresholds ****\n\n")
-
-        parser.on("-S", "--statements-coverage-threshold THRESHOLD", "Specify the statements coverage threshold.",
-                  " If this is a positive number, it is the minimum percentage required for coverage to not fail.",
-                  " If it is a negative number, it is the maximum number of uncovered statements allowed to not fail.") do |threshold|
-          @options[:statements_coverage_threshold] = threshold
-        end
-
-        parser.on("-F", "--functions-coverage-threshold THRESHOLD", "Specify the functions coverage threshold.",
-                  " If this is a positive number, it is the minimum percentage required for coverage to not fail.",
-                  " If it is a negative number, it is the maximum number of uncovered functions allowed to not fail.") do |threshold|
-          @options[:functions_coverage_threshold] = threshold
-        end
-
-        parser.on("-B", "--branches-coverage-threshold THRESHOLD", "Specify the branches coverage threshold.",
-                  " If this is a positive number, it is the minimum percentage required for coverage to not fail.",
-                  " If it is a negative number, it is the maximum number of uncovered branches allowed to not fail.") do |threshold|
-          @options[:branches_coverage_threshold] = threshold
-        end
-
-        parser.on("-L", "--lines-coverage-threshold THRESHOLD", "Specify the lines coverage threshold.",
-                  " If this is a positive number, it is the minimum percentage required for coverage to not fail.",
-                  " If it is a negative number, it is the maximum number of uncovered lines allowed to not fail.") do |threshold|
-          @options[:lines_coverage_threshold] = threshold
-        end
-
-        parser.separator("\n  **** Utility ****\n\n")
-
-        parser.on("-v", "--version", "Display the version.") do
-          puts Teaspoon::VERSION
-          exit
-        end
-
-        parser.on("-h", "--help", "You're looking at it.") do
-          puts parser
-          exit
-        end
+        @parser = parser
+        @parser.banner = "Usage: teaspoon [options] [files]\n\n"
+
+        opts_for_general
+        opts_for_filtering
+        opts_for_output
+        opts_for_coverage
+        opts_for_utility
       end
     end
 
+    protected
+
+    def opts_for_general
+      opt :environment,
+        "-r", "--require FILE",
+        "Require Teaspoon environment file."
+
+      #opt :custom_options_file,
+      #  "-O", "--options PATH",
+      #  "Specify the path to a custom options file."
+
+      opt :driver, "-d", "--driver DRIVER",
+        "Specify driver:",
+        "  phantomjs (default)",
+        "  selenium"
+
+      opt :driver_options, "--driver-options OPTIONS",
+        "Specify driver-specific options to pass into the driver.",
+        "  e.g. \"--ssl-protocol=any --ssl-certificates-path=/path/to/certs\".",
+        "  Driver options are only supported with phantomjs."
+
+      opt :driver_timeout, "--driver-timeout SECONDS",
+        "Sets the timeout for the driver to wait before exiting."
+
+      opt :server, "--server SERVER",
+        "Sets server to use with Rack.",
+        "  e.g. webrick, thin"
+
+      opt :server_port, "--server-port PORT",
+        "Sets the server to use a specific port."
+
+      opt :server_timeout, "--server-timeout SECONDS",
+        "Sets the timeout that the server must start within."
+
+      opt :fail_fast, "-F", "--[no-]fail-fast",
+        "Abort after the first failing suite."
+    end
+
+    def opts_for_filtering
+      separator("Filtering")
+
+      opt :suite, "-s", "--suite SUITE",
+        "Focus to a specific suite."
+
+      opt :filter, "-g", "--filter FILTER",
+        "Filter tests matching a specific filter."
+    end
+
+    def opts_for_output
+      separator("Output")
+
+      opt :suppress_log, "-q", "--[no-]suppress-log",
+        "Suppress logs coming from console[log/debug/error]."
+
+      opt :color, "-c", "--[no-]color",
+        "Enable/Disable color output."
+
+      opt :export, "-e", "--export [OUTPUT_PATH]",
+        "Exports the test suite as the full HTML (requires wget)."
+
+      opt :formatters, "-f", "--format FORMATTERS",
+        "Specify formatters (comma separated)",
+        "  dot (default) - dots",
+        "  documentation - descriptive documentation",
+        "  clean - like dots but doesn't log re-run commands",
+        "  json - json formatter (raw teaspoon)",
+        "  junit - junit compatible formatter",
+        "  pride - yay rainbows!",
+        "  snowday - makes you feel warm inside",
+        "  swayze_or_oprah - quote from either Patrick Swayze or Oprah Winfrey",
+        "  tap - test anything protocol formatter",
+        "  tap_y - tap_yaml, format used by tapout",
+        "  teamcity - teamcity compatible formatter"
+    end
+
+    def opts_for_coverage
+      separator("Coverage")
+
+      opt :use_coverage, "-C", "--coverage CONFIG_NAME",
+        "Generate coverage reports using a pre-defined coverage configuration."
+    end
+
+    def opts_for_utility
+      separator("Utility")
+
+      @parser.on "-v", "--version", "Display the version.", proc{ STDOUT.print("#{Teaspoon::VERSION}\n"); exit }
+      @parser.on "-h", "--help", "You're looking at it.", proc { STDOUT.print("#{@parser}\n"); exit }
+    end
+
+    private
+
+    def separator(message)
+      @parser.separator("\n  **** #{message} ****\n\n")
+    end
+
+    def opt(config, *args)
+      @parser.on(*args, proc{ |value| @options[config] = value })
+    end
+
     def require_console
       require "teaspoon/console"
     end
 
-    def abort
+    def abort(message = nil)
+      STDOUT.print(message) if message
       exit(1)
     end
   end