Merge branch 'master' of git@github.com:pivotal/jasmine

Conflicts:
	Rakefile
	examples/ruby/Rakefile
	examples/ruby/spec/jasmine_spec.rb
	lib/jasmine-0.9.0.js
	src/Queue.js

examples/ruby/Rakefile

@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec/jasmine_helper.rb"))
+
 namespace :test do
   desc "Run continuous integration tests"
   require "spec"
@@ -11,16 +13,12 @@ end
 
 desc "Run specs via server"
 task :jasmine_server do
-  require File.expand_path(File.join(File.dirname(__FILE__), "../../contrib/ruby/jasmine_spec_builder"))
-
-  dir_mappings = {
-    "/spec" => 'spec'
-  }
-
-  spec_files = Dir.glob("spec/**/*[Ss]pec.js")
+  require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
 
   puts "your tests are here:"
-  puts "  http://localhost:8888/"
+  puts "  http://localhost:8888/run.html"
 
-  Jasmine::SimpleServer.start(8888, spec_files, dir_mappings)
+  Jasmine::SimpleServer.start(8888,
+                              lambda { JasmineHelper.jasmine + JasmineHelper.spec_file_urls },
+                              JasmineHelper.dir_mappings)
 end

examples/ruby/spec/jasmine_helper.rb

@@ -0,0 +1,39 @@
+class JasmineHelper
+  def self.jasmine_lib_dir
+    File.expand_path(File.join(jasmine_root, 'lib'))
+  end
+
+  def self.jasmine_root  
+    File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+  end
+
+  def self.jasmine
+    ['/lib/' + File.basename(Dir.glob("#{JasmineHelper.jasmine_lib_dir}/jasmine*.js").first)] +
+      ['/lib/json2.js',
+     '/lib/TrivialReporter.js']
+  end
+
+  def self.jasmine_src_dir
+    File.expand_path(File.join(jasmine_root, 'src'))
+  end
+
+  def self.jasmine_spec_dir
+    File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec'))
+  end
+
+  def self.raw_spec_files
+    Dir.glob(File.join(jasmine_spec_dir, "**/*[Ss]pec.js"))
+  end
+
+  def self.spec_file_urls
+    raw_spec_files.collect {|f| f.sub(jasmine_spec_dir, "/spec")}
+  end
+
+  def self.dir_mappings
+    {
+            "/src" => jasmine_src_dir,
+            "/spec" => jasmine_spec_dir,
+            "/lib" => jasmine_lib_dir
+    }
+  end
+end

examples/ruby/spec/jasmine_spec.rb

@@ -1,14 +1,13 @@
 require 'rubygems'
-require File.expand_path(File.join(File.dirname(__FILE__), "../../../contrib/ruby/jasmine_spec_builder"))
 require "selenium_rc"
+require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_helper.rb"))
+require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
 
-dir_mappings = {
-  "/spec" => 'spec',
-}
+jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path,
+                                     JasmineHelper.jasmine + JasmineHelper.spec_file_urls,
+                                     JasmineHelper.dir_mappings)
 
-spec_files = Dir.glob("spec/**/*[Ss]pec.js")
-jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path, spec_files, dir_mappings)
-spec_builder = Jasmine::SpecBuilder.new(spec_files, jasmine_runner)
+spec_builder = Jasmine::SpecBuilder.new(JasmineHelper.raw_spec_files, jasmine_runner)
 
 should_stop = false