164 changed files with 1318 additions and 3044 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,6 +14,3 @@ jhw-test
 .jhw-cache/
 _site/
 jhw.*.html
-coverage/
-tmp/
-cache dir/
--- a/21
+++ b/21
@ -6,25 +6,12 @@ gemspec
 gem 'rspec'
 gem 'fakefs', :require => nil
 gem 'guard'
-
 gem 'guard-rspec'
 gem 'guard-shell'
 gem 'guard-coffeescript'
-gem 'guard-cucumber'
-
-require 'rbconfig'
-case RbConfig::CONFIG['host_os']
-when /darwin/
-when /linux/
-  gem 'libnotify'
-end
-
-gem 'mocha'
-
-gem 'cucumber'
-
-gem 'jquery-rails', '~> 1.0.0'
-gem 'ejs'
-
+gem 'growl'
+gem 'rake', '0.8.7'
+gem 'mocha', '0.9.12'
 gem 'guard-jasmine-headless-webkit', :git => 'git://github.com/johnbintz/guard-jasmine-headless-webkit.git'
+gem 'facter'

--- a/7
+++ b/7
@ -22,18 +22,13 @@ guard 'rspec', :version => 2, :all_on_start => false do
  watch('spec/spec_helper.rb') { "spec" }
 end

-guard 'cucumber', :cli => '-r features --format pretty' do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/steps/(.+)_steps\.rb$}) { 'features' }
-end
-
 guard 'jasmine-headless-webkit', :all_on_start => false do
  watch(%r{^spec/javascripts/.+_spec\.coffee})
  watch(%r{^jasmine/(.+)\.coffee$}) { |m| "spec/javascripts/#{m[1]}_spec.coffee" }
 end

 def compile
+  #system %{cd ext/jasmine-webkit-specrunner && ruby test.rb && ruby extconf.rb}
  system %{cd ext/jasmine-webkit-specrunner && ruby extconf.rb}
 end

--- a/README.md
+++ b/README.md
@ -1,5 +1,3 @@
-_This project is dead. You should use [Karma](http://karma-runner.github.io/) instead. I do._
-
 # Jasmine Headless WebKit runner

 Run your specs at sonic boom speed! No pesky reload button or page rendering slowdowns!
@ -7,19 +5,6 @@ Run your specs at sonic boom speed! No pesky reload button or page rendering slo
 http://johnbintz.github.com/jasmine-headless-webkit/ has the most up-to-date information on using
 this project. You can see the source of that site on the gh-pages branch.

-## For those who want to hack on the project...
-
-The best way to get everything running that you need for development and testing is
-to use Guard:
-
-``` bash
-bundle install
-bundle exec guard
-... build Qt runner ...
-... compile CoffeeScript to JS ...
-... run RSpec and JHW ...
-```
-
 ## License

 * Copyright (c) 2011 John Bintz
--- a/22
+++ b/22
@ -14,7 +14,7 @@ require 'jasmine/headless/task'

 Jasmine::Headless::Task.new

-PLATFORMS = %w{1.9.2 1.9.3}
+PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3-rc1}

 def rvm_bundle(command = '')
  Bundler.with_clean_env do
@ -30,7 +30,6 @@ namespace :spec do
  task :platforms do
    rvm_bundle
    rvm_bundle "exec rspec spec"
-    rvm_bundle "exec cucumber"
    raise SpecError.new if $?.exitstatus != 0
  end
 end
@ -44,22 +43,3 @@ task :build_runner do
  end
 end

-desc "Generate vendored JS"
-task :generate_js do
-  require 'sprockets'
-
-  source = 'vendor/assets/coffeescripts'
-  target = 'vendor/assets/javascripts'
-
-  env = Sprockets::Environment.new { |s| s.append_path 'vendor/assets/coffeescripts' }
-
-  Dir[File.join(File.expand_path(source), '*.coffee')].each do |file|
-    file_target = file.gsub(source, target).gsub('.coffee', '.js')
-    puts "#{file} => #{file_target}"
-
-    File.open(file_target, 'wb') do |fh|
-      fh.print env.find_asset(File.expand_path(file)).to_s
-    end
-  end
-end
-
--- a/bin/jasmine-headless-webkit
+++ b/bin/jasmine-headless-webkit
@ -1,11 +1,30 @@
 #!/usr/bin/env ruby

 require 'rubygems'
+require 'rainbow'

-$: << File.expand_path('../../lib', __FILE__)
+def gem_dir
+  File.expand_path('../..', __FILE__)
+end

+$:.unshift(File.join(gem_dir, 'lib'))
 require 'jasmine-headless-webkit'
-require 'coffee-script'

-Jasmine::Headless::CommandLine.run!
+begin
+  options = Jasmine::Headless::Options.from_command_line
+  runner = Jasmine::Headless::Runner.new(options)
+
+  if options[:do_list]
+    files_list = Jasmine::FilesList.new(:config => runner.jasmine_config)
+    files_list.files.each { |file| puts file }
+  else
+    exit runner.run
+  end
+rescue CoffeeScript::CompilationError
+  exit 1
+rescue StandardError => e
+  $stderr.puts "[%s] %s (%s)" % [ "jasmine-headless-webkit".color(:red), e.message.color(:white), e.class.name.color(:yellow) ]
+  $stderr.puts e.backtrace.collect { |line| "  #{line}" }.join("\n")
+  exit 1
+end

--- a/config/cucumber.yml
+++ b/config/cucumber.yml
@ -1,2 +0,0 @@
-default: -r features
-
--- a/ext/jasmine-webkit-specrunner/Page.cpp
+++ b/ext/jasmine-webkit-specrunner/Page.cpp
@ -11,5 +11,6 @@ void Page::javaScriptConsoleMessage(const QString & message, int lineNumber, con
 }

 void Page::javaScriptAlert(QWebFrame *, const QString &) {}
-bool Page::javaScriptConfirm(QWebFrame *, const QString &) { return false; }
-bool Page::javaScriptPrompt(QWebFrame *, const QString &, const QString &, QString *) { return false; }
+bool Page::javaScriptConfirm(QWebFrame *, const QString &) {
+  return false;
+}
--- a/ext/jasmine-webkit-specrunner/Page.h
+++ b/ext/jasmine-webkit-specrunner/Page.h
@ -12,7 +12,6 @@ class Page: public QWebPage {
    void javaScriptConsoleMessage(const QString & message, int lineNumber, const QString & sourceID);
    void javaScriptAlert(QWebFrame *, const QString &);
    bool javaScriptConfirm(QWebFrame *, const QString &);
-    bool javaScriptPrompt(QWebFrame *, const QString &, const QString &, QString *);
  signals:
    void handleError(const QString & message, int lineNumber, const QString & sourceID);
 };
--- a/ext/jasmine-webkit-specrunner/Runner.cpp
+++ b/ext/jasmine-webkit-specrunner/Runner.cpp
@ -18,7 +18,6 @@ Runner::Runner() : QObject()
  , usedConsole(false)
  , isFinished(false)
  , useColors(false)
-  , quiet(false)
  {
  page.settings()->enablePersistentStorage();
  ticker.setInterval(TIMER_TICK);
@ -63,17 +62,17 @@ void Runner::handleError(const QString &message, int lineNumber, const QString &

 void Runner::loadSpec()
 {
-  QVectorIterator<QString> iterator(reportFiles);
-
-  while (iterator.hasNext()) {
-    QFile *outputFile = new QFile(iterator.next());
+  if (reportFileName.isEmpty()) {
+    outputFile = 0;
+    ts = 0;
+  } else {
+    outputFile = new QFile(reportFileName);
    outputFile->open(QIODevice::WriteOnly);
-    outputFiles.enqueue(outputFile);
+
+    ts = new QTextStream(outputFile);
  }

-  QString runnerFile = runnerFiles.dequeue();
-
-  page.mainFrame()->load(runnerFile);
+  page.mainFrame()->load(runnerFiles.dequeue());
  ticker.start();
 }

@ -105,8 +104,8 @@ void Runner::hasSpecFailure() {
  _hasSpecFailure = true;
 }

-void Runner::setReportFiles(QStack<QString> &files) {
-  reportFiles = files;
+void Runner::reportFile(const QString &file) {
+  reportFileName = file;
 }

 void Runner::timerPause() {
@ -117,26 +116,6 @@ void Runner::timerDone() {
  ticker.start();
 }

-void Runner::ping() {
-  runs = 0;
-}
-
-void Runner::setSeed(QString s) {
-  seed = s;
-}
-
-void Runner::setQuiet(bool q) {
-  quiet = q;
-}
-
-QString Runner::getSeed() {
-  return seed;
-}
-
-bool Runner::isQuiet() {
-  return quiet;
-}
-
 void Runner::print(const QString &fh, const QString &content) {
  if (fh == "stdout") {
    std::cout << qPrintable(content);
@ -148,18 +127,14 @@ void Runner::print(const QString &fh, const QString &content) {
    std::cerr.flush();
  }

-  if (fh.contains("report")) {
-    int index = (int)fh.split(":").last().toUInt();
-
-    QTextStream ts(outputFiles.at(index));
-    ts << qPrintable(content);
-    ts.flush();
+  if (fh == "report" && outputFile) {
+    *ts << qPrintable(content);
+    ts->flush();
  }
 }

 void Runner::finishSuite() {
  isFinished = true;
-  runs = 0;
 }

 void Runner::timerEvent() {
@ -168,9 +143,9 @@ void Runner::timerEvent() {
  if (hasErrors && runs > 2)
    QApplication::instance()->exit(1);

-  if (isFinished && runs > 2) {
-    while (!outputFiles.isEmpty()) {
-      outputFiles.dequeue()->close();
+  if (isFinished) {
+    if (outputFile) {
+      outputFile->close();
    }

    int exitCode = 0;
--- a/ext/jasmine-webkit-specrunner/Runner.h
+++ b/ext/jasmine-webkit-specrunner/Runner.h
@ -7,9 +7,7 @@
 #include <QTextStream>
 #include <iostream>
 #include <fstream>
-#include <sstream>
 #include <QQueue>
-#include <QApplication>

 #include "Page.h"

@ -22,10 +20,7 @@ class Runner: public QObject {

    Runner();
    void setColors(bool colors);
-    void setReportFiles(QStack<QString> &files);
-    void setSeed(QString s);
-    void setQuiet(bool q);
-
+    void reportFile(const QString &file);
    void addFile(const QString &spec);
    void go();

@ -35,13 +30,8 @@ class Runner: public QObject {
    void hasUsedConsole();
    void hasError();
    void hasSpecFailure();
-
-    bool isQuiet();
-    QString getSeed();
-
    void print(const QString &fh, const QString &content);
    void finishSuite();
-    void ping();

  private slots:
    void watch(bool ok);
@ -58,16 +48,15 @@ class Runner: public QObject {
    bool usedConsole;
    bool isFinished;
    bool useColors;
-    bool quiet;
-
-    QString seed;

    QQueue<QString> runnerFiles;
-    QStack<QString> reportFiles;
+
+    QString reportFileName;

    void loadSpec();

-    QQueue<QFile *> outputFiles;
+    QFile *outputFile;
+    QTextStream *ts;
 };

 #endif
--- a/ext/jasmine-webkit-specrunner/common.pri
+++ b/ext/jasmine-webkit-specrunner/common.pri
@ -1,6 +1,7 @@
 TEMPLATE = app
 CONFIG -= app_bundle
 QMAKE_INFO_PLIST = Info.plist
+QMAKESPEC = macx-g++
 QT += network webkit

 SOURCES = Page.cpp Runner.cpp
--- a/ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner.pro
+++ b/ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner.pro
@ -0,0 +1,19 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue Aug 2 10:37:48 2011
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += . HeadlessSpecRunner Test
+INCLUDEPATH += . HeadlessSpecRunner Test
+
+# Input
+HEADERS += HeadlessSpecRunner/ConsoleOutput.h \
+           HeadlessSpecRunner/Page.h \
+           HeadlessSpecRunner/Runner.h \
+           Test/Page_test.h
+SOURCES += specrunner.cpp \
+           HeadlessSpecRunner/ConsoleOutput.cpp \
+           HeadlessSpecRunner/Page.cpp \
+           HeadlessSpecRunner/Runner.cpp \
+           Test/Page_test.cpp
--- a/ext/jasmine-webkit-specrunner/specrunner.cpp
+++ b/ext/jasmine-webkit-specrunner/specrunner.cpp
@ -23,54 +23,40 @@

 #include "Runner.h"

-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
-#include <getopt.h>
-#endif
-
 #if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
 #error Use Qt 4.7 or later version
 #endif

 int main(int argc, char** argv)
 {
-  bool showColors = false;
-  bool isQuiet = false;
-  QString seed;
-  QStack<QString> reporterFiles;
+  char *reporter = NULL;
+  char showColors = false;

  int c, index;

-  while ((c = getopt(argc, argv, "cr:s:q")) != -1) {
+  while ((c = getopt(argc, argv, "cr:")) != -1) {
    switch(c) {
      case 'c':
        showColors = true;
        break;
-      case 'q':
-        isQuiet = true;
-        break;
      case 'r':
-        reporterFiles.push(QString(optarg));
-        break;
-      case 's':
-        seed = QString(optarg);
+        reporter = optarg;
        break;
    }
  }

  if (optind == argc) {
    std::cerr << "Run Jasmine's SpecRunner headlessly" << std::endl << std::endl;
-    std::cerr << "  specrunner [-c] [-s seed] [-r report file ...] specrunner.html ..." << std::endl;
+    std::cerr << "  specrunner [-c] [-r <report file>] specrunner.html ..." << std::endl;
    return 1;
  }

  QApplication app(argc, argv);
  app.setApplicationName("jasmine-headless-webkit");
  Runner runner;
-
  runner.setColors(showColors);
-  runner.setQuiet(isQuiet);
-  runner.setReportFiles(reporterFiles);
-  runner.setSeed(seed);
+
+  runner.reportFile(reporter);

  for (index = optind; index < argc; index++) {
    runner.addFile(QString::fromLocal8Bit(argv[index]));
--- a/features/bin/failure.feature
+++ b/features/bin/failure.feature
@ -1,7 +0,0 @@
-Feature: Bin - Failure
-  Scenario: Run a failing test
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/failure/failure.yml -f File:spec/report.txt`
-    Then the exit status should be 1
-      And the report file "spec/report.txt" should have 1 total, 1 failure, no console usage
-
--- a/features/bin/files.feature
+++ b/features/bin/files.feature
@ -1,7 +0,0 @@
-Feature: Bin - Files
-  Scenario: List the files a test suite will use
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml -l`
-    Then the exit status should be 0
-      And the output should include "spec/jasmine/success/success.js"
-      And the output should include "spec/jasmine/success/success_spec.js"
--- a/features/bin/filtered_run/both_runs.feature
+++ b/features/bin/filtered_run/both_runs.feature
@ -1,18 +0,0 @@
-Feature: Bin - Filtered Run - Both Runs
-  Background:
-    Given there is no existing "spec/report.txt" file
-
-  Scenario: Run one and fail
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/filtered_failure/filtered_failure.yml -f File:spec/report.txt ./spec/jasmine/filtered_failure/failure_spec.js`
-    Then the exit status should be 1
-      And the report file "spec/report.txt" should have 1 total, 1 failure, no console usage
-
-  Scenario: Run both and succeed
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml -f File:spec/report.txt ./spec/jasmine/filtered_success/success_one_spec.js`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 2 total, 0 failures, no console usage
-
-  Scenario: Run both with console.log
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/filtered_success_with_console/filtered_success.yml -f File:spec/report.txt ./spec/jasmine/filtered_success_with_console/success_one_spec.js`
-    Then the exit status should be 2
-      And the report file "spec/report.txt" should have 2 total, 0 failures, yes console usage
--- a/features/bin/filtered_run/no_full_run.feature
+++ b/features/bin/filtered_run/no_full_run.feature
@ -1,14 +0,0 @@
-Feature: Bin - No Full Run
-  Background:
-    Given there is no existing "spec/report.txt" file
-
-  Scenario: Only run the filtered run
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml -f File:spec/report.txt --no-full-run ./spec/jasmine/filtered_success/success_one_spec.js`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failure, no console usage
-
-  Scenario: Use a file outside of the normal test run
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml -f File:spec/report.txt ./spec/jasmine/filtered_success/success_other_file.js`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failure, no console usage
-
--- a/features/bin/help.feature
+++ b/features/bin/help.feature
@ -1,7 +0,0 @@
-Feature: Bin - Help
-  Scenario: Display the Help
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -h`
-    Then I should get help output
-      And the exit status should be 0
-
--- a/features/bin/quiet_messages.feature
+++ b/features/bin/quiet_messages.feature
@ -1,8 +0,0 @@
-Feature: Bin - Quiet Messages
-  Scenario: Run a test that would cause a lot of messages to be displayed and silence them all
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -q -j spec/jasmine/noisy/noisy.yml`
-    Then the exit status should be 0
-      And the output should not include "[Skipping File]"
-      And the output should not include "You should mock"
-
--- a/features/bin/runner_out.feature
+++ b/features/bin/runner_out.feature
@ -1,8 +0,0 @@
-Feature: Bin - Runner Out
-  Scenario: Write out the runner to a specified file
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml --runner-out spec/runner.html`
-    Then the exit status should be 0
-      And the file "spec/runner.html" should contain a JHW runner
-    When I delete the file "spec/runner.html"
-
--- a/features/bin/spec_files_with_same_basename.feature
+++ b/features/bin/spec_files_with_same_basename.feature
@ -1,7 +0,0 @@
-Feature: Bin - Two spec files with same basename
-  Scenario: Run both files
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/two_spec_files_same_basename/jasmine.yml -f File:spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 2 total, 0 failures, no console usage
-
--- a/features/bin/success.feature
+++ b/features/bin/success.feature
@ -1,20 +0,0 @@
-Feature: Bin - Success
-  Scenario: Run a successful test with long format definition
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit --seed 1234 -j spec/jasmine/success/success.yml --format File --out spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failures, no console usage
-      And the report file "spec/report.txt" should have seed 1234
-
-  Scenario: Run a successful test with legacy file reporting
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml --report spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failures, no console usage
-
-  Scenario: Run a successful test with shortened format definition
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml -f File:spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failures, no console usage
-
--- a/features/bin/success_with_js_error.feature
+++ b/features/bin/success_with_js_error.feature
@ -1,5 +0,0 @@
-Feature: Bin - Success with JS Error
-  Scenario: Succeed
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/success_with_error/success_with_error.yml -f File:spec/report.txt`
-    Then the exit status should be 1
--- a/features/bin/tries_to_leave_page.feature
+++ b/features/bin/tries_to_leave_page.feature
@ -1,7 +0,0 @@
-Feature: Bin - Try to Leave Page
-  Scenario: Fail on trying to leave the page
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/leave_page/leave_page.yml -f File:spec/report.txt`
-    Then the exit status should be 1
-      And the report file "spec/report.txt" should exist
-
--- a/features/bin/try_to_click_a_button.feature
+++ b/features/bin/try_to_click_a_button.feature
@ -1,7 +0,0 @@
-Feature: Bin - Try to Click A Button
-  Scenario: Don't leave page when clicking a button
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/click_button/click_button.yml -f File:spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 0 total, 0 failures, no console usage
-
--- a/features/bin/two_files_from_src_files.feature
+++ b/features/bin/two_files_from_src_files.feature
@ -1,11 +0,0 @@
-Feature: Two files from source files
-  Scenario: Files are ordered directly
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/two_files_from_src_files/jasmine.yml -l`
-    Then the exit status should be 0
-      And the following files should be loaded in order:
-        | vendor/vendor-file.js |
-        | vendor/vendor.js |
-        | app/app-file.js |
-        | app/app.js |
-
--- a/features/bin/with_coffeescript_error.feature
+++ b/features/bin/with_coffeescript_error.feature
@ -1,7 +0,0 @@
-Feature: Bin - With CoffeeScript error
-  Scenario: Fail on CoffeeScript error
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/coffeescript_error/coffeescript_error.yml -f File:spec/report.txt`
-    Then the exit status should be 1
-      And the report file "spec/report.txt" should not exist
-
--- a/features/bin/with_console_log.feature
+++ b/features/bin/with_console_log.feature
@ -1,7 +0,0 @@
-Feature: Use console.log
-  Scenario: Run a successful test that uses console.log
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/console_log/console_log.yml -f File:spec/report.txt`
-    Then the exit status should be 2
-      And the report file "spec/report.txt" should have 1 total, 0 failures, yes console usage
-
--- a/features/bin/with_server.feature
+++ b/features/bin/with_server.feature
@ -1,7 +0,0 @@
-Feature: Bin - With Server
-  Scenario: Run using an HTTP server
-    Given there is no existing "spec/report.txt" file
-    When I run `bin/jasmine-headless-webkit --use-server -j spec/jasmine/success/success.yml -f File:spec/report.txt`
-    Then the exit status should be 0
-      And the report file "spec/report.txt" should have 1 total, 0 failures, no console usage
-
--- a/features/bin/with_window_prompt.feature
+++ b/features/bin/with_window_prompt.feature
@ -1,7 +0,0 @@
-Feature: Bin - With window.prompt()
-  Scenario: Alert the user that window.prompt() needs to be stubbed
-    Given I have a test suite
-    When I run `bin/jasmine-headless-webkit -j spec/jasmine/window_prompt/window_prompt.yml`
-    Then the exit status should be 0
-      And the output should include "You should mock window.prompt"
-
--- a/features/reporters.feature
+++ b/features/reporters.feature
@ -1,24 +0,0 @@
-Feature: Reporters
-  In order to allow for multiple types of output
-  I should be able to
-  Manage reporters and decide which ones to use
-
-  Scenario: Use default reporters
-    Given I have the default runner options
-    When I get a runner
-      And I get a template writer
-    Then the template should use the "Console" reporter to "stdout"
-      And the command to run the runner should not include a report file
-
-  Scenario: Use a file reporter
-    Given I have the default runner options
-      And I have the following reporters:
-        | Name | File |
-        | Console | |
-        | File | file |
-    When I get a runner
-      And I get a template writer
-    Then the template should use the "Console" reporter to "stdout"
-      And the template should use the "File" reporter to "report:0"
-      And the command to run the runner should include the report file "file"
-
--- a/features/runner.feature
+++ b/features/runner.feature
@ -1,34 +0,0 @@
-Feature: Using the Runner directly
-  Scenario: Succeed
-    Given I have the following runner options:
-      """
-      :jasmine_config: spec/jasmine/success/success.yml
-      :reporters:
-      - [ 'File', 'spec/report.txt' ]
-      """
-    When I get a runner
-      And I run the runner
-    Then the runner should have an exit status of 0
-    And the report file "spec/report.txt" should have 1 total, 0 failures, no console usage
-
-  Scenario: JavaScript Error
-    Given I have the following runner options:
-      """
-      :jasmine_config: spec/jasmine/success_with_error/success_with_error.yml
-      """
-    When I get a runner
-      And I run the runner
-    Then the runner should have an exit status of 1
-
-  Scenario: Failure
-    Given I have the following runner options:
-      """
-      :jasmine_config: spec/jasmine/failure/failure.yml
-      :reporters:
-      - [ 'File', 'spec/report.txt' ]
-      """
-    When I get a runner
-      And I run the runner
-    Then the runner should have an exit status of 1
-    And the report file "spec/report.txt" should have 1 total, 1 failure, no console usage
-
--- a/features/steps/given/i_have_test_suite.rb
+++ b/features/steps/given/i_have_test_suite.rb
@ -1,2 +0,0 @@
-Given /^I have a test suite$/ do
-end
--- a/features/steps/given/no_existing_file.rb
+++ b/features/steps/given/no_existing_file.rb
@ -1,4 +0,0 @@
-Given /^there is no existing "([^"]*)" file$/ do |file|
-  FileUtils.rm_rf file
-end
-
--- a/features/steps/given/options/i_have_defaults.rb
+++ b/features/steps/given/options/i_have_defaults.rb
@ -1,4 +0,0 @@
-Given /^I have the default runner options$/ do
-  @options = Jasmine::Headless::Options.new
-end
-
--- a/features/steps/given/options/i_have_reporters.rb
+++ b/features/steps/given/options/i_have_reporters.rb
@ -1,10 +0,0 @@
-Given /^I have the following reporters:$/ do |table|
-  @options[:reporters] = []
-
-  table.hashes.each do |hash|
-    reporter = [ hash['Name'] ]
-    reporter << hash['File'] if !hash['File'].empty?
-
-    @options[:reporters] << reporter
-  end
-end
--- a/features/steps/given/options/i_have_runner_options.rb
+++ b/features/steps/given/options/i_have_runner_options.rb
@ -1,3 +0,0 @@
-Given /^I have the following runner options:$/ do |string|
-  @options = YAML.load(string)
-end
--- a/features/steps/then/bin/exit_status_should_be.rb
+++ b/features/steps/then/bin/exit_status_should_be.rb
@ -1,3 +0,0 @@
-Then /^the exit status should be (\d+)$/ do |exitstatus|
-  $?.exitstatus.should == exitstatus.to_i
-end
--- a/features/steps/then/bin/file_should_contain_runner.rb
+++ b/features/steps/then/bin/file_should_contain_runner.rb
@ -1,4 +0,0 @@
-Then /^the file "([^"]*)" should contain a JHW runner$/ do |file|
-  File.read(file).should include('jasmine.HeadlessReporter')
-end
-
--- a/features/steps/then/bin/following_files_loaded_in_order.rb
+++ b/features/steps/then/bin/following_files_loaded_in_order.rb
@ -1,10 +0,0 @@
-Then /^the following files should be loaded in order:$/ do |table|
-  files = table.raw.flatten
-
-  @output.lines.collect(&:strip).each do |line|
-    files.shift if line[files.first]
-  end
-
-  files.should be_empty
-end
-
--- a/features/steps/then/bin/i_should_get_help_output.rb
+++ b/features/steps/then/bin/i_should_get_help_output.rb
@ -1,4 +0,0 @@
-Then /^I should get help output$/ do
-  @output.should include("Usage:")
-end
-
--- a/features/steps/then/bin/output_should_include.rb
+++ b/features/steps/then/bin/output_should_include.rb
@ -1,3 +0,0 @@
-Then /^the output should include "([^"]*)"$/ do |string|
-  @output.should include(string)
-end
--- a/features/steps/then/bin/output_should_not_include.rb
+++ b/features/steps/then/bin/output_should_not_include.rb
@ -1,4 +0,0 @@
-Then /^the output should not include "([^"]*)"$/ do |string|
-  @output.should_not include(string)
-end
-
--- a/features/steps/then/reporting/report_does_not_exist.rb
+++ b/features/steps/then/reporting/report_does_not_exist.rb
@ -1,4 +0,0 @@
-Then /^the report file "([^"]*)" should not exist$/ do |file|
-  File.file?(file).should be_false
-end
-
--- a/features/steps/then/reporting/report_should_exist.rb
+++ b/features/steps/then/reporting/report_should_exist.rb
@ -1,3 +0,0 @@
-Then /^the report file "([^"]*)" should exist$/ do |file|
-  File.file?(file).should be_true
-end
--- a/features/steps/then/reporting/report_should_have.rb
+++ b/features/steps/then/reporting/report_should_have.rb
@ -1,7 +0,0 @@
-Then /^the report file "(.*)" should have (\d+) total, (\d+) failures?, (no|yes) console usage$/ do |file, total, failures, console_usage|
-  report = Jasmine::Headless::Report.load(file)
-
-  report.total.should == total.to_i
-  report.failed.should == failures.to_i
-  report.has_used_console?.should == (console_usage == 'yes')
-end
--- a/features/steps/then/reporting/report_should_have_seed.rb
+++ b/features/steps/then/reporting/report_should_have_seed.rb
@ -1,4 +0,0 @@
-Then /^the report file "([^"]*)" should have seed (\d+)$/ do |file, seed|
-  report = Jasmine::Headless::Report.load(file)
-  report.seed.should == seed.to_i
-end
--- a/features/steps/then/runner/it_should_have_exit_status.rb
+++ b/features/steps/then/runner/it_should_have_exit_status.rb
@ -1,3 +0,0 @@
-Then /^the runner should have an exit status of (\d+)$/ do |exit_status|
-  @result.should == exit_status.to_i
-end
--- a/features/steps/then/runner/it_should_include_report_file.rb
+++ b/features/steps/then/runner/it_should_include_report_file.rb
@ -1,4 +0,0 @@
-Then /^the command to run the runner should include the report file "([^"]*)"$/ do |file|
-  @runner.jasmine_command.should include("-r #{file}")
-end
-
--- a/features/steps/then/runner/it_should_not_include_report_file.rb
+++ b/features/steps/then/runner/it_should_not_include_report_file.rb
@ -1,3 +0,0 @@
-Then /^the command to run the runner should not include a report file$/ do
-  @runner.jasmine_command.should_not include('-r')
-end
--- a/features/steps/then/templates/it_should_use_reporter.rb
+++ b/features/steps/then/templates/it_should_use_reporter.rb
@ -1,6 +0,0 @@
-Then /^the template should use the "([^"]*)" reporter to "([^"]*)"$/ do |reporter, target|
-  output = @template_writer.render
-
-  output.should include(%{jasmine.HeadlessReporter.#{reporter}("#{target}")})
-end
-
--- a/features/steps/when/i_delete_file.rb
+++ b/features/steps/when/i_delete_file.rb
@ -1,3 +0,0 @@
-When /^I delete the file "([^"]*)"$/ do |file|
-  FileUtils.rm_f(file)
-end
--- a/features/steps/when/i_get_runner.rb
+++ b/features/steps/when/i_get_runner.rb
@ -1,4 +0,0 @@
-When /^I get a runner$/ do
-  @runner = Jasmine::Headless::Runner.new(@options)
-end
-
--- a/features/steps/when/i_get_template_writer.rb
+++ b/features/steps/when/i_get_template_writer.rb
@ -1,4 +0,0 @@
-When /^I get a template writer$/ do
-  @template_writer = Jasmine::Headless::TemplateWriter.new(@runner)
-end
-
--- a/features/steps/when/i_run_executable.rb
+++ b/features/steps/when/i_run_executable.rb
@ -1,4 +0,0 @@
-When /^I run `(.*)`$/ do |command|
-  @output = `#{command}`
-end
-
--- a/features/steps/when/i_run_runner.rb
+++ b/features/steps/when/i_run_runner.rb
@ -1,4 +0,0 @@
-When /^I run the runner$/ do
-  @result = @runner.run
-end
-
--- a/features/support/env.rb
+++ b/features/support/env.rb
@ -1,7 +0,0 @@
-require 'jasmine-headless-webkit'
-
-After do
-  FileUtils.rm_f 'spec/report.txt'
-  FileUtils.rm_f 'spec/runner.html'
-end
-
--- a/jasmine-headless-webkit.gemspec
+++ b/jasmine-headless-webkit.gemspec
@ -20,11 +20,8 @@ Gem::Specification.new do |s|
  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
  s.require_paths = ["lib"]

-  s.add_runtime_dependency 'jasmine-core'
-  s.add_runtime_dependency 'coffee-script'
-  s.add_runtime_dependency 'rainbow'
-  s.add_runtime_dependency 'multi_json', '>= 1.2.0'
-  s.add_runtime_dependency 'sprockets'
-  s.add_runtime_dependency 'sprockets-vendor_gems'
+  s.add_dependency 'jasmine-core', '~>1.1.beta'
+  s.add_dependency 'coffee-script', '>= 2.2'
+  s.add_dependency 'rainbow'
+  s.add_dependency 'multi_json'
 end
-
--- a/lib/jasmine-headless-webkit.rb
+++ b/lib/jasmine-headless-webkit.rb
@ -1,3 +1,7 @@
+module Jasmine
+  autoload :FilesList, 'jasmine/files_list'
+end
+
 require 'jasmine/headless'
 require 'jasmine/headless/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3

--- a/lib/jasmine/files_list.rb
+++ b/lib/jasmine/files_list.rb
@ -0,0 +1,176 @@
+require 'jasmine-core'
+require 'time'
+require 'multi_json'
+
+module Jasmine
+  class FilesList
+    attr_reader :files, :spec_files, :filtered_files, :spec_outside_scope
+
+    class << self
+      def find_vendored_asset_paths(*names)
+        require 'rubygems'
+
+        raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:map)
+        all_spec_files.find_all do |file|
+          names.any? { |name| file["/#{name}.js"] }
+        end
+      end
+
+      def all_spec_files
+        @all_spec_files ||= Gem::Specification.map { |spec| spec.files.find_all { |file|
+          file["vendor/assets/javascripts"]
+        }.compact.collect { |file| File.join(spec.gem_dir, file) } }.flatten
+      end
+    end
+
+    DEFAULT_FILES = [
+      File.join(Jasmine::Core.path, "jasmine.js"),
+      File.join(Jasmine::Core.path, "jasmine-html.js"),
+      File.join(Jasmine::Core.path, "jasmine.css")
+    ] + %w{jasmine-extensions intense headless_reporter_result jasmine.HeadlessConsoleReporter jsDump beautify-html}.collect { |name|
+      Jasmine::Headless.root.join("vendor/assets/javascripts/#{name}.js").to_s
+    }
+
+    PLEASE_WAIT_IM_WORKING_TIME = 2
+
+    def initialize(options = {})
+      @options = options
+      @files = DEFAULT_FILES.dup
+      @filtered_files = @files.dup
+      @spec_outside_scope = false
+      @spec_files = []
+      use_config! if config?
+    end
+
+    def has_spec_outside_scope?
+      @spec_outside_scope
+    end
+
+    def filtered?
+      files != filtered_files
+    end
+
+    def files_to_html
+      to_html(files)
+    end
+
+    def filtered_files_to_html
+      to_html(filtered_files)
+    end
+
+    def spec_file_line_numbers
+      @spec_file_line_numbers ||= Hash[@spec_files.collect { |file|
+        if File.exist?(file)
+          if !(lines = Jasmine::Headless::SpecFileAnalyzer.for(file)).empty?
+            [ file, lines ]
+          end
+        else
+          nil
+        end
+      }.compact]
+    end
+
+    private
+    def to_html(files)
+      alert_time = Time.now + PLEASE_WAIT_IM_WORKING_TIME
+
+      files.collect { |file|
+        if alert_time && alert_time < Time.now
+          puts "Rebuilding cache, please wait..."
+          alert_time = nil
+        end
+
+        source = nil
+
+        result = case File.extname(file)
+        when '.coffee'
+          begin
+            cache = Jasmine::Headless::CoffeeScriptCache.new(file)
+            source = cache.handle
+            if cache.cached?
+              %{<script type="text/javascript" src="#{cache.cache_file}"></script>
+                <script type="text/javascript">
+                  window.CSTF['#{File.split(cache.cache_file).last}'] = '#{file}';
+                </script>}
+            else
+              %{<script type="text/javascript">#{source}</script>}
+            end
+          rescue CoffeeScript::CompilationError => ne
+            puts "[%s] %s: %s" % [ 'coffeescript'.color(:red), file.color(:yellow), ne.message.to_s.color(:white) ]
+            raise ne
+          rescue StandardError => e
+            puts "[%s] Error in compiling one of the followng: %s" % [ 'coffeescript'.color(:red), files.join(' ').color(:yellow) ]
+            raise e
+          end
+        when '.js'
+          %{<script type="text/javascript" src="#{file}"></script>}
+        when '.css'
+          %{<link rel="stylesheet" href="#{file}" type="text/css" />}
+        end
+
+        result
+      }.flatten.compact.reject(&:empty?)
+    end
+
+    def spec_filter
+      return @spec_filter if @spec_filter
+
+      @spec_filter = begin
+                       if @options[:only]
+                         @options[:only].collect { |path| expanded_dir(path) }.flatten
+                       else
+                         []
+                       end
+                     end
+    end
+
+    def use_config!
+      @filtered_files = @files.dup
+
+      data = @options[:config].dup
+      [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'vendored_helpers' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].each do |searches, root|
+        if data[searches]
+          case searches
+          when 'vendored_helpers'
+            data[searches].each do |name|
+              found_files = self.class.find_vendored_asset_path(name)
+
+              @files += found_files
+              @filtered_files += found_files
+            end
+          else
+            data[searches].flatten.collect do |search|
+              path = search
+              path = File.join(data[root], path) if data[root]
+              found_files = expanded_dir(path) - @files
+
+              @files += found_files
+
+              if searches == 'spec_files'
+                @spec_files += spec_filter.empty? ? found_files : (found_files & spec_filter)
+              end
+
+              @filtered_files += begin
+                                    if searches == 'spec_files'
+                                      @spec_outside_scope = ((spec_filter | found_files).sort != found_files.sort)
+                                      spec_filter.empty? ? found_files : (spec_filter || found_files)
+                                    else
+                                      found_files
+                                    end
+                                  end
+            end
+          end
+        end
+      end
+    end
+
+    def config?
+      @options[:config]
+    end
+
+    def expanded_dir(path)
+      Dir[path].collect { |file| File.expand_path(file) }
+    end
+  end
+end
+
--- a/lib/jasmine/headless.rb
+++ b/lib/jasmine/headless.rb
@ -1,61 +1,24 @@
 require 'pathname'

-module Jasmine
-  module Headless
+module Jasmine::Headless
+  autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
+  autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'
+  autoload :CacheableAction, 'jasmine/headless/cacheable_action'
+  autoload :VERSION, 'jasmine/headless/version'
+  autoload :Runner, 'jasmine/headless/runner'
+  autoload :Options, 'jasmine/headless/options'
+  autoload :Task, 'jasmine/headless/task'

-    EXCLUDED_FORMATS = %w{less sass scss erb str}
+  autoload :TemplateWriter, 'jasmine/headless/template_writer'

-    autoload :CommandLine, 'jasmine/headless/command_line'
+  autoload :Report, 'jasmine/headless/report'
+  autoload :ReportMessage, 'jasmine/headless/report_message'

-    autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
-    autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'
-    autoload :CacheableAction, 'jasmine/headless/cacheable_action'
-    autoload :VERSION, 'jasmine/headless/version'
-    autoload :Runner, 'jasmine/headless/runner'
-    autoload :Options, 'jasmine/headless/options'
-    autoload :Task, 'jasmine/headless/task'
-
-    autoload :FilesList, 'jasmine/headless/files_list'
-    autoload :UniqueAssetList, 'jasmine/headless/unique_asset_list'
-
-    autoload :TemplateWriter, 'jasmine/headless/template_writer'
-    
-    autoload :FileChecker, 'jasmine/headless/file_checker'
-
-    autoload :CoffeeTemplate, 'jasmine/headless/coffee_template'
-    autoload :JSTemplate, 'jasmine/headless/js_template'
-    autoload :JSTTemplate, 'jasmine/headless/jst_template'
-    autoload :CSSTemplate, 'jasmine/headless/css_template'
-    autoload :NilTemplate, 'jasmine/headless/nil_template'
-
-    autoload :Report, 'jasmine/headless/report'
-    autoload :ReportMessage, 'jasmine/headless/report_message'
-
-    class << self
-      def root
-        @root ||= Pathname(File.expand_path('../../..', __FILE__))
-      end
-
-      def warn(message)
-        output.puts message if show_warnings?
-      end
-
-      def show_warnings=(show)
-        @show_warnings = show
-      end
-
-      def show_warnings?
-        @show_warnings = true if @show_warnings.nil?
-
-        @show_warnings
-      end
-
-      def output
-        $stdout
-      end
+  class << self
+    def root
+      @root ||= Pathname(File.expand_path('../../..', __FILE__))
    end
  end
 end

 require 'jasmine/headless/errors'
-
--- a/lib/jasmine/headless/cacheable_action.rb
+++ b/lib/jasmine/headless/cacheable_action.rb
@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 module Jasmine::Headless
  class CacheableAction
    class << self
@ -54,11 +56,7 @@ module Jasmine::Headless
    end

    def cache_file
-      @cache_file ||= File.expand_path(relative_cache_file) + '.js'
-    end
-
-    def relative_cache_file
-      File.join(self.class.cache_dir, self.class.cache_type, file.gsub(Dir.pwd + '/', ''))
+      @cache_file ||= File.join(self.class.cache_dir, self.class.cache_type, Digest::SHA1.hexdigest(file)) + '.js'
    end

    def fresh?
--- a/lib/jasmine/headless/coffee_template.rb
+++ b/lib/jasmine/headless/coffee_template.rb
@ -1,36 +0,0 @@
-require 'tilt/template'
-require 'rainbow'
-
-module Jasmine::Headless
-  class CoffeeTemplate < Tilt::Template
-    include Jasmine::Headless::FileChecker
-    
-    self.default_mime_type = 'application/javascript'
-
-    def prepare ; end
-
-    def evaluate(scope, locals, &block)
-      if bad_format?(file)
-        alert_bad_format(file)
-        return ''
-      end
-      begin
-        cache = Jasmine::Headless::CoffeeScriptCache.new(file)
-        source = cache.handle
-        if cache.cached?
-          %{<script type="text/javascript" src="#{cache.cache_file}"></script>
-            <script type="text/javascript">window.CSTF['#{File.split(cache.cache_file).last}'] = '#{file}';</script>}
-        else
-          %{<script type="text/javascript">#{source}</script>}
-        end
-      rescue CoffeeScript::CompilationError => ne
-        puts "[%s] %s: %s" % [ 'coffeescript'.color(:red), file.color(:yellow), "#{ne.message}".color(:white) ]
-        raise ne
-      rescue StandardError => e
-        puts "[%s] Error in compiling file: %s" % [ 'coffeescript'.color(:red), file.color(:yellow) ]
-        raise e
-      end
-    end
-  end
-end
-
--- a/lib/jasmine/headless/command_line.rb
+++ b/lib/jasmine/headless/command_line.rb
@ -1,31 +0,0 @@
-module Jasmine::Headless
-  class CommandLine
-    class << self
-      def run!
-        require 'coffee-script'
-        require 'rainbow'
-
-        begin
-          options = Options.from_command_line
-          runner = Runner.new(options)
-
-          if options[:do_list]
-            FilesList.reset!
-
-            files_list = FilesList.new(:config => runner.jasmine_config)
-            files_list.files.each { |file| puts file }
-          else
-            exit runner.run
-          end
-        rescue CoffeeScript::CompilationError
-          exit 1
-        rescue StandardError => e
-          $stderr.puts "[%s] %s (%s)" % [ "jasmine-headless-webkit".color(:red), e.message.color(:white), e.class.name.color(:yellow) ]
-          $stderr.puts e.backtrace.collect { |line| "  #{line}" }.join("\n")
-          exit 1
-        end
-      end
-    end
-  end
-end
-
--- a/lib/jasmine/headless/css_template.rb
+++ b/lib/jasmine/headless/css_template.rb
@ -1,19 +0,0 @@
-require 'tilt/template'
-
-module Jasmine::Headless
-  class CSSTemplate < Tilt::Template
-    include Jasmine::Headless::FileChecker
-    self.default_mime_type = 'text/css'
-
-    def prepare ; end
-
-    def evaluate(scope, locals, &block)
-      if bad_format?(file)
-        alert_bad_format(file)
-        return ''
-      end
-      file ? %{<link rel="stylesheet" href="#{file}" type="text/css" />} : data
-    end
-  end
-end
-
--- a/lib/jasmine/headless/file_checker.rb
+++ b/lib/jasmine/headless/file_checker.rb
@ -1,25 +0,0 @@
-module Jasmine::Headless::FileChecker
-  def excluded_formats
-    ::Jasmine::Headless::EXCLUDED_FORMATS
-  end
-
-  def bad_format?(file)
-    return if file.nil?
-
-    excluded_formats.any? do |format|
-      file[%r{\.#{format}(\.|$)}]
-    end
-  end
-
-  def alert_bad_format(file)
-    Jasmine::Headless.warn("[%s] %s: %s" % [ 'Skipping File'.color(:red), file.color(:yellow), "unsupported format".color(:white) ])
-  end
-
-  def alert_if_bad_format?(file)
-    if result = bad_format?(file)
-      alert_bad_format(file)
-    end
-
-    result
-  end
-end
--- a/lib/jasmine/headless/files_list.rb
+++ b/lib/jasmine/headless/files_list.rb
@ -1,332 +0,0 @@
-require 'jasmine-core'
-require 'time'
-require 'multi_json'
-require 'set'
-require 'sprockets'
-require 'sprockets/engines'
-require 'sprockets-vendor_gems'
-
-module Jasmine::Headless
-  class FilesList
-    include FileChecker
-
-    class << self
-      def asset_paths
-        @asset_paths ||= Sprockets.find_gem_vendor_paths(:for => 'javascripts')
-      end
-
-      def reset!
-        @asset_paths = nil
-        @registered_engines = {}
-
-        # register haml-sprockets and handlebars_assets if it's available...
-        %w{haml-sprockets handlebars_assets}.each do |library|
-          begin
-            require library
-          rescue LoadError
-          end
-        end
-
-        if ENV['JHW_ENV']
-          begin
-            require 'bundler'
-
-            Bundler.require(ENV['JHW_ENV'].to_sym)
-          rescue LoadError
-          end
-        end
-
-        @sprockets_environment = nil
-      end
-
-      def registered_engines
-        @registered_engines ||= {}
-      end
-
-      def register_engine(file_extension, template_class)
-        registered_engines[file_extension] = template_class
-      end
-
-      def register_engines!
-        registered_engines.each do |file_extension, template_class|
-          Sprockets.register_engine file_extension, template_class
-        end
-      end
-
-      def default_files
-        %w{jasmine.js jasmine-html jasmine.css jasmine-extensions
-           intense headless_reporter_result jasmine.HeadlessReporter
-           jasmine.HeadlessReporter.ConsoleBase
-           jsDump beautify-html}
-      end
-
-      def extension_filter
-        extensions = (%w{.js .css} + Sprockets.engine_extensions)
-
-        %r{(#{extensions.join('|')})$}
-      end
-    end
-
-    PLEASE_WAIT_IM_WORKING_TIME = 2
-
-    attr_reader :options, :required_files, :potential_files_to_filter
-
-    def initialize(options = {})
-      @options = options
-
-      Kernel.srand(options[:seed]) if options[:seed]
-
-      @required_files = UniqueAssetList.new
-      @potential_files_to_filter = []
-
-      register_engines!
-
-      load_initial_assets
-
-      use_config if config?
-    end
-
-    def register_engines!
-      begin
-        require spec_helper
-      rescue LoadError
-      end
-      self.class.register_engines!
-    end
-
-    def load_initial_assets
-      self.class.default_files.each do |file|
-        begin
-          add_path(file)
-        rescue InvalidUniqueAsset => e
-          raise StandardError.new("Not an asset: #{file}")
-        end
-      end
-
-      (options[:reporters] || []).each do |reporter, identifier, file|
-        add_path("jasmine.HeadlessReporter.#{reporter}")
-      end
-    end
-
-    def files
-      required_files.flatten.collect { |asset| asset.pathname.to_s }.uniq
-    end
-
-    def spec_files
-      filter_for_requested_specs(
-        files.find_all { |file| spec_dir.any? { |dir| file[dir] } }
-      )
-    end
-
-    def filtered_files
-      filter_for_requested_specs(files)
-    end
-
-    def search_paths
-      return @search_paths if @search_paths
-
-      @search_paths = [ Jasmine::Core.path, Jasmine::Headless.root.join('vendor/assets/javascripts').to_s ]
-      @search_paths += self.class.asset_paths
-      @search_paths += src_dir.collect { |dir| File.expand_path(dir) }
-      @search_paths += asset_paths.collect { |dir| File.expand_path(dir) }
-      @search_paths += spec_dir.collect { |dir| File.expand_path(dir) }
-
-      @search_paths.uniq!
-      @search_paths
-    end
-
-    def sprockets_environment
-      return @sprockets_environment if @sprockets_environment
-
-      @sprockets_environment = Sprockets::Environment.new
-      search_paths.each { |path| @sprockets_environment.append_path(path) }
-
-      @sprockets_environment.unregister_postprocessor('application/javascript', Sprockets::SafetyColons)
-
-      # ...and unregister ones we don't want/need
-      @sprockets_environment.instance_eval do
-        EXCLUDED_FORMATS.each do |extension|
-          register_engine ".#{extension}", Jasmine::Headless::NilTemplate
-        end
-
-        register_engine '.coffee', Jasmine::Headless::CoffeeTemplate
-        register_engine '.js', Jasmine::Headless::JSTemplate
-        register_engine '.css', Jasmine::Headless::CSSTemplate
-        register_engine '.jst', Jasmine::Headless::JSTTemplate
-      end
-
-      @sprockets_environment
-    end
-
-    def has_spec_outside_scope?
-      if is_outside_scope = !spec_filter.empty?
-        is_outside_scope = spec_dir.any? do |dir|
-          spec_file_searches.any? do |search|
-            !spec_files.any? do |file|
-              target = File.join(dir, search)
-              File.fnmatch?(target, file) || File.fnmatch?(target.gsub(%{^**/}, ''), file)
-            end
-          end
-        end
-      end
-
-      is_outside_scope
-    end
-
-    def filtered?
-      files != filtered_files
-    end
-
-    def files_to_html
-      to_html(files)
-    end
-
-    def filtered_files_to_html
-      to_html(filtered_files)
-    end
-
-    def spec_file_line_numbers
-      @spec_file_line_numbers ||= Hash[spec_files.collect { |file|
-        if File.exist?(file)
-          if !(lines = Jasmine::Headless::SpecFileAnalyzer.for(file)).empty?
-            [ file, lines ]
-          end
-        else
-          nil
-        end
-      }.compact]
-    end
-
-    private
-    def to_html(files)
-      alert_time = Time.now + PLEASE_WAIT_IM_WORKING_TIME
-
-      files.collect do |file|
-        if alert_time && alert_time < Time.now
-          puts "Rebuilding cache, please wait..."
-          alert_time = nil
-        end
-
-        sprockets_environment.find_asset(file, :bundle => false).body
-      end.compact.reject(&:empty?)
-    end
-
-    def spec_filter
-      @spec_filter ||= (@options[:only] && @options[:only].collect { |path| expanded_dir(path) }.flatten) || []
-    end
-
-    SEARCH_ROOTS = {
-      'src_files' => 'src_dir',
-      'stylesheets' => 'src_dir',
-      'helpers' => 'spec_dir',
-      'spec_files' => 'spec_dir'
-    }
-
-    def use_config
-      @config = @options[:config].dup
-      @searches = {}
-      @potential_files_to_filter = []
-
-      %w{src_files stylesheets helpers spec_files}.each do |type|
-        if data = @config[type]
-          add_files(@searches[type] = data.flatten, type, send(SEARCH_ROOTS[type]))
-        end
-      end
-    end
-
-    def add_files(patterns, type, dirs)
-      patterns.each do |pattern|
-        dirs.collect { |dir| expanded_dir(File.join(dir, pattern)) }.each do |files|
-          files.sort! { |a, b| Kernel.rand(3) - 1 } if type == 'spec_files'
-
-          files.each do |path|
-            add_path(path, type)
-          end
-        end
-      end
-
-      if type == 'spec_files'
-        spec_filter.each { |path| add_path(path, type) }
-      end
-    end
-
-    def config?
-      @options[:config]
-    end
-
-    def expanded_dir(path)
-      file_list = Dir.glob(path).sort
-      file_list.find_all { |file|
-        file[extension_filter] && !alert_if_bad_format?(file)
-      }.collect {
-        |file| File.expand_path(file)
-      }.find_all {
-        |path| File.file?(path)
-      }
-    end
-
-    def extension_filter
-      self.class.extension_filter
-    end
-
-    def add_path(path, type = nil)
-      asset = sprockets_environment.find_asset(path)
-
-      @required_files << asset
-
-      if type == 'spec_files'
-        @potential_files_to_filter << path
-      end
-    end
-
-    def src_dir
-      @src_dir ||= config_dir_or_pwd('src_dir') + asset_paths
-    end
-
-    def spec_dir
-      @spec_dir ||= config_dir_or_pwd('spec_dir')
-    end
-
-    def asset_paths
-      @asset_paths ||= config_dir('asset_paths')
-    end
-
-    def spec_file_searches
-      @searches['spec_files']
-    end
-
-    def config_dir_or_pwd(dir)
-      if (found = config_dir(dir)).empty?
-        found = [ Dir.pwd ]
-      end
-
-      found
-    end
-
-    def config_dir(dir)
-      [ @options[:config] && @options[:config][dir] ].flatten.compact.collect { |dir| File.expand_path(dir) }
-    end
-
-    def filter_for_requested_specs(files)
-      files.find_all do |file|
-        if potential_files_to_filter.include?(file)
-          spec_filter.empty? || spec_filter.any? { |pattern| File.fnmatch?(pattern, file) }
-        else
-          true
-        end
-      end
-    end
-
-    def spec_helper
-      File.join(spec_dir, "helpers", "spec_helper")
-    end
-  end
-end
-
-module Jasmine::Headless
-  extend self
-
-  def register_engine(file_extension, template_class)
-    Jasmine::Headless::FilesList.register_engine(file_extension, template_class)
-  end
-end
--- a/lib/jasmine/headless/js_template.rb
+++ b/lib/jasmine/headless/js_template.rb
@ -1,23 +0,0 @@
-require 'tilt/template'
-
-module Jasmine::Headless
-  class JSTemplate < Tilt::Template
-    include Jasmine::Headless::FileChecker
-    self.default_mime_type = 'application/javascript'
-
-    def prepare ; end
-
-    def evaluate(scope, locals, &block)
-      if bad_format?(file)
-        alert_bad_format(file)
-        return ''
-      end
-      if data[%r{^<script type="text/javascript"}]
-        data
-      else
-        file ? %{<script type="text/javascript" src="#{file}"></script>} : data
-      end
-    end
-  end
-end
-
--- a/lib/jasmine/headless/jst_template.rb
+++ b/lib/jasmine/headless/jst_template.rb
@ -1,15 +0,0 @@
-require 'sprockets/jst_processor'
-
-module Jasmine::Headless
-  class JSTTemplate < Sprockets::JstProcessor
-    include Jasmine::Headless::FileChecker
-    def evaluate(*args)
-      if bad_format?(file)
-        alert_bad_format(file)
-        return ''
-      end
-      %{<script type="text/javascript">#{super}</script>}
-    end
-  end
-end
-
--- a/lib/jasmine/headless/nil_template.rb
+++ b/lib/jasmine/headless/nil_template.rb
@ -1,14 +0,0 @@
-require 'tilt/template'
-require 'rainbow'
-
-module Jasmine::Headless
-  class NilTemplate < Tilt::Template
-    
-    def prepare ; end
-
-    def evaluate(scope, locals, &block)
-      return ''
-    end
-  end
-end
-
--- a/lib/jasmine/headless/options.rb
+++ b/lib/jasmine/headless/options.rb
@ -13,21 +13,16 @@ module Jasmine
        :remove_html_file => true,
        :runner_output_filename => false,
        :jasmine_config => 'spec/javascripts/support/jasmine.yml',
+        :report => false,
        :do_list => false,
        :full_run => true,
        :enable_cache => true,
-        :files => [],
-        :reporters => [ [ 'Console' ] ],
-        :quiet => false,
-        :use_server => false,
-        :server_port => nil
+        :files => []
      }

      DEFAULTS_FILE = File.join(Dir.pwd, '.jasmine-headless-webkit')
      GLOBAL_DEFAULTS_FILE = File.expand_path('~/.jasmine-headless-webkit')

-      REPORT_DEPRECATED_MESSAGE = "--report is deprecated. Use --format HeadlessFileReporter --out <filename>"
-
      def self.from_command_line
        options = new
        options.process_command_line_args
@ -37,10 +32,7 @@ module Jasmine

      def initialize(opts = {})
        @options = DEFAULT_OPTIONS.dup
-        srand
-        @options[:seed] = rand(10000)
        read_defaults_files
-
        opts.each { |k, v| @options[k] = v if v }
      end

@ -59,10 +51,7 @@ module Jasmine
        when '--keep'
          @options[:remove_html_file] = false
        when '--report'
-          warn REPORT_DEPRECATED_MESSAGE
-
-          add_reporter('File', arg)
-          add_reporter('Console')
+          @options[:report] = arg
        when '--runner-out'
          @options[:runner_output_filename] = arg
        when '--jasmine-config', '-j'
@ -71,22 +60,6 @@ module Jasmine
          @options[:full_run] = false
        when '--list', '-l'
          @options[:do_list] = true
-        when '--quiet', '-q'
-          @options[:quiet] = true
-        when '--seed'
-          @options[:seed] = arg.to_i
-        when '--format', '-f'
-          add_reporter(arg)
-        when '--use-server'
-          @options[:use_server] = true
-        when '--server-port'
-          @options[:server_port] = arg.to_i
-        when '--out'
-          add_reporter_file(arg)
-        when '-h', '--help'
-          print_help
-
-          exit
        end
      end

@ -103,103 +76,17 @@ module Jasmine
          [ '--colors', '-c', GetoptLong::NO_ARGUMENT ],
          [ '--no-colors', GetoptLong::NO_ARGUMENT ],
          [ '--cache', GetoptLong::NO_ARGUMENT ],
-          [ '--no-cache', GetoptLong::NO_ARGUMENT ],
+          [ '--no-t stcache', GetoptLong::NO_ARGUMENT ],
          [ '--keep', GetoptLong::NO_ARGUMENT ],
          [ '--runner-out', GetoptLong::REQUIRED_ARGUMENT ],
          [ '--report', GetoptLong::REQUIRED_ARGUMENT ],
          [ '--jasmine-config', '-j', GetoptLong::REQUIRED_ARGUMENT ],
          [ '--no-full-run', GetoptLong::NO_ARGUMENT ],
-          [ '--list', '-l', GetoptLong::NO_ARGUMENT ],
-          [ '--seed', GetoptLong::REQUIRED_ARGUMENT ],
-          [ '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
-          [ '--out', GetoptLong::REQUIRED_ARGUMENT ],
-          [ '--use-server', GetoptLong::NO_ARGUMENT ],
-          [ '--server-port', GetoptLong::REQUIRED_ARGUMENT ],
-          [ '-h', '--help', GetoptLong::NO_ARGUMENT ],
-          [ '-q', '--quiet', GetoptLong::NO_ARGUMENT ]
+          [ '--list', '-l', GetoptLong::NO_ARGUMENT ]
        )

        command_line_args.each { |*args| process_option(*args) }
      end
-
-      def reporters
-        file_index = 0
-
-        @options[:reporters].collect do |reporter, file|
-          output = [ reporter ]
-          if file
-            output << "report:#{file_index}"
-            output << file
-            file_index += 1
-          else
-            output << "stdout"
-          end
-
-          output
-        end
-      end
-
-      def file_reporters
-        reporters.find_all { |reporter| reporter[1]["report:"] }
-      end
-
-      private
-      def add_reporter(name, file = nil)
-        if !@added_reporter
-          @options[:reporters] = []
-          @added_reporter = true
-        end
-
-        if (parts = name.split(':')).length == 2
-          name, file = parts
-        end
-
-        @options[:reporters] << [ name ]
-
-        add_reporter_file(file) if file
-      end
-
-      def add_reporter_file(file)
-        @options[:reporters].last << file
-      end
-
-      def print_help
-        options = [
-          [ '-c, --colors', 'Enable colors (default: disabled)' ],
-          [ '-nc, --no-colors', 'Disable colors' ],
-          [ '--cache', 'Enable cache (default: enabled)' ],
-          [ '--no-cache', 'Disable cache' ],
-          [ '--keep', 'Keep runner files on failure' ],
-          [ '--runner-out <filename>', 'Write runner to specified filename' ],
-          [ '-j, --jasmine-config <config file>', 'Jasmine Yaml config to use' ],
-          [ '--no-full-run', 'Do not perform a full spec run after a successful targeted spec run' ],
-          [ '--use-server', 'Load tests from an HTTP server instead of from filesystem' ],
-          [ '-l, --list', 'List files in the order they will be required' ],
-          [ '--seed <seed>', 'Random order seed for spec file ordering' ],
-          [ '-f, --format <reporter<:filename>>', 'Specify an output reporter and possibly output filename' ],
-          [ '--out <filename>', 'Specify output filename for last defined reporter' ],
-          [ '-q, --quiet', "Silence most non-test related warnings" ],
-          [ '-h, --help', "You're looking at it" ]
-        ]
-
-        longest_length = options.collect(&:first).collect(&:length).max
-
-        puts <<-HELP
-Usage: #{$0} [ options ] [ spec files ]
-
-Options:
-#{options.collect { |option, description| "  #{option.ljust(longest_length)}  #{description}" }.join("\n")}
-
-Available reporters:
-  Console  Write out spec results to the console in a progress format (default)
-  Verbose  Write out spec results to the console in a verbose format
-  File     Write spec results in jasmine-headless-webkit ReportFile format
-  Tap      Write spec results in TAP format
-
-Add reporters to the jasmine.HeadlessReporter object to access them
-  (ex: jasmine.HeadlessReporter.Teamcity for the Teamcity reporter)
-HELP
-      end
    end
  end
 end
--- a/lib/jasmine/headless/report.rb
+++ b/lib/jasmine/headless/report.rb
@ -60,13 +60,8 @@ module Jasmine::Headless
      }.collect(&:filename).uniq.compact
    end

-    def seed
-      if seed = report.find { |entry| entry.respond_to?(:seed) }
-        seed.seed
-      end
-    end
-
    private
+
    def last_total
      @report.reverse.find { |entry| entry.respond_to?(:total) }
    end
--- a/lib/jasmine/headless/report_message.rb
+++ b/lib/jasmine/headless/report_message.rb
@ -6,7 +6,6 @@ module Jasmine::Headless
    autoload :Console, 'jasmine/headless/report_message/console'
    autoload :Error, 'jasmine/headless/report_message/error'
    autoload :Total, 'jasmine/headless/report_message/total'
-    autoload :Seed, 'jasmine/headless/report_message/seed'
  end
 end

--- a/lib/jasmine/headless/report_message/console.rb
+++ b/lib/jasmine/headless/report_message/console.rb
@ -1,7 +1,9 @@
 module Jasmine::Headless::ReportMessage
  class Console
-    def self.new_from_parts(parts)
-      new(parts.first)
+    class << self
+      def new_from_parts(parts)
+        new(parts.first)
+      end
    end

    attr_reader :message
--- a/lib/jasmine/headless/report_message/seed.rb
+++ b/lib/jasmine/headless/report_message/seed.rb
@ -1,14 +0,0 @@
-module Jasmine::Headless::ReportMessage
-  class Seed
-    def self.new_from_parts(parts)
-      new(parts.first)
-    end
-
-    attr_reader :seed
-
-    def initialize(seed)
-      @seed = seed.to_i
-    end
-  end
-end
-
--- a/lib/jasmine/headless/report_message/spec.rb
+++ b/lib/jasmine/headless/report_message/spec.rb
@ -1,9 +1,11 @@
 module Jasmine::Headless::ReportMessage
  class Spec
-    def self.new_from_parts(parts)
-      file_info = parts.pop
+    class << self
+      def new_from_parts(parts)
+        file_info = parts.pop

-      new(parts.join(' '), file_info)
+        new(parts.join(' '), file_info)
+      end
    end

    attr_reader :statement, :file_info
--- a/lib/jasmine/headless/runner.rb
+++ b/lib/jasmine/headless/runner.rb
@ -4,29 +4,9 @@ require 'coffee-script'
 require 'rainbow'

 require 'yaml'
-require 'erb'
-require 'sprockets'

 module Jasmine
  module Headless
-    class IndexHandler
-      class << self
-        attr_accessor :index
-      end
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        if env['PATH_INFO'] == '/'
-          return [ 302, { 'Location' => self.class.index }, [ 'Redirecting...' ] ]
-        end
-
-        @app.call(env)
-      end
-    end
-
    class Runner
      JASMINE_DEFAULTS = {
        'spec_files' => [ '**/*[sS]pec.js' ],
@ -44,107 +24,18 @@ module Jasmine
      attr_reader :options

      def self.run(options = {})
+        options = Options.new(options) if !options.kind_of?(Options)
        new(options).run
      end

-      def self.server_port
-        return @server_port if @server_port
-
-        require 'socket'
-
-        count = 100
-        begin
-          port = select_server_port
-
-          socket = TCPSocket.new(server_interface, port)
-          socket.close
-
-          count -= 1
-
-          raise "Could not create server port after 100 attempts!" if count == 0
-        rescue Errno::ECONNREFUSED
-          @server_port = port
-
-          break
-        ensure
-          begin
-            socket.close if socket
-          rescue IOError
-          end
-        end while true
-
-        @server_port
-      end
-
-      def self.server_port=(port)
-        @server_port = port
-      end
-
-      def self.select_server_port
-        21000 + rand(10000)
-      end
-
-      def self.server_interface
-        '127.0.0.1'
-      end
-
-      def self.server_uri
-        "http://#{server_interface}:#{server_port}"
-      end
-
-      def self.server_spec_path
-        self.server_uri + '/__JHW__/'
-      end
-
-      def self.ensure_server(options)
-        return if @server
-
-        require 'webrick'
-        require 'thread'
-        require 'rack'
-        require 'net/http'
-
-        port = server_port
-
-        @server = Thread.new do
-          Jasmine::Headless.warn "Powering up!"
-
-          app = Rack::Builder.new do
-            use IndexHandler
-
-            map '/__JHW__' do
-              run Rack::File.new(Dir.pwd)
-            end
-
-            map '/' do
-              run Rack::File.new('/')
-            end
-          end
-
-          Rack::Handler::WEBrick.run(
-            app,
-            :Port => port,
-            :Logger => Logger.new(StringIO.new),
-            :AccessLog => [
-              [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
-              [ StringIO.new, WEBrick::AccessLog::REFERER_LOG_FORMAT ]
-            ]
-          )
-        end
-
-        while true do
-          begin
-            Net::HTTP.get(URI(server_uri))
-            break
-          rescue Errno::ECONNREFUSED => e
-          end
-
-          sleep 0.1
-        end
-      end
-
      def initialize(options)
-        options = Options.new(options) if !options.kind_of?(Options)
+        if !File.file?(RUNNER)
+          $stderr.puts "No runner found, attempting to compile..."
+          Dir.chdir RUNNER_DIR do
+            system %{ruby extconf.rb}
+          end
+          raise NoRunnerError if !File.file?(RUNNER)
+        end

        @options = options
      end
@ -164,45 +55,27 @@ module Jasmine
      end

      def jasmine_command(*targets)
-        command = [ RUNNER ]
-
-        command << "-s #{options[:seed]}"
-        command << '-c' if options[:colors]
-        command << '-q' if options[:quiet]
-
-        options.file_reporters.each do |reporter, identifier, file|
-          command << "-r #{file}"
-        end
-
-        command += targets
-        command.compact.join(' ')
+        [
+          RUNNER,
+          @options[:colors] ? '-c' : nil,
+          @options[:report] ? "-r #{@options[:report]}" : nil,
+          *targets
+        ].compact.join(" ")
      end

      def run
        Jasmine::Headless::CacheableAction.enabled = @options[:enable_cache]
-        Jasmine::Headless.show_warnings = !@options[:quiet]
-        FilesList.reset!

-        self.class.server_port = options[:server_port]
+        files_list = Jasmine::FilesList.new(
+          :config => jasmine_config,
+          :only => @options[:files]
+        )

-        @_targets = template_writer.write
-
-        run_targets = absolute_run_targets(@_targets.dup)
-
-        if run_targets.length == 2
-          if (!@options[:full_run] && files_list.filtered?) || files_list.has_spec_outside_scope?
-            run_targets.pop
-          end
-        end
-
-        runner = lambda { system jasmine_command(run_targets) }
-
-        if options[:use_server]
-          wrap_in_server(run_targets, &runner)
-        else
-          runner.call
-        end
+        @_targets = template_writer.write!(files_list)
+        run_targets = @_targets.dup
+        run_targets.pop if (!@options[:full_run] && files_list.filtered?) || files_list.has_spec_outside_scope?

+        system jasmine_command(run_targets)
        @_status = $?.exitstatus
      ensure
        if @_targets && !runner_filename && (@options[:remove_html_file] || (@_status == 0))
@ -210,17 +83,6 @@ module Jasmine
        end
      end

-      def absolute_run_targets(targets)
-        targets.flatten.collect do |target|
-          if options[:use_server]
-            target = self.class.server_spec_path + target
-          else
-            target = "file://" + File.expand_path(target)
-          end
-          target
-        end
-      end
-
      def runner_filename
        options[:runner_output_filename] || begin
          if (runner_output = jasmine_config['runner_output']) && !runner_output.empty?
@ -231,29 +93,11 @@ module Jasmine
        end
      end

-      def files_list
-        @files_list ||= Jasmine::Headless::FilesList.new(
-          :config => jasmine_config,
-          :only => options[:files],
-          :seed => options[:seed],
-          :reporters => options.reporters
-        )
-      end
-
-      def wrap_in_server(run_targets)
-        self.class.ensure_server(options)
-        IndexHandler.index = run_targets.last
-
-        Jasmine::Headless.warn "HTTP powered specs! Located at #{run_targets.join(' ')}"
-
-        yield
-      end
-
      private
      def jasmine_config_data
        raise JasmineConfigNotFound.new("Jasmine config not found. I tried #{@options[:jasmine_config]}.") if !File.file?(@options[:jasmine_config])

-        YAML.load(ERB.new(File.read(@options[:jasmine_config])).result(binding))
+        YAML.load_file(@options[:jasmine_config])
      end
    end
  end
--- a/lib/jasmine/headless/spec_file_analyzer.rb
+++ b/lib/jasmine/headless/spec_file_analyzer.rb
@ -14,7 +14,7 @@ module Jasmine::Headless
      data = File.read(file)

      if data.respond_to?(:encode)
-        data.encode!('US-ASCII', 'UTF-8', :invalid => :replace, :undef => :replace)
+        data.encode!('US-ASCII', 'UTF-8', :invalid => :replace)
      else
        require 'iconv'
        ic = Iconv.new('UTF-8//IGNORE', 'US-ASCII')
@ -33,11 +33,11 @@ module Jasmine::Headless
    end

    def serialize(data)
-      MultiJson.dump(data)
+      MultiJson.encode(data)
    end

    def unserialize(data)
-      MultiJson.load(data)
+      MultiJson.decode(data)
    end
  end
 end
--- a/lib/jasmine/headless/task.rb
+++ b/lib/jasmine/headless/task.rb
@ -1,3 +1,23 @@
+module Digest
+  class JasmineTest
+    def self.file(file)
+      new
+    end
+
+    def file(file)
+      self
+    end
+
+    def hexdigest
+      'test'
+    end
+
+    def update(prefix)
+      self
+    end
+  end
+end
+
 module Jasmine
  module Headless
    class Task
@ -14,9 +34,22 @@ module Jasmine

        desc 'Run Jasmine specs headlessly'
        task(name) { run_rake_task }
+
+        create_rails_compliant_task if defined?(Rails)
      end

      private
+      def create_rails_compliant_task
+        if Rails.respond_to?(:version) && Rails.version >= "3.1.0"
+          desc 'Force generate static assets without an MD5 hash, all assets end with -test.<ext>'
+          task 'assets:precompile:for_testing' => :environment do
+            Rails.application.assets.digest_class = Digest::JasmineTest
+
+            Rake::Task['assets:precompile'].invoke
+          end
+        end
+      end
+
      def run_rake_task
        case Jasmine::Headless::Runner.run(
          :colors => colors,
--- a/lib/jasmine/headless/template_writer.rb
+++ b/lib/jasmine/headless/template_writer.rb
@ -1,32 +1,24 @@
 require 'multi_json'
 require 'erb'
 require 'tempfile'
-require 'forwardable'

 module Jasmine::Headless
  class TemplateWriter
    attr_reader :runner

-    extend Forwardable
-
-    def_delegators :runner, :files_list, :options
-    def_delegators :options, :reporters
-
    def initialize(runner)
      @runner = runner
    end

-    def write
+    def write!(files_list)
      output = [
        [ all_tests_filename, files_list.files_to_html ]
      ]

-      output.unshift([filtered_tests_filename, files_list.filtered_files_to_html ]) if files_list.filtered?
+      output.unshift([filtered_tests_filename , files_list.filtered_files_to_html ]) if files_list.filtered?

      output.each do |name, files|
-        template = template_for(files)
-
-        File.open(name, 'wb') { |fh| fh.print template }
+        File.open(name, 'w') { |fh| fh.print template_for(files, files_list.spec_file_line_numbers) }
      end

      output.collect(&:first)
@ -40,24 +32,8 @@ module Jasmine::Headless
      all_tests_filename.gsub(%r{\.html$}, '.filter.html')
    end

-    def render
-      template_for(all_files)
-    end
-
-    def all_files
-      files_list.files_to_html
-    end
-
-    def jhw_reporters
-      reporters.collect do |reporter, output|
-        %{jasmine.getEnv().addReporter(new jasmine.HeadlessReporter.#{reporter}("#{output}"));}
-      end.join("\n")
-    end
-
    private
-    def template_for(files)
-      spec_lines = files_list.spec_file_line_numbers
-
+    def template_for(files, spec_lines)
      ERB.new(Jasmine::Headless.root.join('skel/template.html.erb').read).result(binding)
    end
  end
--- a/lib/jasmine/headless/unique_asset_list.rb
+++ b/lib/jasmine/headless/unique_asset_list.rb
@ -1,16 +0,0 @@
-module Jasmine::Headless
-  class UniqueAssetList < ::Array
-    def <<(asset)
-      raise InvalidUniqueAsset.new("Not an asset: #{asset.inspect}") if !asset.respond_to?(:logical_path)
-
-      super if !self.any? { |other| asset.pathname == other.pathname }
-    end
-
-    def flatten
-      self.collect(&:to_a).flatten
-    end
-  end
-
-  class InvalidUniqueAsset < StandardError ; end
-end
-
--- a/lib/jasmine/headless/version.rb
+++ b/lib/jasmine/headless/version.rb
@ -1,5 +1,5 @@
 module Jasmine
  module Headless
-    VERSION = "0.9.0.rc.2"
+    VERSION = "0.8.0"
  end
 end
--- a/script/hooks/post-commit
+++ b/script/hooks/post-commit
@ -1,4 +0,0 @@
-#!/bin/bash
-
-penchant gemfile remote --switch-back
-
--- a/script/hooks/pre-commit
+++ b/script/hooks/pre-commit
@ -2,9 +2,9 @@

 OLD_GIT_DIR=$GIT_DIR

-if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
+if [ "$(penchant gemfile-env)" != "remote" ]; then
  unset GIT_DIR
-  penchant gemfile remote --deployment
+  penchant gemfile remote
  GIT_DIR=$OLD_GIT_DIR
  git add Gemfile*
 fi
--- a/script/initialize-environment
+++ b/script/initialize-environment
@ -5,7 +5,7 @@ if File.file?('Gemfile.erb')

  Dir.chdir '..' do
    File.readlines(File.join(pwd, 'Gemfile.erb')).find_all { |line| line[':git'] }.each do |line|
-      repo = line[%r{:git => (['"])([^'"]+)\1}, 2]
+      repo = line[%r{:git => (['"])(.*)\1}, 2]

      puts "Installing #{repo}"
      system %{git clone #{repo}}
--- a/skel/template.html.erb
+++ b/skel/template.html.erb
@ -6,67 +6,24 @@
    <script type="text/javascript" src="<%= Jasmine::Headless.root.join('vendor/assets/javascripts/prolog.js') %>"></script>
    <%= files.join("\n") %>
    <script type="text/javascript">
-      if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.dump(spec_lines) %>; }
+      if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.encode(spec_lines) %>; }
    </script>
  </head>
  <body>
    <script type="text/javascript">
      jasmine.getEnv().console = {
-        log: function(msg) { JHW.print('stdout', msg + "\n"); }
+        log: function(msg) { JHW.stdout.puts(msg) }
      }

-      window._onload = window.onload;
+      window._onload = window.onload

      window.onload = function() {
-        if (window._onload && (window._onload != window.onload)) {
-          window._onload();
-        }
+        if (window._onload) { window._onload() }

        if (window.JHW) {
-          <%= jhw_reporters %>
+          jasmine.getEnv().addReporter(new jasmine.HeadlessConsoleReporter());
        } else {
-          types = [ 'HtmlReporter', 'TrivialReporter' ];
-
-          for (var i = 0, j = types.length; i < j; ++i) {
-            var type = jasmine[types[i]]
-            if (type) {
-              jasmine.getEnv().addReporter(new type());
-              break;
-            }
-          }
-
-          var location = window.location.href;
-
-          var getLastModified = function(callback) {
-            var http = new XMLHttpRequest();
-            var header;
-
-            http.open('HEAD', location, true);
-
-            http.onreadystatechange = function() {
-              if(http.readyState === http.DONE) {
-                callback(http.getResponseHeader('Last-Modified'));
-              }
-            };
-            http.send();
-          }
-
-          getLastModified(function(currentLastModified) {
-            var checker;
-            checker = function() {
-              setTimeout(function() {
-                getLastModified(function(newLastModified) {
-                  if (currentLastModified != newLastModified) {
-                    setTimeout(function() { window.location.reload(); }, 1000);
-                  } else {
-                    checker();
-                  }
-                });
-              }, 3000);
-            };
-
-            checker();
-          });
+          jasmine.getEnv().addReporter(new jasmine.HtmlReporter());
        }

        jasmine.getEnv().execute();
--- a/spec/bin/jasmine-headless-webkit_spec.rb
+++ b/spec/bin/jasmine-headless-webkit_spec.rb
@ -0,0 +1,142 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe "jasmine-headless-webkit" do
+  let(:report) { 'spec/report.txt' }
+
+  before do
+    FileUtils.rm_f report
+  end
+
+  after do
+    FileUtils.rm_f report
+  end
+
+  describe 'success' do
+    it "should succeed with error code 0" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml --report #{report}}
+      $?.exitstatus.should == 0
+
+      report.should be_a_report_containing(1, 0, false)
+    end
+  end
+
+
+  describe 'success but with js error' do
+    it "should succeed with error code 0" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/success_with_error/success_with_error.yml --report #{report}}
+      $?.exitstatus.should == 1
+
+      # returns are unpredictable due to changes in jasmine! >.<
+      # all we can do is ensure that we've actually failed
+      #
+      # report.should be_a_report_containing(0, 0, false)
+    end
+  end
+
+  describe 'failure' do
+    it "should fail with an error code of 1" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/failure/failure.yml --report #{report}}
+      $?.exitstatus.should == 1
+
+      report.should be_a_report_containing(1, 1, false)
+    end
+  end
+
+  describe 'with console.log' do
+    it "should succeed, but has a console.log so an error code of 2" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/console_log/console_log.yml --report #{report}}
+      $?.exitstatus.should == 2
+
+      report.should be_a_report_containing(1, 0, true)
+    end
+  end
+
+  describe 'with coffeescript error' do
+    it "should fail" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/coffeescript_error/coffeescript_error.yml --report #{report}}
+      $?.exitstatus.should == 1
+
+      File.exist?(report).should be_false
+    end
+  end
+
+  describe 'tries to leave page' do
+    it "should not leave the page nor loop" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/leave_page/leave_page.yml --report #{report}}
+      $?.exitstatus.should == 1
+    end
+  end
+
+  describe 'tries to click a button' do
+    it "should not leave the page nor loop" do
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/click_button/click_button.yml --report #{report}}
+      $?.exitstatus.should == 0
+
+      report.should be_a_report_containing(0, 0, false)
+    end
+  end
+
+  describe 'with filtered run' do
+    context "don't run a full run, just the filtered run" do
+      it "should succeed and run both" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml --no-full-run --report #{report} ./spec/jasmine/filtered_success/success_one_spec.js}
+        $?.exitstatus.should == 0
+
+        report.should be_a_report_containing(1, 0, false)
+      end
+
+      it "should use a file outside the normal test run and only run one" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml --report #{report} ./spec/jasmine/filtered_success/success_other_file.js}
+        $?.exitstatus.should == 0
+
+        report.should be_a_report_containing(1, 0, false)
+      end
+    end
+
+    context "do both runs" do
+      it "should fail and not run the second" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_failure/filtered_failure.yml --report #{report} ./spec/jasmine/filtered_failure/failure_spec.js}
+        $?.exitstatus.should == 1
+
+        report.should be_a_report_containing(1, 1, false)
+      end
+
+      it "should succeed and run both" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml --report #{report} ./spec/jasmine/filtered_success/success_one_spec.js}
+        $?.exitstatus.should == 0
+
+        report.should be_a_report_containing(2, 0, false)
+      end
+
+      it "should succeed and run both, with the first having a console.log call" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success_with_console/filtered_success.yml --report #{report} ./spec/jasmine/filtered_success_with_console/success_one_spec.js}
+        $?.exitstatus.should == 2
+
+        report.should be_a_report_containing(2, 0, true)
+      end
+    end
+  end
+
+  describe 'files' do
+    it 'should list all the files that will be found' do
+      files = %x{bin/jasmine-headless-webkit -l -j spec/jasmine/success/success.yml}
+      $?.exitstatus.should == 0
+
+      files.lines.to_a.should include(File.expand_path("./spec/jasmine/success/success.js\n"))
+      files.lines.to_a.should include(File.expand_path("./spec/jasmine/success/success_spec.js\n"))
+    end
+  end
+
+  describe 'runner-out' do
+    it 'should write out the runner HTML to the specified path and not run the test' do
+      runner_path = Tempfile.new('jhw')
+      runner_path.close
+
+      system %{bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml --runner-out #{runner_path.path}}
+
+      File.size(runner_path.path).should_not == 0
+    end
+  end
+end
+
--- a/spec/files/UTF-8-test.txt
+++ b/spec/files/UTF-8-test.txt
--- a/spec/integration/randomization_spec.rb
+++ b/spec/integration/randomization_spec.rb
@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'randomize run order' do
-  let(:seed) { 100 }
-
-  it 'should randomize the run order' do
-    output = %x{bin/jasmine-headless-webkit -j spec/jasmine/success/success.yml --seed #{seed}}
-    $?.exitstatus.should == 0
-
-    output.should include("--seed #{seed}")
-  end
-end
-
--- a/spec/integration/specify_runner_file_spec.rb
+++ b/spec/integration/specify_runner_file_spec.rb
@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'specify runner in jasmine.yml' do
-  before do
-    File.unlink "spec/temp_out.html" if File.file?('spec/temp_out.html')
-  end
-
-  it 'should randomize the run order' do
-    output = %x{bin/jasmine-headless-webkit -j spec/jasmine/runner_out_in_jasmine_yml/jasmine.yml}
-    $?.exitstatus.should == 2
-
-    output.should include("made it")
-    output.should include("1 test")
-
-    "spec/temp_out.html".should be_a_file
-  end
-
-  after do
-    File.unlink "spec/temp_out.html" if File.file?('spec/temp_out.html')
-  end
-end
-
--- a/spec/integration/sprockets_spec.rb
+++ b/spec/integration/sprockets_spec.rb
@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'sprockets' do
-  it 'should pull in the code via sprockets' do
-    files = %x{bin/jasmine-headless-webkit -l -j spec/jasmine/with_sprockets_includes/with_sprockets_includes.yml}
-    $?.exitstatus.should == 0
-    files.lines.to_a.should contain_in_order_in_file_list(
-      'assets/application.js.erb: unsupported format',
-      'vendor/assets/javascripts/jquery.js',
-      'templates/that.jst.ejs',
-      'templates/this.jst',
-      'things/jquery.string.js',
-      'assets/things/required.js',
-      'assets/things/code.js',
-      'assets/things/subcode/more_code.js',
-      'spec_helper.js',
-      'spec/things/code_spec.js'
-    )
-
-    files.lines.to_a.any? { |line| line['assets/jquery.string.js: unsupported format'] }.should be_false
-  end
-end
-
--- a/spec/jasmine/console_log/console_log.yml
+++ b/spec/jasmine/console_log/console_log.yml
@ -1,5 +1,5 @@
+
 src_files:
-  - spec/javascripts/support/jquery-1.6.2.min.js
  - spec/jasmine/console_log/console_log.js

 spec_files:
--- a/spec/jasmine/noisy/file.js.erb
+++ b/spec/jasmine/noisy/file.js.erb
--- a/spec/jasmine/noisy/noisy.yml
+++ b/spec/jasmine/noisy/noisy.yml
@ -1,8 +0,0 @@
-src_dir: spec/jasmine/noisy
-src_files:
- '**/*'
-
-spec_dir: spec/jasmine/noisy
-spec_files:
- '**/*'
-
--- a/spec/jasmine/noisy/other_file.js
+++ b/spec/jasmine/noisy/other_file.js
@ -1,2 +0,0 @@
-window.prompt("hello");
-
--- a/spec/jasmine/runner_out_in_jasmine_yml/jasmine.yml
+++ b/spec/jasmine/runner_out_in_jasmine_yml/jasmine.yml
@ -1,11 +0,0 @@
-src_dir: spec/jasmine/runner_out_in_jasmine_yml
-spec_dir: spec/jasmine/runner_out_in_jasmine_yml
-
-src_files:
- "*.js"
-
-spec_files:
- "*_spec.coffee"
-
-runner_output: 'spec/temp_out.html'
-
--- a/spec/jasmine/runner_out_in_jasmine_yml/test.js
+++ b/spec/jasmine/runner_out_in_jasmine_yml/test.js
@ -1,2 +0,0 @@
-console.log("made it")
-
--- a/spec/jasmine/runner_out_in_jasmine_yml/test_spec.coffee
+++ b/spec/jasmine/runner_out_in_jasmine_yml/test_spec.coffee
@ -1,4 +0,0 @@
-describe 'this', ->
-  it 'should be true', ->
-    expect(true).toEqual(true)
-
--- a/spec/jasmine/two_files_from_src_files/app/app-file.js
+++ b/spec/jasmine/two_files_from_src_files/app/app-file.js
--- a/Show More
+++ b/Show More