Skip to content

Commit

Permalink
sails generate etc (with some modifications afterwards)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikermcneil committed Nov 17, 2016
1 parent a49c8fe commit 663bd1f
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 50 deletions.
12 changes: 10 additions & 2 deletions .editorconfig
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,12 @@
# editorconfig.org # ╔═╗╔╦╗╦╔╦╗╔═╗╦═╗┌─┐┌─┐┌┐┌┌─┐┬┌─┐
# ║╣ ║║║ ║ ║ ║╠╦╝│ │ ││││├┤ ││ ┬
# o╚═╝═╩╝╩ ╩ ╚═╝╩╚═└─┘└─┘┘└┘└ ┴└─┘
#
# This file (`.editorconfig`) exists to help maintain consistent formatting
# throughout this package, the Sails framework, and the Node-Machine project.
#
# To review what each of these options mean, see:
# http://editorconfig.org/
root = true root = true


[*] [*]
Expand All @@ -7,4 +15,4 @@ indent_size = 2
end_of_line = lf end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
44 changes: 30 additions & 14 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
@@ -1,34 +1,50 @@
# ┌─┐┬┌┬┐╦╔═╗╔╗╔╔═╗╦═╗╔═╗
# │ ┬│ │ ║║ ╦║║║║ ║╠╦╝║╣
# o└─┘┴ ┴ ╩╚═╝╝╚╝╚═╝╩╚═╚═╝
#
# This file (`.gitignore`) exists to signify to `git` that certain files
# and/or directories should be ignored for the purposes of version control.
#
# This is primarily useful for excluding temporary files of all sorts; stuff
# generated by IDEs, build scripts, automated tests, package managers, or even
# end-users (e.g. file uploads). `.gitignore` files like this also do a nice job
# at keeping sensitive credentials and personal data out of version control systems.
#

############################ ############################
# npm # sails / node.js / npm
############################ ############################
node_modules node_modules
npm-debug.log npm-debug.log

.node_history


############################ ############################
# tmp, editor & OS files # editor & OS files
############################ ############################
.tmp
*.swo *.swo
*.swp *.swp
*.swn *.swn
*.swm *.swm
*.seed
*.log
*.out
*.pid
lib-cov
.DS_STORE .DS_STORE
*# *#
*\#
.\#*
*~ *~
.idea .idea
.netbeans
nbproject nbproject



############################ ############################
# Tests # misc
############################ ############################
.tmp
dump.rdb
testApp testApp
coverage -coverage
isolate-0x* -isolate-0x*

ssl

############################
# Other
############################
.node_history
36 changes: 24 additions & 12 deletions .npmignore
Original file line number Original file line Diff line number Diff line change
@@ -1,21 +1,33 @@
*# .git
./.gitignore
./.jshintrc
./.editorconfig
./.travis.yml
./example
./examples
./test
./tests
./.github

node_modules node_modules
ssl npm-debug.log
.DS_STORE .node_history
*.swo *.swo
*.swp *.swp
*.swn *.swn
*.swm *.swm
*.seed
*.log
*.out
*.pid
lib-cov
.DS_STORE
*#
*\#
.\#*
*~ *~
.idea .idea
.netbeans
nbproject nbproject
.git
.gitignore
.tmp .tmp
.jshintrc dump.rdb
.editorconfig
CONTRIBUTING.md
*.md
**/*.md
test
.github
28 changes: 6 additions & 22 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,29 +18,13 @@ node_js:
- "5" - "5"
- "6" - "6"
- "7" - "7"
- "node"


sudo: false

script:
- "npm test"

notifications:
irc:
channels:
- "irc.freenode.org#sailsjs"
on_success: never
on_failure: always
template:
- "Build by %{author} has failed:"
- "Git Info: %{branch} - %{commit}"
- "Travis states: %{message}"
- "Build Details: %{build_url}"
- "Change View: %{compare_url}"
skip_join: true

# whitelisted branches
branches: branches:
only: only:
- master - master
- stable - 0.12
- beta
notifications:
email:
- ci@sailsjs.com

0 comments on commit 663bd1f

Please sign in to comment.