You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/24 23:13:24 UTC
[1/7] git commit: CB-6178 Plugman does not cache downloaded plugins
Repository: cordova-plugman
Updated Branches:
refs/heads/browserify 7e05089d0 -> 013adc61c
CB-6178 Plugman does not cache downloaded plugins
close #70
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/34221b31
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/34221b31
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/34221b31
Branch: refs/heads/browserify
Commit: 34221b31e9d376656fee7863eb98de42a5d635fa
Parents: c14f6b8
Author: sgrebnov <v-...@microsoft.com>
Authored: Sun Apr 6 15:55:59 2014 +0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Apr 16 15:36:12 2014 -0400
----------------------------------------------------------------------
src/registry/registry.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/34221b31/src/registry/registry.js
----------------------------------------------------------------------
diff --git a/src/registry/registry.js b/src/registry/registry.js
index 3b1a973..e0d733d 100644
--- a/src/registry/registry.js
+++ b/src/registry/registry.js
@@ -52,7 +52,7 @@ function fetchPackage(info, cl) {
if(fs.existsSync(cached)) {
d.resolve(cached);
} else {
- var download_dir = path.join(os.tmpdir(), info.name);
+ var download_dir = path.resolve(cached, '..');
shell.mkdir('-p', download_dir);
var req = makeRequest('GET', info.dist.tarball, function (err, res, body) {
[7/7] git commit: Merge branch 'master' into browserify
Posted by an...@apache.org.
Merge branch 'master' into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/013adc61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/013adc61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/013adc61
Branch: refs/heads/browserify
Commit: 013adc61c852561810994d899692d63b65176c6c
Parents: 93c6578 8aca4cb
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:13:08 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:13:08 2014 -0700
----------------------------------------------------------------------
README.md | 8 ++---
RELEASENOTES.md | 6 ++--
spec/common.js | 2 +-
spec/install.spec.js | 18 +++++------
spec/platforms/amazon-fireos.spec.js | 10 +++---
spec/platforms/common.spec.js | 2 +-
spec/platforms/ios.spec.js | 6 ++--
spec/platforms/windows8.spec.js | 2 +-
spec/platforms/wp7.spec.js | 2 +-
spec/platforms/wp8.spec.js | 2 +-
spec/plugins/Contacts/src/wp/Contacts.cs | 4 +--
spec/plugins/FaultyPlugin/plugin.xml | 4 +--
.../WebNotifications/src/ios/AppDelegate.m.diff | 2 +-
.../WebNotifications/src/ios/WebNotifications.h | 2 +-
.../WebNotifications/src/ios/WebNotifications.m | 2 +-
.../WebNotifications/www/webnotifications.js | 2 +-
.../src/blackberry10/native/public/json/value.h | 8 ++---
.../blackberry10/native/public/json/writer.h | 4 +--
.../native/public/json_batchallocator.h | 8 ++---
.../native/public/json_internalmap.inl | 2 +-
.../blackberry10/native/public/json_value.cpp | 2 +-
.../blackberry10/native/public/json_writer.cpp | 6 ++--
.../src/blackberry10/native/public/plugin.cpp | 2 +-
spec/projects/android_one/assets/www/cordova.js | 6 ++--
spec/projects/android_one/cordova/lib/cordova | 6 ++--
spec/projects/windows8/www/cordova-2.6.0.js | 6 ++--
spec/projects/windows8/www/js/index.js | 2 +-
spec/uninstall.spec.js | 34 ++++++++++----------
spec/util/config-changes.spec.js | 4 +--
spec/util/csproj.spec.js | 4 +--
src/install.js | 14 ++++----
src/platform.js | 2 +-
src/platforms/common.js | 4 +--
src/platforms/firefoxos.js | 2 +-
src/platforms/ios.js | 2 +-
src/platforms/windows8.js | 6 ++--
src/platforms/wp8.js | 2 +-
src/prepare.js | 2 +-
src/registry/manifest.js | 13 ++++++++
src/registry/registry.js | 2 +-
src/uninstall.js | 34 ++++++++++----------
src/util/config-changes.js | 8 ++---
src/util/csproj.js | 8 ++---
src/util/default-engines.js | 32 +++++++++---------
src/util/dependencies.js | 2 +-
src/util/plist-helpers.js | 10 +++---
src/util/plugins.js | 4 +--
src/util/w8jsproj.js | 16 ++++-----
src/util/xml-helpers.js | 6 ++--
49 files changed, 175 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/platforms/ios.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/013adc61/src/prepare.js
----------------------------------------------------------------------
[4/7] git commit: Fix spelling typos
Posted by an...@apache.org.
Fix spelling typos
github close #64
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/b0d0782d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/b0d0782d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/b0d0782d
Branch: refs/heads/browserify
Commit: b0d0782d442a473f45d7c3a6feeac86a030ad309
Parents: 967f116
Author: Josh Soref <js...@blackberry.com>
Authored: Thu Mar 6 17:33:12 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Apr 23 11:36:41 2014 -0400
----------------------------------------------------------------------
README.md | 8 ++++----
RELEASENOTES.md | 6 +++---
spec/platforms/amazon-fireos.spec.js | 2 +-
spec/platforms/common.spec.js | 2 +-
spec/plugins/Contacts/src/wp/Contacts.cs | 4 ++--
spec/plugins/FaultyPlugin/plugin.xml | 4 ++--
spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff | 2 +-
spec/plugins/WebNotifications/src/ios/WebNotifications.h | 2 +-
spec/plugins/WebNotifications/src/ios/WebNotifications.m | 2 +-
spec/plugins/WebNotifications/www/webnotifications.js | 2 +-
.../cordova.echo/src/blackberry10/native/public/json/value.h | 8 ++++----
.../src/blackberry10/native/public/json/writer.h | 4 ++--
.../src/blackberry10/native/public/json_batchallocator.h | 8 ++++----
.../src/blackberry10/native/public/json_internalmap.inl | 2 +-
.../src/blackberry10/native/public/json_value.cpp | 2 +-
.../src/blackberry10/native/public/json_writer.cpp | 6 +++---
.../cordova.echo/src/blackberry10/native/public/plugin.cpp | 2 +-
spec/projects/android_one/assets/www/cordova.js | 6 +++---
spec/projects/android_one/cordova/lib/cordova | 6 +++---
spec/projects/windows8/www/cordova-2.6.0.js | 6 +++---
spec/projects/windows8/www/js/index.js | 2 +-
spec/util/config-changes.spec.js | 4 ++--
src/platform.js | 2 +-
src/platforms/common.js | 2 +-
src/prepare.js | 2 +-
src/util/config-changes.js | 2 +-
src/util/plugins.js | 4 ++--
src/util/w8jsproj.js | 2 +-
28 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 41c2314..15dca3e 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ You must have `git` on your PATH to be able to install plugins directly from rem
plugman install --platform <ios|amazon-fireos|android|blackberry10|wp7|wp8> --project <directory> --plugin <name|url|path> [--plugins_dir <directory>] [--www <directory>] [--variable <name>=<value> [--variable <name>=<value> ...]]
- plugman uninstall --platform <ios|amazon-fireos|android|blackberr10|wp7|wp8> --project <directory> --plugin <id> [--www <directory>] [--plugins_dir <directory>]
+ plugman uninstall --platform <ios|amazon-fireos|android|blackberry10|wp7|wp8> --project <directory> --plugin <id> [--www <directory>] [--plugins_dir <directory>]
* Using minimum parameters, installs a plugin into a cordova project. You must specify a platform and cordova project location for that platform. You also must specify a plugin, with the different `--plugin` parameter forms being:
* `name`: The directory name where the plugin contents exist. This must be an existing directory under the `--plugins_dir` path (see below for more info) or a plugin in the Cordova registry.
@@ -91,7 +91,7 @@ Installs a plugin into a specified cordova project of a specified platform.
* `id`: a string representing the `id` of the plugin, a path to a cordova plugin with a valid `plugin.xml` file, or an `https://` or `git://` url to a git repository of a valid cordova plugin or a plugin published to the Cordova registry
* `plugins_dir`: path to directory where plugins will be stored, defaults to `<project_dir>/cordova/plugins`
* `subdir`: subdirectory within the plugin directory to consider as plugin directory root, defaults to `.`
- * `cli_variables`: an object mapping cordova plugin specification variable namess (see [plugin specification](plugin_spec.md)) to values
+ * `cli_variables`: an object mapping cordova plugin specification variable names (see [plugin specification](plugin_spec.md)) to values
* `www_dir`: path to directory where web assets are to be copied to, defaults to the specified project directory's `www` dir (dependent on platform)
* `callback`: callback to invoke once complete. If specified, will pass in an error object as a first parameter if the action failed. If not and an error occurs, `plugman` will throw the error
@@ -106,7 +106,7 @@ Uninstalls a previously-installed cordova plugin from a specified cordova projec
* `id`: a string representing the `id` of the plugin
* `plugins_dir`: path to directory where plugins are stored, defaults to `<project_dir>/cordova/plugins`
* `subdir`: subdirectory within the plugin directory to consider as plugin directory root, defaults to `.`
- * `cli_variables`: an object mapping cordova plugin specification variable namess (see [plugin specification](plugin_spec.md)) to values
+ * `cli_variables`: an object mapping cordova plugin specification variable names (see [plugin specification](plugin_spec.md)) to values
* `www_dir`: path to directory where web assets are to be copied to, defaults to the specified project directory's `www` dir (dependent on platform)
* `callback`: callback to invoke once complete. If specified, will pass in an error object as a first parameter if the action failed. If not and an error occurs, `plugman` will throw the error
@@ -143,7 +143,7 @@ Adds a user account to the registry. Function takes no arguments other than a an
### `publish` method
-Publishes plugins to the registry. `plugin_paths` is an array of plugin paths to publish to the reigstry.
+Publishes plugins to the registry. `plugin_paths` is an array of plugin paths to publish to the registry.
module.exports = function(plugin_paths, callback) {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b0e2306..172046c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -84,7 +84,7 @@
* Overhaul dependency uninstallation
* [CB-4872] - adding in custom semver check for project
* [CB-4872] - updated paths to version files
-* Update action-stack to avoid static platform detection + test if parseProjectFile is present instea
+* Update action-stack to avoid static platform detection + test if parseProjectFile is present instead
* Update spec to match new ios parse method name
* Update references to old ios parse method
* Rename parse method and add a write method to result + parseIOSProjectFiles --> parseProjectFile +
@@ -102,10 +102,10 @@
* [CB-4837]: Version 0.12.0. Release notes updated.
* Rename CHANGELOG.md -> RELEASENOTES.md
* CB-4492 tracking which of cli or plugman is used to fetch from registry
-* removed unncessary console.logs
+* removed unnecessary console.logs
* add full ff support to plugman
* add firefoxos
-* removed unncessary console.logs
+* removed unnecessary console.logs
* add full ff support to plugman
* add firefoxos
* Fix tests broken by lazy module requiring.
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/platforms/amazon-fireos.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/amazon-fireos.spec.js b/spec/platforms/amazon-fireos.spec.js
index 5bd7cc3..e634731 100644
--- a/spec/platforms/amazon-fireos.spec.js
+++ b/spec/platforms/amazon-fireos.spec.js
@@ -13,7 +13,7 @@ var amazon_fireos = require('../../src/platforms/amazon-fireos'),
dummyplugin = path.join(__dirname, '..', 'plugins', 'DummyPlugin'),
faultyplugin = path.join(__dirname, '..', 'plugins', 'FaultyPlugin'),
variableplugin = path.join(__dirname, '..', 'plugins', 'VariablePlugin'),
- amzon_fireos_one_project = path.join(__dirname, '..', 'projects', 'android_one', '*'),
+ amazon_fireos_one_project = path.join(__dirname, '..', 'projects', 'android_one', '*'),
amazon_fireos_two_project = path.join(__dirname, '..', 'projects', 'android_two', '*');
var xml_path = path.join(dummyplugin, 'plugin.xml')
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/platforms/common.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/common.spec.js b/spec/platforms/common.spec.js
index beb646b..dcf5f2a 100644
--- a/spec/platforms/common.spec.js
+++ b/spec/platforms/common.spec.js
@@ -105,7 +105,7 @@ describe('common platform handler', function() {
shell.rm('-rf', java_dir);
});
- it('should delete empty directories after removing source code in a java src path heirarchy', function(){
+ it('should delete empty directories after removing source code in a java src path hierarchy', function(){
shell.mkdir('-p', java_dir);
fs.writeFileSync(java_file, 'contents', 'utf-8');
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/Contacts/src/wp/Contacts.cs
----------------------------------------------------------------------
diff --git a/spec/plugins/Contacts/src/wp/Contacts.cs b/spec/plugins/Contacts/src/wp/Contacts.cs
index af78942..6789bb8 100644
--- a/spec/plugins/Contacts/src/wp/Contacts.cs
+++ b/spec/plugins/Contacts/src/wp/Contacts.cs
@@ -537,7 +537,7 @@ namespace WPCordovaClassLib.Cordova.Commands
return retVal.TrimEnd(',');
}
- private string getFormattedJSONAddress(ContactAddress address, bool isPrefered)
+ private string getFormattedJSONAddress(ContactAddress address, bool isPreferred)
{
string addressFormatString = "\"pref\":{0}," + // bool
@@ -557,7 +557,7 @@ namespace WPCordovaClassLib.Cordova.Commands
+ address.PhysicalAddress.PostalCode;
string jsonAddress = string.Format(addressFormatString,
- isPrefered ? "\"true\"" : "\"false\"",
+ isPreferred ? "\"true\"" : "\"false\"",
address.Kind.ToString(),
formattedAddress,
address.PhysicalAddress.AddressLine1 + " " + address.PhysicalAddress.AddressLine2,
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/FaultyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/spec/plugins/FaultyPlugin/plugin.xml b/spec/plugins/FaultyPlugin/plugin.xml
index 628496d..22564e7 100644
--- a/spec/plugins/FaultyPlugin/plugin.xml
+++ b/spec/plugins/FaultyPlugin/plugin.xml
@@ -127,7 +127,7 @@
<source-file src="src/wp7/FaultyPlugin.cs" />
- <!-- this desn't exist -->
+ <!-- this doesn't exist -->
<source-file src="src/wp7/NotHere.cs" />
</platform>
@@ -141,7 +141,7 @@
<source-file src="src/wp8/FaultyPlugin.cs" />
- <!-- this desn't exist -->
+ <!-- this doesn't exist -->
<source-file src="src/wp8/NotHere.cs" />
</platform>
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff
----------------------------------------------------------------------
diff --git a/spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff b/spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff
index 30a557c..754d079 100644
--- a/spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff
+++ b/spec/plugins/WebNotifications/src/ios/AppDelegate.m.diff
@@ -10,7 +10,7 @@
//NSString *body = [notification.userInfo objectForKey:@"body"];
NSString *tag = [notification.userInfo objectForKey:@"tag"];
- [(WebNotifications*)[self.viewController getCommandInstance:@"WebNotifications"] clickNofification:tag];
+ [(WebNotifications*)[self.viewController getCommandInstance:@"WebNotifications"] clickNotification:tag];
application.applicationIconBadgeNumber = 0;
application.scheduledLocalNotifications = [NSArray arrayWithArray:application.scheduledLocalNotifications]; // "hack" to clear seen notifications
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/WebNotifications/src/ios/WebNotifications.h
----------------------------------------------------------------------
diff --git a/spec/plugins/WebNotifications/src/ios/WebNotifications.h b/spec/plugins/WebNotifications/src/ios/WebNotifications.h
index f0f158d..1702f40 100644
--- a/spec/plugins/WebNotifications/src/ios/WebNotifications.h
+++ b/spec/plugins/WebNotifications/src/ios/WebNotifications.h
@@ -30,6 +30,6 @@
- (void)createNotification:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
- (void)closeNotification:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void)clickNofification:(NSString*)tag;
+- (void)clickNotification:(NSString*)tag;
@end
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/WebNotifications/src/ios/WebNotifications.m
----------------------------------------------------------------------
diff --git a/spec/plugins/WebNotifications/src/ios/WebNotifications.m b/spec/plugins/WebNotifications/src/ios/WebNotifications.m
index 46f9f55..6f0c11f 100644
--- a/spec/plugins/WebNotifications/src/ios/WebNotifications.m
+++ b/spec/plugins/WebNotifications/src/ios/WebNotifications.m
@@ -96,7 +96,7 @@
[self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsInt:0] callbackId:command.callbackId];
}
-- (void)clickNofification:(NSString*)tag {
+- (void)clickNotification:(NSString*)tag {
NSString *jsCallBack;
jsCallBack = [NSString stringWithFormat:@"window.Notification.callOnclickByTag('%@')", tag];
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/WebNotifications/www/webnotifications.js
----------------------------------------------------------------------
diff --git a/spec/plugins/WebNotifications/www/webnotifications.js b/spec/plugins/WebNotifications/www/webnotifications.js
index e2409b3..6597337 100644
--- a/spec/plugins/WebNotifications/www/webnotifications.js
+++ b/spec/plugins/WebNotifications/www/webnotifications.js
@@ -43,7 +43,7 @@ if (typeof window.Notification == 'undefined') {
this.soundUrl = options.soundUrl || '';
this.badgeNumber = options.badgeNumber || 0;
- // there must be one unique notification per tag, so close any existing outstanting notifications
+ // there must be one unique notification per tag, so close any existing outstanding notifications
if (window.Notification.active[this.tag])
window.Notification.active[this.tag].close();
window.Notification.active[this.tag] = this;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json/value.h
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json/value.h b/spec/plugins/cordova.echo/src/blackberry10/native/public/json/value.h
index 58bfd88..912b830 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json/value.h
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json/value.h
@@ -47,7 +47,7 @@ namespace Json {
/** \brief Lightweight wrapper to tag static string.
*
- * Value constructor and objectValue member assignement takes advantage of the
+ * Value constructor and objectValue member assignment takes advantage of the
* StaticString and avoid the cost of string duplication when storing the
* string or the member name.
*
@@ -102,7 +102,7 @@ namespace Json {
* The sequence of an #arrayValue will be automatically resize and initialized
* with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
*
- * The get() methods can be used to obtanis default value in the case the required element
+ * The get() methods can be used to obtains default value in the case the required element
* does not exist.
*
* It is possible to iterate over the list of a #objectValue values using
@@ -479,7 +479,7 @@ namespace Json {
* - ".name1.name2.name3"
* - ".[0][1][2].name1[3]"
* - ".%" => member name is provided as parameter
- * - ".[%]" => index is provied as parameter
+ * - ".[%]" => index is provided as parameter
*/
class Path
{
@@ -616,7 +616,7 @@ namespace Json {
/** \brief A linked page based hash-table implementation used internally by Value.
- * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
+ * \internal ValueInternalMap is a traditional bucket based hash-table, with a linked
* list in each bucket to handle collision. There is an addional twist in that
* each node of the collision linked list is a page containing a fixed amount of
* value. This provides a better compromise between memory usage and speed.
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json/writer.h
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json/writer.h b/spec/plugins/cordova.echo/src/blackberry10/native/public/json/writer.h
index 5f4b83b..16cf022 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json/writer.h
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json/writer.h
@@ -23,7 +23,7 @@ namespace Json {
/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
*
* The JSON document is written in a single line. It is not intended for 'human' consumption,
- * but may be usefull to support feature such as RPC where bandwith is limited.
+ * but may be useful to support feature such as RPC where bandwidth is limited.
* \sa Reader, Value
*/
class JSON_API FastWriter : public Writer
@@ -41,7 +41,7 @@ namespace Json {
void writeValue( const Value &value );
std::string document_;
- bool yamlCompatiblityEnabled_;
+ bool yamlCompatibilityEnabled_;
};
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json_batchallocator.h
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_batchallocator.h b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_batchallocator.h
index 87ea5ed..141ca77 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_batchallocator.h
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_batchallocator.h
@@ -49,7 +49,7 @@ public:
}
/// allocate space for an array of objectPerAllocation object.
- /// @warning it is the responsability of the caller to call objects constructors.
+ /// @warning it is the responsibility of the caller to call objects constructors.
AllocatedType *allocate()
{
if ( freeHead_ ) // returns node from free list.
@@ -77,7 +77,7 @@ public:
}
/// Release the object.
- /// @warning it is the responsability of the caller to actually destruct the object.
+ /// @warning it is the responsibility of the caller to actually destruct the object.
void release( AllocatedType *object )
{
assert( object != 0 );
@@ -94,7 +94,7 @@ private:
AllocatedType buffer_[objectPerAllocation];
};
- // disabled copy constructor and assignement operator.
+ // disabled copy constructor and assignment operator.
BatchAllocator( const BatchAllocator & );
void operator =( const BatchAllocator &);
@@ -111,7 +111,7 @@ private:
BatchInfo *batches_;
BatchInfo *currentBatch_;
- /// Head of a single linked list within the allocated space of freeed object
+ /// Head of a single linked list within the allocated space of freed object
AllocatedType *freeHead_;
unsigned int objectsPerPage_;
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json_internalmap.inl
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_internalmap.inl b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_internalmap.inl
index 1977148..ef37991 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_internalmap.inl
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_internalmap.inl
@@ -361,7 +361,7 @@ ValueInternalMap::doActualRemove( ValueInternalLink *link,
{
// find last item of the bucket and swap it with the 'removed' one.
// set removed items flags to 'available'.
- // if last page only contains 'available' items, then desallocate it (it's empty)
+ // if last page only contains 'available' items, then deallocate it (it's empty)
ValueInternalLink *&lastLink = getLastLinkInBucket( index );
BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
for ( ;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json_value.cpp
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_value.cpp b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_value.cpp
index 6e5dcd3..67638ca 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_value.cpp
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_value.cpp
@@ -84,7 +84,7 @@ public:
virtual char *duplicateStringValue( const char *value,
unsigned int length = unknown )
{
- //@todo invesgate this old optimization
+ //@todo investigate this old optimization
//if ( !value || value[0] == 0 )
// return 0;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/json_writer.cpp
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_writer.cpp b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_writer.cpp
index cdf4188..a522ef6 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/json_writer.cpp
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/json_writer.cpp
@@ -182,7 +182,7 @@ Writer::~Writer()
// //////////////////////////////////////////////////////////////////
FastWriter::FastWriter()
- : yamlCompatiblityEnabled_( false )
+ : yamlCompatibilityEnabled_( false )
{
}
@@ -190,7 +190,7 @@ FastWriter::FastWriter()
void
FastWriter::enableYAMLCompatibility()
{
- yamlCompatiblityEnabled_ = true;
+ yamlCompatibilityEnabled_ = true;
}
@@ -252,7 +252,7 @@ FastWriter::writeValue( const Value &value )
if ( it != members.begin() )
document_ += ",";
document_ += valueToQuotedString( name.c_str() );
- document_ += yamlCompatiblityEnabled_ ? ": "
+ document_ += yamlCompatibilityEnabled_ ? ": "
: ":";
writeValue( value[name] );
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/plugins/cordova.echo/src/blackberry10/native/public/plugin.cpp
----------------------------------------------------------------------
diff --git a/spec/plugins/cordova.echo/src/blackberry10/native/public/plugin.cpp b/spec/plugins/cordova.echo/src/blackberry10/native/public/plugin.cpp
index 6906275..387fcea 100644
--- a/spec/plugins/cordova.echo/src/blackberry10/native/public/plugin.cpp
+++ b/spec/plugins/cordova.echo/src/blackberry10/native/public/plugin.cpp
@@ -158,7 +158,7 @@ char* g_str2global( const string& strRetVal )
else
{
- // To minimaize the number of memory reallocations, the assumption
+ // To minimize the number of memory reallocations, the assumption
// is that in most times this will be the case
delete [] g_pszRetVal;
g_pszRetVal = new char[ nMAXSIZE ];
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/projects/android_one/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/spec/projects/android_one/assets/www/cordova.js b/spec/projects/android_one/assets/www/cordova.js
index 30e7c70..000791b 100644
--- a/spec/projects/android_one/assets/www/cordova.js
+++ b/spec/projects/android_one/assets/www/cordova.js
@@ -881,7 +881,7 @@ function hookOnlineApis() {
}
// The network module takes care of firing online and offline events.
// It currently fires them only on document though, so we bridge them
- // to window here (while first listening for exec()-releated online/offline
+ // to window here (while first listening for exec()-related online/offline
// events).
window.addEventListener('online', pollOnce, false);
window.addEventListener('offline', pollOnce, false);
@@ -5469,7 +5469,7 @@ getLocaleName:function(successCB, failureCB) {
* successCB callback with a properties object as a parameter. If there is an error
* formatting the date, then the errorCB callback is invoked.
*
-* The defaults are: formatLenght="short" and selector="date and time"
+* The defaults are: formatLength="short" and selector="date and time"
*
* @param {Date} date
* @param {Function} successCB
@@ -6166,7 +6166,7 @@ var exec = require('cordova/exec'),
utils = require('cordova/utils');
// Link the onLine property with the Cordova-supplied network info.
-// This works because we clobber the naviagtor object with our own
+// This works because we clobber the navigator object with our own
// object in bootstrap.js.
if (typeof navigator != 'undefined') {
utils.defineGetter(navigator, 'onLine', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/projects/android_one/cordova/lib/cordova
----------------------------------------------------------------------
diff --git a/spec/projects/android_one/cordova/lib/cordova b/spec/projects/android_one/cordova/lib/cordova
index 294df49..be343e9 100755
--- a/spec/projects/android_one/cordova/lib/cordova
+++ b/spec/projects/android_one/cordova/lib/cordova
@@ -299,8 +299,8 @@ function run {
wait_for_emulator
install_emulator
else
- # TODO : look for emulator images and start one if it's availible
- echo "Error : there are no availible devices or emulators to deploy to."
+ # TODO : look for emulator images and start one if it's available
+ echo "Error : there are no available devices or emulators to deploy to."
echo " create an emulator or connect your device to run this command."
echo "If you would like to create an emulator follow the instructions"
echo " provided here : http://developer.android.com/tools/devices/index.html"
@@ -381,6 +381,6 @@ elif [[ $# == 1 ]] ; then
exit 2
fi
else
- echo "Error : No command recieved, exiting..."
+ echo "Error : No command received, exiting..."
exit 2
fi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/projects/windows8/www/cordova-2.6.0.js
----------------------------------------------------------------------
diff --git a/spec/projects/windows8/www/cordova-2.6.0.js b/spec/projects/windows8/www/cordova-2.6.0.js
index e7649db..2fedaa6 100644
--- a/spec/projects/windows8/www/cordova-2.6.0.js
+++ b/spec/projects/windows8/www/cordova-2.6.0.js
@@ -4750,7 +4750,7 @@ getLocaleName:function(successCB, failureCB) {
* successCB callback with a properties object as a parameter. If there is an error
* formatting the date, then the errorCB callback is invoked.
*
-* The defaults are: formatLenght="short" and selector="date and time"
+* The defaults are: formatLength="short" and selector="date and time"
*
* @param {Date} date
* @param {Function} successCB
@@ -5335,7 +5335,7 @@ var exec = require('cordova/exec'),
utils = require('cordova/utils');
// Link the onLine property with the Cordova-supplied network info.
-// This works because we clobber the naviagtor object with our own
+// This works because we clobber the navigator object with our own
// object in bootstrap.js.
if (typeof navigator != 'undefined') {
utils.defineGetter(navigator, 'onLine', function() {
@@ -6118,7 +6118,7 @@ module.exports = {
cameraCaptureUI.videoSettings.format = Windows.Media.Capture.CameraCaptureUIVideoFormat.mp4;
cameraCaptureUI.videoSettings.maxDurationInSeconds = videoOptions.duration;
cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.video).then(function (file) {
- file.moveAsync(Windows.Storage.KnownFolders.videosLibrary, "cameraCaptureVedio.mp4", Windows.Storage.NameCollisionOption.generateUniqueName).then(function () {
+ file.moveAsync(Windows.Storage.KnownFolders.videosLibrary, "cameraCaptureVideo.mp4", Windows.Storage.NameCollisionOption.generateUniqueName).then(function () {
file.getBasicPropertiesAsync().then(function (basicProperties) {
var results = [];
results.push(new MediaFile(file.name, file.path, file.contentType, basicProperties.dateModified, basicProperties.size));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/projects/windows8/www/js/index.js
----------------------------------------------------------------------
diff --git a/spec/projects/windows8/www/js/index.js b/spec/projects/windows8/www/js/index.js
index 31d9064..87b5660 100644
--- a/spec/projects/windows8/www/js/index.js
+++ b/spec/projects/windows8/www/js/index.js
@@ -31,7 +31,7 @@ var app = {
// deviceready Event Handler
//
// The scope of 'this' is the event. In order to call the 'receivedEvent'
- // function, we must explicity call 'app.receivedEvent(...);'
+ // function, we must explicitly call 'app.receivedEvent(...);'
onDeviceReady: function() {
app.receivedEvent('deviceready');
},
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/spec/util/config-changes.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/config-changes.spec.js b/spec/util/config-changes.spec.js
index 2efae84..9d93d72 100644
--- a/spec/util/config-changes.spec.js
+++ b/spec/util/config-changes.spec.js
@@ -143,7 +143,7 @@ describe('config-changes module', function() {
beforeEach(function() {
shell.cp('-rf', android_two_project, temp);
});
- it('should return a flat config heirarchy for simple, one-off config changes', function() {
+ it('should return a flat config hierarchy for simple, one-off config changes', function() {
var xml;
var munger = new configChanges.PlatformMunger('android', temp, 'unused');
var munge = munger.generate_plugin_config_munge(dummyplugin, {});
@@ -184,7 +184,7 @@ describe('config-changes module', function() {
expect(configChanges.get_munge_change(munge, 'AndroidManifest.xml', '/manifest', '<!--library-->')).not.toBeDefined();
expect(configChanges.get_munge_change(munge, 'AndroidManifest.xml', '/manifest', '<!-- GCM connects to Google Services. -->')).not.toBeDefined();
});
- it('should increment config heirarchy leaves if dfferent config-file elements target the same file + selector + xml', function() {
+ it('should increment config hierarchy leaves if different config-file elements target the same file + selector + xml', function() {
var munger = new configChanges.PlatformMunger('android', temp, 'unused');
var munge = munger.generate_plugin_config_munge(configplugin, {});
expect(configChanges.get_munge_change(munge, 'res/xml/config.xml', '/widget', '<poop />').count).toEqual(2);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index f85573d..c80ac75 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -52,7 +52,7 @@ module.exports = {
//Remove the Platform in question
pluginxml.getroot().remove( 0, pluginxml.find("./platform/[@name='"+ platformName +"']") );
- //Rewrtie the plugin.xml file back out
+ //Rewrite the plugin.xml file back out
fs.writeFileSync( "plugin.xml", pluginxml.write( "plugin.xml", {indent: 4} ), 'utf-8' );
//Remove the src/"platform"
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/platforms/common.js
----------------------------------------------------------------------
diff --git a/src/platforms/common.js b/src/platforms/common.js
index e7ca241..9f01bdd 100644
--- a/src/platforms/common.js
+++ b/src/platforms/common.js
@@ -21,7 +21,7 @@ module.exports = common = {
dest = module.exports.resolveTargetPath(project_dir, dest);
shell.mkdir('-p', path.dirname(dest));
- // XXX sheljs decides to create a directory when -R|-r is used which sucks. http://goo.gl/nbsjq
+ // XXX shelljs decides to create a directory when -R|-r is used which sucks. http://goo.gl/nbsjq
if(fs.statSync(src).isDirectory()) {
shell.cp('-Rf', src+'/*', dest);
} else {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 361249d..c650306 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -72,7 +72,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
events.emit('verbose', 'Processing configuration changes for plugins.');
config_changes.process(plugins_dir, project_dir, platform);
- // for windows phone plaform we need to add all www resources to the .csproj file
+ // for windows phone platform we need to add all www resources to the .csproj file
// first we need to remove them all to prevent duplicates
var wp_csproj;
if(platform == 'wp7' || platform == 'wp8') {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 3ca7cc0..818b785 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -516,7 +516,7 @@ function ConfigFile_load() {
// plist file
self.type = 'plist';
// TODO: isBinaryPlist() reads the file and then parse re-reads it again.
- // We always write out text plist, not binaray.
+ // We always write out text plist, not binary.
// Do we still need to support binary plist?
// If yes, use plist.parseStringSync() and read the file once.
self.plist_module = (isBinaryPlist(filepath) ? bplist : plist);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/util/plugins.js
----------------------------------------------------------------------
diff --git a/src/util/plugins.js b/src/util/plugins.js
index 7613169..5a5d14a 100644
--- a/src/util/plugins.js
+++ b/src/util/plugins.js
@@ -86,8 +86,8 @@ module.exports = {
var xml = xml_helpers.parseElementtreeSync(xml_file);
var plugin_id = xml.getroot().attrib.id;
- // TODO: what if a plugin dependended on different subdirectories of the same plugin? this would fail.
- // should probably copy over entire plugin git repo contents into plugins_dir and handle subdir seperately during install.
+ // TODO: what if a plugin depended on different subdirectories of the same plugin? this would fail.
+ // should probably copy over entire plugin git repo contents into plugins_dir and handle subdir separately during install.
var plugin_dir = path.join(plugins_dir, plugin_id);
events.emit('verbose', 'Copying fetched plugin over "' + plugin_dir + '"...');
shell.cp('-R', path.join(tmp_dir, '*'), plugin_dir);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b0d0782d/src/util/w8jsproj.js
----------------------------------------------------------------------
diff --git a/src/util/w8jsproj.js b/src/util/w8jsproj.js
index 692719e..8b06b23 100644
--- a/src/util/w8jsproj.js
+++ b/src/util/w8jsproj.js
@@ -228,7 +228,7 @@ jsproj.prototype = {
fs.writeFileSync(solutionPath,solText,{encoding:"utf8"});
// select first ItemsGroups with a ChildNode ProjectReference
- // ideally select all, and look for @attib 'Include'= projectFullPath
+ // ideally select all, and look for @attrib 'Include'= projectFullPath
var projectRefNodesPar = this.xml.find("ItemGroup/ProjectReference[@Include='" + relative_path + "']/..");
if(projectRefNodesPar) {
this.xml.getroot().remove(0, projectRefNodesPar);
[3/7] git commit: CB-6280: plugman publish now publishes doc/index.md
Posted by an...@apache.org.
CB-6280: plugman publish now publishes doc/index.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/967f1164
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/967f1164
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/967f1164
Branch: refs/heads/browserify
Commit: 967f1164e182d65b4f9c5e2d9ccd415546b9589a
Parents: b156a69
Author: Steven Gill <st...@gmail.com>
Authored: Tue Apr 22 17:49:10 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Apr 22 17:49:10 2014 -0700
----------------------------------------------------------------------
src/registry/manifest.js | 11 ++++++-----
src/registry/registry.js | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/967f1164/src/registry/manifest.js
----------------------------------------------------------------------
diff --git a/src/registry/manifest.js b/src/registry/manifest.js
index f6bcf07..54f74b6 100644
--- a/src/registry/manifest.js
+++ b/src/registry/manifest.js
@@ -73,19 +73,20 @@ function generatePackageJsonFromPluginXml(plugin_path) {
}
}
- //adding docs
+ //set docs_path to doc/index.md exists
var docs_path = path.resolve(plugin_path, 'doc/index.md');
- console.log(docs_path);
+ if(!(fs.existsSync(docs_path))){
+ //set docs_path to doc/en/index.md
+ docs_path = path.resolve(plugin_path, 'doc/en/index.md');
+ }
if(fs.existsSync(docs_path)){
- console.log("english docs exisit");
englishdoc = fs.readFileSync(docs_path, 'utf-8');
package_json.englishdoc = englishdoc;
- console.log(englishdoc);
}
// write package.json
var package_json_path = path.resolve(plugin_path, 'package.json');
- console.log('about to write package.json');
+ //console.log('about to write package.json');
fs.writeFileSync(package_json_path, JSON.stringify(package_json, null, 4), 'utf8');
return package_json;
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/967f1164/src/registry/registry.js
----------------------------------------------------------------------
diff --git a/src/registry/registry.js b/src/registry/registry.js
index d95d17e..e0d733d 100644
--- a/src/registry/registry.js
+++ b/src/registry/registry.js
@@ -148,7 +148,7 @@ module.exports = {
}).then(function() {
return Q.ninvoke(npm.commands, 'publish', args)
}).fin(function() {
- //fs.unlink(path.resolve(args[0], 'package.json'));
+ fs.unlink(path.resolve(args[0], 'package.json'));
});
});
},
[6/7] git commit: fixing empty merges
Posted by an...@apache.org.
fixing empty merges
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/93c65780
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/93c65780
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/93c65780
Branch: refs/heads/browserify
Commit: 93c65780a96818b21346d210c7d74bd28f66f94e
Parents: 7e05089
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:12:05 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:12:05 2014 -0700
----------------------------------------------------------------------
src/platforms/ios.js | 6 +++---
src/prepare.js | 3 ++-
src/util/prepare-namespace.js | 8 ++++++--
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index 9631e64..16808a0 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -153,9 +153,9 @@ module.exports = {
// there is now double caching of iOS project files.
// Remove the cache here when install can handle
// a list of plugins at once.
- if (cachedProjectFiles[project_dir]) {
- return cachedProjectFiles[project_dir];
- }
+ // if (cachedProjectFiles[project_dir]) {
+ // return cachedProjectFiles[project_dir];
+ // }
// grab and parse pbxproj
// we don't want CordovaLib's xcode project
var project_files = glob.sync(path.join(project_dir, '*.xcodeproj', 'project.pbxproj'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 9940dc1..9710569 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -27,7 +27,8 @@ var platform_modules = require('./platforms'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
- common = require('./platforms/common');
+ common = require('./platforms/common'),
+ events = require('./events'),
fs = require('fs'),
shell = require('shelljs'),
util = require('util'),
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 8c18b1f..a8a6e20 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,3 +1,5 @@
+var util = require('util');
+
// FIXME this is extremely guettho
module.exports = function(target, method) {
var old = target;
@@ -26,11 +28,13 @@ module.exports = function(target, method) {
object,
lastName
);
- } else if(method === "m") {
+ } else if(method === "m" && target !== "") {
return util.format(
"%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
code,
- object
+ target
);
+ } else {
+ return "// no clobber or merges";
}
}
[2/7] git commit: added basic support for doc/index.md
Posted by an...@apache.org.
added basic support for doc/index.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/b156a692
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/b156a692
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/b156a692
Branch: refs/heads/browserify
Commit: b156a692d44955bc6a626f99665ce31c613103ad
Parents: 34221b3
Author: Steven Gill <st...@gmail.com>
Authored: Thu Apr 10 16:20:27 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Apr 22 11:39:53 2014 -0700
----------------------------------------------------------------------
src/registry/manifest.js | 12 ++++++++++++
src/registry/registry.js | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b156a692/src/registry/manifest.js
----------------------------------------------------------------------
diff --git a/src/registry/manifest.js b/src/registry/manifest.js
index d7ddc48..f6bcf07 100644
--- a/src/registry/manifest.js
+++ b/src/registry/manifest.js
@@ -41,6 +41,7 @@ function generatePackageJsonFromPluginXml(plugin_path) {
issue = pluginElm.findtext('issue'),
engines = pluginElm.findall('engines/engine'),
platformsElm = pluginElm.findall('platform'),
+ englishdoc = "",
platforms = [];
platformsElm.forEach(function(plat){
@@ -72,8 +73,19 @@ function generatePackageJsonFromPluginXml(plugin_path) {
}
}
+ //adding docs
+ var docs_path = path.resolve(plugin_path, 'doc/index.md');
+ console.log(docs_path);
+ if(fs.existsSync(docs_path)){
+ console.log("english docs exisit");
+ englishdoc = fs.readFileSync(docs_path, 'utf-8');
+ package_json.englishdoc = englishdoc;
+ console.log(englishdoc);
+ }
+
// write package.json
var package_json_path = path.resolve(plugin_path, 'package.json');
+ console.log('about to write package.json');
fs.writeFileSync(package_json_path, JSON.stringify(package_json, null, 4), 'utf8');
return package_json;
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b156a692/src/registry/registry.js
----------------------------------------------------------------------
diff --git a/src/registry/registry.js b/src/registry/registry.js
index e0d733d..d95d17e 100644
--- a/src/registry/registry.js
+++ b/src/registry/registry.js
@@ -148,7 +148,7 @@ module.exports = {
}).then(function() {
return Q.ninvoke(npm.commands, 'publish', args)
}).fin(function() {
- fs.unlink(path.resolve(args[0], 'package.json'));
+ //fs.unlink(path.resolve(args[0], 'package.json'));
});
});
},
[5/7] git commit: Remove trailing spaces in all js files
Posted by an...@apache.org.
Remove trailing spaces in all js files
So that everyone can use auto removal of trailing spaces without generating
unwanted diff lines. Only white space changes, nothing else.
The command used:
sed -i '' 's/[[:space:]]*$//g' **/*.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8aca4cb5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8aca4cb5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8aca4cb5
Branch: refs/heads/browserify
Commit: 8aca4cb5b1a8012aa23ba05386d10cb59b3b4817
Parents: b0d0782
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Thu Apr 24 17:06:26 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Thu Apr 24 17:06:26 2014 -0400
----------------------------------------------------------------------
spec/common.js | 2 +-
spec/install.spec.js | 18 ++++++++--------
spec/platforms/amazon-fireos.spec.js | 8 ++++----
spec/platforms/ios.spec.js | 6 +++---
spec/platforms/windows8.spec.js | 2 +-
spec/platforms/wp7.spec.js | 2 +-
spec/platforms/wp8.spec.js | 2 +-
spec/uninstall.spec.js | 34 +++++++++++++++----------------
spec/util/csproj.spec.js | 4 ++--
src/install.js | 14 ++++++-------
src/platforms/common.js | 2 +-
src/platforms/firefoxos.js | 2 +-
src/platforms/ios.js | 2 +-
src/platforms/windows8.js | 6 +++---
src/platforms/wp8.js | 2 +-
src/uninstall.js | 34 +++++++++++++++----------------
src/util/config-changes.js | 6 +++---
src/util/csproj.js | 8 ++++----
src/util/default-engines.js | 32 ++++++++++++++---------------
src/util/dependencies.js | 2 +-
src/util/plist-helpers.js | 10 ++++-----
src/util/w8jsproj.js | 14 ++++++-------
src/util/xml-helpers.js | 6 +++---
23 files changed, 109 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/common.js
----------------------------------------------------------------------
diff --git a/spec/common.js b/spec/common.js
index 6a87e23..b71efbf 100644
--- a/spec/common.js
+++ b/spec/common.js
@@ -30,7 +30,7 @@ if(opt.debug) {
}
module.exports = common = {
- spy: {
+ spy: {
getInstall: function(emitSpy){
return common.spy.startsWith(emitSpy, 'Install start');
},
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/install.spec.js
----------------------------------------------------------------------
diff --git a/spec/install.spec.js b/spec/install.spec.js
index c15d38f..732eb24 100644
--- a/spec/install.spec.js
+++ b/spec/install.spec.js
@@ -33,7 +33,7 @@ var install = require('../src/install'),
'G' : path.join(plugins_dir, 'dependencies', 'G')
},
promise,
- results = {},
+ results = {},
dummy_id = 'com.phonegap.plugins.dummyplugin';
function installPromise(f) {
@@ -83,7 +83,7 @@ describe('start', function() {
.then(
function(){ return install('android', project, plugins['DummyPlugin']) }
).then(
- function(){
+ function(){
results['actions_callCount'] = actions_push.callCount;
results['actions_create'] = ca.argsForCall[0];
results['config_add'] = config_queue_add.argsForCall[0];
@@ -95,14 +95,14 @@ describe('start', function() {
).then(
function(){
emit = spyOn(events, 'emit');
- return install('android', project, plugins['ChildBrowser'])
+ return install('android', project, plugins['ChildBrowser'])
}
).then(
- function(){
- return install('android', project, plugins['VariablePlugin'], plugins_install_dir, { cli_variables:{API_KEY:'batman'} })
+ function(){
+ return install('android', project, plugins['VariablePlugin'], plugins_install_dir, { cli_variables:{API_KEY:'batman'} })
}
).then(
- function(){
+ function(){
done = true;
results['prepareCount'] = prepare.callCount;
results['emit_results'] = [];
@@ -124,7 +124,7 @@ describe('install', function() {
beforeEach(function() {
prepare = spyOn(plugman, 'prepare').andReturn( Q(true) );
-
+
exec = spyOn(child_process, 'exec').andCallFake(function(cmd, cb) {
cb(false, '', '');
});
@@ -353,7 +353,7 @@ describe('install', function() {
waitsFor(function () { return done; }, 'install promise never resolved', 200);
runs(function () {
var install = common.spy.getInstall(emit);
-
+
expect(done.message).toEqual('Cyclic dependency from G to H');
});
});
@@ -455,7 +455,7 @@ describe('install', function() {
describe('end', function() {
-
+
it('end', function() {
done = false;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/amazon-fireos.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/amazon-fireos.spec.js b/spec/platforms/amazon-fireos.spec.js
index e634731..49a8b0d 100644
--- a/spec/platforms/amazon-fireos.spec.js
+++ b/spec/platforms/amazon-fireos.spec.js
@@ -19,7 +19,7 @@ var amazon_fireos = require('../../src/platforms/amazon-fireos'),
var xml_path = path.join(dummyplugin, 'plugin.xml')
, xml_text = fs.readFileSync(xml_path, 'utf-8')
, plugin_et = new et.ElementTree(et.XML(xml_text));
-
+
var platformTag = plugin_et.find('./platform[@name="amazon-fireos"]');
var dummy_id = plugin_et._root.attrib['id'];
@@ -82,13 +82,13 @@ describe('amazon-fireos project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/amazon-fireos/DummyPlugin.java', temp, path.join('src', 'com', 'phonegap', 'plugins', 'dummyplugin', 'DummyPlugin.java'));
});
it('should throw if source file cannot be found', function() {
var source = copyArray(invalid_source);
expect(function() {
- amazon_fireos['source-file'].install(source[0], faultyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], faultyplugin, temp);
}).toThrow('"' + path.resolve(faultyplugin, 'src/amazon-fireos/NotHere.java') + '" not found!');
});
it('should throw if target file already exists', function() {
@@ -100,7 +100,7 @@ describe('amazon-fireos project handler', function() {
var source = copyArray(valid_source);
expect(function() {
- amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
+ amazon_fireos['source-file'].install(source[0], dummyplugin, temp);
}).toThrow('"' + target + '" already exists!');
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/ios.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/ios.spec.js b/spec/platforms/ios.spec.js
index a4e7c22..e2589e0 100644
--- a/spec/platforms/ios.spec.js
+++ b/spec/platforms/ios.spec.js
@@ -304,9 +304,9 @@ describe('ios project handler', function() {
});
it('should rm the file from the right target location when element has a target-dir', function(){
var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] != undefined});
- shell.cp('-rf', ios_config_xml_project, temp);
+ shell.cp('-rf', ios_config_xml_project, temp);
var spy = spyOn(shell, 'rm');
-
+
ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'));
});
@@ -314,7 +314,7 @@ describe('ios project handler', function() {
var source = copyArray(valid_source).filter(function(s) { return s.attrib['framework'] == "true"});
shell.cp('-rf', ios_config_xml_project, temp);
var spy = spyOn(proj_files.xcode, 'removeFramework');
-
+
ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m'));
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/windows8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/windows8.spec.js b/spec/platforms/windows8.spec.js
index 6764301..99a5cb7 100644
--- a/spec/platforms/windows8.spec.js
+++ b/spec/platforms/windows8.spec.js
@@ -89,7 +89,7 @@ describe('windows8 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/windows8/dummer.js', temp, path.join('www', 'plugins', 'com.phonegap.plugins.dummyplugin', 'dummer.js'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/wp7.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp7.spec.js b/spec/platforms/wp7.spec.js
index c085be4..262e851 100644
--- a/spec/platforms/wp7.spec.js
+++ b/spec/platforms/wp7.spec.js
@@ -83,7 +83,7 @@ describe('wp7 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp7/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/platforms/wp8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp8.spec.js b/spec/platforms/wp8.spec.js
index 2b0f265..ba9cdb4 100644
--- a/spec/platforms/wp8.spec.js
+++ b/spec/platforms/wp8.spec.js
@@ -88,7 +88,7 @@ describe('wp8 project handler', function() {
it('should copy stuff from one location to another by calling common.copyFile', function() {
var source = copyArray(valid_source);
var s = spyOn(common, 'copyFile');
- wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+ wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp8/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
});
it('should throw if source-file src cannot be found', function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/uninstall.spec.js
----------------------------------------------------------------------
diff --git a/spec/uninstall.spec.js b/spec/uninstall.spec.js
index 875b609..a0c903c 100644
--- a/spec/uninstall.spec.js
+++ b/spec/uninstall.spec.js
@@ -2,7 +2,7 @@ var uninstall = require('../src/uninstall'),
install = require('../src/install'),
actions = require('../src/util/action-stack'),
config_changes = require('../src/util/config-changes'),
- events = require('../src/events'),
+ events = require('../src/events'),
plugman = require('../plugman'),
common = require('./common'),
fs = require('fs'),
@@ -154,7 +154,7 @@ describe('uninstallPlugin', function() {
});
describe('with dependencies', function() {
- it('should delete all dependent plugins', function() {
+ it('should delete all dependent plugins', function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('A', plugins_install_dir) );
});
@@ -170,7 +170,7 @@ describe('uninstallPlugin', function() {
});
});
- it("should fail if plugin is a required dependency", function() {
+ it("should fail if plugin is a required dependency", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('C', plugins_install_dir) );
});
@@ -180,7 +180,7 @@ describe('uninstallPlugin', function() {
});
});
- it("allow forcefully removing a plugin", function() {
+ it("allow forcefully removing a plugin", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('C', plugins_install_dir, {force: true}) );
});
@@ -192,7 +192,7 @@ describe('uninstallPlugin', function() {
});
});
- it("never remove top level plugins if they are a dependency", function() {
+ it("never remove top level plugins if they are a dependency", function() {
runs(function() {
uninstallPromise( uninstall.uninstallPlugin('A', plugins_install_dir2) );
});
@@ -253,27 +253,27 @@ describe('uninstall', function() {
});
describe('end', function() {
-
+
it('end', function() {
done = false;
- promise.then(
- function(){
- return uninstall('android', project, plugins['DummyPlugin'])
+ promise.then(
+ function(){
+ return uninstall('android', project, plugins['DummyPlugin'])
}
- ).then(
- function(){
- // Fails... A depends on
- return uninstall('android', project, plugins['C'])
+ ).then(
+ function(){
+ // Fails... A depends on
+ return uninstall('android', project, plugins['C'])
}
- ).fail(
+ ).fail(
function(err) {
expect(err.message).toBe("The plugin 'C' is required by (A), skipping uninstallation.");
}
- ).then(
- function(){
+ ).then(
+ function(){
// dependencies on C,D ... should this only work with --recursive? prompt user..?
- return uninstall('android', project, plugins['A'])
+ return uninstall('android', project, plugins['A'])
}
).fin(function(err){
if(err)
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/spec/util/csproj.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/csproj.spec.js b/spec/util/csproj.spec.js
index a24ab72..c506c38 100644
--- a/spec/util/csproj.spec.js
+++ b/spec/util/csproj.spec.js
@@ -27,7 +27,7 @@ describe('csproj', function() {
});
describe('write method', function() {
-
+
});
describe('source file', function() {
@@ -43,7 +43,7 @@ describe('csproj', function() {
var test_csproj = new csproj(example1_csproj);
it('should properly add .xaml files', function() {
test_csproj.addSourceFile(page_test);
- expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();
+ expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/Generator').text).toEqual('MSBuild:Compile');
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/SubType').text).toEqual('Designer');
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 277ef83..cce145d 100644
--- a/src/install.js
+++ b/src/install.js
@@ -71,7 +71,7 @@ function possiblyFetch(id, plugins_dir, options) {
}
var opts = underscore.extend({}, options, {
- link: false,
+ link: false,
client: 'plugman'
});
@@ -278,7 +278,7 @@ var runInstall = module.exports.runInstall = function runInstall(actions, platfo
filtered_variables[key] = options.cli_variables[key]
});
install.filtered_variables = filtered_variables;
-
+
if (missing_vars.length > 0) {
throw new Error('Variable(s) missing: ' + missing_vars.join(", "));
}
@@ -327,7 +327,7 @@ function installDependencies(install, dependencies, options) {
return dependencies.reduce(function(soFar, depXml) {
return soFar.then(
- function() {
+ function() {
var dep = {
id: depXml.attrib.id,
subdir: depXml.attrib.subdir || '',
@@ -348,7 +348,7 @@ function installDependencies(install, dependencies, options) {
options.graph.getChain(install.top_plugin_id);
return tryFetchDependency(dep, install, options)
- .then(
+ .then(
function(url){
dep.url = url;
return installDependency(dep, install, options);
@@ -439,7 +439,7 @@ function tryFetchDependency(dep, install, options) {
}
}
- // Test relative to parent folder
+ // Test relative to parent folder
if( dep.url && isRelativePath(dep.url) ) {
var relativePath = path.resolve(install.top_plugin_dir, '../' + dep.url);
@@ -463,7 +463,7 @@ function installDependency(dep, install, options) {
if ( fs.existsSync(dep.install_dir) ) {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" already fetched, using that version.');
var opts = underscore.extend({}, options, {
- cli_variables: install.filtered_variables,
+ cli_variables: install.filtered_variables,
is_top_level: false
});
@@ -473,7 +473,7 @@ function installDependency(dep, install, options) {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" not fetched, retrieving then installing.');
var opts = underscore.extend({}, options, {
- cli_variables: install.filtered_variables,
+ cli_variables: install.filtered_variables,
is_top_level: false,
subdir: dep.subdir,
git_ref: dep.git_ref,
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/common.js
----------------------------------------------------------------------
diff --git a/src/platforms/common.js b/src/platforms/common.js
index 9f01bdd..399da00 100644
--- a/src/platforms/common.js
+++ b/src/platforms/common.js
@@ -31,7 +31,7 @@ module.exports = common = {
// Same as copy file but throws error if target exists
copyNewFile:function(plugin_dir, src, project_dir, dest) {
var target_path = common.resolveTargetPath(project_dir, dest);
- if (fs.existsSync(target_path))
+ if (fs.existsSync(target_path))
throw new Error('"' + target_path + '" already exists!');
common.copyFile(plugin_dir, src, project_dir, dest);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/firefoxos.js
----------------------------------------------------------------------
diff --git a/src/platforms/firefoxos.js b/src/platforms/firefoxos.js
index c2e5971..efbeba9 100644
--- a/src/platforms/firefoxos.js
+++ b/src/platforms/firefoxos.js
@@ -68,5 +68,5 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
}
- }
+ }
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index 9631e64..4f570c3 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -147,7 +147,7 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for ios');
}
- },
+ },
parseProjectFile:function(project_dir) {
// TODO: With ConfigKeeper introduced in config-changes.js
// there is now double caching of iOS project files.
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/windows8.js
----------------------------------------------------------------------
diff --git a/src/platforms/windows8.js b/src/platforms/windows8.js
index 1f7583f..523dc6e 100644
--- a/src/platforms/windows8.js
+++ b/src/platforms/windows8.js
@@ -78,7 +78,7 @@ module.exports = {
}
},
"lib-file": {
- install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+ install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
var inc = el.attrib['Include'];
project_file.addSDKRef(inc);
},
@@ -114,7 +114,7 @@ module.exports = {
var src = el.attrib['src'];
// technically it is not possible to get here without isCustom == true -jm
- // var isCustom = el.attrib.custom == "true";
+ // var isCustom = el.attrib.custom == "true";
var type = el.attrib["type"];
// unfortunately we have to generate the plugin_dir path because it is not passed to uninstall
var plugin_dir = path.join(project_dir,"cordova/plugins",plugin_id,src);
@@ -123,7 +123,7 @@ module.exports = {
project_file.removeProjectReference(plugin_dir);
}
else {
- // if(isCustom) { }
+ // if(isCustom) { }
var targetPath = path.join('plugins', plugin_id);
common.removeFile(project_dir, targetPath);
project_file.removeReference(src);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/platforms/wp8.js
----------------------------------------------------------------------
diff --git a/src/platforms/wp8.js b/src/platforms/wp8.js
index 31bbdea..1163b44 100644
--- a/src/platforms/wp8.js
+++ b/src/platforms/wp8.js
@@ -109,5 +109,5 @@ module.exports = {
uninstall:function(source_el, project_dir, plugin_id) {
events.emit('verbose', 'lib-file.uninstall is not supported for wp8');
}
- }
+ }
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 1997abd..04ecb1a 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -197,7 +197,7 @@ function runUninstallPlatform(actions, platform, project_dir, plugin_dir, plugin
danglers.map(function(dangler) {
var dependent_path = dependencies.resolvePath(dangler, plugins_dir);
- var opts = underscore.extend({}, options, {
+ var opts = underscore.extend({}, options, {
is_top_level: depsInfo.top_level_plugins.indexOf(dangler) > -1,
depsInfo: depsInfo
});
@@ -221,7 +221,7 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
var platformTag = plugin_et.find('./platform[@name="'+platform+'"]');
www_dir = www_dir || handler.www_dir(project_dir);
events.emit('log', 'Uninstalling ' + plugin_id + ' from ' + platform);
-
+
var assets = plugin_et.findall('./asset');
if (platformTag) {
var sourceFiles = platformTag.findall('./source-file'),
@@ -233,38 +233,38 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
// queue up native stuff
sourceFiles && sourceFiles.forEach(function(source) {
- actions.push(actions.createAction(handler["source-file"].uninstall,
- [source, project_dir, plugin_id],
- handler["source-file"].install,
+ actions.push(actions.createAction(handler["source-file"].uninstall,
+ [source, project_dir, plugin_id],
+ handler["source-file"].install,
[source, plugin_dir, project_dir, plugin_id]));
});
headerFiles && headerFiles.forEach(function(header) {
- actions.push(actions.createAction(handler["header-file"].uninstall,
- [header, project_dir, plugin_id],
- handler["header-file"].install,
+ actions.push(actions.createAction(handler["header-file"].uninstall,
+ [header, project_dir, plugin_id],
+ handler["header-file"].install,
[header, plugin_dir, project_dir, plugin_id]));
});
resourceFiles && resourceFiles.forEach(function(resource) {
- actions.push(actions.createAction(handler["resource-file"].uninstall,
- [resource, project_dir, plugin_id],
- handler["resource-file"].install,
+ actions.push(actions.createAction(handler["resource-file"].uninstall,
+ [resource, project_dir, plugin_id],
+ handler["resource-file"].install,
[resource, plugin_dir, project_dir]));
});
// CB-5238 custom frameworks only
frameworkFiles && frameworkFiles.forEach(function(framework) {
- actions.push(actions.createAction(handler["framework"].uninstall,
- [framework, project_dir, plugin_id],
- handler["framework"].install,
+ actions.push(actions.createAction(handler["framework"].uninstall,
+ [framework, project_dir, plugin_id],
+ handler["framework"].install,
[framework, plugin_dir, project_dir]));
});
libFiles && libFiles.forEach(function(source) {
- actions.push(actions.createAction(handler["lib-file"].uninstall,
- [source, project_dir, plugin_id],
- handler["lib-file"].install,
+ actions.push(actions.createAction(handler["lib-file"].uninstall,
+ [source, project_dir, plugin_id],
+ handler["lib-file"].install,
[source, plugin_dir, project_dir, plugin_id]));
});
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 818b785..67adfb6 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -39,7 +39,7 @@ var fs = require('fs'),
bplist = require('bplist-parser'),
xcode = require('xcode'),
et = require('elementtree'),
- _ = require('underscore'),
+ _ = require('underscore'),
xml_helpers = require('./../util/xml-helpers'),
platforms = require('./../platforms'),
events = require('./../events'),
@@ -132,7 +132,7 @@ PlatformMunger.prototype.apply_file_munge = PlatformMunger_apply_file_munge;
function PlatformMunger_apply_file_munge(file, munge, remove) {
var self = this;
var xml_child;
-
+
if ( file === 'framework' && self.platform === 'ios' ) {
// ios pbxproj file
var pbxproj = self.config_keeper.get(self.project_dir, self.platform, 'framework');
@@ -275,7 +275,7 @@ function reapply_global_munge () {
continue;
}
- self.apply_file_munge(file, global_munge.files[file]);
+ self.apply_file_munge(file, global_munge.files[file]);
}
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/csproj.js
----------------------------------------------------------------------
diff --git a/src/util/csproj.js b/src/util/csproj.js
index 01a5fbf..1024878 100644
--- a/src/util/csproj.js
+++ b/src/util/csproj.js
@@ -13,7 +13,7 @@ csproj.prototype = {
write:function() {
fs.writeFileSync(this.location, this.xml.write({indent:4}), 'utf-8');
},
-
+
addReference:function(relPath) {
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -33,10 +33,10 @@ csproj.prototype = {
}
item.append(elem);
-
+
this.xml.getroot().append(item);
},
-
+
removeReference:function(relPath) {
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -60,7 +60,7 @@ csproj.prototype = {
if(extName == ".xaml") {
var page = new et.Element('Page');
var sub_type = new et.Element('SubType');
-
+
sub_type.text = "Designer";
page.append(sub_type);
page.attrib.Include = relative_path;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/default-engines.js
----------------------------------------------------------------------
diff --git a/src/util/default-engines.js b/src/util/default-engines.js
index 926c206..5e4f151 100644
--- a/src/util/default-engines.js
+++ b/src/util/default-engines.js
@@ -2,35 +2,35 @@ var path = require('path');
module.exports = function(project_dir){
return {
- 'cordova':
+ 'cordova':
{ 'platform':'*', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-plugman':
+ 'cordova-plugman':
{ 'platform':'*', 'currentVersion': require('../../package.json').version },
- 'cordova-android':
+ 'cordova-android':
{ 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-ios':
+ 'cordova-ios':
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-blackberry10':
+ 'cordova-blackberry10':
{ 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-wp7':
+ 'cordova-wp7':
{ 'platform':'wp7', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-wp8':
+ 'cordova-wp8':
{ 'platform':'wp8', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-windows8':
+ 'cordova-windows8':
{ 'platform':'windows8', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'apple-xcode' :
+ 'apple-xcode' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_xcode_version') },
- 'apple-ios' :
+ 'apple-ios' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_ios_version') },
- 'apple-osx' :
+ 'apple-osx' :
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','apple_osx_version') },
- 'blackberry-ndk' :
+ 'blackberry-ndk' :
{ 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','bb10-ndk-version') },
- 'android-sdk' :
+ 'android-sdk' :
{ 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','android_sdk_version') },
- 'windows-os' :
+ 'windows-os' :
{ 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_os_version') },
- 'windows-sdk' :
- { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
+ 'windows-sdk' :
+ { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/dependencies.js
----------------------------------------------------------------------
diff --git a/src/util/dependencies.js b/src/util/dependencies.js
index 8abbc5b..a297372 100644
--- a/src/util/dependencies.js
+++ b/src/util/dependencies.js
@@ -93,4 +93,4 @@ module.exports = package = {
danglers = danglers && danglers.filter(function(x) { return tlps.indexOf(x) < 0; });
return danglers;
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/plist-helpers.js
----------------------------------------------------------------------
diff --git a/src/util/plist-helpers.js b/src/util/plist-helpers.js
index 206d7a6..e1dfbd9 100644
--- a/src/util/plist-helpers.js
+++ b/src/util/plist-helpers.js
@@ -21,7 +21,7 @@
var et = require('elementtree'),
plist = require('plist-with-patches');
-
+
// adds node to doc at selector
module.exports = {
graftPLIST:function (doc, xml, selector) {
@@ -38,7 +38,7 @@ module.exports = {
// removes node from doc at selector
prunePLIST:function(doc, xml, selector) {
var obj = plist.parseStringSync("<plist>"+xml+"</plist>");
-
+
pruneOBJECT(doc, selector, obj);
return true;
@@ -51,9 +51,9 @@ function pruneOBJECT(doc, selector, fragment) {
for (i in fragment) {
for (j in doc[selector]) {
empty = pruneOBJECT(doc[selector], j, fragment[i]) && empty;
- }
+ }
}
- if (empty)
+ if (empty)
{
delete doc[selector];
return true;
@@ -63,7 +63,7 @@ function pruneOBJECT(doc, selector, fragment) {
delete doc[selector];
return true;
}
-
+
return false;
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/w8jsproj.js
----------------------------------------------------------------------
diff --git a/src/util/w8jsproj.js b/src/util/w8jsproj.js
index 8b06b23..903a214 100644
--- a/src/util/w8jsproj.js
+++ b/src/util/w8jsproj.js
@@ -75,7 +75,7 @@ jsproj.prototype = {
item.append(elem);
this.xml.getroot().append(item);
},
-
+
removeReference:function(relPath) {
events.emit('verbose','removeReference::' + relPath);
@@ -163,18 +163,18 @@ jsproj.prototype = {
else if(projectExt == ".csproj") {
projectTypeGuid = WinCSharpProjectTypeGUID;
}
-
+
if(!projectTypeGuid) {
throw new Error("unrecognized project type");
}
- var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
+ var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
projName + '", "' + relative_path + '",' +
'"' + projectGuid + '"\n\r EndProject\n\r';
solText = splitText[0] + preInsertText + "EndProject\n\r" + postInsertText + splitText[1];
fs.writeFileSync(solutionPath,solText,{encoding:"utf8"});
-
+
// Add the ItemGroup/ProjectReference to the cordova project :
// <ItemGroup><ProjectReference Include="blahblah.csproj"/></ItemGroup>
@@ -204,7 +204,7 @@ jsproj.prototype = {
else if(projectExt == ".csproj") {
projectTypeGuid = WinCSharpProjectTypeGUID;
}
-
+
if(!projectTypeGuid) {
throw new Error("unrecognized project type");
}
@@ -213,7 +213,7 @@ jsproj.prototype = {
projectGuid + "=" + projectGuid + "\n\r" +
"EndProjectSection\n\r";
- var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
+ var postInsertText = 'Project("' + projectTypeGuid + '") = "' +
projName + '", "' + relative_path + '",' +
'"' + projectGuid + '"\n\r EndProject\n\r';
@@ -221,7 +221,7 @@ jsproj.prototype = {
var solutionPath = shell.ls(path.join(path.dirname(this.location),"*.sln"))[0]; // TODO:error handling
var solText = fs.readFileSync(solutionPath,{encoding:"utf8"});
var splitText = solText.split(preInsertText);
-
+
solText = splitText.join("").split(postInsertText);
solText = solText.join("");
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8aca4cb5/src/util/xml-helpers.js
----------------------------------------------------------------------
diff --git a/src/util/xml-helpers.js b/src/util/xml-helpers.js
index 265025e..601ed4d 100644
--- a/src/util/xml-helpers.js
+++ b/src/util/xml-helpers.js
@@ -180,9 +180,9 @@ function resolveParent(doc, selector) {
return parent;
}
-// Find the index at which to insert an entry. After is a ;-separated priority list
-// of tags after which the insertion should be made. E.g. If we need to
-// insert an element C, and the rule is that the order of children has to be
+// Find the index at which to insert an entry. After is a ;-separated priority list
+// of tags after which the insertion should be made. E.g. If we need to
+// insert an element C, and the rule is that the order of children has to be
// As, Bs, Cs. After will be equal to "C;B;A".
function findInsertIdx(children, after) {