Made CLI build packaged apps. Fixes Bug#962879

* Added support for raw packaged app directory * Seperating apk-cli out into a new repo mozilla/apk-cli
mozilla · Apr 25, 2014 · e8759f7 · e8759f7
1 parent 249a739
commit e8759f7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 157 deletions.
diff --git a/bin/cli.js b/bin/cli.js
diff --git a/config/cli.js b/config/cli.js
diff --git a/config/dev.js-dist b/config/dev.js-dist
diff --git a/lib/cli_dev_build.js b/lib/cli_dev_build.js
@@ -37,17 +37,17 @@ module.exports = function(appData, config, cb) {
   };
   // TODO  we need to control where apks are built on the filesystem
   generator(config, manifestParams, appData.packageZip, loaderDirname, log,
-            function genCb(err, locationType, s3PublicUrlOrBlob) {
-              if (err) {
-                cb(err);
-              } else if (locationType === BLOB_TYPE) {                
-                cb(null, s3PublicUrlOrBlob, true);
-              } else {
-                var s3key = androidifier.packageName(manifestUrl) + '.apk';
-                if(undefined === s3) {
-                  s3 = require('./s3');
-                }
-                s3.getApk(s3key, cb);           
-              }
-            });
-};
+    function genCb(err, locationType, s3PublicUrlOrBlob) {
+      if (err) {
+        cb(err);
+      } else if (locationType === BLOB_TYPE) {
+        cb(null, s3PublicUrlOrBlob, true);
+      } else {
+        var s3key = androidifier.packageName(manifestUrl) + '.apk';
+        if (undefined === s3) {
+          s3 = require('./s3');
+        }
+        s3.getApk(s3key, cb);
+      }
+    });
+};
diff --git a/lib/owa_downloader.js b/lib/owa_downloader.js
@@ -17,23 +17,22 @@ withConfig(function(config) {
   log = require('../lib/logging')(config);
 
   module.exports = function(manifestUrl, manifestOverride, loader,
-                            appBuildDir, cb) {
+    appBuildDir, cb) {
     var manifestFilename;
     if (/^\w+:\/\//.test(manifestUrl)) {
       manifestFilename = '';
     } else {
       manifestFilename = path.basename(manifestUrl);
     }
-
     loader.load(manifestFilename, function(err, string) {
       if (err) {
         logError(log, "OWA Cannot load manifest: " + manifestFilename, err);
         return cb(err);
       }
       try {
         var manifest = JSON.parse(fileLoader.stripBom(string)),
-        appType,
-        zipFileLocation;
+          appType,
+          zipFileLocation;
 
         if (false === owaValidator(manifest)) {
           return cb(new Error('invalid manifest'));
@@ -72,4 +71,4 @@ withConfig(function(config) {
       }
     });
   };
-});
+});
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "mozilla-apk-cli",
+  "name": "apk-factory-service",
   "version": "0.0.1",
-  "description": "A Command Line Inteface for generating Android native apps from open webapps",
+  "description": "Web service which creates Android APK installers",
   "developer": [
     {
       "name": "James Hugman",
@@ -12,9 +12,6 @@
       "email": "shout@ozten.com"
     }
   ],
-  "bin": {
-    "mozilla-apk-cli": "node bin/cli.js"
-  },
   "scripts": {
     "test": "tap test/*.js",
     "start": "node scripts/development-server.js"