From 12f56787b0788bf9a5d5b782f5e013202f504290 Mon Sep 17 00:00:00 2001
From: "Davis W. Frank" <dwfrank@infe.ws>
Date: Sun, 5 Jun 2011 21:55:32 -0700
Subject: [PATCH] Move building single-file JS to use a JSON file with initial
 priority files

---
 Rakefile             | 8 ++++++--
 lib/jasmine.js       | 4 ++--
 src/SourcesList.json | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/SourcesList.json

diff --git a/Rakefile b/Rakefile
index 019b497..89a8ccb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,10 @@
+require 'json'
+
 def jasmine_sources
-  sources  = ["src/core/base.js", "src/core/util.js", "src/core/Env.js", "src/core/Reporter.js", "src/core/Block.js"]
-  sources += Dir.glob('src/core/*.js').reject { |f| f == 'src/core/base.js' || sources.include?(f) }.sort
+  first_sources = JSON.parse(File.read('src/SourcesList.json')).collect {|f| "src/core/#{f}"}
+
+  sources = first_sources
+  sources += Dir.glob('src/core/*.js').reject {|f| first_sources.include?(f)}.sort
   sources
 end
 
diff --git a/lib/jasmine.js b/lib/jasmine.js
index 2162355..612d9b6 100644
--- a/lib/jasmine.js
+++ b/lib/jasmine.js
@@ -99,7 +99,7 @@ jasmine.ExpectationResult = function(params) {
   this.actual = params.actual;
   this.message = this.passed_ ? 'Passed.' : params.message;
 
-  var trace = params.trace || new Error(this.message);
+  var trace = (params.trace || new Error(this.message));
   this.trace = this.passed_ ? '' : trace;
 };
 
@@ -2468,5 +2468,5 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1307334045
+  "revision": 1307335480
 };
diff --git a/src/SourcesList.json b/src/SourcesList.json
new file mode 100644
index 0000000..c00f84d
--- /dev/null
+++ b/src/SourcesList.json
@@ -0,0 +1,7 @@
+[
+  "base.js",
+  "util.js",
+  "Env.js",
+  "Reporter.js",
+  "Block.js"
+]
\ No newline at end of file