.gitignore

@@ -16,4 +16,3 @@ _site/
 jhw.*.html
 coverage/
 tmp/
-cache dir/

Gemfile

@@ -15,6 +15,7 @@ gem 'guard-cucumber'
 require 'rbconfig'
 case RbConfig::CONFIG['host_os']
 when /darwin/
+  gem 'rb-fsevent'
 when /linux/
   gem 'libnotify'
 end

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!

Rakefile

@@ -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}
 
 def rvm_bundle(command = '')
   Bundler.with_clean_env do

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

ext/jasmine-webkit-specrunner/specrunner.cpp

@@ -23,10 +23,6 @@
 
 #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

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 |
-

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
-

jasmine-headless-webkit.gemspec

@@ -20,11 +20,9 @@ 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 'jasmine-core', '~> 1.1'
   s.add_runtime_dependency 'coffee-script'
   s.add_runtime_dependency 'rainbow'
-  s.add_runtime_dependency 'multi_json', '>= 1.2.0'
+  s.add_runtime_dependency 'multi_json'
-  s.add_runtime_dependency 'sprockets'
+  s.add_runtime_dependency 'sprockets', '~> 2'
-  s.add_runtime_dependency 'sprockets-vendor_gems'
 end
-

lib/jasmine/headless/cacheable_action.rb

@@ -54,11 +54,7 @@ module Jasmine::Headless
     end
 
     def cache_file
-      @cache_file ||= File.expand_path(relative_cache_file) + '.js'
+      @cache_file ||= File.expand_path(File.join(self.class.cache_dir, self.class.cache_type, file)) + '.js'
-    end
-
-    def relative_cache_file
-      File.join(self.class.cache_dir, self.class.cache_type, file.gsub(Dir.pwd + '/', ''))
     end
 
     def fresh?

lib/jasmine/headless/files_list.rb

@@ -4,7 +4,6 @@ require 'multi_json'
 require 'set'
 require 'sprockets'
 require 'sprockets/engines'
-require 'sprockets-vendor_gems'
 
 module Jasmine::Headless
   class FilesList
@@ -12,12 +11,33 @@ module Jasmine::Headless
 
     class << self
       def asset_paths
-        @asset_paths ||= Sprockets.find_gem_vendor_paths(:for => 'javascripts')
+        return @asset_paths if @asset_paths
+
+        require 'rubygems'
+
+        raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:each)
+
+        @asset_paths = []
+
+        Gem::Specification.each { |gemspec| @asset_paths += get_paths_from_gemspec(gemspec) }
+
+        @asset_paths
+      end
+
+      def get_paths_from_gemspec(gemspec)
+        %w{vendor lib app}.collect do |dir|
+          path = File.join(gemspec.gem_dir, dir, "assets/javascripts")
+
+          if File.directory?(path) && !@asset_paths.include?(path)
+            path
+          else
+            nil
+          end
+        end.compact
       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|
@@ -36,20 +56,16 @@ module Jasmine::Headless
           end
         end
 
-        @sprockets_environment = nil
+        # ...and unregister ones we don't want/need
-      end
+        Sprockets.instance_eval do
+          EXCLUDED_FORMATS.each do |extension|
+            register_engine ".#{extension}", Jasmine::Headless::NilTemplate
+          end
 
-      def registered_engines
+          register_engine '.coffee', Jasmine::Headless::CoffeeTemplate
-        @registered_engines ||= {}
+          register_engine '.js', Jasmine::Headless::JSTemplate
-      end
+          register_engine '.css', Jasmine::Headless::CSSTemplate
-
+          register_engine '.jst', Jasmine::Headless::JSTTemplate
-      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
 
@@ -79,21 +95,11 @@ module Jasmine::Headless
       @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
@@ -131,7 +137,6 @@ module Jasmine::Headless
       @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
 
@@ -142,19 +147,6 @@ module Jasmine::Headless
       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
 
@@ -235,13 +227,13 @@ module Jasmine::Headless
     end
 
     def add_files(patterns, type, dirs)
-      patterns.each do |pattern|
+      dirs.product(patterns).each do |search|
-        dirs.collect { |dir| expanded_dir(File.join(dir, pattern)) }.each do |files|
+        files = expanded_dir(File.join(*search))
-          files.sort! { |a, b| Kernel.rand(3) - 1 } if type == 'spec_files'
 
-          files.each do |path|
+        files.sort! { |a, b| Kernel.rand(3) - 1 } if type == 'spec_files'
-            add_path(path, type)
+
-          end
+        files.each do |path|
+          add_path(path, type)
         end
       end
 
@@ -255,8 +247,7 @@ module Jasmine::Headless
     end
 
     def expanded_dir(path)
-      file_list = Dir.glob(path).sort
+      Dir[path].find_all { |file|
-      file_list.find_all { |file|
         file[extension_filter] && !alert_if_bad_format?(file)
       }.collect {
         |file| File.expand_path(file)
@@ -280,7 +271,7 @@ module Jasmine::Headless
     end
 
     def src_dir
-      @src_dir ||= config_dir_or_pwd('src_dir') + asset_paths
+      @src_dir ||= config_dir_or_pwd('src_dir')
     end
 
     def spec_dir
@@ -288,7 +279,7 @@ module Jasmine::Headless
     end
 
     def asset_paths
-      @asset_paths ||= config_dir('asset_paths')
+      @asset_paths ||= config_dir_or_pwd('asset_paths')
     end
 
     def spec_file_searches
@@ -296,15 +287,9 @@ module Jasmine::Headless
     end
 
     def config_dir_or_pwd(dir)
-      if (found = config_dir(dir)).empty?
+      found_dir = (@options[:config] && @options[:config][dir]) || Dir.pwd
-        found = [ Dir.pwd ]
-      end
 
-      found
+      [ found_dir ].flatten.collect { |dir| File.expand_path(dir) }
-    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)
@@ -316,17 +301,5 @@ module Jasmine::Headless
         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

lib/jasmine/headless/spec_file_analyzer.rb

@@ -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

lib/jasmine/headless/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Headless
-    VERSION = "0.9.0.rc.2"
+    VERSION = "0.8.4"
   end
 end

skel/template.html.erb

@@ -6,7 +6,7 @@
     <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>
@@ -35,18 +35,14 @@
             }
           }
 
-          var location = window.location.href;
-
           var getLastModified = function(callback) {
             var http = new XMLHttpRequest();
             var header;
 
-            http.open('HEAD', location, true);
+            http.open('HEAD', window.location.href, false);
 
             http.onreadystatechange = function() {
-              if(http.readyState === http.DONE) {
+              callback(http.getResponseHeader('Last-Modified'));
-                callback(http.getResponseHeader('Last-Modified'));
-              }
             };
             http.send();
           }

spec/jasmine/two_files_from_src_files/app/app.js

@@ -1,2 +0,0 @@
-//= require app-file
-//

spec/jasmine/two_files_from_src_files/jasmine.yml

@@ -1,7 +0,0 @@
-src_dir: spec/jasmine/two_files_from_src_files/app
-
-asset_paths:
-- "spec/jasmine/two_files_from_src_files/vendor"
-
-src_files: [ 'vendor.js', 'app.js' ]
-

spec/jasmine/two_files_from_src_files/vendor/vendor.js

@@ -1,2 +0,0 @@
-//= require vendor-file
-//

spec/lib/jasmine/headless/cacheable_action_spec.rb

@@ -95,28 +95,5 @@ describe Jasmine::Headless::CacheableAction do
       end
     end
   end
-
-  describe '#relative_cache_file' do
-    context 'file is an absolute windows file' do
-      let(:current_path) { 'C:/path' }
-      let(:filename) { "file.coffee" }
-      let(:windows_path) { File.join(current_path, filename) }
-      let(:cache_dir) { 'cache dir' }
-      let(:cache_type) { 'cache type' }
-
-      before do
-        cache_object.stubs(:file).returns(windows_path)
-
-        described_class.stubs(:cache_dir).returns(cache_dir)
-        described_class.stubs(:cache_type).returns(cache_type)
-
-        Dir.stubs(:pwd).returns(current_path)
-      end
-
-      subject { cache_object.relative_cache_file }
-
-      it { should == File.join(cache_dir, cache_type, filename) }
-    end
-  end
 end
 

spec/lib/jasmine/headless/files_list_spec.rb

@@ -5,6 +5,50 @@ require 'coffee-script'
 describe Jasmine::Headless::FilesList do
   let(:files_list) { described_class.new }
 
+  describe '.get_paths_from_gemspec' do
+    include FakeFS::SpecHelpers
+
+    let(:gem_dir) { "dir" }
+    let(:gemspec) { stub(:gem_dir => gem_dir) }
+
+    let(:paths) do
+      %w{vendor lib app}.collect do |dir|
+        File.join(gem_dir, dir, 'assets/javascripts')
+      end
+    end
+
+    before do
+      paths.each { |path| FileUtils.mkdir_p path }
+
+      described_class.instance_variable_set(:@asset_paths, [])
+    end
+
+    subject { described_class.get_paths_from_gemspec(gemspec) }
+
+    it { should =~ paths }
+  end
+
+  describe '.asset_paths' do
+    include FakeFS::SpecHelpers
+
+    let(:dir_one) { 'dir_one' }
+    let(:dir_two) { 'dir_two' }
+
+    let(:gem_one) { stub(:gem_dir => dir_one) }
+    let(:gem_two) { stub(:gem_dir => dir_two) }
+
+    before do
+      described_class.instance_variable_set(:@asset_paths, nil)
+      FileUtils.mkdir_p File.join(dir_two, 'vendor/assets/javascripts')
+
+      Gem::Specification.stubs(:_all).returns([gem_one, gem_two])
+    end
+
+    it 'should return all matching gems with vendor/assets/javascripts directories' do
+      described_class.asset_paths.should == [ File.join(dir_two, 'vendor/assets/javascripts') ]
+    end
+  end
+
   describe '#initialize' do
     before do
       described_class.any_instance.stubs(:load_initial_assets)
@@ -174,21 +218,6 @@ describe Jasmine::Headless::FilesList do
         files_list.files.any? { |file| file['.erb'] }.should be_false
       end
     end
-
-    describe "#register_engine!" do
-
-      before(:each) do
-        Jasmine::Headless::FilesList.reset!
-      end
-
-      it "should register code added via configure blocks" do
-        template_class = mock()
-        described_class.register_engine ".foo", template_class
-        Sprockets.expects(:register_engine).with(".foo", template_class)
-        described_class.new
-      end
-
-    end
   end
 end
 

vendor/assets/javascripts/intense.coffee

@@ -11,16 +11,16 @@ window.Intense = {
   methods:
     foreground: (color) ->
       if Intense.useColors
-        '\x1b' + "[3#{Intense.colors[color]}m#{this}" + '\x1b' + "[0m"
+        "\033[3#{Intense.colors[color]}m#{this}\033[0m"
       else
         this
     bright: ->
       if Intense.useColors
-        '\x1b' + "[1m#{this}" + '\x1b' + "[0m"
+        "\033[1m#{this}\033[0m"
       else
         this
   useColors: true
-  moveBack: (count = 1) -> '\x1b' + "[#{count}D"
+  moveBack: (count = 1) -> "\033[#{count}D"
 }
 
 for method, code of Intense.methods