Refactor dev

docs/tutorial.rst

@@ -55,3 +55,25 @@ __
     Yout can use object spread syntax to replace them into your components, or just use them like a normal object.
 
     .. image:: https://user-images.githubusercontent.com/11625554/45738864-17445980-bc24-11e8-912b-eedf4a97b3c6.png
+
+----------------
+``kaizen build``
+----------------
+
+  To build the kaizen's dapp, and the built code will be output into the build folder
+
+---------------
+``kaizen init``
+---------------
+
+  To setup the configuration you need, like IPFS provider.
+
+----------------
+``kaizen publish``
+----------------
+
+  To upload your dapp to the IPFS. You shall execute `kaizen build` before publish
+
+
+
+

kaizen

@@ -3,13 +3,11 @@
 const clear = require('clear');
 const chalk = require('chalk');
 const figlet = require('figlet');
-const newDapp = require("./lib/NewDapp");
-const { 
-  add: pluginAdd, 
-  build: build,
-  ipfsPublish: ipfsPublish,
-  init: init
-} = require('./lib/plugin');
+const plugin = require('./lib/plugin');
+const initialization = require('./lib/initialization');
+const build = require('./lib/build');
+const ipfs = require('./lib/ipfs');
+const kaizenNew = require('./lib/new');
 
 // to clear terminal screen
 clear();
@@ -27,45 +25,11 @@ console.log(
 
 const argv = require('yargs')
   .usage('Kaizen - a dapp framework for Blockchain\n\nUsage: $0 <command> [options]')
-  .command('init', 'Initialization environment', (yargs) => {
-    init.init();
-  })
-  .command('new', 'create a dapp with boilerplate', (yargs) => {
-    return yargs
-      .option('n', {
-        alias: 'name',
-        describe: 'clone a file'
-      })
-      .option('b', {
-        alias: 'boilerplate',
-        describe: 'dapp boilerplate of vue or react',
-        choices: ['vue', 'react'],
-        default: 'vue'
-      })
-      .demandOption(['name'], 'Please enter your project name')
-      .example(
-        'kaizen new -n <package name> -b <vue or react>'
-      )
-  }, (argv) => {
-    const { name, boilerplate } = argv;
-    newDapp({ name, boilerplate });
-  })
-  .command('config', 'environment variables of dapps')
-  .command('plugin', 'list all the plugin to dapp')
-  .command('plugin add [plugin-name]', pluginAdd.description, (yargs) => pluginAdd.yargs(yargs), (argv) => pluginAdd.argv(argv))
-  .command('plugin:remove', 'remove an plugin to dapp', (yargs) => {
-    return yargs
-      .demandOption(['name'], 'Please enter a plugin name')
-      .example(
-        'kaizen plugin:remove <plugin name>'
-      )
-  })
-  .command('publish', 'scripts used to publish dapp', (yargs) => {
-    ipfsPublish.ipfsPublish(yargs);
-  })
-  .command('build', 'build dapp package', (yargs) => {
-    build.build(yargs);
-  })
+  .command('init', initialization.init.description, initialization.init.yargs, initialization.init.argv)
+  .command('new', kaizenNew.create.description, kaizenNew.create.yargs, kaizenNew.create.argv)
+  .command('plugin add [plugin-name]', plugin.add.description, plugin.add.yargs, plugin.add.argv)
+  .command('publish', ipfs.publish.description, ipfs.publish.yargs)
+  .command('build', build.description, build.yargs, build.argv)
   .demandCommand(1, 'You need at least one command before moving on')
   .options({
     'v': {
@@ -78,4 +42,13 @@ const argv = require('yargs')
     }
   })
   .epilog('copyright Portal Network 2018')
-  .argv;
+  .argv;
+
+
+
+  /**
+   * TODO: kaizen new with choose blockchain e.g. ethereum, wanchain
+   */
+
+
+

lib/initialization/index.js

@@ -0,0 +1 @@
+exports.init = require('./init.js');

lib/initialization/init.js

@@ -0,0 +1,26 @@
+const fs = require('fs');
+const path = require('path');
+const Log = require('../Log');
+const KAIZEN_CONFIG_FILE = "kaizen.json";
+
+exports.description = 'initialize kaizen environment';
+
+exports.yargs = function(yargs) {
+  yargs.example('kaizen init');
+}
+
+exports.argv = function (argv) {
+  const targetPath = path.resolve('./', KAIZEN_CONFIG_FILE);
+
+  if(fs.existsSync(targetPath) === false) {
+    console.error('[ERROR]: please use kaizen new to create new project first.');
+    return;
+  }
+
+  const sourcePath = path.resolve(__dirname, '../../config/', KAIZEN_CONFIG_FILE);
+  const sourceConfig = JSON.parse(fs.readFileSync(sourcePath));
+  const targetConfig = JSON.parse(fs.readFileSync(targetPath));
+  const newConfig = Object.assign({}, targetConfig, sourceConfig);
+  fs.writeFileSync(targetPath, JSON.stringify(newConfig));
+  Log.SuccessLog("complete initialization");
+}

lib/ipfs/index.js

@@ -0,0 +1 @@
+exports.publish = require('./publish.js');

lib/ipfs/publish.js

@@ -0,0 +1,69 @@
+const fs = require('fs');
+const path = require('path');
+const Log = require('../Log');
+const ipfsAPI = require('ipfs-api');
+const JSONFile = require('jsonfile');
+const openBrowser = require('opn');
+const BuildPath = 'build';
+const kaizenfile = "kaizen.json";
+
+function fsExistsSync() {
+  try {
+    fs.accessSync(BuildPath, fs.constants.R_OK | fs.constants.W_OK);
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+function loopFilesInFolder(path, files) {
+  const readdirSyncs = fs.readdirSync(path);
+  readdirSyncs.forEach(item => {
+    if (item.includes('.DS_Store')) return;
+    switch (fs.statSync(`${path}/${item}`).isDirectory()) {
+      case true:
+        files = loopFilesInFolder(`${path}/${item}`, files);
+        break;
+      case false:
+        files.push(`${path}/${item}`);
+        break
+    }
+  });
+
+  return files;
+}
+
+function getIPFSContentObject(filePath, targetPath) {
+  return ({
+    path: `public${filePath.replace(targetPath, '')}`,
+    content: fs.readFileSync(filePath)
+  });
+}
+
+exports.description = 'publish you app to the IPFS';
+
+exports.yargs = function (yargs) {
+  if (!fsExistsSync()) {
+    Log.ErrorLog("Build This folder does not exist");
+  }
+
+  const targetPath = `${path.resolve('./', BuildPath)}`;
+
+  try {
+    (async function(yargs, targetPath) {
+      const kaizenConfig = await JSONFile.readFile(kaizenfile)
+      const ipfs = ipfsAPI(kaizenConfig.provider);
+      console.log('=== uploading to the IPFS ===')
+      const files = loopFilesInFolder(targetPath, []).map(item => getIPFSContentObject(item, targetPath));
+      const hashes = await ipfs.files.add(files, { recursive: false });
+      const { hash, } = hashes[hashes.length - 1];
+      const iphsUrl = `https://ipfs.infura.io/ipfs/${hash}`;
+      openBrowser(iphsUrl);
+      Log.SuccessLog(`ipfs url => ${iphsUrl}`)
+      process.exit();
+    })(yargs, targetPath);
+  } catch (err) {
+    Log.ErrorLog(err)
+  }
+}
+

lib/NewDapp.js → lib/new/create.js

@@ -1,17 +1,36 @@
 const cmd = require('node-cmd');
 const fs = require("fs");
 const del = require('del');
-const Log = require('./plugin/Log');
+const Log = require('../Log');
 
-module.exports = (argv) => {
+exports.description = 'create a dapp with boilerplate';
+
+exports.yargs = function (yargs) {
+  yargs
+    .option('n', {
+      alias: 'name',
+      describe: 'clone a file'
+    })
+    .option('b', {
+      alias: 'boilerplate',
+      describe: 'dapp boilerplate of vue or react',
+      choices: ['vue', 'react'],
+      default: 'vue'
+    })
+    .demandOption(['name'], 'Please enter your project name')
+    .example(
+      'kaizen new -n <package name> -b <vue or react>'
+    )
+}
+
+exports.argv = function (argv) {
   let f2eFramework = '';
   let rename = '';
   switch (argv.boilerplate) {
     case 'vue':
       f2eFramework = 'https://github.com/PortalNetwork/vue-truffle.git';
       rename = 'vue-truffle';
       break;
-
     case 'react':
       f2eFramework = 'https://github.com/PortalNetwork/react-truffle-metamask.git';
       rename = 'react-truffle-metamask';

lib/new/index.js

@@ -0,0 +1 @@
+exports.create = require('./create.js');

lib/plugin/add.js

@@ -3,10 +3,10 @@ const path = require('path');
 const cmd = require('node-cmd');
 const ncp = require('ncp').ncp;
 
-exports.description = 'attach an plugin to dapp';
+exports.description = 'attach a plugin to dapp';
 
 exports.yargs = function (yargs) {
-  return yargs
+  yargs
     .option('b', {
       alias: 'boilerplate',
       describe: 'dapp boilerplate of vue or react',
@@ -19,12 +19,20 @@ exports.yargs = function (yargs) {
 
 exports.argv = function (argv) {
   const { pluginName, boilerplate, } = argv;
+
+  const configPath = path.resolve('./', 'kaizen.json');
+  if(fs.existsSync(configPath) === false) {
+    console.log('[ERROR]: please use kaizen new to create new project first.')
+    return;
+  }
+
+  const kaizenConfig = JSON.parse(fs.readFileSync(configPath));
   switch (pluginName) {
     case 'noia':
-      handleNOIA();
+      handleNOIA(kaizenConfig);
       break;
     case 'bluzelle':
-      handleBluzelle(boilerplate);
+      handleBluzelle(kaizenConfig, boilerplate);
       break;
   }
 }
@@ -54,20 +62,21 @@ function handleError(error) {
   console.error(`[ERROR]: ${error.message}`);
 }
 
-function reactMixBluzelle() {
+function reactMixBluzelle(kaizenConfig) {
   const sourceFolder = path.resolve(__dirname, '../../templates');
   const targetFolder = path.resolve('./', 'node_modules/pn-react-bluzelle');
-  
+
   if (!fs.existsSync(targetFolder)) {
     fs.mkdirSync(targetFolder);
   }
 
   const readStream = fs.createReadStream(path.resolve(sourceFolder, 'pn-react-bluzelle.js'));
   const writeStream = fs.createWriteStream(path.resolve(targetFolder, 'index.js'));
   readStream.pipe(writeStream);
+  updateConfig(kaizenConfig, 'pn-react-bluzelle');
 }
 
-function vueMixBluzelle() {
+function vueMixBluzelle(kaizenConfig) {
   const sourceFolder = path.resolve(__dirname, '../../templates');
   const targetFolder = path.resolve('./', 'node_modules/pn-vue-bluzelle');
 
@@ -78,12 +87,26 @@ function vueMixBluzelle() {
   const readStream = fs.createReadStream(path.resolve(sourceFolder, 'pn-vue-bluzelle.js'));
   const writeStream = fs.createWriteStream(path.resolve(targetFolder, 'index.js'));
   readStream.pipe(writeStream);
+  updateConfig(kaizenConfig, 'pn-vue-bluzelle');
+}
+
+function updateConfig(kaizenConfig, plugin) {
+  if(!kaizenConfig.plugins) {
+    kaizenConfig.plugins = [];
+  }
+
+  if(kaizenConfig.plugins.includes(plugin)) {
+    console.log('sfsfd')
+    return;
+  }
+
+  kaizenConfig.plugins.push(plugin);
+  fs.writeFileSync(path.resolve('./', 'kaizen.json'), JSON.stringify(kaizenConfig));
 }
 
-function handleNOIA() {
+function handleNOIA(kaizenConfig) {
   try {
-    const package = JSON.parse(fs.readFileSync('./kaizen.json', 'utf8'));
-    const checkResult = packageChecker(package);
+    const checkResult = packageChecker(kaizenConfig);
     if (checkResult.isValid === false) {
       console.error('[ERROR]: please use kaizen new to create new project first');
       return;
@@ -99,7 +122,12 @@ function handleNOIA() {
       }
 
       ncp('./temp-noia-sdk/packages', './', function (error) {
+        if (error) {
+          handleError(error);
+          return;
+        }
         cmd.run('rm -rf ./temp-noia-sdk');
+        updateConfig(kaizenConfig, 'NOIA');
       });
     });
 
@@ -108,10 +136,9 @@ function handleNOIA() {
   }
 }
 
-function handleBluzelle(boilerplate) {
+function handleBluzelle(kaizenConfig, boilerplate) {
   try {
-    const package = JSON.parse(fs.readFileSync('./kaizen.json', 'utf8'));
-    const checkResult = packageChecker(package);
+    const checkResult = packageChecker(kaizenConfig);
     if (checkResult.isValid === false) {
       console.error('[ERROR]: please use kaizen new to create new project first.');
       return;
@@ -125,12 +152,12 @@ function handleBluzelle(boilerplate) {
         return;
       }
 
-      switch(boilerplate) {
+      switch (boilerplate) {
         case 'react':
-          reactMixBluzelle();
+          reactMixBluzelle(kaizenConfig);
           break;
         case 'vue':
-          vueMixBluzelle();
+          vueMixBluzelle(kaizenConfig);
           break;
         default:
           handleError(new Error('please specify boilerplate'));