Skip to content

Commit

Permalink
Cleaned up angular: commands to use angularfire:
Browse files Browse the repository at this point in the history
  • Loading branch information
katowulf committed Dec 19, 2014
1 parent 89191b6 commit a5307b5
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var FIREBASE_PROMPTS = [
}
}, {
name: 'loginModule',
message: 'Use FirebaseSimpleLogin?',
message: 'Include Firebase auth and account tools?',
type: 'confirm'
}, {
type: 'checkbox',
Expand Down
2 changes: 1 addition & 1 deletion constant/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description:
Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services

Example:
yo angular:constant thing [--coffee]
yo angularfire:constant thing [--coffee]

This will create:
app/scripts/services/thing.js
2 changes: 1 addition & 1 deletion controller/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new Angular controller

Example:
yo angular:controller Thing [--coffee]
yo angularfire:controller Thing [--coffee]

This will create:
app/scripts/controllers/thing-ctrl.js
2 changes: 1 addition & 1 deletion decorator/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new AngularJS decorator for a specified service

Example:
yo angular:decorator serviceName [--coffee]
yo angularfire:decorator serviceName [--coffee]

This will create:
app/scripts/decorators/serviceNameDecorator.js
2 changes: 1 addition & 1 deletion directive/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new Angular directive

Example:
yo angular:directive thing [--coffee]
yo angularfire:directive thing [--coffee]

This will create:
app/scripts/directives/thing.js
2 changes: 1 addition & 1 deletion factory/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description:
Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services

Example:
yo angular:factory thing [--coffee]
yo angularfire:factory thing [--coffee]

This will create:
app/scripts/services/thing.js
2 changes: 1 addition & 1 deletion filter/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new AngularJS filter

Example:
yo angular:filter thing [--coffee]
yo angularfire:filter thing [--coffee]

This will create:
app/scripts/filters/thing.js
2 changes: 1 addition & 1 deletion provider/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description:
Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services

Example:
yo angular:provider thing [--coffee]
yo angularfire:provider thing [--coffee]

This will create:
app/scripts/services/thing.js
2 changes: 1 addition & 1 deletion route/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new AngularJS route

Example:
yo angular:route thing [--coffee] [--uri=path_to/thing]
yo angularfire:route thing [--coffee] [--uri=path_to/thing] [--auth-required]

This will create:
app/scripts/controllers/thing.js
Expand Down
4 changes: 2 additions & 2 deletions route/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ var Generator = module.exports = function Generator(name, skipFiles) {
}

if( !skipFiles ) {
this.hookFor('angular:controller');
this.hookFor('angular:view');
this.hookFor('angularfire:controller');
this.hookFor('angularfire:view');
}
};

Expand Down
2 changes: 1 addition & 1 deletion service/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description:
Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services

Example:
yo angular:service thing [--coffee]
yo angularfire:service thing [--coffee]

This will create:
app/scripts/services/thing.js
2 changes: 1 addition & 1 deletion templates/common/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3 class="text-muted"><%= appname %></h3>
} %>

<div class="footer">
<p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
<p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team, and from Firebase</p>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion test/test-appname-substitution.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('Angular generator template mechanism', function () {
done(err);
}

angular = helpers.createGenerator('angular:app', deps, [appName], {
angular = helpers.createGenerator('angularfire:app', deps, [appName], {
'appPath': 'app',
'skip-welcome-message': true,
'skip-install': true,
Expand Down
8 changes: 4 additions & 4 deletions test/test-apppath.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('Angular generator appPath option', function () {
}

angular = helpers.createGenerator(
'angular:app',
'angularfire:app',
[
'../../app',
'../../common',
Expand Down Expand Up @@ -100,7 +100,7 @@ describe('Angular generator appPath option', function () {
var angularGenerator;
var name = 'foo';
var deps = [path.join('../..', generatorType)];
angularGenerator = helpers.createGenerator('angular:' + generatorType, deps, [name], genOptions);
angularGenerator = helpers.createGenerator('angularfire:' + generatorType, deps, [name], genOptions);

angular.run([], function () {
angularGenerator.run([], function () {
Expand Down Expand Up @@ -145,7 +145,7 @@ describe('Angular generator appPath option', function () {
it('should generate a new view', function (done) {
var angularView;
var deps = ['../../view'];
angularView = helpers.createGenerator('angular:view', deps, ['foo'], genOptions);
angularView = helpers.createGenerator('angularfire:view', deps, ['foo'], genOptions);

helpers.mockPrompt(angular, mockPrompts);
angular.run([], function () {
Expand All @@ -159,7 +159,7 @@ describe('Angular generator appPath option', function () {
it('should generate a new view in subdirectories', function (done) {
var angularView;
var deps = ['../../view'];
angularView = helpers.createGenerator('angular:view', deps, ['foo/bar'], genOptions);
angularView = helpers.createGenerator('angularfire:view', deps, ['foo/bar'], genOptions);

helpers.mockPrompt(angular, mockPrompts);
angular.run([], function () {
Expand Down
8 changes: 4 additions & 4 deletions test/test-file-creation.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('Angular generator', function () {
done(err);
}
angular = helpers.createGenerator(
'angular:app',
'angularfire:app',
[
'../../app',
'../../common',
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('Angular generator', function () {
var generatorTest = function (generatorType, specType, targetDirectory, scriptNameFn, specNameFn, suffix, done) {
var name = 'foo';
var deps = [path.join('../..', generatorType)];
var genTester = helpers.createGenerator('angular:' + generatorType, deps, [name], genOptions);
var genTester = helpers.createGenerator('angularfire:' + generatorType, deps, [name], genOptions);

angular.run([], function () {
genTester.run([], function () {
Expand Down Expand Up @@ -149,7 +149,7 @@ describe('Angular generator', function () {
it('should generate a new view', function (done) {
var angularView;
var deps = ['../../view'];
angularView = helpers.createGenerator('angular:view', deps, ['foo'], genOptions);
angularView = helpers.createGenerator('angularfire:view', deps, ['foo'], genOptions);

helpers.mockPrompt(angularView, mockPrompts);
angularView.run([], function () {
Expand All @@ -161,7 +161,7 @@ describe('Angular generator', function () {
it('should generate a new view in subdirectories', function (done) {
var angularView;
var deps = ['../../view'];
angularView = helpers.createGenerator('angular:view', deps, ['foo/bar'], genOptions);
angularView = helpers.createGenerator('angularfire:view', deps, ['foo/bar'], genOptions);

helpers.mockPrompt(angularView, mockPrompts);
angularView.run([], function () {
Expand Down
4 changes: 2 additions & 2 deletions test/test-route-creation.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('Angular generator route mechanism', function () {
done(err);
}
angular = helpers.createGenerator(
'angular:app',
'angularfire:app',
[
'../../app',
'../../common',
Expand All @@ -49,7 +49,7 @@ describe('Angular generator route mechanism', function () {
helpers.mockPrompt(angular, mockPrompts);
angular.run({}, function () {
angular = helpers.createGenerator(
'angular:route',
'angularfire:route',
[
'../../controller',
'../../route',
Expand Down
2 changes: 1 addition & 1 deletion value/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description:
Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services

Example:
yo angular:value thing [--coffee]
yo angularfire:value thing [--coffee]

This will create:
app/scripts/services/thing.js
2 changes: 1 addition & 1 deletion view/USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Description:
Creates a new AngularJS view

Example:
yo angular:view thing
yo angularfire:view thing

This will create:
app/views/thing.html

0 comments on commit a5307b5

Please sign in to comment.