diff --git a/Rakefile b/Rakefile index 47c0fb7..02ec64b 100644 --- a/Rakefile +++ b/Rakefile @@ -38,3 +38,9 @@ end task :default => [ 'spec:platforms', 'jasmine:headless' ] +desc "Build the runner" +task :build do + Dir.chdir 'ext/jasmine-headless-specrunner' do + system %{ruby extconf.rb} + end +end diff --git a/jasmine-headless-webkit.gemspec b/jasmine-headless-webkit.gemspec index dc2cb46..17aeb06 100644 --- a/jasmine-headless-webkit.gemspec +++ b/jasmine-headless-webkit.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - s.add_dependency 'jasmine', '~>1.1.beta' + s.add_dependency 'jasmine-core', '~>1.1.beta' s.add_dependency 'coffee-script', '>= 2.2' s.add_dependency 'rainbow' s.add_dependency 'multi_json' diff --git a/lib/jasmine/files_list.rb b/lib/jasmine/files_list.rb index 9f0c8d3..b1313f4 100644 --- a/lib/jasmine/files_list.rb +++ b/lib/jasmine/files_list.rb @@ -1,13 +1,4 @@ -begin - require 'jasmine' -rescue NameError => e - if e.message['ActiveSupport::Concern'] - $stderr.puts "[%s] %s (%s)" % [ "jasmine-gem".color(:red), e.message.color(:white), e.class.name.color(:yellow) ] - $stderr.puts "#{'Jasmine'.color(:red)} believes Rails 3 is available. Try using #{'Bundler'.color(:green)} and running via #{'bundle exec'.color(:green)}." - else - raise e - end -end +require 'jasmine-core' module Jasmine class FilesList diff --git a/lib/jasmine/headless/runner.rb b/lib/jasmine/headless/runner.rb index a9d48a0..4be91c9 100644 --- a/lib/jasmine/headless/runner.rb +++ b/lib/jasmine/headless/runner.rb @@ -3,7 +3,6 @@ require 'jasmine/headless/options' require 'fileutils' -require 'jasmine/base' require 'coffee-script' require 'rainbow'