Merge pull request #29 from SqueezerIO/v1.1.13

V1.1.13

Author: nickchisiu

.eslintignore

@@ -3,3 +3,5 @@
 /_book
 public/
 test-projects/
+/docs
+/lib/plugins/templates/

.eslintrc

@@ -50,7 +50,8 @@
     "strict": 0,
     "import/no-extraneous-dependencies": "off",
     "import/no-dynamic-require": "off",
-    "react/require-extension": "off"
+    "react/require-extension": "off",
+    "import/no-unresolved" : "off"
   },
   "globals": {
     "AnalysisView": true,

CONTRIBUTING.md

@@ -0,0 +1,86 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. 
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Pull Request Process
+
+1. Lock down dependency versions `npm shrinkwrap`
+2. TravisCI will trigger linter check, js duplicate code scan and integration tests
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at nick@squeezer.io . All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -1,3 +1,5 @@
+# Squeezer Framework [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+
 ![Squeezer Intro](docs/gitbook/images/introduction.png)
 
 ## [Watch video](https://www.youtube.com/watch?v=DfRnJOZvtJg&t=3s)
@@ -104,3 +106,7 @@ NOTE: **Windows** users should [enable symlinks](http://answers.perforce.com/art
 ├── node_modules        Node NPM packages
 └── plugins             Project's plugins
 ```
+
+### Contributing
+
+See [contributing.md](CONTRIBUTING.md) for contribution guidelines.

bin/Squeezer.js

@@ -14,7 +14,6 @@ const CommonCliLog     = require(`${appRoot}/lib/common/cli/log`);
 const CommonCliParams  = require(`${appRoot}/lib/common/cli/params`);
 const CommonCliHelp    = require(`${appRoot}/lib/common/cli/help`);
 const CommonUtils      = require(`${appRoot}/lib/common/utils`);
-const CommonCloudsInfo = require(`${appRoot}/lib/common/clouds/info`);
 const CommonLifecycle  = require(`${appRoot}/lib/common/lifecycle`);
 const CommonVariables  = require(`${appRoot}/lib/common/variables`);
 const CommonVersion    = require(`${appRoot}/lib/common/version`);
@@ -24,41 +23,40 @@ const CommonChecksums  = require(`${appRoot}/lib/common/checksums`);
 
 class Squeezer {
   init() {
-    this.cli        = {};
-    this.cli.params = new CommonCliParams(this);
-    this.cli.error  = new CommonCliError(this);
-    this.cli.loader = new CommonCliLoader(this);
-    this.cli.log    = new CommonCliLog(this);
-    this.cli.help   = new CommonCliHelp(this);
-    this.utils      = new CommonUtils(this);
-    this.yaml       = new CommonYaml(this);
-    this.lifecycle  = new CommonLifecycle(this);
-    this.command    = new CommonCommand(this);
-    this.variables  = new CommonVariables(this);
-    this.archive    = new CommonArchiver(this);
-    this.version    = new CommonVersion(this);
-    this.config     = new CommonConfig(this);
-    this.validate   = new CommonValidate(this);
-    this.checksums  = new CommonChecksums(this);
+    this.cli       = {
+      params : new CommonCliParams(this),
+      error  : new CommonCliError(this),
+      loader : new CommonCliLoader(this),
+      log    : new CommonCliLog(this),
+      help   : new CommonCliHelp(this)
+    };
+    this.utils     = new CommonUtils(this);
+    this.yaml      = new CommonYaml(this);
+    this.lifecycle = new CommonLifecycle(this);
+    this.command   = new CommonCommand(this);
+    this.variables = new CommonVariables(this);
+    this.archive   = new CommonArchiver(this);
+    this.version   = new CommonVersion(this);
+    this.config    = new CommonConfig(this);
+    this.validate  = new CommonValidate(this);
+    this.checksums = new CommonChecksums(this);
 
     this.deploy = {};
 
-    this.clouds      = {};
-    this.clouds.info = new CommonCloudsInfo(this);
-
-    this.vars               = {};
-    this.vars.project       = {};
-    this.vars.microservices = {};
-    this.vars.hooks         = [];
-    this.vars.apiBaseUrl    = 'https://api.squeezer.io';
-    this.vars.stage         = 'dev';
-    this.vars.assets        = {
-      main          : {
-        previousChecksum : null,
-        currentChecksum  : null
-      },
-      microservices : [],
-      uploadPaths   : []
+    this.vars = {
+      project       : {},
+      microservices : {},
+      hooks         : [],
+      apiBaseUrl    : 'https://api.squeezer.io',
+      stage         : 'dev',
+      assets        : {
+        main          : {
+          previousChecksum : null,
+          currentChecksum  : null
+        },
+        microservices : [],
+        uploadPaths   : []
+      }
     };
 
     if (process.argv[2] === 'deploy') {
@@ -99,7 +97,7 @@ class Squeezer {
     }, splitPath.length);
 
     if (this.vars.project.isValid === true) {
-      const buildPath = `${this.vars.project.path}/.build`;
+      const buildPath             = `${this.vars.project.path}/.build`;
       this.vars.project.buildPath = buildPath;
       if (!fs.existsSync(buildPath)) {
         fs.mkdirSync(buildPath);

bin/interface.js

@@ -24,14 +24,14 @@ module.exports = (() => {
 
     load() {
       const frameworkCmdsPaths = walkSync(`${appRoot}`, { globs : ['lib/plugins/*/index.js'] })
-        .map((val) => (`${appRoot}/${val}`));
+        .map(val => (`${appRoot}/${val}`));
 
       let pluginsCmdsPaths = [];
 
       if (sqz.vars.project.isValid && sqz.vars.project.plugins
         && sqz.vars.project.plugins.length > 0) {
         pluginsCmdsPaths = sqz.vars.project.plugins
-          .map((val) => (`${sqz.vars.project.path}/${val.path}/${val.name}/index.js`));
+          .map(val => (`${sqz.vars.project.path}/${val.path}/${val.name}/index.js`));
       }
 
       const paths = _.concat(frameworkCmdsPaths, pluginsCmdsPaths);
@@ -79,36 +79,50 @@ module.exports = (() => {
 
       const helpCmdMsg = colors.yellow(`\n\n$ ${bin} ${colors.blue.bold('help')} ${args.names.join(':')}`);
 
-      _.forEach(cmdData.options, (value, key) => {
-        if (_.has(args.flags, value.flag)) {
-          sqz.cli.params.setOption(key, args.flags[value.flag]);
-        }
+      const check = (value, key) => {
         if (value.required === true) {
-
           if (!_.has(args.options, key) && !_.has(args.flags, value.flag)) {
             sqz.cli.log.error(`Missing option ${colors.green(`--${key}`)}  ${helpCmdMsg}`);
           } else if (!args.options[key] && !args.flags[value.flag]) {
             sqz.cli.log.error(`Missing option ${colors.green(`--${key}`)} ` +
               `${colors.red('value')} ${helpCmdMsg}`);
           }
-        } else {
-          if (!args.options[key] && value.defaultValue !== null) { // eslint-disable-line no-lonely-if
-            args.options[key] = value.defaultValue;
-          }
+        } else if (!args.options[key] && value.defaultValue !== null) {
+          args.options[key] = value.defaultValue;
         }
+      };
 
+      _.forEach(cmdData.options, (value, key) => {
+        if (_.has(args.flags, value.flag)) {
+          sqz.cli.params.setOption(key, args.flags[value.flag]);
+        }
         if (value.boolean && args.options[key]) {
           args.options[key] = JSON.parse(args.options[key]);
         }
-
         if (_.has(value, 'validate')) {
           if (!value.validate.fn(args.options[key])) {
             sqz.cli.log.error(`${colors.blue.bold(`--${key}`)} : ${value.validate.error}`);
           }
         }
+        check(value, key);
       });
     }
 
+    index(args, logo) {
+      if (args.names.length === 0) {
+        const msg =
+                `${logo}\n` +
+                `* Lists all commands ${colors.green('`sqz list`')}.\n` +
+                `* Get help for a command ${colors.green('`sqz help [command]`')}.\n` +
+                `* Add ${colors.green('--debug')} to any command for debugging\n` +
+                `* Squeezer framework documentation: ${colors.cyan('docs.squeezer.io')}\n`;
+
+        sqz.cli.log.console(msg.replace(/^/gm, ' '.repeat(1)));
+
+        process.exit(0);
+      }
+    }
+
     run() {
       const args       = this.args;
       const command    = this.commands[args.names.join(':')];
@@ -129,22 +143,11 @@ module.exports = (() => {
       let errorMsg            = `Command "${colors.green(hintCmd)}" not found  ... \n`;
       const availableHelpCmds = [];
 
-      if (args.names.length === 0) {
-        const msg =
-                `${logo}\n` +
-                `* Lists all commands ${colors.green('`sqz list`')}.\n` +
-                `* Get help for a command ${colors.green('`sqz help [command]`')}.\n` +
-                `* Add ${colors.green('--debug')} to any command for debugging\n` +
-                `* Squeezer framework documentation: ${colors.cyan('docs.squeezer.io')}\n`;
-
-        sqz.cli.log.console(msg.replace(/^/gm, ' '.repeat(1)));
-
-        process.exit(0);
-      }
+      this.index(args, logo);
 
       if (args.names[0] === 'help' && args.args.length === 0) {
         sqz.cli.log.error(
-          `Missing help command argument , please use ` +
+          'Missing help command argument , please use ' +
           `${colors.blue.bold(`\`${bin} help [command]\``)}` +
           `\n\n... or ${colors.blue.bold(`\`${bin} list\``)} to get all available commands\n`
         );
@@ -155,10 +158,11 @@ module.exports = (() => {
           if (cmd.indexOf(hintCmd) >= 0) {
             availableHelpCmds.push(cmd);
           }
+          return availableHelpCmds;
         });
 
         if (availableHelpCmds.length > 0) {
-          errorMsg += colors.green(`\nDid you mean one of these commands?\n\n`);
+          errorMsg += colors.green('\nDid you mean one of these commands?\n\n');
           errorMsg += `${' '.repeat(3)}${colors.blue.bold(availableHelpCmds.join(`\n${' '.repeat(3)}`))}`;
         }
 

docs/gitbook/js/framework.js

@@ -1,3 +1,3 @@
 
-window.frameworkVersion = '1.1.11';
+window.frameworkVersion = '1.1.12';
 window.frameworkVersionReleaseDate = '2017-05-12';