cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject git commit: Remove all trailing spaces
Date Mon, 03 Nov 2014 23:13:57 GMT
Repository: cordova-coho
Updated Branches:
  refs/heads/master 1e31755e3 -> a3ccf8c48


Remove all trailing spaces

White space changes only. Remove all trailing space in src/*.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/a3ccf8c4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/a3ccf8c4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/a3ccf8c4

Branch: refs/heads/master
Commit: a3ccf8c4833b13de91bda0ebf9226ff32eb49833
Parents: 1e31755
Author: Mark Koudritsky <kamrik@gmail.com>
Authored: Mon Nov 3 16:36:49 2014 -0500
Committer: Mark Koudritsky <kamrik@gmail.com>
Committed: Mon Nov 3 16:36:49 2014 -0500

----------------------------------------------------------------------
 src/cadence-release.js  |  4 ++--
 src/nightly.js          | 24 ++++++++++++------------
 src/npm-publish.js      |  6 +++---
 src/platform-release.js | 18 +++++++++---------
 src/repoutil.js         |  6 +++---
 src/retrieve-sha.js     |  2 +-
 src/validLicenses.json  |  2 +-
 7 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/cadence-release.js
----------------------------------------------------------------------
diff --git a/src/cadence-release.js b/src/cadence-release.js
index 0dabcf8..6dab4c0 100644
--- a/src/cadence-release.js
+++ b/src/cadence-release.js
@@ -140,7 +140,7 @@ function *updateRepoVersion(repo, version) {
     } else {
         console.warn('No VERSION file exists in repo ' + repo.repoName);
     }
-    
+
     // Update the package.json VERSION.
     var packageFilePaths = repo.packageFilePaths || ['package.json'];
     if (fs.existsSync(packageFilePaths[0])) {
@@ -149,7 +149,7 @@ function *updateRepoVersion(repo, version) {
             var packageJSON = JSON.parse(data);
             packageJSON.version = version;
             fs.writeFileSync(packageFilePaths[0], JSON.stringify(packageJSON, null, "   
"));
-        }); 
+        });
         if (!(yield gitutil.pendingChangesExist())) {
             print('package.json file was already up-to-date.');
         }

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/nightly.js
----------------------------------------------------------------------
diff --git a/src/nightly.js b/src/nightly.js
index 6cd6e74..392cbe1 100644
--- a/src/nightly.js
+++ b/src/nightly.js
@@ -45,7 +45,7 @@ module.exports = function*(argv) {
             desc: 'Don\'t actually publish to npm, just print what would be run.',
             type:'boolean'
         })
-        .argv;    
+        .argv;
 
     if(argv.h) {
         optimist.showHelp();
@@ -60,14 +60,14 @@ module.exports = function*(argv) {
         yield gitutil.gitClean();
         yield gitutil.resetFromOrigin();
     })
-        
+
     //get SHAS from platforms
     var SHAJSON = yield retrieveSha(repos);
-    
+
     //save SHAJSON in cordova-cli repo
     yield repoutil.forEachRepo([cli], function*() {
         //need to get the path to cordova-cli using executil
-        var cordovaclidir = process.cwd(); 
+        var cordovaclidir = process.cwd();
         fs.writeFileSync((path.join(cordovaclidir, 'shas.json')), JSON.stringify(SHAJSON,
null, 4), 'utf8', function(err) {
             if (err) return console.log (err);
         });
@@ -78,7 +78,7 @@ module.exports = function*(argv) {
     var cordovalibdir;
     yield repoutil.forEachRepo([cordovaLib], function*() {
         //need to get the path to cordova-lib using executil
-        cordovalibdir = process.cwd(); 
+        cordovalibdir = process.cwd();
     });
 
     yield updatePlatformsFile(path.join(cordovalibdir, 'src/cordova/platformsConfig.json'),
SHAJSON);
@@ -90,7 +90,7 @@ module.exports = function*(argv) {
     var cordovaLibVersion;
     //update package.json version for cli + lib, update lib reference for cli
     yield repoutil.forEachRepo([cordovaLib, cli], function*(repo) {
-        var dir = process.cwd(); 
+        var dir = process.cwd();
         var packageJSON = require(dir+'/package.json');
         packageJSON.version = versionutil.removeDev(packageJSON.version) + nightlyVersion;
 
@@ -123,18 +123,18 @@ module.exports = function*(argv) {
 function *updatePlatformsFile(file, shajson) {
     var platformsJS = require(file);
 
-    var repos = flagutil.computeReposFromFlag('active-platform');  
+    var repos = flagutil.computeReposFromFlag('active-platform');
 
     yield repoutil.forEachRepo(repos, function*(repo) {
         if(repo.id === 'windowsphone'){
-            platformsJS['wp8'].version = shajson[repo.id]; 
+            platformsJS['wp8'].version = shajson[repo.id];
         } else if(repo.id === 'windows') {
-            platformsJS[repo.id].version = shajson[repo.id];     
-            platformsJS['windows8'].version = shajson[repo.id]; 
+            platformsJS[repo.id].version = shajson[repo.id];
+            platformsJS['windows8'].version = shajson[repo.id];
         } else if(repo.id === 'blackberry') {
-            platformsJS['blackberry10'].version = shajson[repo.id]; 
+            platformsJS['blackberry10'].version = shajson[repo.id];
         } else {
-            platformsJS[repo.id].version = shajson[repo.id]; 
+            platformsJS[repo.id].version = shajson[repo.id];
         }
     });
 

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/npm-publish.js
----------------------------------------------------------------------
diff --git a/src/npm-publish.js b/src/npm-publish.js
index 7031b84..2f3a777 100644
--- a/src/npm-publish.js
+++ b/src/npm-publish.js
@@ -20,13 +20,13 @@ under the License.
 var optimist = require('optimist');
 var apputil = require('./apputil');
 var flagutil = require('./flagutil');
-var repoutil = require('./repoutil');   
+var repoutil = require('./repoutil');
 var executil = require('./executil');
 var print = apputil.print;
 
 exports.publishTag = function*(options) {
     var opt = flagutil.registerHelpFlag(optimist);
-   
+
     //argv was passed through another function, set defaults to appease demand.
     if(options) {
         opt = opt
@@ -63,7 +63,7 @@ exports.publishTag = function*(options) {
         optimist.showHelp();
         process.exit(1);
     }
-    
+
     var repos = flagutil.computeReposFromFlag(argv.r);
 
     //npm publish --tag argv.tag

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/platform-release.js
----------------------------------------------------------------------
diff --git a/src/platform-release.js b/src/platform-release.js
index 68d5116..cf2c083 100644
--- a/src/platform-release.js
+++ b/src/platform-release.js
@@ -80,13 +80,13 @@ var hasBuiltJs = '';
 function *updateJsSnapshot(repo, version) {
     function *ensureJsIsBuilt() {
         var cordovaJsRepo = repoutil.getRepoById('js');
-        
+
         if (hasBuiltJs != version) {
             yield repoutil.forEachRepo([cordovaJsRepo], function*() {
                 yield gitutil.stashAndPop(cordovaJsRepo, function*() {
                     //git fetch and update master for cordovajs
                     yield repoupdate.updateRepos([cordovaJsRepo], ['master'], false);
-                    yield gitutil.gitCheckout('master'); 
+                    yield gitutil.gitCheckout('master');
                     yield executil.execHelper(executil.ARGS('grunt compile:' +repo.id + '
--platformVersion='+version));
                     hasBuiltJs = version;
                 });
@@ -124,14 +124,14 @@ function *updateRepoVersion(repo, version) {
             shelljs.sed('-i', /CORDOVA_VERSION.*=.*;/, 'CORDOVA_VERSION = "' + version +
'";', path.join('framework', 'src', 'org', 'apache', 'cordova', 'CordovaWebView.java'));
             shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin',
'templates', 'cordova', 'version'));
         } else if (repo.id == 'ios') {
-            shelljs.sed('-i', /VERSION.*=.*/, 'VERSION="' + version + '"', path.join('bin',
'templates', 'scripts', 'cordova', 'version'));   
+            shelljs.sed('-i', /VERSION.*=.*/, 'VERSION="' + version + '"', path.join('bin',
'templates', 'scripts', 'cordova', 'version'));
         } else if (repo.id == 'blackberry') {
             shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin',
'templates', 'project','cordova', 'lib', 'version.js'));
         } else if (repo.id == 'firefoxos') {
             shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin',
'templates', 'project','cordova', 'version'));
         } else if (repo.id == 'ubuntu') {
             shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin',
'build', 'version'));
-        } 
+        }
         shelljs.config.fatal = false;
         if (!(yield gitutil.pendingChangesExist())) {
             print('VERSION file was already up-to-date.');
@@ -139,7 +139,7 @@ function *updateRepoVersion(repo, version) {
     } else {
         console.warn('No VERSION file exists in repo ' + repo.repoName);
     }
-    
+
     // Update the package.json VERSION.
     var packageFilePaths = repo.packageFilePaths || ['package.json'];
     if (fs.existsSync(packageFilePaths[0])) {
@@ -148,7 +148,7 @@ function *updateRepoVersion(repo, version) {
             var packageJSON = JSON.parse(data);
             packageJSON.version = version;
             fs.writeFileSync(packageFilePaths[0], JSON.stringify(packageJSON, null, "   
"));
-        }); 
+        });
         if (!(yield gitutil.pendingChangesExist())) {
             print('package.json file was already up-to-date.');
         }
@@ -181,7 +181,7 @@ exports.prepareReleaseBranchCommand = function*() {
 
     // First - perform precondition checks.
     yield repoupdate.updateRepos(repos, [], true);
-    
+
     yield repoutil.forEachRepo(repos, function*(repo) {
         yield gitutil.stashAndPop(repo, function*() {
             // git fetch + update master
@@ -237,7 +237,7 @@ function *tagJs(repo, version, pretend) {
             } else {
                 yield execOrPretend(executil.ARGS('git tag ' + repo.id + '-' + version));
             }
-            yield execOrPretend(executil.ARGS('git push --tags ' + repo.remoteName)); 
+            yield execOrPretend(executil.ARGS('git push --tags ' + repo.remoteName));
         });
     });
 }
@@ -296,7 +296,7 @@ exports.tagReleaseBranchCommand = function*(argv) {
                 print('Repo ' + repo.repoName + ' is already tagged.');
             }
             yield tagJs(repo, version, pretend);
-                
+
         });
     });
 

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/repoutil.js
----------------------------------------------------------------------
diff --git a/src/repoutil.js b/src/repoutil.js
index a8b81d5..7a9e972 100644
--- a/src/repoutil.js
+++ b/src/repoutil.js
@@ -461,19 +461,19 @@ exports.forEachRepo = function*(repos, func) {
         var newPath = isInForEachRepoFunction ? path.join('..', repo.repoName) : repo.repoName;
 
         isInForEachRepoFunction = true;
-        
+
         //cordova-lib lives inside of a top level cordova-lib directory
         if(repo.id === 'lib'){
             newPath = newPath + '/cordova-lib';
             origPath = origPath + '/..';
-        } 
+        }
         shelljs.cd(newPath);
 
         if (shelljs.error()) {
             apputil.fatal('Repo directory does not exist: ' + repo.repoName + '. First run
coho repo-clone.');
         }
         yield func(repo);
-        
+
         shelljs.cd(origPath);
 
         isInForEachRepoFunction = !((origPath === '..')||(origPath === '../..'));

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/retrieve-sha.js
----------------------------------------------------------------------
diff --git a/src/retrieve-sha.js b/src/retrieve-sha.js
index daf346e..a694cdc 100644
--- a/src/retrieve-sha.js
+++ b/src/retrieve-sha.js
@@ -21,7 +21,7 @@ var executil = require('./executil');
 
 module.exports = function *(repos) {
     var shas = {};
-    yield repoutil.forEachRepo(repos, function*(repo) { 
+    yield repoutil.forEachRepo(repos, function*(repo) {
         shas[repo.id] = yield executil.execHelper(executil.ARGS('git rev-parse HEAD'), true,
true);
     });
     return shas;

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/a3ccf8c4/src/validLicenses.json
----------------------------------------------------------------------
diff --git a/src/validLicenses.json b/src/validLicenses.json
index bb0b4a6..08ccaac 100644
--- a/src/validLicenses.json
+++ b/src/validLicenses.json
@@ -21,4 +21,4 @@
 	    "E(clipse )?D(istribution )?L(icense)?",
 	    "P(ython )?S(oftware )?F(oundation )?L(icense)?"
   	]
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message