From e88d88e427eb8cc7dac3d49219dda88590529a25 Mon Sep 17 00:00:00 2001 From: "Davis W. Frank" Date: Sun, 5 Jun 2011 21:28:26 -0700 Subject: [PATCH] Move all core files into src/core. Move Browser & Node specs to test against lib/jasmine.js instead of the separate source. Yes, this makes development a little harder but it's better to test that jasmine.js was built correctly. --- HowToRelease.markdown | 13 +++++++++++++ Rakefile | 8 ++++---- jshint/run.js | 1 + lib/jasmine.js | 2 +- spec/node_suite.js | 15 +++------------ spec/runner.html | 19 +------------------ src/{ => core}/Block.js | 0 src/{ => core}/Env.js | 0 src/{ => core}/JsApiReporter.js | 0 src/{ => core}/Matchers.js | 0 src/{ => core}/MultiReporter.js | 0 src/{ => core}/NestedResults.js | 0 src/{ => core}/PrettyPrinter.js | 0 src/{ => core}/Queue.js | 0 src/{ => core}/Reporter.js | 0 src/{ => core}/Runner.js | 0 src/{ => core}/Spec.js | 0 src/{ => core}/Suite.js | 0 src/{ => core}/WaitsBlock.js | 0 src/{ => core}/WaitsForBlock.js | 0 src/{ => core}/base.js | 0 src/{ => core}/mock-timeout.js | 0 src/{ => core}/util.js | 0 src/{ => core}/version.json | 0 24 files changed, 23 insertions(+), 35 deletions(-) rename src/{ => core}/Block.js (100%) rename src/{ => core}/Env.js (100%) rename src/{ => core}/JsApiReporter.js (100%) rename src/{ => core}/Matchers.js (100%) rename src/{ => core}/MultiReporter.js (100%) rename src/{ => core}/NestedResults.js (100%) rename src/{ => core}/PrettyPrinter.js (100%) rename src/{ => core}/Queue.js (100%) rename src/{ => core}/Reporter.js (100%) rename src/{ => core}/Runner.js (100%) rename src/{ => core}/Spec.js (100%) rename src/{ => core}/Suite.js (100%) rename src/{ => core}/WaitsBlock.js (100%) rename src/{ => core}/WaitsForBlock.js (100%) rename src/{ => core}/base.js (100%) rename src/{ => core}/mock-timeout.js (100%) rename src/{ => core}/util.js (100%) rename src/{ => core}/version.json (100%) diff --git a/HowToRelease.markdown b/HowToRelease.markdown index 5f6949e..21bef82 100644 --- a/HowToRelease.markdown +++ b/HowToRelease.markdown @@ -1,3 +1,16 @@ + + +## Development + + + + +## Release + + + + + # Making a Release of Jasmine Core 'Jasmine' is the Github repo for Jasmine Core and contains all the JavaScript code for the Jasmine BDD framework. diff --git a/Rakefile b/Rakefile index 9da9602..019b497 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ def jasmine_sources - sources = ["src/base.js", "src/util.js", "src/Env.js", "src/Reporter.js", "src/Block.js"] - sources += Dir.glob('src/*.js').reject { |f| f == 'src/base.js' || sources.include?(f) }.sort + 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 sources end @@ -14,7 +14,7 @@ end def version_hash require 'json' - @version ||= JSON.parse(File.new("src/version.json").read); + @version ||= JSON.parse(File.new("src/core/version.json").read); end @@ -28,7 +28,7 @@ end task :default => :spec desc "Run spec suite: Browser, Node, JSHint" -task :spec => ["spec:node", "spec:browser", "jasmine:hint"] +task :spec => ["jasmine:build", "spec:node", "spec:browser"] namespace :spec do desc 'Run specs in Node.js' diff --git a/jshint/run.js b/jshint/run.js index 90d7a8f..7fc856c 100644 --- a/jshint/run.js +++ b/jshint/run.js @@ -3,6 +3,7 @@ var sys = require("sys"); var path = require("path"); var JSHINT = require("./jshint").JSHINT; +// DWF TODO: Standardize this? function isExcluded(fullPath) { var fileName = path.basename(fullPath); var excludeFiles = ["json2.js", "jshint.js", "publish.js", "node_suite.js", "jasmine.js", "jasmine-html.js"]; diff --git a/lib/jasmine.js b/lib/jasmine.js index e2e265c..2162355 100644 --- a/lib/jasmine.js +++ b/lib/jasmine.js @@ -2468,5 +2468,5 @@ jasmine.version_= { "major": 1, "minor": 1, "build": 0, - "revision": 1306942160 + "revision": 1307334045 }; diff --git a/spec/node_suite.js b/spec/node_suite.js index 1e61804..cb6e60f 100644 --- a/spec/node_suite.js +++ b/spec/node_suite.js @@ -5,21 +5,12 @@ var path = require('path'); // yes, really keep this here to keep us honest, but only for jasmine's own runner! [xw] // undefined = "diz be undefined yo"; -var jasmineGlobals = require("../src/base"); + +var jasmineGlobals = require('../lib/jasmine.js'); for (var k in jasmineGlobals) { global[k] = jasmineGlobals[k]; } - -//load jasmine src files based on the order in runner.html -var srcFilesInProperRequireOrder = []; -var runnerHtmlLines = fs.readFileSync("spec/runner.html", "utf8").split("\n"); -var srcFileLines = []; -for (var i = 0; i < runnerHtmlLines.length; i++) - if (runnerHtmlLines[i].match(/script(.*?)\/src\//)) - srcFileLines.push(runnerHtmlLines[i]); -for (i = 0; i < srcFileLines.length; i++) srcFilesInProperRequireOrder.push(srcFileLines[i].match(/src=\"(.*?)\"/)[1]); -for (i = 0; i < srcFilesInProperRequireOrder.length; i++) require(srcFilesInProperRequireOrder[i]); - +require('../src/console/TrivialConsoleReporter.js'); /* Pulling in code from jasmine-node. diff --git a/spec/runner.html b/spec/runner.html index ef0f070..8835c63 100644 --- a/spec/runner.html +++ b/spec/runner.html @@ -9,24 +9,7 @@ undefined = "diz be undefined yo"; - - - - - - - - - - - - - - - - - - + diff --git a/src/Block.js b/src/core/Block.js similarity index 100% rename from src/Block.js rename to src/core/Block.js diff --git a/src/Env.js b/src/core/Env.js similarity index 100% rename from src/Env.js rename to src/core/Env.js diff --git a/src/JsApiReporter.js b/src/core/JsApiReporter.js similarity index 100% rename from src/JsApiReporter.js rename to src/core/JsApiReporter.js diff --git a/src/Matchers.js b/src/core/Matchers.js similarity index 100% rename from src/Matchers.js rename to src/core/Matchers.js diff --git a/src/MultiReporter.js b/src/core/MultiReporter.js similarity index 100% rename from src/MultiReporter.js rename to src/core/MultiReporter.js diff --git a/src/NestedResults.js b/src/core/NestedResults.js similarity index 100% rename from src/NestedResults.js rename to src/core/NestedResults.js diff --git a/src/PrettyPrinter.js b/src/core/PrettyPrinter.js similarity index 100% rename from src/PrettyPrinter.js rename to src/core/PrettyPrinter.js diff --git a/src/Queue.js b/src/core/Queue.js similarity index 100% rename from src/Queue.js rename to src/core/Queue.js diff --git a/src/Reporter.js b/src/core/Reporter.js similarity index 100% rename from src/Reporter.js rename to src/core/Reporter.js diff --git a/src/Runner.js b/src/core/Runner.js similarity index 100% rename from src/Runner.js rename to src/core/Runner.js diff --git a/src/Spec.js b/src/core/Spec.js similarity index 100% rename from src/Spec.js rename to src/core/Spec.js diff --git a/src/Suite.js b/src/core/Suite.js similarity index 100% rename from src/Suite.js rename to src/core/Suite.js diff --git a/src/WaitsBlock.js b/src/core/WaitsBlock.js similarity index 100% rename from src/WaitsBlock.js rename to src/core/WaitsBlock.js diff --git a/src/WaitsForBlock.js b/src/core/WaitsForBlock.js similarity index 100% rename from src/WaitsForBlock.js rename to src/core/WaitsForBlock.js diff --git a/src/base.js b/src/core/base.js similarity index 100% rename from src/base.js rename to src/core/base.js diff --git a/src/mock-timeout.js b/src/core/mock-timeout.js similarity index 100% rename from src/mock-timeout.js rename to src/core/mock-timeout.js diff --git a/src/util.js b/src/core/util.js similarity index 100% rename from src/util.js rename to src/core/util.js diff --git a/src/version.json b/src/core/version.json similarity index 100% rename from src/version.json rename to src/core/version.json