Added rake :build task to concat files together. Removed jsUnitMockTimeout.js

Rakefile

@@ -0,0 +1,20 @@
+desc 'Builds lib/jasmine from source'
+task :build do
+  sources = [ "src/base.js",
+    "src/util.js",
+    "src/Env.js",
+    "src/ActionCollection.js",
+    "src/Matchers.js",
+    "src/NestedResults.js",
+    "src/PrettyPrinter.js",
+    "src/QueuedFunction.js",
+    "src/Reporters.js",
+    "src/Runner.js",
+    "src/Spec.js",
+    "src/Suite.js"]
+
+  jasmine = File.new('lib/jasmine.js', 'w')
+  sources.each do |source_filename|
+    jasmine.puts(File.read(source_filename))
+  end
+end

spec/bootstrap.html

@@ -6,7 +6,7 @@
 
   <script type="text/javascript" src="lib/json2.js"></script>
   <script type="text/javascript" src="lib/mock-timeout.js"></script>
-  <script type="text/javascript" src="../lib/jsUnitMockTimeout.js"></script>
+  
   <script type="text/javascript" src="../src/base.js"></script>
   <script type="text/javascript" src="../src/util.js"></script>
   <script type="text/javascript" src="../src/Env.js"></script>

src/jsUnitMockTimeout.js

@@ -1,81 +0,0 @@
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-var Clock = {
-    timeoutsMade: 0,
-    scheduledFunctions: {},
-    nowMillis: 0,
-    reset: function() {
-        this.scheduledFunctions = {};
-        this.nowMillis = 0;
-        this.timeoutsMade = 0;
-    },
-    tick: function(millis) {
-        var oldMillis = this.nowMillis;
-        var newMillis = oldMillis + millis;
-        this.runFunctionsWithinRange(oldMillis, newMillis);
-        this.nowMillis = newMillis;
-    },
-    runFunctionsWithinRange: function(oldMillis, nowMillis) {
-        var scheduledFunc;
-        var funcsToRun = [];
-        for (var timeoutKey in this.scheduledFunctions) {
-            scheduledFunc = this.scheduledFunctions[timeoutKey];
-            if (scheduledFunc != undefined &&
-                scheduledFunc.runAtMillis >= oldMillis &&
-                scheduledFunc.runAtMillis <= nowMillis) {
-                funcsToRun.push(scheduledFunc);
-                this.scheduledFunctions[timeoutKey] = undefined;
-            }
-        }
-
-        if (funcsToRun.length > 0) {
-            funcsToRun.sort(function(a, b) {
-                return a.runAtMillis - b.runAtMillis;
-            });
-            for (var i = 0; i < funcsToRun.length; ++i) {
-                try {
-                    this.nowMillis = funcsToRun[i].runAtMillis;
-                    funcsToRun[i].funcToCall();
-                    if (funcsToRun[i].recurring) {
-                        Clock.scheduleFunction(funcsToRun[i].timeoutKey,
-                                funcsToRun[i].funcToCall,
-                                funcsToRun[i].millis,
-                                true);
-                    }
-                } catch(e) {
-                }
-            }
-            this.runFunctionsWithinRange(oldMillis, nowMillis);
-        }
-    },
-    scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
-        Clock.scheduledFunctions[timeoutKey] = {
-            runAtMillis: Clock.nowMillis + millis,
-            funcToCall: funcToCall,
-            recurring: recurring,
-            timeoutKey: timeoutKey,
-            millis: millis
-        };
-    }
-};
-
-function setTimeout(funcToCall, millis) {
-    Clock.timeoutsMade = Clock.timeoutsMade + 1;
-    Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, false);
-    return Clock.timeoutsMade;
-}
-
-function setInterval(funcToCall, millis) {
-    Clock.timeoutsMade = Clock.timeoutsMade + 1;
-    Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, true);
-    return Clock.timeoutsMade;
-}
-
-function clearTimeout(timeoutKey) {
-    Clock.scheduledFunctions[timeoutKey] = undefined;
-}
-
-function clearInterval(timeoutKey) {
-    Clock.scheduledFunctions[timeoutKey] = undefined;
-}