You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/01/09 17:50:02 UTC
[1/3] git commit: Revert "CB-4871 Remove unused dependencies in CLI"
Updated Branches:
refs/heads/master 011f9794f -> 57c0fbd25
Revert "CB-4871 Remove unused dependencies in CLI"
This reverts commit 75af910b6494df409587510f7845d4b7f2101e8b.
Didn't mean to delete ripple.js in this commit
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/ef992bd0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/ef992bd0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/ef992bd0
Branch: refs/heads/master
Commit: ef992bd0ed55bb9618b9e2b9c2da6b0ea1e47fe2
Parents: 011f979
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jan 9 11:44:35 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Jan 9 11:44:35 2014 -0500
----------------------------------------------------------------------
package.json | 7 ++++
spec/metadata/blackberry_parser.spec.js | 1 +
src/lazy_load.js | 1 +
src/prepare.js | 2 ++
src/ripple.js | 52 ++++++++++++++++++++++++++++
5 files changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ef992bd0/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4663e6e..22d5a32 100644
--- a/package.json
+++ b/package.json
@@ -28,15 +28,22 @@
"cli"
],
"dependencies": {
+ "colors": ">=0.6.0",
"elementtree": "0.1.5",
"plugman": "0.17.x",
"plist": "0.4.x",
"xcode": "0.6.2",
+ "express": "3.0.0",
"shelljs": "0.1.2",
+ "ncallbacks": "1.0.0",
"request": "2.22.0",
"ripple-emulator": "0.9.18",
"semver": "1.1.0",
+ "glob": "3.2.x",
+ "follow-redirects": "0.0.x",
+ "prompt": "0.2.7",
"tar": "0.1.x",
+ "open": "0.0.3",
"npm": "1.3.x",
"q": "~0.9",
"optimist": "0.6.0",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ef992bd0/spec/metadata/blackberry_parser.spec.js
----------------------------------------------------------------------
diff --git a/spec/metadata/blackberry_parser.spec.js b/spec/metadata/blackberry_parser.spec.js
index 6a47ef6..097f860 100644
--- a/spec/metadata/blackberry_parser.spec.js
+++ b/spec/metadata/blackberry_parser.spec.js
@@ -26,6 +26,7 @@ var platforms = require('../../platforms'),
Q = require('q'),
child_process = require('child_process'),
config = require('../../src/config'),
+ prompt = require('prompt'),
config_parser = require('../../src/config_parser'),
cordova = require('../../cordova');
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ef992bd0/src/lazy_load.js
----------------------------------------------------------------------
diff --git a/src/lazy_load.js b/src/lazy_load.js
index c54d4b7..825a512 100644
--- a/src/lazy_load.js
+++ b/src/lazy_load.js
@@ -25,6 +25,7 @@ var path = require('path'),
request = require('request'),
config = require('./config'),
hooker = require('./hooker'),
+ https = require('follow-redirects').https,
zlib = require('zlib'),
tar = require('tar'),
URL = require('url'),
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ef992bd0/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 89daf5f..92b828d 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -27,7 +27,9 @@ var cordova_util = require('./util'),
lazy_load = require('./lazy_load'),
config = require('./config'),
events = require('./events'),
+ n = require('ncallbacks'),
Q = require('q'),
+ prompt = require('prompt'),
plugman = require('plugman'),
util = require('util');
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ef992bd0/src/ripple.js
----------------------------------------------------------------------
diff --git a/src/ripple.js b/src/ripple.js
new file mode 100644
index 0000000..d576d58
--- /dev/null
+++ b/src/ripple.js
@@ -0,0 +1,52 @@
+/**
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+var serve = require('./serve'),
+ ripple = require('ripple-emulator'),
+ open = require('open');
+
+module.exports = function (platform, port) {
+ port = port || 8000;
+
+ serve.config(platform, port, function (cfg) {
+ ripple.emulate.start({
+ path: cfg.paths,
+ port: port
+ });
+
+ var device;
+
+ switch (platform) {
+ case "blackberry10":
+ device = "Z10";
+ break;
+ case "ios":
+ device = "IPhone5";
+ break;
+ case "android":
+ device = "NexusS";
+ break;
+ default:
+ device = "XVGA";
+ break;
+ }
+
+ var uri = "http://localhost:" + port + "?enableripple=cordova-2.0.0-" + device;
+ open(uri);
+ });
+};
[2/3] git commit: CB-4871 Remove unused dependencies in CLI (take 2)
Posted by ag...@apache.org.
CB-4871 Remove unused dependencies in CLI (take 2)
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/69738caf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/69738caf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/69738caf
Branch: refs/heads/master
Commit: 69738cafb4c22c45500c1458a2731343f499122e
Parents: ef992bd
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jan 9 11:45:01 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Jan 9 11:46:50 2014 -0500
----------------------------------------------------------------------
package.json | 7 -------
spec/metadata/blackberry_parser.spec.js | 1 -
src/lazy_load.js | 1 -
src/prepare.js | 2 --
4 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/69738caf/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 22d5a32..4663e6e 100644
--- a/package.json
+++ b/package.json
@@ -28,22 +28,15 @@
"cli"
],
"dependencies": {
- "colors": ">=0.6.0",
"elementtree": "0.1.5",
"plugman": "0.17.x",
"plist": "0.4.x",
"xcode": "0.6.2",
- "express": "3.0.0",
"shelljs": "0.1.2",
- "ncallbacks": "1.0.0",
"request": "2.22.0",
"ripple-emulator": "0.9.18",
"semver": "1.1.0",
- "glob": "3.2.x",
- "follow-redirects": "0.0.x",
- "prompt": "0.2.7",
"tar": "0.1.x",
- "open": "0.0.3",
"npm": "1.3.x",
"q": "~0.9",
"optimist": "0.6.0",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/69738caf/spec/metadata/blackberry_parser.spec.js
----------------------------------------------------------------------
diff --git a/spec/metadata/blackberry_parser.spec.js b/spec/metadata/blackberry_parser.spec.js
index 097f860..6a47ef6 100644
--- a/spec/metadata/blackberry_parser.spec.js
+++ b/spec/metadata/blackberry_parser.spec.js
@@ -26,7 +26,6 @@ var platforms = require('../../platforms'),
Q = require('q'),
child_process = require('child_process'),
config = require('../../src/config'),
- prompt = require('prompt'),
config_parser = require('../../src/config_parser'),
cordova = require('../../cordova');
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/69738caf/src/lazy_load.js
----------------------------------------------------------------------
diff --git a/src/lazy_load.js b/src/lazy_load.js
index 825a512..c54d4b7 100644
--- a/src/lazy_load.js
+++ b/src/lazy_load.js
@@ -25,7 +25,6 @@ var path = require('path'),
request = require('request'),
config = require('./config'),
hooker = require('./hooker'),
- https = require('follow-redirects').https,
zlib = require('zlib'),
tar = require('tar'),
URL = require('url'),
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/69738caf/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 92b828d..89daf5f 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -27,9 +27,7 @@ var cordova_util = require('./util'),
lazy_load = require('./lazy_load'),
config = require('./config'),
events = require('./events'),
- n = require('ncallbacks'),
Q = require('q'),
- prompt = require('prompt'),
plugman = require('plugman'),
util = require('util');
[3/3] git commit: CB-4871 Delete ripple command.
Posted by ag...@apache.org.
CB-4871 Delete ripple command.
This saves 11 megs from node_modules.
- The command was undocumented and reported broken (CB-5075)
If we add back the command, we should ask users to install ripple
separately instead of using node_modules.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/57c0fbd2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/57c0fbd2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/57c0fbd2
Branch: refs/heads/master
Commit: 57c0fbd2586e4d134fdeb19b6c51f22ebc710417
Parents: 69738ca
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jan 9 11:48:32 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Jan 9 11:48:32 2014 -0500
----------------------------------------------------------------------
cordova.js | 1 -
package.json | 1 -
src/ripple.js | 52 ----------------------------------------------------
3 files changed, 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/57c0fbd2/cordova.js
----------------------------------------------------------------------
diff --git a/cordova.js b/cordova.js
index eb0c788..45ad0c2 100644
--- a/cordova.js
+++ b/cordova.js
@@ -46,7 +46,6 @@ addModuleProperty(module, 'build', './src/build', true);
addModuleProperty(module, 'help', './src/help');
addModuleProperty(module, 'config', './src/config');
addModuleProperty(module, 'create', './src/create', true);
-addModuleProperty(module, 'ripple', './src/ripple');
addModuleProperty(module, 'emulate', './src/emulate', true);
addModuleProperty(module, 'plugin', './src/plugin', true);
addModuleProperty(module, 'plugins', './src/plugin', true);
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/57c0fbd2/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4663e6e..ad63a4f 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
"xcode": "0.6.2",
"shelljs": "0.1.2",
"request": "2.22.0",
- "ripple-emulator": "0.9.18",
"semver": "1.1.0",
"tar": "0.1.x",
"npm": "1.3.x",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/57c0fbd2/src/ripple.js
----------------------------------------------------------------------
diff --git a/src/ripple.js b/src/ripple.js
deleted file mode 100644
index d576d58..0000000
--- a/src/ripple.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-var serve = require('./serve'),
- ripple = require('ripple-emulator'),
- open = require('open');
-
-module.exports = function (platform, port) {
- port = port || 8000;
-
- serve.config(platform, port, function (cfg) {
- ripple.emulate.start({
- path: cfg.paths,
- port: port
- });
-
- var device;
-
- switch (platform) {
- case "blackberry10":
- device = "Z10";
- break;
- case "ios":
- device = "IPhone5";
- break;
- case "android":
- device = "NexusS";
- break;
- default:
- device = "XVGA";
- break;
- }
-
- var uri = "http://localhost:" + port + "?enableripple=cordova-2.0.0-" + device;
- open(uri);
- });
-};