Skip to content

Commit

Permalink
Merge pull request #21 from reflexdemon/papa-feedback
Browse files Browse the repository at this point in the history 
Papa feedback - [email protected]
  • Loading branch information
@reflexdemon
reflexdemon committed Aug 24, 2015
2 parents 5793e10 + f29ec92 commit 83e72c6
Show file tree
Hide file tree
Showing 41 changed files with 576 additions and 589 deletions.
4 changes: 1 addition & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slush-angular-gulp",
"version": "0.3.7",
"version": "0.3.8",
"description": "Gulp, Angular, Less with Web server, this generator is build with inspiration from the below projects. slush-angular, angular-styleguide and generator-angular",
"main": "slushfile.js",
"repository": {
Expand Down Expand Up @@ -46,7 +46,6 @@
},
"homepage": "https://github.com/reflexdemon/slush-angular-gulp",
"dependencies": {
"fs": "0.0.2",
"gulp": "^3.8.11",
"gulp-conflict": "^0.4.0",
"gulp-install": "^0.2.0",
Expand All @@ -56,7 +55,6 @@
"include-all": "^0.1.6",
"inquirer": "^0.9.0",
"lodash": "^3.6.0",
"path": "^0.11.14",
"underscore.string": "^3.0.3",
"yargs": "^3.7.2"
},
Expand Down
17 changes: 2 additions & 15 deletions tasks/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,9 @@
var files = [__dirname + '/../templates/app/**'];
var exclude = _.xor(examples, answers.example);
_.each(exclude, function(choice) {
files.push('!' + __dirname + '/../templates/app/src/app/components/' + choice + '/**');
files.push('!' + __dirname + '/../templates/app/src/app/components/' + choice);
files.push('!' + __dirname + '/../templates/app/src/app/' + choice + '/**');
files.push('!' + __dirname + '/../templates/app/src/app/' + choice);
});
/*
{ name: 'my-angular-app',
csstype: 'less',
middleware: true,
example: [ 'todo', 'heat', settings: { todo: 'todo', heat: 'heat' } ],
nameDashed: 'my-angular-app',
modulename: 'myAngularApp',
styleData:
{ plugin: 'gulp-less',
pluginVersion: '^1.2.3',
pipeCommand: 'g.less()',
extension: 'less' } }
*/
answers.exampleSettings = {};
_.each(answers.example, function(item) {
answers.exampleSettings[item] = item;
Expand Down
92 changes: 46 additions & 46 deletions tasks/constant.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@
*/

(function() {
var gulp = require('gulp'),
install = require('gulp-install'),
conflict = require('gulp-conflict'),
template = require('gulp-template'),
rename = require('gulp-rename'),
inquirer = require('inquirer')
var gulp = require('gulp'),
install = require('gulp-install'),
conflict = require('gulp-conflict'),
template = require('gulp-template'),
rename = require('gulp-rename'),
inquirer = require('inquirer')
_ = require('underscore.string');

//Local dependencies
var util = require('../util');
//Local dependencies
var util = require('../util');

module.exports = function(gulp) {
'use strict';
module.exports = function(gulp) {
'use strict';

gulp.task('constant', function(done) {
var _this = this;
var name = util.getDefaultOption(_this.args, 0);
var options = util.getGlobalOptions();
var modules = util.getModuleProposal(options.appDir);
gulp.task('constant', function(done) {
var _this = this;
var name = util.getDefaultOption(_this.args, 0);
var options = util.getGlobalOptions();
var modules = util.getModuleProposal(options.appDir);

if (modules.length === 0) {
throw new Error('constant must be created in a module, but no modules exist. Create a module using "slush angular-gulp:module <module-Name>".');
}
if (modules.length === 0) {
throw new Error('constant must be created in a module, but no modules exist. Create a module using "slush angular-gulp:module <module-Name>".');
}

inquirer.prompt([{
type: 'input',
name: 'fileName',
message: 'What is the name of your constant?',
default: name
}, {
type: 'list',
name: 'module',
message: 'What is your AngularJS module name?',
choices: modules
}], function(answers) {
//Init
answers.nameDashed = _.slugify(util.getNameProposal());
answers.scriptAppName = _.camelize(answers.nameDashed) + '.' +answers.module ;
answers.classedName = _.camelize(answers.fileName);
answers.classedNameDashed = _.slugify(answers.fileName);
answers.classedModule = _.capitalize(_.camelize(answers.module));;
inquirer.prompt([{
type: 'input',
name: 'fileName',
message: 'What is the name of your constant?',
default: name
}, {
type: 'list',
name: 'module',
message: 'What is your AngularJS module name?',
choices: modules
}], function(answers) {
//Init
answers.nameDashed = _.slugify(util.getNameProposal());
answers.scriptAppName = _.camelize(answers.nameDashed) + '.' + answers.module;
answers.classedName = _.camelize(answers.fileName);
answers.classedNameDashed = _.slugify(answers.fileName);
answers.classedModule = _.capitalize(_.camelize(answers.module));;

//Source
gulp.src(__dirname + '/../templates/constant/constant.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-constant.js'))
.pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module))
.on('finish', function() {
done();
});
//Source
gulp.src(__dirname + '/../templates/constant/constant.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-constant.js'))
.pipe(conflict(options.base + options.appDir + '/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/' + answers.module))
.on('finish', function() {
done();
});
});
});
});
}
}
})();
18 changes: 9 additions & 9 deletions tasks/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
gulp.src(__dirname + '/../templates/controller/controller.spec.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-controller.spec.js'))
.pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module));
gulp.src(__dirname + '/../templates/controller/controller.js')
.pipe(conflict(options.base + options.appDir + '/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/' + answers.module));
gulp.src(__dirname + '/../templates/controller/controller.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-controller.js'))
.pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module))
.pipe(conflict(options.base + options.appDir + '/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/' + answers.module))
.on('finish', function() {
done();
});
Expand All @@ -68,8 +68,8 @@
gulp.src(__dirname + '/../templates/controller/controller.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-controller.js'))
.pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module))
.pipe(conflict(options.base + options.appDir + '/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/' + answers.module))
.on('finish', function() {
done();
});
Expand All @@ -79,8 +79,8 @@
// gulp.src(__dirname + '/../templates/controller/controller.js')
// .pipe(template(answers))
// .pipe(rename(answers.fileName + '-controller.js'))
// .pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
// .pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module))
// .pipe(conflict(options.base + options.appDir + '/' + answers.module))
// .pipe(gulp.dest(options.base + options.appDir + '/' + answers.module))
// .on('finish', function() {
// done();
// });
Expand Down
92 changes: 46 additions & 46 deletions tasks/decorator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@
*/

(function() {
var gulp = require('gulp'),
install = require('gulp-install'),
conflict = require('gulp-conflict'),
template = require('gulp-template'),
rename = require('gulp-rename'),
inquirer = require('inquirer')
var gulp = require('gulp'),
install = require('gulp-install'),
conflict = require('gulp-conflict'),
template = require('gulp-template'),
rename = require('gulp-rename'),
inquirer = require('inquirer')
_ = require('underscore.string');

//Local dependencies
var util = require('../util');
//Local dependencies
var util = require('../util');

module.exports = function(gulp) {
'use strict';
module.exports = function(gulp) {
'use strict';

gulp.task('decorator', function(done) {
var _this = this;
var name = util.getDefaultOption(_this.args, 0);
var options = util.getGlobalOptions();
var modules = util.getModuleProposal(options.appDir);
gulp.task('decorator', function(done) {
var _this = this;
var name = util.getDefaultOption(_this.args, 0);
var options = util.getGlobalOptions();
var modules = util.getModuleProposal(options.appDir);

if (modules.length === 0) {
throw new Error('decorator must be created in a module, but no modules exist. Create a module using "slush angular-gulp:module <module-Name>".');
}
if (modules.length === 0) {
throw new Error('decorator must be created in a module, but no modules exist. Create a module using "slush angular-gulp:module <module-Name>".');
}

inquirer.prompt([{
type: 'input',
name: 'fileName',
message: 'What is the name of your decorator?',
default: name
}, {
type: 'list',
name: 'module',
message: 'What is your AngularJS module name?',
choices: modules
}], function(answers) {
//Init
answers.nameDashed = _.slugify(util.getNameProposal());
answers.scriptAppName = _.camelize(answers.nameDashed) + '.' +answers.module ;
answers.classedName = _.camelize(answers.fileName);
answers.classedNameDashed = _.slugify(answers.fileName);
answers.classedModule = _.capitalize(_.camelize(answers.module));
inquirer.prompt([{
type: 'input',
name: 'fileName',
message: 'What is the name of your decorator?',
default: name
}, {
type: 'list',
name: 'module',
message: 'What is your AngularJS module name?',
choices: modules
}], function(answers) {
//Init
answers.nameDashed = _.slugify(util.getNameProposal());
answers.scriptAppName = _.camelize(answers.nameDashed) + '.' + answers.module;
answers.classedName = _.camelize(answers.fileName);
answers.classedNameDashed = _.slugify(answers.fileName);
answers.classedModule = _.capitalize(_.camelize(answers.module));

//Source
gulp.src(__dirname + '/../templates/decorator/decorator.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-decorator.js'))
.pipe(conflict(options.base + options.appDir + '/components/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/components/' + answers.module))
.on('finish', function() {
done();
});
//Source
gulp.src(__dirname + '/../templates/decorator/decorator.js')
.pipe(template(answers))
.pipe(rename(answers.fileName + '-decorator.js'))
.pipe(conflict(options.base + options.appDir + '/' + answers.module))
.pipe(gulp.dest(options.base + options.appDir + '/' + answers.module))
.on('finish', function() {
done();
});
});
});
});
}
}
})();
Loading

0 comments on commit 83e72c6

Please sign in to comment.