Skip to content

Commit

Permalink
feat(*): cleanup for 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Jul 21, 2017
1 parent a3d94a5 commit ef14fd0
Show file tree
Hide file tree
Showing 22 changed files with 3,550 additions and 813 deletions.
56 changes: 5 additions & 51 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,54 +1,8 @@
###Node###

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
node_modules

# Users Environment Variables
.lock-wscript


###OSX###

.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
npm-debug.log
.idea
out
.nyc_output
test/tmp
63 changes: 6 additions & 57 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,63 +1,12 @@
###Node###

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
node_modules

# Users Environment Variables
.lock-wscript


###OSX###

.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# npm specific

npm-debug.log
test
.cz.json
.travis.yml
.editorconfig
bin
benchmarks
.idea
bin
out
.nyc_output
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
language: node_js
node_js:
- node
- 5.3.0
- 4.0.0
- 7.0.0
sudo: false
services:
- redis-server
install:
- npm install --no-optional
- npm install
notifications:
slack:
secure: m91zkX2cLVDRDMBAUnR1d+hbZqtSHXLkuPencHadhJ3C3wm53Box8U25co/goAmjnW5HNJ1SMSIg+DojtgDhqTbReSh5gSbU0uU8YaF8smbvmUv3b2Q8PRCA7f6hQiea+a8+jAb7BOvwh66dV4Al/1DJ2b4tCjPuVuxQ96Wll7Pnj1S7yW/Hb8fQlr9wc+INXUZOe8erFin+508r5h1L4Xv0N5ZmNw+Gqvn2kPJD8f/YBPpx0AeZdDssTL0IOcol1+cDtDzMw5PAkGnqwamtxhnsw+i8OW4avFt1GrRNlz3eci5Cb3NQGjHxJf+JIALvBeSqkOEFJIFGqwAXMctJ9q8/7XyXk7jVFUg5+0Z74HIkBwdtLwi/BTyXMZAgsnDjndmR9HsuBP7OSTJF5/V7HCJZAaO9shEgS8DwR78owv9Fr5er5m9IMI+EgSH3qtb8iuuQaPtflbk+cPD3nmYbDqmPwkSCXcXRfq3IxdcV9hkiaAw52AIqqhnAXJWZfL6+Ct32i2mtSaov9FYtp/G0xb4tjrUAsDUd/AGmMJNEBVoHtP7mKjrVQ35cEtFwJr/8SmZxGvOaJXPaLs43dhXKa2tAGl11wF02d+Rz1HhbOoq9pJvJuqkLAVvRdBHUJrB4/hnTta5B0W5pe3mIgLw3AmOpk+s/H4hAP4Hp0gOWlPA=
22 changes: 22 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
environment:
matrix:
- nodejs_version: 'Stable'
- nodejs_version: '7'

init:
git config --global core.autocrlf true

install:
- ps: Install-Product node $env:nodejs_version
- npm install

test_script:
- node --version
- npm --version
- npm run test:win

build: off
clone_depth: 1

matrix:
fast_finish: true
12 changes: 0 additions & 12 deletions bin/coverage.js

This file was deleted.

40 changes: 40 additions & 0 deletions bin/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict'

/*
* adonis-framework
*
* (c) Harminder Virk <virk@adonisjs.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

const semver = require('semver')
const { spawn } = require('child_process')
const spawnArgs = []

if (semver.lt(process.version, '8.0.0')) {
spawnArgs.push('--harmony-async-await')
}

function local () {
spawnArgs.push('./node_modules/.bin/japa')
const tests = spawn('node', spawnArgs)
tests.stdout.on('data', (data) => process.stdout.write(data))
tests.stderr.on('data', (data) => process.stderr.write(data))
tests.on('close', (code) => process.exit(code))
}

function win () {
spawnArgs.push('./node_modules/japa-cli/index.js')
const tests = spawn('node', spawnArgs)
tests.stdout.on('data', (data) => process.stdout.write(data))
tests.stderr.on('data', (data) => process.stderr.write(data))
tests.on('close', (code) => process.exit(code))
}

if (process.argv.indexOf('--local') > -1) {
local()
} else if (process.argv.indexOf('--win') > -1) {
win()
}
12 changes: 0 additions & 12 deletions bin/test.js

This file was deleted.

4 changes: 0 additions & 4 deletions examples/redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
const Env = use('Env')

module.exports = {

/*
|--------------------------------------------------------------------------
| connection
Expand All @@ -40,7 +39,6 @@ module.exports = {
keyPrefix: ''
},


/*
|--------------------------------------------------------------------------
| cluster config
Expand All @@ -63,6 +61,4 @@ module.exports = {
db: 0
}]
}


}
22 changes: 0 additions & 22 deletions lib/util.js

This file was deleted.

Loading

0 comments on commit ef14fd0

Please sign in to comment.