From 219fb2c6e7acdbda816f04a40e8ebf53f7b6fdfd Mon Sep 17 00:00:00 2001 From: jbavari Date: Fri, 30 Oct 2015 14:44:22 -0600 Subject: [PATCH] Refactor(generate): Remove comments and logging --- package.json | 5 +- tooling/generate.js | 85 +++++++------------------------- tooling/generators/page/index.js | 27 ---------- 3 files changed, 21 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index 98da731c23..05b556514c 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,12 @@ "link": "npm install && gulp src && npm link" }, "dependencies": { + "@reactivex/rxjs": "5.0.0-alpha.4", "angular2": "2.0.0-alpha.44", "es6-shim": "^0.33.6", "lodash": "^3.10.1", - "@reactivex/rxjs": "5.0.0-alpha.4", "reflect-metadata": "0.1.1", + "shelljs": "^0.5.3", "zone.js": "0.5.8" }, "devDependencies": { @@ -45,6 +46,7 @@ "gulp-watch": "^4.2.4", "html-entities": "^1.1.3", "htmlparser2": "^3.8.3", + "jasmine-node": "^1.14.5", "js-yaml": "^3.4.2", "karma": "^0.12.31", "karma-chrome-launcher": "^0.1.7", @@ -52,7 +54,6 @@ "lazypipe": "^0.2.3", "lunr": "^0.5.12", "minimist": "^1.1.3", - "mkdirp": "^0.5.1", "node-html-encoder": "0.0.2", "node-libs-browser": "^0.5.2", "q": "^1.4.1", diff --git a/tooling/generate.js b/tooling/generate.js index 2a2115c4d1..238af3d939 100644 --- a/tooling/generate.js +++ b/tooling/generate.js @@ -1,6 +1,5 @@ var _ = require('lodash'), fs = require('fs'), - // logging = require('../logging'), path = require('path'), shell = require('shelljs'), Generate = module.exports; @@ -15,13 +14,22 @@ Generate.__defineGetter__('generators', function() { return Generate._generators; }); +Generate.log = function log() { + console.log('DEBUG'.red, arguments); +}; + // options: appDirectory, generatorName, name Generate.generate = function generate(options) { - // console.log('Generate options', options); + // Generate.log('Generate options', options); if (!options) { throw new Error('No options passed to generator'); } - // var generatorPath = path.join(__dirname, 'generators'); + + //add optional logger for CLI or other tools + if (options.log) { + Generate.log = options.log; + } + if (!options.generatorName) { options.generatorName = 'page'; } @@ -39,7 +47,6 @@ Generate.generate = function generate(options) { }; Generate.loadGeneratorTemplates = function loadGeneratorTemplates(generatorPath) { - // var generatorPath = path.join(__dirname, 'generators', generatorName); var templates = []; fs.readdirSync(generatorPath) .forEach(function(template) { @@ -62,15 +69,19 @@ Generate.loadGenerator = function loadGenerator(file) { try { generateModule = require(generatorPath); } catch (ex) { - console.log('Error loading generator module', ex); + Generate.log('Error loading generator module', ex); + Generate.log(ex.stack); } - return generateModule;//page + return generateModule; }; Generate.loadGenerators = function loadGenerators() { var generators = {}; fs.readdirSync(path.join(__dirname, 'generators')) .forEach(function (file) { + if (file.indexOf('.') !== -1) { + return; + } var generatorName = file.replace('.js', ''); generators[generatorName] = Generate.loadGenerator(generatorName); }); @@ -92,30 +103,6 @@ Generate.renderTemplateFromFile = function renderTemplateFromFile(options) { return result; }; -/* - Will take options to render the basic page javascript template - the name of the component/page being rendered, ex: 'IonicTest' -*/ -Generate.generateJsTemplate = function generateJsTemplate(name) { - var jsTemplatePath = path.join(__dirname, 'page.tmpl.js'); - var options = { javascriptClassName: Generate.javascriptClassName(name), filename: Generate.fileAndClassName(name), templatePath: jsTemplatePath}; - return Generate.renderTemplateFromFile(options); -}; - -/* - Will take options to render the basic page html template - the name of the component/page being rendered, ex: 'IonicTest' -*/ -Generate.generateHtmlTemplate = function generateHtmlTemplate(name) { - var htmlTemplatePath = path.join(__dirname, 'page.tmpl.html'); - return Generate.renderTemplateFromFile({ name: Generate.fileAndClassName(name), capitalizedName: Generate.capitalizeName(name) ,templatePath: htmlTemplatePath}); -}; - -Generate.generateScssTemplate = function generateScssTemplate(name) { - var scssTemplatePath = path.join(__dirname, 'page.tmpl.scss'); - return Generate.renderTemplateFromFile({ name: Generate.fileAndClassName(name), templatePath: scssTemplatePath}); -}; - // Tabs - name = name of the page with the tabs, // tabs = array of the tabs to create. Generate.tabPages = function tabPages(appDirectory, name, tabs) { @@ -140,33 +127,6 @@ Generate.tabPages = function tabPages(appDirectory, name, tabs) { }) }; -Generate.generateTabHtmlTemplate = function generateTabHtmlTemplate(appDirectory, name) { - throw new Error('not implemented'); -}; - -Generate.generateTabsHtmlTemplate = function generateTabsHtmlTemplate(appDirectory, name, tabs) { - // throw new Error('not implemented'); - var fileAndClassName = Generate.fileAndClassName(name); - var javascriptClassName = Generate.javascriptClassName(name); - // Generate.createScaffoldDirectories(appDirectory, fileAndClassName); - - var tabsData = []; - tabs.forEach(function(tab) { - var tabObj = { name: tab, javascriptClassName: Generate.javascriptClassName(tab)}; - tabsData.push(tabObj); - }); - - var tabsHtmlTemplatePath = path.join(__dirname, 'tabs.tmpl.html'); - return Generate.renderTemplateFromFile({tabs: tabsData, templatePath: tabsHtmlTemplatePath }); - - // - // <% _.forEach(tabs, function(tab) { %> - // - // - // <% }); %> - // -}; - Generate.generateTabJsTemplate = function generateTabJsTemplate(appDirectory, name) { throw new Error('not implemented'); }; @@ -201,17 +161,8 @@ Generate.generateTabsJsTemplate = function generateTabsJsTemplate(appDirectory, return Generate.renderTemplateFromFile({tabs: tabsData, templatePath: tabsHtmlTemplatePath, filename: fileAndClassName, javascriptClassName: javascriptClassName }); }; -Generate.generateTabScssTemplate = function generateTabScssTemplate(appDirectory, name) { - throw new Error('not implemented'); -}; - -Generate.generateTabsScssTemplate = function generateTabsScssTemplate(appDirectory, name) { - throw new Error('not implemented'); -}; -// end of tabs - Generate.createScaffoldDirectories = function createScaffoldDirectories(options) { - // console.log('Create', options.appDirectory, options.fileAndClassName); + // Generate.log('Create', options.appDirectory, options.fileAndClassName); var componentPath = path.join(options.appDirectory, 'www', 'app', options.fileAndClassName); shell.mkdir('-p', componentPath); }; diff --git a/tooling/generators/page/index.js b/tooling/generators/page/index.js index 92159ab58a..db9fe34c87 100644 --- a/tooling/generators/page/index.js +++ b/tooling/generators/page/index.js @@ -31,31 +31,4 @@ Generator.run = function run(options) { console.log('\nāˆš Create'.blue, path.relative(options.appDirectory, saveFilePath)); fs.writeFileSync(saveFilePath, renderedTemplate); }); - - return Q(); }; - -// var fileAndClassName = Generate.fileAndClassName(name); -// var javascriptClassName = Generate.javascriptClassName(name); -// Generate.createScaffoldDirectories(appDirectory, fileAndClassName); - -// var jsTemplate = Generate.generateJsTemplate(name); -// var htmlTemplate = Generate.generateHtmlTemplate(name); -// var scssTemplate = Generate.generateScssTemplate(name); - -// var pagePath = path.join(appDirectory, 'www', 'app', fileAndClassName), -// jsPath = path.join(pagePath, [fileAndClassName, '.js'].join('')), -// htmlPath = path.join(pagePath, [fileAndClassName, '.html'].join('')), -// scssPath = path.join(pagePath, [fileAndClassName, '.scss'].join('')); - -// logging.logger.info('āˆš Create'.blue, path.relative(appDirectory, jsPath)); -// fs.writeFileSync(jsPath, jsTemplate, 'utf8'); -// logging.logger.info('āˆš Create'.blue, path.relative(appDirectory, htmlPath)); -// fs.writeFileSync(htmlPath, htmlTemplate, 'utf8'); -// logging.logger.info('āˆš Create'.blue, path.relative(appDirectory, scssPath)); -// fs.writeFileSync(scssPath, scssTemplate, 'utf8'); - -// //TODO: Modify the main sass file (via config) to somehow update it -// //to include this sass file. -// //In the meantime, put a console message to alert them -// logging.logger.info('* Tip: if youd like to use the generated sass file, use \'@import "' + path.relative(appDirectory, scssPath) + '"\' in your main sass file');