Skip to content

Commit

Permalink
Updated dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
sgress454 committed Dec 28, 2016
1 parent 267b002 commit 90761a4
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 20 deletions.
21 changes: 14 additions & 7 deletions .gitignore
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,35 @@
#

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

.node_history

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


############################
# Tests
# misc
############################
.waterline
.tmp
dump.rdb
8 changes: 8 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@
// read, albeit a bit less exciting)
"laxcomma": false,

// Do NOT allow avant garde use of commas in conditional statements.
// (this prevents accidentally writing code like:
// ```
// if (!_.contains(['+ci', '-ci', '∆ci', '+ce', '-ce', '∆ce']), change.verb) {...}
// ```
// See the problem in that code? Neither did we-- that's the problem!)
"nocomma": true,

// Strictly enforce the consistent use of single quotes.
// (this is a convention that was established primarily to make it easier
// to grep [or FIND+REPLACE in Sublime] particular string literals in
Expand Down
38 changes: 25 additions & 13 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
*#
.git
./.gitignore
./.jshintrc
./.editorconfig
./.travis.yml
./appveyor.yml
./example
./examples
./test
./tests
./.github

node_modules
ssl
.DS_STORE
npm-debug.log
.node_history
*.swo
*.swp
*.swn
*.swm
*.seed
*.log
*.out
*.pid
lib-cov
.DS_STORE
*#
*\#
.\#*
*~
.idea
.netbeans
nbproject
.git
.gitignore
.tmp
.jshintrc
.editorconfig
CONTRIBUTING.md
*.md
**/*.md
test
.github
.waterline
dump.rdb
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# ╔╦╗╦═╗╔═╗╦ ╦╦╔═╗ ┬ ┬┌┬┐┬ #
# ║ ╠╦╝╠═╣╚╗╔╝║╚═╗ └┬┘││││ #
# o ╩ ╩╚═╩ ╩ ╚╝ ╩╚═╝o ┴ ┴ ┴┴─┘ #
# #
# This file configures Travis CI. #
# (i.e. how we run the tests... mainly) #
# #
# https://docs.travis-ci.com/user/customizing-the-build #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # #

language: node_js

node_js:
- "0.10"
- "0.12"
- "4"
- "5"
- "6"
- "7"
- "node"

sudo: false
branches:
only:
- master

notifications:
email:
- ci@sailsjs.com
47 changes: 47 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# # # # # # # # # # # # # # # # # # # # # # # # # #
# ╔═╗╔═╗╔═╗╦ ╦╔═╗╦ ╦╔═╗╦═╗ ┬ ┬┌┬┐┬ #
# ╠═╣╠═╝╠═╝╚╗╔╝║╣ ╚╦╝║ ║╠╦╝ └┬┘││││ #
# ╩ ╩╩ ╩ ╚╝ ╚═╝ ╩ ╚═╝╩╚═o ┴ ┴ ┴┴─┘ #
# #
# This file configures Appveyor CI. #
# (i.e. how we run the tests on Windows) #
# #
# https://www.appveyor.com/docs/lang/nodejs-iojs/ #
# # # # # # # # # # # # # # # # # # # # # # # # # #


# Test against these versions of Node.js.
environment:
matrix:
- nodejs_version: "0.10"
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
- nodejs_version: "7"

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node.js
# (Not sure what this is for, it's just in Appveyor's example.)
- ps: Install-Product node $env:nodejs_version
# Install declared dependencies
- npm install


# Post-install test scripts.
test_script:
# Output Node and NPM version info.
# (Presumably just in case Appveyor decides to try any funny business?
# But seriously, always good to audit this kind of stuff for debugging.)
- node --version
- npm --version
# Run the actual tests.
- npm test


# Don't actually build.
# (Not sure what this is for, it's just in Appveyor's example.
# I'm not sure what we're not building... but I'm OK with not
# building it. I guess.)
build: off

0 comments on commit 90761a4

Please sign in to comment.