github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allegedly cleaned up failed refactor, pass all self tests

Browse Source
This commit is contained in:
Sashko Stubailo
2014-08-18 17:56:48 -07:00
parent d7cd40a318
commit fc6488fee1
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/commands-cordova.js
View File

@@ -215,11 +215,6 @@ cordova.ensureCordovaProject = function (localPath, appName) {
// Ensures that the Cordova platforms are synchronized with the app-level
// platforms.
cordova.ensureCordovaPlatforms = function (localPath) {
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
var cordovaPath = path.join(localPath, 'cordova-build');
var platforms = project.getCordovaPlatforms();
var platformsList = execFileSyncOrThrow(localCordova, ['platform', 'list'],
@@ -259,11 +254,6 @@ cordova.ensureCordovaPlatforms = function (localPath) {
// we bundle the app to find the required plugins.
cordova.ensureCordovaPlugins = function (localPath, options) {
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
options = options || {};
var plugins = options.packagePlugins;
if (! plugins) {
@@ -442,7 +432,7 @@ var checkRequestedPlatforms = function (platforms) {
_.each(requestedPlatforms, function (platform) {
if (! _.contains(cordovaPlatforms, platform))
throw new Error(platform +
": platform is not added to the project. Try 'meteor add platform:" +
": platform is not added to the project. Try 'meteor add-platform " +
platform + "' to add it or 'meteor help add' for help.");
});
};
@@ -583,6 +573,10 @@ main.registerCommand({
if (platforms.length) {
var localPath = path.join(options.appDir, '.meteor', 'local');
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
cordova.ensureCordovaPlatforms(localPath);
}
@@ -604,6 +598,10 @@ main.registerCommand({
if (platforms.length) {
var localPath = path.join(options.appDir, '.meteor', 'local');
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
cordova.ensureCordovaPlatforms(localPath);
}

8
tools/commands-packages.js
View File

@@ -1584,6 +1584,10 @@ main.registerCommand({
if (cordovaPlugins.length) {
var localPath = path.join(options.appDir, '.meteor', 'local');
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
// The plugins installation still can fail
try {
@@ -1790,6 +1794,10 @@ main.registerCommand({
if (cordovaPlugins.length) {
var localPath = path.join(options.appDir, '.meteor', 'local');
files.mkdir_p(localPath);
var appName = path.basename(options.appDir);
cordova.ensureCordovaProject(localPath, appName);
cordova.ensureCordovaPlugins(localPath);
}

8
tools/tests/cordova-platforms.js vendored
View File

@@ -54,10 +54,10 @@ selftest.define("add cordova platforms", function () {
run = s.run("run", "android");
run.matchErr("platform is not added");
run.matchErr("meteor add platform:android");
run.matchErr("meteor add-platform android");
run.expectExit(1);
run = s.run("add", "platform:android");
run = s.run("add-platform", "android");
run.match("added");
run = s.run("run", "android");
@@ -71,10 +71,10 @@ selftest.define("add cordova platforms", function () {
// run.match("running at");
// run.match("localhost");
run = s.run("remove", "platform:android");
run = s.run("remove-platform", "android");
run.match("removed");
run = s.run("run", "android");
run.matchErr("platform is not added");
run.matchErr("meteor add platform:android");
run.matchErr("meteor add-platform android");
run.expectExit(1);
});

6
tools/tests/cordova-plugins.js vendored
View File

@@ -142,9 +142,9 @@ selftest.define("add cordova plugins", function () {
run = s.run("run", "android");
run.matchErr("not added to the project");
run.matchErr("meteor add platform:");
run.matchErr("meteor add-platform ");
run = s.run("add", "platform:android");
run = s.run("add-platform", "android");
run.waitSecs(5);
run.match("added platform");
@@ -171,6 +171,8 @@ selftest.define("add cordova plugins", function () {
run = s.run("list");
run.match("org.apache.cordova.camera");
run = s.run("list-platforms");
run.match("android");
run = s.run("bundle", "../a", "--android-path", "../android",