Squashed commit of work to make Jasmine a collection of isolated modu…

…les. Note now that in our test suite, "jasmine" now always refers to the build jasmine loaded from jasmine.js and "j$" always refers to the code in the src directories.

Also, dev_boot.js is now a copy of boot.js and has additional changes to load jasmine the second time, into the j$ reference.

grunt/config/concat.js

@@ -11,6 +11,7 @@ function license() {
 module.exports = {
   'jasmine-html': {
     src: [
+      'src/html/requireHtml.js',
       'src/html/HtmlReporter.js',
       'src/html/HtmlSpecFilter.js',
       'src/html/ResultsNode.js',
@@ -20,6 +21,7 @@ module.exports = {
   },
   jasmine: {
     src: [
+      'src/core/requireCore.js',
       'src/core/base.js',
       'src/core/util.js',
       'src/core/Spec.js',
@@ -37,6 +39,13 @@ module.exports = {
     src: ['lib/jasmine-core/boot/boot.js'],
     dest: 'lib/jasmine-core/boot.js'
   },
+  console: {
+    src: [
+      'src/console/requireConsole.js',
+      'src/console/ConsoleReporter.js'
+    ],
+    dest: 'src/console/console.js'
+  },
   options: {
     banner: license(),
     process: {

lib/jasmine-core.rb

@@ -6,7 +6,7 @@ def path
       end
 
       def js_files
-        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq
+        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq - boot_files
       end
 
       SPEC_TYPES = ["core", "html", "node"]

lib/jasmine-core/boot.js

@@ -22,6 +22,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 // Jasmine boot.js for browser runners - exposes external/global interface, builds the Jasmine environment and executes it.
 (function() {
+  window.jasmine = jasmineRequire.core(jasmineRequire);
+  jasmineRequire.html(jasmine);
+
   var env = jasmine.getEnv();
 
   var jasmineInterface = {

lib/jasmine-core/boot/boot.js

@@ -1,5 +1,8 @@
 // Jasmine boot.js for browser runners - exposes external/global interface, builds the Jasmine environment and executes it.
 (function() {
+  window.jasmine = jasmineRequire.core(jasmineRequire);
+  jasmineRequire.html(jasmine);
+
   var env = jasmine.getEnv();
 
   var jasmineInterface = {