You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2013/10/15 20:39:44 UTC
[03/31] git commit: file cleanup
file cleanup
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/a2a4f3cd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/a2a4f3cd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/a2a4f3cd
Branch: refs/heads/master
Commit: a2a4f3cd977308bca9847b84e5ff08c5658e66f8
Parents: 216f635
Author: David Kemp <dr...@google.com>
Authored: Wed Aug 21 08:32:04 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:09:10 2013 -0400
----------------------------------------------------------------------
build.js | 19 -----
dbwrite.js | 56 --------------
fullbuild.sh | 61 ---------------
runtests.js | 224 ------------------------------------------------------
runtests2.js | 143 ----------------------------------
5 files changed, 503 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a2a4f3cd/build.js
----------------------------------------------------------------------
diff --git a/build.js b/build.js
deleted file mode 100755
index f8acf74..0000000
--- a/build.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-var path = require ('path');
-var config = require('./config');
-var mobile_spec = require('./src/build/makers/mobile_spec');
-var android = require('./src/build/makers/android');
-var ios = require('./src/build/makers/ios');
-
-// call the builder for the requested platform
-
- var fake_sha='HEAD';
- var test_entry='all.html';
- var output_location = path.join('..','mobilespec','platforms','android');
- android(output_location,fake_sha,'',config.app.entry,function(err){
-
- });
-
-// ios.(output_location,fake_sha,'',test_entry,function(err){
-// });
-
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a2a4f3cd/dbwrite.js
----------------------------------------------------------------------
diff --git a/dbwrite.js b/dbwrite.js
deleted file mode 100644
index 2a10df5..0000000
--- a/dbwrite.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var path = require ('path');
-var shell = require('shelljs');
-var fs = require('fs');
-var couch = require('./src/couchdb/interface');
-
-var argv = require('optimist').boolean(['android','ios','js']).argv;
-
-var TEST_DIR=process.cwd();
-var BRANCH='master';
-var TOOL_DIR=path.join(TEST_DIR,'medic');
-var MSPEC_DIR=path.join(TEST_DIR,'mobilespec');
-
-//records a success in the couchdb
-function success(platform,sha,component,details) {
- var doc= {
- mobilespec:details,
- sha:sha,
- platform:platform,
- version:component,
- timestamp:Math.round(Math.floor((new Date()).getTime() / 1000)),
- model:''
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.mobilespec_results.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-// records an error in the couch db
-function error(platform,sha,failure,details) {
- var doc = {
- sha:sha,
- timestamp:(new Date().getTime() / 1000),
- platform:platform.toLowerCase(),
- failure:failure,
- details:details
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.build_errors.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a2a4f3cd/fullbuild.sh
----------------------------------------------------------------------
diff --git a/fullbuild.sh b/fullbuild.sh
deleted file mode 100755
index fb66b0a..0000000
--- a/fullbuild.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# move up to the sandbox
-
-cd ..
-echo ==== Cleaning up ====
-rm -rf cordova-*
-rm -rf mobilespec
-
-echo ==== Installing coho ====
-git clone https://github.com/apache/cordova-coho.git
-cd cordova-coho
-npm install
-cd ..
-
-echo ==== Getting repositories ====
-./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r android -r ios -r cli -r js
-cd cordova-cli
-npm install
-cd ..
-
-echo ==== Creating mobilespec ====
-./cordova-cli/bin/cordova create mobilespec org.apache.mobilespec mobilespec
-cd mobilespec
-cp ../medic/cordova_config.json .cordova/config.json
-../cordova-cli/bin/cordova platform add android ios
-echo ==== Adding plugins to mobilespec ====
-../cordova-cli/bin/cordova -d plugin add ../cordova-mobile-spec/dependencies-plugin
-echo ==== Modifying www for mobilespec ====
-rm -r www
-ln -s ../cordova-mobile-spec www
-
-echo ==== updating cordova-js ====
-cd ../cordova-js
-npm install
-grunt
-cd ../mobilespec
-cp ../cordova-js/pkg/cordova.ios.js platforms/ios/www/cordova.js
-cp ../cordova-js/pkg/cordova.android.js platforms/android/assets/www/cordova.js
-
-echo ==== Preparing mobilespec ====
-../cordova-cli/bin/cordova prepare
-
-echo ==== patching for test ====
-cd ../medic
-node build.js
-cd ../mobilespec
-
-echo ==== Building for android ====
-../cordova-cli/bin/cordova build android
-
-echo ==== Building for ios ====
-../cordova-cli/bin/cordova build ios
-
-echo ==== Deploying to android ====
-../cordova-cli/bin/cordova run android
-
-echo ==== Deploying to ios ====
-# ../cordova-cli/bin/cordova emulate ios
-
-
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a2a4f3cd/runtests.js
----------------------------------------------------------------------
diff --git a/runtests.js b/runtests.js
deleted file mode 100644
index 468c8f8..0000000
--- a/runtests.js
+++ /dev/null
@@ -1,224 +0,0 @@
-var path = require ('path');
-var shell = require('shelljs');
-var fs = require('fs');
-var couch = require('./src/couchdb/interface');
-
-var config = require('./config');
-var android = require('./src/build/makers/android');
-var ios = require('./src/build/makers/ios');
-var argv = require('optimist').boolean(['android','ios','js']).argv;
-
-// this assumes that you start it in the sandbox
-
-var TEST_DIR=process.cwd();
-var BRANCH='master';
-var TOOL_DIR=path.join(TEST_DIR,'medic');
-var MSPEC_DIR=path.join(TEST_DIR,'mobilespec');
-var TEST_OK=true;
-var last_error="";
-
-
-// when things end, I need to ensure that it exits with the right
-// return code.
-process.once('exit', function () {
- if(!TEST_OK) process.exit(1);
-});
-
-//records a success in the couchdb
-function success(platform,sha,component,details) {
- var doc= {
- mobilespec:details,
- sha:sha,
- platform:platform,
- version:component,
- timestamp:Math.round(Math.floor((new Date()).getTime() / 1000)),
- model:''
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.mobilespec_results.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-// records an error in the couch db
-function error(platform,sha,failure,details) {
- var doc = {
- sha:sha,
- timestamp:(new Date().getTime() / 1000),
- platform:platform.toLowerCase(),
- failure:failure,
- details:details
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.build_errors.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-// runs a command in a directory and handles errors, etc.
-function trythis(dir, cmd, sha, platform, operation) {
- if(TEST_OK) {
- shell.echo(platform+': '+operation);
- shell.pushd(dir);
- var cmdobj = shell.exec(cmd);
- if(cmdobj.code!=0){
- error(platform, 'HEAD', 'Error in '+operation, cmdobj.output)
- TEST_OK=false;
- last_error=platform+': '+operation;
- }
- shell.popd();
- console.log("% complete",operation);
- } else {
- shell.echo('Skipping due to previous errors: '+platform+': '+operation);
- }
-}
-
-// clear out the test sandbox prior to a test run
-function cleanSandbox() {
- shell.cd(TEST_DIR);
- shell.echo(' ==== Cleaning up ====');
- shell.rm('-rf','cordova-*');
- shell.rm('-rf','mobilespec');
-}
-
-//puts text into a file
-function writefile(target,text){
- shell.echo(text).to(target);
-}
-
-
-// this re-invokes the command with more handles
-// ShellJS opens a lot of file handles, and the default on OS X is too small.
-var ulimit = shell.exec('ulimit -S -n');
-if (ulimit && ulimit.output.trim() < 2000) {
- var cmdobj=shell.exec('/bin/bash -c \'ulimit -S -n 4096; exec "' + process.argv[0] + '" "' + process.argv.slice(1).join('" "') + '" --ulimit\'');
- if(cmdobj.code !=0) TEST_OK=false;
- console.log("Sub-command ended with: "+cmdobj.code);
- return;
-}
-
-console.log('current path='+TEST_DIR+", config=%j",config);
-console.log('runtests invoked with: %j',argv);
-shell.echo('runtests run with Android:'+argv.android+' iOS:'+argv.ios+' JS:'+argv.js+' branch:'+argv.branch);
-var build_android=false;
-var build_ios=false;
-var build_js=false;
-
-if(argv.android) build_android=true;
-if(argv.ios) build_ios=true;
-if(argv.js) build_js=true;
-if(argv.branch) BRANCH=argv.branch;
-
-cleanSandbox();
-
-trythis(TEST_DIR, 'git clone https://github.com/apache/cordova-coho.git',BRANCH,'coho','git clone');
-trythis(path.join(TEST_DIR,'cordova-coho'),'npm install', BRANCH, 'npm', 'coho npm install');
-
-trythis(TEST_DIR,'./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r android -r ios -r cli -r js -b '+BRANCH, BRANCH,'coho','loading repos');
-if(TEST_OK) {
- success('coho',BRANCH,'repo clone','ok');
-}
-trythis(TEST_DIR,'./cordova-coho/coho repo-update -r plugins -r mobile-spec -r android -r ios -r cli -r js -b '+BRANCH, BRANCH,'coho','loading repos');
-if(TEST_OK) {
- success('coho',BRANCH,'repo update','ok');
-}
-trythis(path.join(TEST_DIR,'cordova-cli'), 'npm install',BRANCH,'cli','cli npm install');
-
-trythis(TEST_DIR,'./cordova-cli/bin/cordova create mobilespec org.apache.mobilespec mobilespec',BRANCH,'Cli','Create Mobilespec');
-if(TEST_OK) {
- writefile(path.join(MSPEC_DIR,'.cordova','config.json'),
-'{\
- "id":"org.apache.mobilespec",\
- "name":"mobilespec",\
- "lib": {\
- "android": {\
- "uri": "'+TEST_DIR+'/cordova-android",\
- "version": "dev",\
- "id": "cordova-android-dev"\
- },\
- "ios": {\
- "uri": "'+TEST_DIR+'/cordova-ios",\
- "version": "dev",\
- "id": "cordova-ios-dev"\
- }\
- }\
-}');
-}
-
-if(TEST_OK && build_android) {
- trythis(MSPEC_DIR,'../cordova-cli/bin/cordova platform add android',BRANCH,'Cli','platform add');
-}
-
-if(TEST_OK && build_ios) {
- trythis(MSPEC_DIR,'../cordova-cli/bin/cordova platform add ios',BRANCH,'Cli','platform add');
-}
-
-trythis(MSPEC_DIR,'../cordova-cli/bin/cordova -d plugin add ../cordova-mobile-spec/dependencies-plugin',BRANCH,'Cli','plugin add');
-
-// hook up the mobilespec project
-if(TEST_OK){
- shell.rm('-r',path.join(MSPEC_DIR,'www'));
- shell.exec('ln -s '+path.join(TEST_DIR,'cordova-mobile-spec')+' '+path.join(MSPEC_DIR,'www'));
-}
-
-if(build_js) {
- // get the latest cordova-js going
- trythis(path.join(TEST_DIR,'cordova-js'),'npm install',BRANCH,'JS','npm install');
- trythis(path.join(TEST_DIR,'cordova-js'),'grunt',BRANCH,'JS','grunt');
-
- if(TEST_OK){
- success('cordova-js',BRANCH,'build','ok');
- shell.pushd(MSPEC_DIR);
- if(build_ios) shell.cp('-f', '../cordova-js/pkg/cordova.ios.js','platforms/ios/www/cordova.js');
- if(build_android) shell.cp('-f', '../cordova-js/pkg/cordova.android.js','platforms/android/assets/www/cordova.js');
- shell.popd();
- }
-}
-
-trythis(MSPEC_DIR,'../cordova-cli/bin/cordova prepare',BRANCH,'Cli','prepare');
-
-// call the builder for the requested platform
-if(TEST_OK && build_android) {
- var output_location = path.join(MSPEC_DIR,'platforms','android');
- android(output_location, BRANCH,'', config.app.entry, config.couchdb.host, function(err){
- if(err) {
- shell.echo('Android test prepare failed')
- TEST_OK=false;
- } else {
- shell.echo('Android tests complete')
- }
- });
-}
-if(TEST_OK && build_ios) {
- var output_location = path.join(MSPEC_DIR,'platforms','ios');
- console.log('iOS testing start')
- ios(output_location, BRANCH,'', config.app.entry, config.couchdb.host, function(err){
- if(err) {
- console.log('iOS test prepare failed')
- TEST_OK=false;
- } else {
- console.log('iOS tests complete')
- }
- });
-}
-
-if(TEST_OK){
- success('Testrun',BRANCH,'complete','ok');
- console.log('Testrun complete without error');
-} else {
- error('Testrun',BRANCH,'failed',last_error);
- console.error('Failure Exit with code 1');
-}
-
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a2a4f3cd/runtests2.js
----------------------------------------------------------------------
diff --git a/runtests2.js b/runtests2.js
deleted file mode 100644
index 34c7b01..0000000
--- a/runtests2.js
+++ /dev/null
@@ -1,143 +0,0 @@
-var path = require ('path');
-var shell = require('shelljs');
-var fs = require('fs');
-var couch = require('./src/couchdb/interface');
-
-var config = require('./config');
-var android = require('./src/build/makers/android');
-var ios = require('./src/build/makers/ios');
-var argv = require('optimist').boolean(['android','ios','js']).argv;
-
-// this assumes that you start it in the sandbox
-
-var TEST_DIR=process.cwd();
-var BRANCH='master';
-var TOOL_DIR=path.join(TEST_DIR,'medic');
-var MSPEC_DIR=path.join(TEST_DIR,'mobilespec');
-var TEST_OK=true;
-var last_error="";
-
-
-// when things end, I need to ensure that it exits with the right
-// return code.
-process.once('exit', function () {
- if(!TEST_OK) process.exit(1);
-});
-
-//records a success in the couchdb
-function success(platform,sha,component,details) {
- var doc= {
- mobilespec:details,
- sha:sha,
- platform:platform,
- version:component,
- timestamp:Math.round(Math.floor((new Date()).getTime() / 1000)),
- model:''
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.mobilespec_results.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-// records an error in the couch db
-function error(platform,sha,failure,details) {
- var doc = {
- sha:sha,
- timestamp:(new Date().getTime() / 1000),
- platform:platform.toLowerCase(),
- failure:failure,
- details:details
- };
-
- // fire off to couch
- var doc_id_array = [doc.platform, sha];
- doc_id_array = doc_id_array.map(encodeURIComponent);
- var doc_id = doc_id_array.join('__');
- couch.build_errors.clobber(doc_id, doc, function(resp) {
- if (resp.error) {
- console.error('[COUCH ERROR] Saving doc with id ' + doc_id);
- }
- });
-}
-
-// runs a command in a directory and handles errors, etc.
-function trythis(dir, cmd, sha, platform, operation) {
- if(TEST_OK) {
- shell.echo(platform+': '+operation);
- shell.pushd(dir);
- var cmdobj = shell.exec(cmd);
- if(cmdobj.code!=0){
- error(platform, 'HEAD', 'Error in '+operation, cmdobj.output)
- TEST_OK=false;
- last_error=platform+': '+operation;
- }
- shell.popd();
- console.log("% complete",operation);
- } else {
- shell.echo('Skipping due to previous errors: '+platform+': '+operation);
- }
-}
-
-
-// this re-invokes the command with more handles
-// ShellJS opens a lot of file handles, and the default on OS X is too small.
-var ulimit = shell.exec('ulimit -S -n');
-if (ulimit && ulimit.output.trim() < 2000) {
- var cmdobj=shell.exec('/bin/bash -c \'ulimit -S -n 4096; exec "' + process.argv[0] + '" "' + process.argv.slice(1).join('" "') + '" --ulimit\'');
- if(cmdobj.code !=0) TEST_OK=false;
- console.log("Sub-command ended with: "+cmdobj.code);
- return;
-}
-
-var build_android=false;
-var build_ios=false;
-var build_js=false;
-
-if(argv.android) build_android=true;
-if(argv.ios) build_ios=true;
-if(argv.js) build_js=true;
-if(argv.branch) BRANCH=argv.branch;
-
-
-// call the builder for the requested platform
-if(TEST_OK && build_android) {
- var output_location = path.join(MSPEC_DIR,'platforms','android');
- android(output_location, BRANCH,'', config.app.entry, config.couchdb.host, function(err){
- if(err) {
- shell.echo('Android test prepare failed')
- TEST_OK=false;
- } else {
- shell.echo('Android tests complete')
- }
- });
-}
-if(TEST_OK && build_ios) {
- var output_location = path.join(MSPEC_DIR,'platforms','ios');
- var library_location = path.join(TEST_DIR,'cordova-ios');
- var medic_dir = path.join(TEST_DIR,'medic');
- console.log('iOS testing start')
- ios(output_location, library_location,medic_dir, BRANCH,'', config.app.entry, config.couchdb.host, function(err){
- if(err) {
- console.log('iOS test prepare failed')
- TEST_OK=false;
- } else {
- console.log('iOS tests complete')
- }
- });
-}
-
-if(TEST_OK){
- success('Testrun',BRANCH,'complete','ok');
- console.log('Testrun complete without error');
-} else {
- error('Testrun',BRANCH,'failed',last_error);
- console.error('Failure Exit with code 1');
-}
-