Skip to content

Commit

Permalink
Merge pull request #7 from jaumesegarra/feature/package-updates
Browse files Browse the repository at this point in the history
Feature/package updates
  • Loading branch information
jaumesegarra authored Apr 25, 2020
2 parents d7de895 + b918993 commit 56733bf
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 35 deletions.
21 changes: 10 additions & 11 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
#!/usr/bin/env node
'use strict';

const cmd = require('commander');
const { program } = require('commander');
const pkg = require('./package.json');

const generator = require('./generator');
const utils = require('./utils');

process.bin = pkg.name;

cmd.version(pkg.version)
program.version(pkg.version)
.option('--vars [data]', 'Use custom variables')
.option('--delimiter [d]', 'Use another delimiter instead of #')
.option('--package-folder [pck]', 'Set the package folder')
.usage("<command> [options]");

cmd.command("g <name> <path> [vars]")
program.command("g <name> <path> [vars]")
.description("Generate a new stuff")
.action((name, path, vars) => {

if(cmd.packageFolder)
global.CUSTOM_PACKAGE_FOLDER = cmd.packageFolder;
if(program.packageFolder)
global.CUSTOM_PACKAGE_FOLDER = program.packageFolder;

// Trying obtain xtuff config from project package.json (xtuff)
utils.getXtuffPackageConfig().then((pckConfig) => {
let v = vars || cmd.vars || pckConfig.vars;
console.log(v);
let v = vars || program.vars || pckConfig.vars;

if(v && typeof v === 'string')
try{ v = JSON.parse(v); } catch (err) { v = {}; console.info('INVALID VARIABLES PASSED', err); }

const delimiter = cmd.delimiter || pckConfig.delimiter;
const delimiter = program.delimiter || pckConfig.delimiter;

generator(name, path, delimiter, v);
});
});

cmd.on('*', opt => {
program.on('*', opt => {
cmd.help();
});

cmd.parse(process.argv);
program.parse(process.argv);

// Handle case where no command is passed (`$ xtuff`)
if (!process.argv.slice(2).length) {
cmd.help();
program.help();
}
45 changes: 26 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xtuff",
"version": "1.3.3",
"version": "1.4.0",
"description": "A dev command to create stuffs easy! (components, services, etc...)",
"keywords": "cli, generator, component, service, stuff, react, files",
"repository": "https://github.com/jaumesegarra/xtuff",
Expand All @@ -15,10 +15,10 @@
"author": "Jaume Segarra <[email protected]>",
"license": "MIT",
"dependencies": {
"commander": "2.19.0",
"ejs": "2.6.1",
"fs-extra": "8.1.0",
"moment": "^2.24.0",
"commander": "5.0.0",
"ejs": "3.0.2",
"fs-extra": "9.0.0",
"moment": "2.24.0",
"path": "0.12.7",
"relative": "3.0.2",
"tmp": "0.1.0"
Expand Down

0 comments on commit 56733bf

Please sign in to comment.