Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'dep-task'. Fix #126.

  • Loading branch information...
commit aed4249cd8d119934ae36cd37207e2ca51032956 2 parents bdb931f + 7209da4
@reid reid authored
View
14 .npmignore
@@ -1,10 +1,14 @@
api
-tools
+dep/dev
+doc
coverage.*
.git*
+.npm*
+.travis.yml
*.swp
+go
+build_docs
+Makefile
test/vendor
-scripts/darwin/build_tmp
-scripts/darwin/build_tmp.dmg
-scripts/darwin/Yeti.dmg
-scripts/darwin/npm-cache
+scripts/darwin
+scripts/*.sh
View
24 Jakefile.js
@@ -4,7 +4,6 @@
var fs = require("fs");
var child_process = require("child_process");
-
var Ronn = require("ronn").Ronn;
var rimraf = require("rimraf");
var walk = require("walk");
@@ -78,7 +77,11 @@ task("default", ["install"]);
desc("Install all modules including devDependencies");
task("install", function () {
- spawn("npm", ["install"], complete);
+ var dep = jake.Task['dep'];
+ dep.addListener('complete', function () {
+ spawn("npm", ["install"], complete);
+ });
+ dep.invoke();
}, {
async: true
});
@@ -95,7 +98,7 @@ task("test", function () {
});
desc("Run all of Yeti's unit tests with the '--spec' flag");
-task("spec", function () {
+task("spec", ["dep"], function () {
bin("vows", ["--spec"].concat(getTestFiles()), complete);
}, {
async: true
@@ -150,3 +153,18 @@ task("maintainer-clean", function () {
spawn("rpm", ["rm", "webkit-devtools-agent"]);
nuke("tools");
});
+
+desc("Fetch external dependencies");
+task("dep", function () {
+ jake.mkdirP('dep/dev');
+ spawn(process.argv[0], ["./scripts/fetch_deps.js"], complete);
+}, {
+ async: true
+});
+
+desc("Print history");
+task("history", function () {
+ spawn(process.argv[0], ["./scripts/postinstall.js"], complete);
+}, {
+ async: true
+});
View
199 LICENSE
@@ -1,4 +1,7 @@
-Software Copyright License Agreement (BSD License)
+The following license text applies to all parts of Yeti that are not
+externally maintained libraries.
+
+# License for Yeti (BSD License)
Copyright 2013 Yahoo! Inc.
All rights reserved.
@@ -31,3 +34,197 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Included externally maintained libraries
+
+The externally maintained libraries included with Yeti are:
+
+- YUI, located at deps/yui-runtime.js.
+ Copyright 2013 Yahoo! Inc.
+ Used under the same BSD license as Yeti.
+ http://yuilibrary.com/license/
+
+- sock.js, located at deps/sock.js.
+ Copyright 2011-2012 VMware, Inc.
+ Used under the MIT license.
+ https://github.com/sockjs/sockjs-client/blob/3f7e5f4ef5673dc15d3d3db890bc82a725f0c91d/LICENSE-MIT-SockJS
+
+# Required externally maintained libraries
+
+These libraries are not included with Yeti, but are downloaded
+by npm as dependencies of Yeti:
+
+- async
+ https://npmjs.org/package/async
+ Copyright 2010 Caolan McMahon.
+ Used under the MIT license.
+ https://github.com/caolan/async/blob/96a7da519adc9e8cb3c187a2da4945f5edea71d3/LICENSE
+
+- wd
+ https://npmjs.org/package/wd
+ Copyright 2012 Sauce Labs.
+ Used under the Apache 2.0 license.
+ https://github.com/admc/wd/blob/7371d45734f52d592afb98922153d2077bd803ab/LICENSE.APACHE2
+
+- echoecho
+ https://npmjs.org/package/echoecho
+ Copyright 2013 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/davglass/echoecho/blob/a71637997fae473608d7494c984c675ec4cdadf0/LICENSE
+
+- eventemitter2
+ https://npmjs.org/package/eventemitter2
+ Copyright 2011 hij1nx http://www.twitter.com/hij1nx
+ Used under the MIT license.
+ https://github.com/hij1nx/EventEmitter2/blob/30258b5f1ce7f24d88c6fbe20ff0f0714c8226cb/README.md#licence
+
+- eventyoshi
+ https://npmjs.org/package/eventyoshi
+ Copyright 2012 Roly Fentanes.
+ Used under the MIT license.
+ https://github.com/fent/node-eventyoshi/blob/8bfbed86d1dff9b7b2f3b8679cf2e9a4e911c412/LICENSE
+
+- nopt
+ https://npmjs.org/package/nopt
+ Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+ Used under the MIT license.
+ https://github.com/isaacs/nopt/blob/5a5914439c5048921699da8c31d24e5bdf0bacba/LICENSE
+
+- onyx
+ https://npmjs.org/package/onyx
+ Cpyright 2011 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/reid/onyx/blob/edc3666054895ef59f40503d0473675f6a8201b2/LICENSE
+
+- sockjs
+ https://npmjs.org/package/sockjs
+ Copyright 2011 VMware, Inc.
+ Used under the MIT license.
+ https://github.com/sockjs/sockjs-node/blob/750a17c88df6659dd97cb2eed886b93d21b941e1/LICENSE-MIT-SockJS
+
+- proto-list
+ https://npmjs.org/package/proto-list
+ Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+ Used under the MIT license.
+ https://github.com/isaacs/proto-list/blob/71161783a3254bc977b0acfb7e42f4a536133ecf/LICENSE
+
+- glob
+ https://npmjs.org/package/glob
+ Copyright Isaac Z. Schlueter.
+ Used under the BSD license.
+ https://github.com/isaacs/node-glob/blob/b00bd496988568e9b0eb781a5250f15ea229bd6c/LICENSE
+
+- graceful-fs
+ https://npmjs.org/package/graceful-fs
+ Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+ Used under the MIT license.
+ https://github.com/isaacs/node-graceful-fs/blob/f13074088076faa4f3be9501bca99b4caa847fed/LICENSE
+
+# Other externally maintained libraries
+
+These libraries are not included with Yeti, but are downloaded
+by a build step or by npm in order to test Yeti:
+
+- YUI Test, located at deps/dev/yui-test.*
+ Copyright 2013 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/yui/yuitest/blob/9f86ac45dc811abab8591c643b13c068f3534dfe/LICENSE
+
+- QUnit, located at deps/dev/qunit.*.
+ Copyright 2013 jQuery Foundation and other contributors.
+ Used under the MIT license.
+ https://github.com/jquery/jquery/blob/b326225d9087ee8c5648ace3cf88feab0330353d/MIT-LICENSE.txt
+
+- Jasmine, located at deps/dev/jasmine*.
+ Copyright 2008-2011 Pivotal Labs.
+ Used under the MIT license.
+ https://github.com/pivotal/jasmine/blob/8b02bf731b193e135ccb486e99b3ecd7165bf95c/MIT.LICENSE
+
+- Mocha, located at deps/dev/mocha.*.
+ Copyright 2011-2013 TJ Holowaychuk <tj@vision-media.ca>.
+ Used under the MIT license.
+ https://github.com/visionmedia/mocha/blob/8f66a59657dc37e523749f519753cdade9486b5f/LICENSE
+
+- Dojo, located at deps/dev/dojo*.
+ Copyright 2005-2006 The Dojo Foundation.
+ Used under the BSD license.
+ http://bugs.dojotoolkit.org/browser/dojo/trunk/LICENSE?rev=6646
+
+- portfinder
+ https://npmjs.org/package/portfinder
+ Copyright 2012 Charlie Robbins.
+ Used under the MIT license.
+ https://github.com/indexzero/node-portfinder/blob/fe67dc1a726f97c551a89171fde243ac6f5d67cf/LICENSE
+
+- istanbul
+ https://npmjs.org/package/istanbul
+ Copyright 2012 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/gotwarlost/istanbul/blob/e2b707c33a978a8db8c9acbff72d2fc0071db64f/LICENSE
+
+- semver
+ https://npmjs.org/package/semver
+ Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+ Used under the MIT license.
+ https://github.com/isaacs/node-semver/blob/db040936e7f5dbcea2c8989bf6f8a4515f40c505/LICENSE
+
+- ronn
+ https://npmjs.org/package/ronn
+ Copyright 2010 Jérémy Lal <kapouer@melix.org>, 2009 Ryan Tomayko <tomayko.com/about>
+ Copyright 2009-2010 Dominic Baggott, 2009-2010 Ash Berlin.
+ Copyright 2010 Joey Mazzarelli <mazzarelli@gmail.com>
+ Used under MIT and Simplified BSD licenses.
+ https://github.com/kapouer/ronnjs/blob/db2ea507970971d64b6b6b82b24deb215312b348/LICENSE
+
+- jshint
+ https://npmjs.org/package/jshint
+ Copyright 2012 Anton Kovalyov (http://jshint.com)
+ https://github.com/jshint/jshint/blob/0930de4bb6867ddad97d6d6f0749dbb18f81cefa/LICENSE
+
+- pact
+ https://npmjs.org/package/pact
+ Copyright 2011 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/reid/pact/blob/e07814cf86495e3e8dc9a9f31918527c8d33413c/LICENSE
+
+- node-phantom
+ https://npmjs.org/package/node-phantom
+ Written by Alex Scheel Meyer.
+ Public domain.
+ https://github.com/alexscheelmeyer/node-phantom/blob/193a3a0dda2080d0219c9757330b9677c7b3eda1/README.md#other
+
+- vows
+ https://npmjs.org/package/vows
+ Copyright 2009 cloudhead.
+ Used under the MIT license.
+ https://github.com/cloudhead/vows/blob/a7843f45e6b763b1eacefa7098d66dd45fca2e7a/LICENSE
+
+- selleck
+ https://npmjs.org/package/selleck
+ Copyright 2012 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/yui/selleck/blob/8c55ccbb43f1b6de399be722c20272727da17d63/LICENSE
+
+- yuidocjs
+ https://npmjs.org/package/yuidocjs
+ Copyright 2011 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/yui/yuidoc/blob/76a9918d6e11d6fdbd8c40700ab527c84eae18e1/LICENSE
+
+- jake
+ https://npmjs.org/package/jake
+ Written by Matthew Eernisse.
+ Used under the Apache 2.0 license.
+ https://github.com/mde/jake/blob/f8e62752ccf8e384b8e0fc0a8997ab257bd113ec/README.md#license
+
+- rimraf
+ https://npmjs.org/package/rimraf
+ Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+ Used under the MIT license.
+ https://github.com/isaacs/rimraf/blob/d951675a75a04157b6ae1cef2a3d45064be48af4/LICENSE
+
+- walk
+ https://npmjs.org/package/walk
+ Copyright 2011 AJ ONeal.
+ Used under the MIT license.
+ https://github.com/coolaj86/node-walk/blob/a26de5a66ce8cc05ac83dcadace7a01f873282ad/LICENSE.MIT
View
1  Makefile
@@ -3,6 +3,7 @@ all: install
install:
npm install .
+ ./jake dep
.PHONY: install
test:
View
2  package.json
@@ -38,7 +38,7 @@
"yeti": "./cli.js"
},
"scripts": {
- "pretest": "jshint lib test",
+ "pretest": "jshint lib test && jake dep",
"test": "jake test",
"postinstall": "node scripts/postinstall.js"
},
View
149 scripts/fetch_deps.js
@@ -0,0 +1,149 @@
+#!/usr/bin/env node
+
+"use strict";
+
+var fs = require("fs"),
+ url = require("url"),
+ path = require("path"),
+ http = require("http"),
+ https = require("https");
+
+var depDir = path.join(__dirname, "..", "dep");
+
+var YUI_TEST_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-base/event-base-min.js&3.7.3/build/event-simulate/event-simulate-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/substitute/substitute-min.js&3.7.3/build/json-stringify/json-stringify-min.js&3.7.3/build/test/test-min.js";
+
+var QUNIT_JS_URL = "http://code.jquery.com/qunit/qunit-1.10.0.js";
+var QUNIT_CSS_URL = "http://code.jquery.com/qunit/qunit-1.10.0.css";
+
+var JASMINE_JS_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine.js";
+var JASMINE_JS_REPORTER_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine-html.js";
+var JASMINE_CSS_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine.css";
+
+var MOCHA_JS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.js";
+var MOCHA_JS_ASSERTION_URL = "https://raw.github.com/LearnBoost/expect.js/master/expect.js";
+var MOCHA_CSS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.css";
+
+var YUI_RUNTIME_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/event-base/event-base-min.js&3.7.3/build/attribute-events/attribute-events-min.js&3.7.3/build/attribute-core/attribute-core-min.js&3.7.3/build/base-core/base-core-min.js&3.7.3/build/cookie/cookie-min.js&3.7.3/build/array-extras/array-extras-min.js";
+
+var DOJO_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo.js";
+var DOJO_DOH_RUNNER_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo-release-1.8.3/util/doh/runner.js";
+
+function log() {
+ if (process.env.npm_config_loglevel !== "silent") {
+ console.log.apply(null, Array.prototype.slice.call(arguments));
+ }
+}
+
+var options = {
+ "minify": false,
+ "debug": false
+ },
+ argv = {};
+
+function applyArgv() {
+ var k, v;
+ for (k in options) {
+ v = argv.original.some(function (arg) {
+ return "--" + k === arg;
+ });
+
+ options[k] = v;
+
+ if (v) {
+ log("Enabled", k + ".");
+ break;
+ }
+ }
+}
+
+if (process.env.npm_config_argv) {
+ try {
+ argv = JSON.parse(process.env.npm_config_argv);
+ } catch (ex) {
+ // Nothing.
+ }
+
+ if (argv.original) {
+ applyArgv();
+ }
+}
+
+function die(message) {
+ console.warn(message.message || message);
+ process.exit(1);
+}
+
+function saveURLToDep(sourceURL, filename, cb) {
+ var protocol = url.parse(sourceURL).protocol;
+
+ protocol = (protocol === "http:") ? http : https;
+ filename = path.join(depDir, filename);
+
+ function done() {
+ log("Saved", sourceURL, "as", filename);
+ }
+
+ log("Saving", sourceURL, "as", filename);
+
+ protocol.get(url.parse(sourceURL), function onResponse(res) {
+ if (res.statusCode !== 200) {
+ die("Got status " + res.statusCode + " for URL " + sourceURL);
+ return;
+ }
+
+ var data = "";
+
+ res.setEncoding("utf8");
+
+ res.on("data", function (chunk) {
+ data += chunk;
+ });
+
+ res.on("end", function () {
+ fs.writeFile(filename, data, "utf8", done);
+ });
+ }).on("error", die);
+}
+
+function download(err) {
+ if (err) {
+ die(err);
+ }
+
+ [
+ [YUI_TEST_URL, "dev/yui-test.js"],
+ [QUNIT_JS_URL, "dev/qunit.js"],
+ [QUNIT_CSS_URL, "dev/qunit.css"],
+ [JASMINE_JS_URL, "dev/jasmine.js"],
+ [JASMINE_JS_REPORTER_URL, "dev/jasmine-html.js"],
+ [JASMINE_CSS_URL, "dev/jasmine.css"],
+ [MOCHA_JS_URL, "dev/mocha.js"],
+ [MOCHA_JS_ASSERTION_URL, "dev/expect.js"],
+ [MOCHA_CSS_URL, "dev/mocha.css"],
+ [DOJO_URL, "dev/dojo.js"],
+ [DOJO_DOH_RUNNER_URL, "dev/dojo-doh-runner.js"],
+ [YUI_RUNTIME_URL, "yui-runtime.js"],
+ ["http://cdn.sockjs.org/sockjs-0.3.min.js", "sock.js"]
+ ].forEach(function downloader(args) {
+ if (options.debug && args[0].indexOf("yui") !== -1) {
+ args[0] = args[0].replace(/[\.\-]min\.js/g, "-debug.js");
+ }
+
+ if (!options.minify) {
+ args[0] = args[0].replace(/[\.\-]min\.js/g, ".js");
+ }
+ saveURLToDep.apply(null, args);
+ });
+}
+
+log("Downloading script dependencies...");
+
+fs.readdir(depDir, function (err) {
+ if (err) {
+ log("Attempting to create directory", depDir);
+ fs.mkdir(depDir, download);
+ } else {
+ log("Found directory", depDir);
+ download();
+ }
+});
View
142 scripts/postinstall.js
@@ -3,30 +3,8 @@
"use strict";
var fs = require("fs"),
- url = require("url"),
path = require("path"),
- http = require("http"),
- https = require("https");
-
-var depDir = path.join(__dirname, "..", "dep");
-
-var YUI_TEST_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-base/event-base-min.js&3.7.3/build/event-simulate/event-simulate-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/substitute/substitute-min.js&3.7.3/build/json-stringify/json-stringify-min.js&3.7.3/build/test/test-min.js";
-
-var QUNIT_JS_URL = "http://code.jquery.com/qunit/qunit-1.10.0.js";
-var QUNIT_CSS_URL = "http://code.jquery.com/qunit/qunit-1.10.0.css";
-
-var JASMINE_JS_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine.js";
-var JASMINE_JS_REPORTER_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine-html.js";
-var JASMINE_CSS_URL = "https://raw.github.com/pivotal/jasmine/master/lib/jasmine-core/jasmine.css";
-
-var MOCHA_JS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.js";
-var MOCHA_JS_ASSERTION_URL = "https://raw.github.com/LearnBoost/expect.js/master/expect.js";
-var MOCHA_CSS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.css";
-
-var YUI_RUNTIME_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/event-base/event-base-min.js&3.7.3/build/event-base-ie/event-base-ie-min.js&3.7.3/build/attribute-events/attribute-events-min.js&3.7.3/build/attribute-core/attribute-core-min.js&3.7.3/build/base-core/base-core-min.js&3.7.3/build/cookie/cookie-min.js&3.7.3/build/array-extras/array-extras-min.js";
-
-var DOJO_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo.js";
-var DOJO_DOH_RUNNER_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo-release-1.8.3/util/doh/runner.js";
+ history;
function log() {
if (process.env.npm_config_loglevel !== "silent") {
@@ -34,126 +12,10 @@ function log() {
}
}
-var options = {
- "minify": false,
- "debug": false
- },
- argv = {};
-
-function applyArgv() {
- var k, v;
- for (k in options) {
- v = argv.original.some(function (arg) {
- return "--" + k === arg;
- });
-
- options[k] = v;
-
- if (v) {
- log("Enabled", k + ".");
- break;
- }
- }
-}
-
-if (process.env.npm_config_argv) {
- try {
- argv = JSON.parse(process.env.npm_config_argv);
- } catch (ex) {
- // Nothing.
- }
-
- if (argv.original) {
- applyArgv();
- }
-}
-
-function die(message) {
- console.warn(message.message || message);
- process.exit(1);
-}
-
-function saveURLToDep(sourceURL, filename, cb) {
- var protocol = url.parse(sourceURL).protocol;
-
- protocol = (protocol === "http:") ? http : https;
- filename = path.join(depDir, filename);
-
- function done() {
- log("Saved", sourceURL, "as", filename);
- }
-
- log("Saving", sourceURL, "as", filename);
-
- protocol.get(url.parse(sourceURL), function onResponse(res) {
- if (res.statusCode !== 200) {
- die("Got status " + res.statusCode + " for URL " + sourceURL);
- return;
- }
-
- var data = "";
-
- res.setEncoding("utf8");
-
- res.on("data", function (chunk) {
- data += chunk;
- });
-
- res.on("end", function () {
- fs.writeFile(filename, data, "utf8", done);
- });
- }).on("error", die);
-}
-
-function download(err) {
- if (err) {
- die(err);
- }
-
- [
- [YUI_TEST_URL, "yui-test.js"],
- [QUNIT_JS_URL, "qunit.js"],
- [QUNIT_CSS_URL, "qunit.css"],
- [JASMINE_JS_URL, "jasmine.js"],
- [JASMINE_JS_REPORTER_URL, "jasmine-html.js"],
- [JASMINE_CSS_URL, "jasmine.css"],
- [MOCHA_JS_URL, "mocha.js"],
- [MOCHA_JS_ASSERTION_URL, "expect.js"],
- [MOCHA_CSS_URL, "mocha.css"],
- [YUI_RUNTIME_URL, "yui-runtime.js"],
- [DOJO_URL, "dojo.js"],
- [DOJO_DOH_RUNNER_URL, "dojo-doh-runner.js"],
- ["http://cdn.sockjs.org/sockjs-0.3.min.js", "sock.js"]
- ].forEach(function downloader(args) {
- if (options.debug && args[0].indexOf("yui") !== -1) {
- args[0] = args[0].replace(/[\.\-]min\.js/g, "-debug.js");
- }
-
- if (!options.minify) {
- args[0] = args[0].replace(/[\.\-]min\.js/g, ".js");
- }
- saveURLToDep.apply(null, args);
- });
-}
-
-log("Downloading script dependencies...");
-
-fs.readdir(depDir, function (err) {
- if (err) {
- log("Attempting to create directory", depDir);
- fs.mkdir(depDir, download);
- } else {
- log("Found directory", depDir);
- download();
- }
-});
-
-var history;
-
fs.readFile(path.join(__dirname, "..", "HISTORY.md"), "utf8", function (err, data) {
history = data.split("\n").slice(2, 20).join("\n");
process.on("exit", function () {
- log("\nThanks for installing Yeti", process.env.npm_package_version);
+ log("\nThanks for installing Yeti", process.env.npm_package_version || 'dev/master');
log("\nRecent changes in HISTORY.md:\n\n" + history);
});
});
View
2  test/fixture/404-script.html
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Basic Test with 404ing script</title>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script src="bogus.js"></script>
<script>
YUI().use("test", function (Y) {
View
2  test/fixture/basic.html
@@ -1,7 +1,7 @@
<!doctype html>
<title>Yeti Basic Test</title>
<iframe src="frame.html"></iframe>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var SimpleTestCase = new Y.Test.Case({
View
4 test/fixture/doh.html
@@ -2,9 +2,9 @@
<head>
<title>Yeti DOH Test</title>
</head>
-<script src="../../dep/dojo.js"></script>
+<script src="../../dep/dev/dojo.js"></script>
<script>define('doh/_browserRunner', function(){ /* browserRunner stub */});</script>
-<script src="../../dep/dojo-doh-runner.js"></script>
+<script src="../../dep/dev/dojo-doh-runner.js"></script>
<script>
require(["doh/runner"], function(doh){
doh._testFinished = function(group, fixture, success){
View
6 test/fixture/jasmine.html
@@ -2,9 +2,9 @@
<html>
<head>
<title>Yeti Jasmine Test</title>
- <link rel="stylesheet" type="text/css" href="../../dep/jasmine.css">
- <script type="text/javascript" src="../../dep/jasmine.js"></script>
- <script type="text/javascript" src="../../dep/jasmine-html.js"></script>
+ <link rel="stylesheet" type="text/css" href="../../dep/dev/jasmine.css">
+ <script type="text/javascript" src="../../dep/dev/jasmine.js"></script>
+ <script type="text/javascript" src="../../dep/dev/jasmine-html.js"></script>
</head>
<body>
View
2  test/fixture/local-js.html
@@ -1,5 +1,5 @@
<!doctype html>
<title>Yeti Local JS Test</title>
<p>This test requires external JavaScript that will be served by Yeti's server.</p>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script src="local-js.js"></script>
View
2  test/fixture/long-async.html
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Long Async Test</title>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var LongAsyncCase = new Y.Test.Case({
View
8 test/fixture/mocha.html
@@ -3,9 +3,9 @@
<head>
<title>Yeti Mocha Test</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" href="../../dep/mocha.css" />
- <script src="../../dep/mocha.js"></script>
- <script src="../../dep/expect.js"></script>
+ <link rel="stylesheet" href="../../dep/dev/mocha.css" />
+ <script src="../../dep/dev/mocha.js"></script>
+ <script src="../../dep/dev/expect.js"></script>
</head>
<body>
<div id="mocha"></div>
@@ -23,4 +23,4 @@
}
</script>
</body>
-</html>
+</html>
View
2  test/fixture/query-string.html
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Query String Test</title>
-<script src="../../dep/yui-test.js"></script>
+<script src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var QueryStringTestCase = new Y.Test.Case({
View
4 test/fixture/qunit.html
@@ -1,10 +1,10 @@
<!doctype html>
<head>
<title>Yeti QUnit Test</title>
- <link rel="stylesheet" href="../../dep/qunit.css">
+ <link rel="stylesheet" href="../../dep/dev/qunit.css">
</head>
<div id="qunit"></div>
-<script src="../../dep/qunit.js"></script>
+<script src="../../dep/dev/qunit.js"></script>
<script>
test("hello qunit", function () {
ok(1 == 1, "Yay!");
View
2  test/functional.js
@@ -438,7 +438,7 @@ function errorContext(createBatchConfiguration) {
var DUMMY_PROTOCOL = "YetiDummyProtocol/1.0";
var SERVER_TEST_FIXTURE = fs.readFileSync(path.join(__dirname, "fixture/attach-server.html"), "utf8");
-var YUI_TEST_FIXTURE = fs.readFileSync(path.resolve(__dirname, "../dep/yui-test.js"), "utf8");
+var YUI_TEST_FIXTURE = fs.readFileSync(path.resolve(__dirname, "../dep/dev/yui-test.js"), "utf8");
function attachServerContext(testContext, explicitRoute) {
var route, testFixture;
Please sign in to comment.
Something went wrong with that request. Please try again.