Optimize structure

Author: jsveron23

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
 node_modules
-*.app
 *.apk
+*.app
+*.ipa

.npmignore

@@ -1,5 +1,4 @@
 .DS_Store
-.git*
 .eslint*
 .prettier*
 *.apk

bin/cli.js

@@ -1,3 +1,33 @@
 #!/usr/bin/env node
 
-require('../src/extract-pkg')
+// TODO:
+// - Support Windows OS for Android
+
+const yargs = require('yargs')
+const { check, options } = require('./yargs')
+const logger = require('./utils/logger')
+const { version } = require('../package.json')
+
+const isWin = process.platform === 'win32'
+
+// no Windows support
+if (isWin) {
+  logger.warn('No support Windows platform yet.')
+
+  process.exit(1)
+}
+
+// prettier-ignore
+const argv = yargs
+  .usage('Usage: $0 <ios|android> [options]')
+  .help('help', 'show help').alias('help', 'h')
+  .version('version', 'show version', `v${version}`).alias('version', 'V')
+  .command('ios', 'extract .app from iOS simulator')
+  .command('android', 'extract .apk from Android emulator')
+  .demandCommand(1, 'choose a platform, <ios|android>')
+  .config('config', '.js or JSON support', (c) => require(c)).alias('config', 'c')
+  .options(options)
+  .check(check)
+  .argv
+
+require('./main')(argv)

bin/constants.js

@@ -0,0 +1,3 @@
+'use strict'
+
+exports.IDS = ['id', 'to', 'rename']

bin/main.js

@@ -0,0 +1,43 @@
+'use strict'
+
+const { IDS } = require('./constants')
+const set = require('./utils/set')
+
+function main (argv) {
+  const { _ } = argv
+  const [platform] = _
+
+  // filtered argv
+  const nextArgv = Object.keys(argv).reduce((acc, key) => {
+    if (IDS.includes(key)) {
+      return {
+        ...acc,
+        [key]: argv[key]
+      }
+    }
+
+    return acc
+  }, {})
+
+  // set prioritization
+  const args = set(IDS, [
+    nextArgv,
+    argv[platform] || {},
+    {
+      to: process.cwd()
+    }
+  ])
+
+  const { extract, getFrom, cp } = require(`./platforms/${platform}`)
+
+  const from = getFrom(extract(args.id))
+  const tmpArr = from.slice(0).split('/')
+  const dirname = tmpArr.slice(0, -1).join('/')
+  const [filename] = tmpArr.reverse()
+  const prefix = args.rename ? 'Copy & Rename' : 'Copy'
+  const dest = `${args.to}/${args.rename || filename}`
+
+  cp({ ...args, from, dest, prefix, dirname, filename })
+}
+
+module.exports = main

bin/platforms/android.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const command = require('../utils/command')
+
+exports.extract = function extract (id) {
+  const extract = command('Extract `.apk` from Android emulator')('adb')
+
+  extract(['shell', 'pm', 'path', id])
+}
+
+exports.getFrom = function getFrom ({ stdout }) {
+  return stdout.toString().replace(/package:|\n/g, '')
+}
+
+exports.cp = function cp ({ from, to, dest, prefix, dirname, filename, rename }) {
+  const cp = command(
+    [
+      `${prefix}:`,
+      `From(emulator) - ${dirname}`,
+      `To - ${to}`,
+      `Filename - ${rename || filename}`
+    ].join('\n')
+  )('adb')
+
+  cp(['pull', from, dest])
+}

bin/platforms/ios.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const command = require('../utils/command')
+
+exports.extract = function extract (id) {
+  const extract = command('Extract `.app` from iOS simulator')('xcrun')
+
+  return extract(['simctl', 'get_app_container', 'booted', id])
+}
+
+exports.getFrom = function getFrom ({ stdout }) {
+  return stdout.split('\n').join('')
+}
+
+exports.cp = function cp ({ from, to, dest, prefix, dirname, filename, rename }) {
+  const cp = command(
+    [
+      `${prefix}:`,
+      `From - ${dirname}`,
+      `To - ${to}`,
+      `Filename - ${rename || filename}`
+    ].join('\n')
+  )('cp')
+
+  cp(['-r', from, dest])
+}

src/helpers/command.js bin/utils/command.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { spawnSync } = require('child_process')
 const logger = require('./logger')
 

src/helpers/logger.js bin/utils/logger.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const colors = require('colors') // eslint-disable-line
 
 function info (prefix = '', message) {

bin/utils/set.js

@@ -0,0 +1,23 @@
+'use strict'
+
+function set (ids, args) {
+  return args.reduce((acc, arg) => {
+    const o = ids.reduce((nextArg, id) => {
+      if (!acc[id] && arg[id]) {
+        return {
+          ...nextArg,
+          [id]: arg[id]
+        }
+      }
+
+      return nextArg
+    }, {})
+
+    return {
+      ...o,
+      ...acc
+    }
+  }, {})
+}
+
+module.exports = set

src/yargs/check.js bin/yargs/check.js

@@ -1,4 +1,6 @@
-module.exports = function check (argv) {
+'use strict'
+
+function check (argv) {
   const { _, id, ios = {}, android = {} } = argv
   const [platform] = _
   const config = platform === 'ios' ? ios : android
@@ -9,3 +11,5 @@ module.exports = function check (argv) {
 
   return true
 }
+
+module.exports = check

src/yargs/index.js bin/yargs/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const check = require('./check')
 const options = require('./options')
 

src/yargs/options.js bin/yargs/options.js

@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = {
   id: {
     alias: 'i',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "extract-pkg",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Extract .app, .apk from iOS simulator or Android emulator",
   "main": "./bin/cli.js",
   "scripts": {
@@ -22,6 +22,9 @@
     "app",
     "apk"
   ],
+  "files": [
+    "bin/*"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/jsveron23/extract-pkg"

src/extract-pkg.js

@@ -1,5 +1,5 @@
 const expect = require('chai').expect
-const set = require('../src/helpers/set')
+const set = require('../bin/utils/set')
 
 describe('set priorities of argv', () => {
   const config = {
@@ -12,23 +12,35 @@ describe('set priorities of argv', () => {
     const id = 'com.arg.id'
     const to = '/arg/to'
     const rename = 'app-debug.app'
-    const args = set({ id, to, rename, config })
+    const args = set(['id', 'to', 'rename'], [{ id, to, rename }, config])
 
     expect(args).to.have.property('id', id)
     expect(args).to.have.property('to', to)
     expect(args).to.have.property('rename', rename)
   })
 
   it('use config props', () => {
-    const args = set({ id: null, to: null, rename: null, config })
+    const args = set(
+      ['id', 'to', 'rename'],
+      [{ id: null, to: null, rename: null }, config]
+    )
 
     expect(args).to.have.property('id', config.id)
     expect(args).to.have.property('to', config.to)
     expect(args).to.have.property('rename', config.rename)
   })
 
   it('`to` value assigned same as the command path', () => {
-    const args = set({ id: null, to: null, config: {} })
+    const args = set(
+      ['id', 'to', 'rename'],
+      [
+        { id: null, to: null },
+        {},
+        {
+          to: process.cwd()
+        }
+      ]
+    )
 
     // TODO: help me by submitting PR to test process.cwd() properly
     expect(args).to.have.property('to', process.cwd())