Merge branch 'master' of http://github.com/elight/evergreen into elig…

…ht-master

Conflicts:
	Gemfile.lock
	lib/evergreen/runner.rb

evergreen.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = ["jonas.nicklas@gmail.com"]
   s.description = "Run Jasmine JavaScript unit tests, integrate them into Ruby applications."
 
-  s.files = Dir.glob("{lib,spec,config}/**/*") + %w(README.rdoc)
+  s.files = Dir.glob("{bin,lib,spec,config}/**/*") + %w(README.rdoc)
   s.extra_rdoc_files = ["README.rdoc"]
   s.executables = ['evergreen']
 

lib/evergreen/tasks.rb

@@ -0,0 +1,6 @@
+require 'evergreen'
+
+Dir[File.join(File.dirname(__FILE__), '..', 'tasks', '*.rake')].each do |f|
+  load f
+end
+

lib/tasks/evergreen.rake

@@ -1,7 +1,7 @@
 namespace :spec do
   desc "Run JavaScript specs via Evergreen"
   task :javascripts do
-    result = Evergreen::Runner.run(Rails.root)
+    result = Evergreen::Suite.new(Rails.root, :selenium).run
     Kernel.exit(1) unless result
   end
 end