Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
297 commits
Select commit Hold shift + click to select a range
fca79d9
caching folders to reduce build time
DaftMonk Sep 22, 2014
f9e7f6d
revert caching
DaftMonk Sep 22, 2014
25d9187
fix test timeouts and sign up test failure
DaftMonk Sep 22, 2014
2f3ee4f
run e2e tests for other builds
DaftMonk Sep 22, 2014
4bf0750
chore(docs): remove outdated readme from test folder
DaftMonk Sep 22, 2014
c131bc4
make tests more dry
DaftMonk Sep 22, 2014
828857b
fix test failure
DaftMonk Sep 22, 2014
4667013
update sauce labs config so e2e tests can run against pull requests
DaftMonk Sep 26, 2014
d2bd1f5
fix sauce username
DaftMonk Sep 26, 2014
654de87
feat(gen): unify testing framework
kingcody Sep 22, 2014
effef8d
Merge pull request #585 from kingcody/feature/unify-testing-frameworks
DaftMonk Sep 27, 2014
696c6fb
docs(gen:endpoint): standardized comments
BenFradet Sep 27, 2014
a29b713
remove sauce connect addon from travis and replace with shell script
DaftMonk Sep 28, 2014
283d493
Merge pull request #599 from BenFradet/canary
DaftMonk Sep 28, 2014
8a1a245
feat(app): add grunt jscs task for maintaining consistent code style
DaftMonk Sep 22, 2014
18c4c31
style(app): update style to match jscs style guide
DaftMonk Sep 27, 2014
9cdcc90
fix(server): server should launch in dev mode if production env var i…
DaftMonk Sep 28, 2014
a5edbcd
fix test framework options when scaffolding with existing project
DaftMonk Sep 28, 2014
6391313
add test for #403
DaftMonk Sep 28, 2014
9285856
test(gen): add tests for running the e2e tests in production mode
DaftMonk Sep 28, 2014
e94ffb7
Merge branch 'fix-default-server' into canary
DaftMonk Sep 28, 2014
add986f
remove production e2e tests because issues with node 0.11.x
DaftMonk Sep 29, 2014
68b34f3
add production e2e tests back in, only test against node 0.10.x
DaftMonk Oct 2, 2014
a84f644
test(gen): fix grunt test false positives
DaftMonk Oct 2, 2014
95152ce
test(gen): add grunt test:fast task to generator, for skipping e2e tests
DaftMonk Oct 2, 2014
09b4b60
comment out e2e production tests again because of flaky results
DaftMonk Oct 2, 2014
499bc8d
missed one test that should have been commented out
DaftMonk Oct 2, 2014
950da47
Merge branch 'master' into canary
DaftMonk Oct 3, 2014
32ab12e
Merge branch 'master' into canary
DaftMonk Oct 3, 2014
f29e907
fix appPath for serving index.html
DaftMonk Oct 3, 2014
8c9f0f9
test(gen): use path.normalize to be windows aware
gintsgints Sep 28, 2014
6a196e2
fix(deps): use angular ~1.2 before migrated to 1.3
sigriston Oct 22, 2014
b986998
Merge pull request #655 from sigriston/fix-deps-angular-1.2
DaftMonk Nov 3, 2014
dedf46c
fix(openshift): fix processing of rhc app show output
velichkov Nov 26, 2014
943120e
feat(server): add support for sequelize
sigriston Nov 26, 2014
38c0d7c
fix: return a 404 when no user is found fixes #711
dotch Nov 27, 2014
fbcd8ef
Merge pull request #713 from velichkov/openshift
DaftMonk Dec 1, 2014
422b264
Merge pull request #718 from dotch/canary
DaftMonk Dec 1, 2014
75ba13d
Merge pull request #714 from sigriston/feature-sequelize
DaftMonk Dec 1, 2014
bb4d92e
fix(gen:build): Adds missing slash
mchapman Dec 31, 2014
af69a68
style(jscs): update jscs definition to use settings closer to the ang…
DaftMonk Jan 23, 2015
061c2d1
feat:app: grunt-build-control to v0.4.0
kevinawoo Apr 11, 2015
366d032
chore(admin): splice user without iteration
dciccale Jun 2, 2015
bb48cde
Merge pull request #981 from dciccale/splice_no_iteration
Awk34 Jun 15, 2015
710d04e
Merge pull request #927 from kevinawoo/patch-2
Awk34 Jun 16, 2015
955912c
feat(app): Add experimental Gulp option
Pentiado Apr 28, 2014
3d36966
fix(generator): Add missing `filters.`
Awk34 Jun 17, 2015
1e97764
feat(gulp): Update to Gulp 3.9.0 and rename Gulpfile.js to gulpfile.b…
Awk34 Jun 17, 2015
c67f1e5
refactor(gulp): Rename $ to plugins
Awk34 Jun 17, 2015
e9af2b2
refactor(gulp): Use import for gulp and path
Awk34 Jun 17, 2015
10708a4
fix(gulp): Add if(filters.stylus) statement back
Awk34 Jun 17, 2015
d1ba9ef
feat(gulp): Fix a bunch of things, update a buttload of packages..
Awk34 Jun 18, 2015
39e0667
refactor(gulp): Convert the rest of the require statements to ES2015 …
Awk34 Jun 18, 2015
d281166
chore(test): update chai related test libs
kingcody Jun 20, 2015
8df9992
fix(test): update sequelize destroy usage
kingcody Jun 20, 2015
c7f6c36
fix(test): change `protractor.getInstance` to `browser`
kingcody Jun 20, 2015
b904867
Merge pull request #1006 from kingcody/chore/update-test-libs
Awk34 Jun 21, 2015
0e4474a
Merge pull request #1007 from kingcody/fix/sequelize-destroy
Awk34 Jun 21, 2015
484a443
Merge pull request #1008 from kingcody/fix/e2e-test
Awk34 Jun 21, 2015
1d5fd55
fix(travis): Remove node 10 & 11 targets
Awk34 Jun 21, 2015
2364178
fix(gulp): Make wiredep work for the bower task, and refactor a few p…
Awk34 Jun 21, 2015
58bafcd
style(gulp): Use 4-space tabs
Awk34 Jun 21, 2015
d78e0f6
refactor(gulp): Use arrow functions in a bunch of places
Awk34 Jun 22, 2015
69c88fa
feat(gulp): Include lodash and use it to replace array.concat(array) …
Awk34 Jun 22, 2015
7362262
fix(gulp): Fix lodash import and missing braces
Awk34 Jun 22, 2015
3d8ce97
chore(npm): Update lodash from ~2.4.1 to ~3.9.3, and bump lazypipe
Awk34 Jun 22, 2015
538f803
feat(npm): Add gulp-babel
Awk34 Jun 22, 2015
eb16725
fix(app): Add relative path for bower sass assets
Awk34 Jun 22, 2015
996919f
feat(gulp): Rework to get styles working again
Awk34 Jun 22, 2015
9fd160d
feat(gulp): Add inject tasks for css and js into index.html, add them…
Awk34 Jun 22, 2015
df48188
test(model): refactor tests to expose model update bugs
kingcody Jun 20, 2015
1805975
fix(model): fix update bugs with mongoose and sequelize
kingcody Jun 22, 2015
dff3c12
Merge pull request #1010 from kingcody/fix/userModel-updates
Awk34 Jun 22, 2015
4cf6ebe
Merge branch 'master' of https://github.com/DaftMonk/generator-angula…
Awk34 Jun 22, 2015
349b6d3
fix(npm): Remove git diff comment
Awk34 Jun 22, 2015
1bcffd6
fix(gen:endpoint): Fix JSCS stuff and use Express 4 syntax
Awk34 Jun 22, 2015
0af7c3e
fix(endpoint): refactor handleError for promise use
kingcody Jun 23, 2015
0ec2e18
fix(test): remove package.json and bower.json
kingcody Jun 23, 2015
35a1f58
Merge pull request #1013 from kingcody/fix/remove-package-bower
Awk34 Jun 23, 2015
e150342
Merge pull request #1012 from kingcody/fix/endpoint-handleError
Awk34 Jun 23, 2015
342606c
fix(gen): Check that answers.odms exists
Awk34 Jun 23, 2015
dae69cf
fix(travis): remove node v0.11 from testing
kingcody Jun 24, 2015
d084fab
Merge pull request #1018 from kingcody/fix/travis.yml
Awk34 Jun 25, 2015
c98cb5d
fix(endpoint:user): refactor validationError for promise use
kingcody Jun 27, 2015
c7b48a5
fix(endpoint:thing): use Express 4 syntax
kingcody Jun 27, 2015
60334a8
feat(server): implement server-side ES6 via babel
kingcody Jun 24, 2015
ee40b5c
Merge pull request #1026 from kingcody/fix/api-thing
Awk34 Jun 27, 2015
85b92bd
Merge pull request #1025 from kingcody/fix/api-user
Awk34 Jun 27, 2015
dbb291a
Merge pull request #1024 from kingcody/feature/babel
Awk34 Jun 27, 2015
f87b34c
chore(dependencies): remove unused dependency wiredep
kingcody Jun 28, 2015
f4f0b5a
Merge pull request #1027 from kingcody/chore/remove-wiredep
Awk34 Jun 29, 2015
443af83
fix(gulp:jshint): split jshint into client and server tasks
Awk34 Jul 3, 2015
79cf0dd
style(gulp): Reformat section comments
Awk34 Jul 3, 2015
7cb111d
feat(gulp:injector): Add Sass injector
Awk34 Jul 3, 2015
39cfe1f
refactor(gulp): refactor callbacks
Awk34 Jul 3, 2015
1f03946
refactor(gulp): use let
Awk34 Jul 3, 2015
b01cff3
refactor(gulp): use variables for file extensions instead of conditio…
Awk34 Jul 3, 2015
94b2aba
style(gulp): split onServerLog log into multiple lines
Awk34 Jul 3, 2015
3bdda89
fix(gulp): fix remaining refactored linter function uses
Awk34 Jul 3, 2015
43920ff
fix(gulp): fix sass injector start/end tags
Awk34 Jul 3, 2015
df82d17
fix(endpoint): fully support sequelize models
kingcody Jul 5, 2015
aee5983
Merge pull request #1034 from kingcody/fix/endpoint-controller-model
Awk34 Jul 6, 2015
6dc8130
feat(gen): use common endpoint templates for thing route
kingcody Jul 7, 2015
42b2404
Merge pull request #1039 from kingcody/feature/common-endpoint-template
Awk34 Jul 8, 2015
24171aa
feat(app): implement navbar as directive
kingcody Jul 7, 2015
c5f31fb
Merge pull request #506 from kingcody/docs/update-testing
Awk34 Jul 8, 2015
cc841e1
Merge pull request #1042 from kingcody/feature/navbar-directive
Awk34 Jul 8, 2015
93c295c
chore(gen): port updates from master
kingcody Jul 8, 2015
2233ee9
chore(gen): simplify package.json templating
kingcody Jul 8, 2015
059b00b
style(app): fix inconsistent indention
kingcody Jul 8, 2015
cf298a7
feat(app): implement footer as directive
kingcody Jul 8, 2015
041f214
Merge pull request #1045 from kingcody/feature/footer-directive
Awk34 Jul 8, 2015
3fa30b7
Merge pull request #1046 from kingcody/style/fix-indention
Awk34 Jul 8, 2015
2a1f37a
Merge pull request #1043 from kingcody/chore/port-fixes-from-master
Awk34 Jul 8, 2015
59e1b00
Merge branch 'master' of https://github.com/DaftMonk/generator-angula…
Awk34 Jul 9, 2015
4011b9b
fix(gulp): fix styles
Awk34 Jul 10, 2015
fecf1b1
feat(gulp): add transpile task
Awk34 Jul 10, 2015
97b0f3b
feat(gulp): fix livereload
Awk34 Jul 10, 2015
396a203
fix(gulp): prevent injecting specs
Awk34 Jul 10, 2015
2fd6ee5
Merge branch 'master' of https://github.com/DaftMonk/generator-angula…
Awk34 Jul 10, 2015
dba7d63
fix(gulp): fix inject tasks
Awk34 Jul 10, 2015
c6e5df7
feat(gulp:build): make a working build task
Awk34 Jul 10, 2015
a03be33
fix(npm): exclude 4 more grunt packages if using gulp
Awk34 Jul 10, 2015
531012c
feat(gen): make option for grunt and/or gulp
Awk34 Jul 10, 2015
7022e84
feat(gen): conditionally add build files
Awk34 Jul 10, 2015
00317a8
feat(travis-ci): enable container builds and caching
kingcody Jul 13, 2015
03a0ef3
Merge pull request #1056 from kingcody/feature/travis-containers
Awk34 Jul 14, 2015
1214b70
fix(gulp): don't automatically lint test scripts
Awk34 Jul 14, 2015
97f0524
chore(test:fixtures): update deps
Awk34 Jul 14, 2015
fb523d7
chore(gen:npm): add css gulp deps
Awk34 Jul 14, 2015
f6e7a12
fix(oauth): Facebook API updated
adamk33n3r Jul 14, 2015
136f15e
fix(oauth): Google scopes deprecated
adamk33n3r Jul 15, 2015
91657d7
feat(model): abstract model events to a standard EventEmitter
kingcody Jul 5, 2015
ceb9c64
Merge pull request #1062 from adamk33n3r/update-passport-auth-api
Awk34 Jul 15, 2015
f07b09c
feat(gen): add README.md
Awk34 Jul 15, 2015
9db44ac
Merge pull request #1063 from DaftMonk/gen-readme
Awk34 Jul 15, 2015
1f47403
chore(travis): target only node 0.12
Awk34 Jul 15, 2015
a8122d7
chore(dependencies): update connect-livereload
kingcody Jul 16, 2015
700028c
Merge pull request #1065 from kingcody/chore/update-connect-livereload
Awk34 Jul 16, 2015
7ae43ae
fix(build): exclued `bower_components` from the grunt rev and usemin …
kingcody Jul 16, 2015
02c656e
Merge pull request #1066 from kingcody/fix/grunt-rev
Awk34 Jul 16, 2015
cd28298
feat(build): switch to grunt-filerev
kingcody Jul 16, 2015
ea16b44
Merge pull request #761 from mchapman/missing-slash
Awk34 Jul 16, 2015
595ac93
Merge pull request #1067 from kingcody/feature/grunt-filerev
Awk34 Jul 16, 2015
09f9778
chore(dependencies): remove `peerDependencies` and update docs to ref…
kingcody Jul 16, 2015
0b46b6d
Merge pull request #1069 from kingcody/chore/remove-peerDependencies
Awk34 Jul 16, 2015
bed6ef7
style(app): remove extra spacing and clean template
kingcody Jul 17, 2015
40800f1
Merge pull request #1073 from kingcody/style/clean-template-spacing
Awk34 Jul 17, 2015
5874dfd
feat(app): improve `Gruntfile.js` file globbing
kingcody Jul 17, 2015
1249392
Merge pull request #1076 from kingcody/feature/improved-globs
Awk34 Jul 17, 2015
655ce10
Merge pull request #1057 from kingcody/feature/model-events
Awk34 Jul 17, 2015
8e8ae96
fix(app): correct grunt clean glob
kingcody Jul 18, 2015
18f8d31
fix(app): fix folder depth in rev and usemin globs
kingcody Jul 18, 2015
0071276
Merge pull request #1078 from kingcody/fix/clean-glob
Awk34 Jul 19, 2015
997f7d2
docs(gen): update readme.md to reflect new heroku commands
akaashanky Jul 19, 2015
e578b4e
Merge pull request #1082 from akaashanky/canary
kingcody Jul 19, 2015
4a88551
feat(app): merge H5BP updates to index.html
kingcody Jul 20, 2015
6b575d1
fix(app:test): include `client/components` in babel preprocessing
kingcody Jul 20, 2015
87808e6
Merge pull request #1084 from kingcody/fix/karma-babel
Awk34 Jul 20, 2015
7ce366c
Merge pull request #1079 from kingcody/fix/rev-usemin-globs
Awk34 Jul 20, 2015
037b498
Merge pull request #1083 from kingcody/feature/merge-h5bp-updates
Awk34 Jul 20, 2015
a9372a1
fix(app): update sequelize syntax in seed.js
kingcody Jul 23, 2015
98e62a3
chore(dependencies): update mocha dependencies
kingcody Jul 23, 2015
e2760cf
chore(dependencies) update jasmine dependencies
kingcody Jul 23, 2015
f34e8f3
feat(test): add jasmine-spec-reporter
kingcody Jul 23, 2015
8dce663
fix(test): use proper controlFlow in protractor tests
kingcody Jul 23, 2015
2aebc24
chore(dependencies): update protractor dependencies
kingcody Jul 23, 2015
30a2eeb
chore(dependencies): update karma dependencies
kingcody Jul 23, 2015
f4aaae0
chore(gen:bower): update angular deps
Awk34 Jul 14, 2015
f5acad0
fix(test): update protractor test for angular 1.4
kingcody Jul 22, 2015
bd9bf54
chore(gen): update license configuration in package.json
kingcody Jul 24, 2015
d5b86c1
Feat(grunt): remove grunt-autoprefixer, add grunt-postcss
macneib Jul 26, 2015
c30fa85
Merge pull request #1103 from macneib/canary
kingcody Jul 27, 2015
a81aeb1
feat(app): watch integration tests for changes
kingcody Jul 27, 2015
8511260
fix(app): ensure all files end with a newline
kingcody Jul 28, 2015
43de9b6
Merge pull request #1096 from kingcody/fix/sequelize-seed
Awk34 Jul 28, 2015
e129c38
Merge pull request #1097 from kingcody/feature/update-angular+testing
Awk34 Jul 28, 2015
d3b0850
Merge pull request #1098 from kingcody/chore/update-package-license
Awk34 Jul 28, 2015
af0ce9b
Merge pull request #1104 from kingcody/feature/watch-integration-tests
Awk34 Jul 28, 2015
e14eaee
Merge pull request #1106 from kingcody/fix/line-endings
Awk34 Jul 28, 2015
e7a1a46
refactor(client:auth): use $cookies instead
ysqty Jul 22, 2015
4c928e0
Merge pull request #1109 from kingcody/feature/upgrade-cookieStorage
kingcody Jul 28, 2015
6918070
chore(gen): merge branch 'master' into canary
kingcody Jul 31, 2015
37a1890
Merge pull request #1115 from kingcody/chore/merge-master-into-canary
Awk34 Jul 31, 2015
90ff36e
fix(gen): default grunt filter
kingcody Jul 31, 2015
8342a31
Merge pull request #1117 from kingcody/fix/default-grunt-filter
Awk34 Jul 31, 2015
1bfcc1f
fix(app.coffee): missing preventDefault()
dciccale Aug 2, 2015
6bfc1da
chore(auth.service): changePassword does not receive success data
dciccale Aug 2, 2015
7ecf751
chore(dependencies): update grunt-wiredep to `^2.0.0`
kingcody Aug 4, 2015
f31e996
feat(app): use wiredep to inject bower deps into karma.conf.js
kingcody Aug 4, 2015
e04185a
fix(app): auth.login waits for user resource to resolve
kingcody Aug 4, 2015
93f534d
Merge pull request #1126 from kingcody/fix/client-auth-login
Awk34 Aug 4, 2015
661de88
Merge pull request #1127 from kingcody/feature/wiredep-karma
Awk34 Aug 4, 2015
8247085
feat(grunt): add watch to bower.json
Awk34 Aug 5, 2015
2526ca5
feat(server:auth): add role to signToken
Awk34 Aug 5, 2015
c81b8e6
Merge pull request #1129 from DaftMonk/watch-bower
kingcody Aug 5, 2015
76325bd
fix(gen:css): ensure scss/less/stylus files have proper relative paths
Awk34 Jul 17, 2015
799e94b
refactor(grunt): remove no longer needed paths
Awk34 Aug 5, 2015
9c3e7ee
fix(grunt): `watch.jade` only watches jade files
kingcody Aug 6, 2015
1dfc856
chore(dependencies): update yeoman-generator to ~0.8.10
kingcody Jul 24, 2015
533bbd7
chore(dependencies): update generator-ng-component to ~0.1.0
kingcody Aug 6, 2015
d7fc0a8
chore(user): change status code 204 for empty response body
dciccale Aug 7, 2015
bce9c99
Merge pull request #1124 from dciccale/canary
kingcody Aug 7, 2015
63782b3
feat(package): upgrade jshint packages
drochag Aug 8, 2015
f0ec563
Merge pull request #1134 from kingcody/fix/jade-watch
Awk34 Aug 8, 2015
a77d051
Merge pull request #1144 from DanMMX/JshintUpgrade
kingcody Aug 10, 2015
ea2a733
fix(server:errors): fix res.render syntax
Awk34 Aug 11, 2015
2617ab2
feat(client:main): use times symbol instead of 'x' in jade template
Awk34 Aug 11, 2015
0bd8a64
Merge pull request #1135 from kingcody/chore/update-yeoman-generator
Awk34 Aug 11, 2015
e6a3fe9
Merge pull request #1153 from DaftMonk/jade-main-parity-times
Awk34 Aug 11, 2015
761d4ae
Merge branch 'canary' of https://github.com/DaftMonk/generator-angula…
Awk34 Aug 11, 2015
8054bbb
Merge pull request #1152 from DaftMonk/681-fix-error-renderer
kingcody Aug 11, 2015
08467ce
Merge pull request #1077 from DaftMonk/fix-sass-relative-paths
Awk34 Aug 11, 2015
6f598c9
fix(): fix missed merge conflicts
Awk34 Aug 11, 2015
bb394ee
feat(gen): move babel choice to script list
Awk34 Aug 11, 2015
fb915b2
fix(gen): `endpointDirectory` is now a full option/config
kingcody Jul 28, 2015
3fcd8e9
feat(gen): add `relativeRequire` and other template helpers
kingcody Jul 28, 2015
5227ef0
fix(gen): endpoint accepts path as name
kingcody Jul 28, 2015
40277fd
chore(dependencies): update sequelize
kingcody Jul 29, 2015
63fae5c
fix(gen): remove thing import from sequelize template
kingcody Jul 29, 2015
06eeab4
fix(test): add endpoint sub-gen as test dependency
kingcody Aug 2, 2015
c18824a
test(endpoint): test against a path name endpoint
kingcody Aug 2, 2015
9528318
Merge pull request #1122 from kingcody/fix/endpoint-dynamic-path
kingcody Aug 12, 2015
0438921
Merge pull request #1154 from DaftMonk/babel-in-lang-list
kingcody Aug 12, 2015
3b66507
feat(gen): add david grunt task
kingcody Aug 10, 2015
1d5ab7d
feat(app): server ships with babel
kingcody Aug 12, 2015
733843e
chore(dependencies): remove angular-scenario
Aug 12, 2015
a849395
docs(readme): remove angular-senario in bower list
Aug 12, 2015
479f022
Merge pull request #1157 from kingcody/feature/david-integration
Awk34 Aug 12, 2015
3c68556
Merge pull request #1158 from ligeek/canary
Awk34 Aug 12, 2015
50a7a98
Merge pull request #1131 from DaftMonk/382-signtoken-parameters
kingcody Aug 12, 2015
2f4b76f
Merge pull request #1159 from kingcody/feature/server-ships-babel
Awk34 Aug 12, 2015
c8e2f0f
feat(gen): test helper `does` accepts escaped template strings
kingcody Aug 13, 2015
6fa4b4e
fix(app): only generate excludes for included deps
kingcody Aug 13, 2015
cbbd039
Merge pull request #1162 from kingcody/fix/wiredep-excludes
Awk34 Aug 13, 2015
04daafa
Merge pull request #1161 from kingcody/feature/does-accepts-template
Awk34 Aug 13, 2015
ee9f4f0
fix(app): karma requires `babel` always
kingcody Aug 13, 2015
4376afe
Merge pull request #1165 from kingcody/fix/mocha-conf-babel
Awk34 Aug 13, 2015
a734289
feat(gulp): add LESS
Awk34 Aug 13, 2015
ee110f7
Merge branch 'canary' of https://github.com/DaftMonk/generator-angula…
Awk34 Aug 13, 2015
ba855d8
fix(gulp:watch): fix gulp watch for styles
Awk34 Aug 15, 2015
306896e
fix(gulp): return stream
Awk34 Aug 15, 2015
e6af7e1
docs(gulp): remove old comment
Awk34 Aug 15, 2015
e6e5512
feat(gulp): run injector on script & style watches
Awk34 Aug 15, 2015
fb42a6f
fix(gulp): include components in views.main paths
Awk34 Aug 15, 2015
e8e9ad8
fix(gulp): fix styles watcher
Awk34 Aug 18, 2015
5431375
refactor(gulp): make sure to return gulp streams from tasks
Awk34 Aug 18, 2015
8f4aba3
fix(gulp): use let, add missing semicolon
Awk34 Aug 18, 2015
4b5caf2
fix(gulp:watch): fix styles and script watchers
Awk34 Aug 19, 2015
a7f2967
fix(gulp:serve): add transpile and styles tasks
Awk34 Aug 19, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* text=auto
* text eol=lf
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ demo
.idea
.DS_Store
release.txt
fixtures/bower.json
fixtures/package.json
test/fixtures/bower.json
test/fixtures/package.json
13 changes: 12 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
sudo: false
language: node_js
node_js:
- '0.12'
env:
global:
- SAUCE_USERNAME=fullstack_ci
- SAUCE_ACCESS_KEY=1a527ca6-4aa5-4618-86ce-0278bf158cbf
before_install:
- ./scripts/sauce_connect_setup.sh
- gem update --system
- gem install sass --version "=3.3.7"
- npm install -g bower grunt-cli
services: mongodb
cache:
directories:
- node_modules
- test/fixtures/node_modules
- test/fixtures/bower_components
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/911ed472ef19bcb27858
- secure: "DhPNqHXuUIeIGE9Ek3+63qhco+4MozXqMZL6dAKoq1MHQ2RAPO6SYIkUYZqDnuWYlwWao2EnTYcDREivIV/m/RnkP9bKlpX/n/RNJe+X4bwFaCU55fVKgkAFn3takSBC5SVoeTWHdWu3WhhqSdioWjT7mlE1wtt/RanSMb5Id8M="
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -582,4 +582,4 @@ Closes #18, #17

#### Features

* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))
* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))
53 changes: 48 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var markdown = require('marked');
var semver = require('semver');
var _s = require('underscore.string');
var shell = require('shelljs');
var process = require('child_process');
var child_process = require('child_process');
var Q = require('q');
var helpers = require('yeoman-generator').test;
var fs = require('fs-extra');
Expand Down Expand Up @@ -58,6 +58,11 @@ module.exports = function (grunt) {
},
all: ['Gruntfile.js', '*/index.js']
},
env: {
fast: {
SKIP_E2E: true
}
},
mochaTest: {
test: {
src: [
Expand All @@ -82,6 +87,16 @@ module.exports = function (grunt) {
]
}]
}
},
david: {
gen: {
options: {}
},
app: {
options: {
package: 'test/fixtures/package.json'
}
}
}
});

Expand Down Expand Up @@ -139,6 +154,7 @@ module.exports = function (grunt) {
bootstrap: true,
uibootstrap: true,
mongoose: true,
testing: 'jasmine',
auth: true,
oauth: ['googleAuth', 'twitterAuth'],
socketio: true
Expand Down Expand Up @@ -227,12 +243,21 @@ module.exports = function (grunt) {

shell.cd('test/fixtures');
grunt.log.ok('installing npm dependencies for generated app');
process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {
child_process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {

grunt.log.ok('installing bower dependencies for generated app');
process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
shell.cd('../../');
done();
child_process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {

if(!process.env.SAUCE_USERNAME) {
grunt.log.ok('running npm run update-webdriver');
child_process.exec('npm run update-webdriver', function() {
shell.cd('../../');
done();
});
} else {
shell.cd('../../');
done();
}
})
});
});
Expand All @@ -242,6 +267,24 @@ module.exports = function (grunt) {
'installFixtures',
'mochaTest'
]);
grunt.registerTask('test', function(target, option) {
if (target === 'fast') {
grunt.task.run([
'env:fast'
]);
}

return grunt.task.run([
'updateFixtures',
'installFixtures',
'mochaTest'
])
});

grunt.registerTask('deps', function(target) {
if (!target || target === 'app') grunt.task.run(['updateFixtures']);
grunt.task.run(['david:' + (target || '')]);
});

grunt.registerTask('demo', [
'clean:demo',
Expand Down
Loading