Skip to content

Commit

Permalink
Merge 090a899 into b635534
Browse files Browse the repository at this point in the history
  • Loading branch information
danactive committed Dec 11, 2016
2 parents b635534 + 090a899 commit 447d0c6
Show file tree
Hide file tree
Showing 19 changed files with 119 additions and 107 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ before_install:
- npm install -g yarn --cache-min 999999999
install:
- yarn install

before_script:
- yarn lint
scripts:
- yarn ci
- yarn test:all
- yarn test:react
after_success:
- yarn ci-cover:coveralls
- yarn ci-cover:prep-codeclimate
Expand Down
12 changes: 7 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
* Ask a question
* Submit a bug
* Recommend a feature
* Enforced rules for new Issues
* Issue description cannot be empty [read more...](https://gitmagic.io/rules/#/issue/body-cannot-be-empty)
* More with GitHub.com documentation on [Mastering Issues](https://guides.github.com/features/issues/)

## Pull Requests (code review)
* Pull request description must include verification steps [read more...](https://gitmagic.io/rules/#/pull-request/body-must-include-verification-steps)
* Commit message subject must include a GitHub issue [read more...](https://gitmagic.io/rules/#/commit/subject-must-include-github-issue)
* Explain code commits and reference the issue number such as (#123)
* Do not bump version or update changelog as it's automated when manually triggered
* Write unit tests for code commit
* Do not bump version or update changelog as it's manually triggered when released
* Enforced rules for new Pull Requests
* Pull request description must include verification steps [read more...](https://gitmagic.io/rules/#/pull-request/body-must-include-verification-steps)
* Commit message subject must include a GitHub issue [read more...](https://gitmagic.io/rules/#/commit/subject-must-include-github-issue)
* Write unit tests to match existing test coverage
* More with GitHub.com documentation on [Contributing to a Project](https://guides.github.com/activities/contributing-to-open-source/#contributing)

## Commit message
Expand Down
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ Your personal **history** storyboarded with photo and video albums. Associate p
* Includes administration tools for XML generation

## Installation
1. Node.js v6.9.x
1. Node.js v6.9.x [Download](https://nodejs.org/)
1. Install project dependencies `npm install` (`yarn` is used for development)
1. Start web server `npm start`
1. View address in browser (printed in terminal on successful load)

## Changelog of releases
See [CHANGELOG](CHANGELOG.md)

## Contributing to this open-source project
See [CONTRIBUTING](CONTRIBUTING.md)

## Copyright
See [LICENSE](LICENSE)
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@
"name": "history",
"version": "1.12.1",
"scripts": {
"ci": "gulp --gulpfile plugins/gulpfile.js ci",
"dev": "gulp develop",
"debug": "node-debug index.js",
"harness": "node ./node_modules/tuxharness/index.js",
"lint": "gulp --gulpfile plugins/gulpfile.js lint",
"eslint": "eslint **/*.{js,jsx}",
"nsp": "gulp --gulpfile plugins/gulpfile.js nsp",
"release": "standard-version",
"start": "webpack --config plugins/editAlbum/webpack.js && node .",
"test:all": "gulp --gulpfile plugins/gulpfile.js test",
"test": "nyc tape plugins/**/*.spec.js",
"test:react": "babel-tape-runner plugins/album/test/*.js | faucet",
"ci-cover:coveralls": "nyc report --reporter=text-lcov | coveralls",
"ci-cover:prep-codeclimate": "nyc report --reporter=text-lcov > coverage.lcov",
"ci-cover:codeclimate": "codeclimate-test-reporter < coverage.lcov",
"test:react": "babel-tape-runner plugins/album/test/*.js | faucet"
"ci-lint": "eslint **/*.{js,jsx}"
},
"main": "index.js",
"dependencies": {
Expand Down Expand Up @@ -75,7 +73,6 @@
"gulp-filter": "^4.0.0",
"gulp-load-plugins": "^1.2.0",
"gulp-mocha": "^3.0.1",
"gulp-nsp": "^2.4.2",
"gulp-plumber": "^1.0.1",
"gulp-print": "^2.0.1",
"gulp-rename": "^1.2.0",
Expand Down
8 changes: 8 additions & 0 deletions plugins/admin/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
2 changes: 2 additions & 0 deletions plugins/admin/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ tape('Verify /admin route', { skip: false }, (describe) => {
const lib = require('../lib');

describe.test('* Placeholder', { skip: false }, (assert) => {
assert.ok(lib);

assert.end();
});
});
8 changes: 8 additions & 0 deletions plugins/album/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/editAlbum/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
2 changes: 2 additions & 0 deletions plugins/editAlbum/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ tape('Verify /edit/admin route', { skip: false }, (describe) => {
const lib = require('../lib');

describe.test('* Placeholder', { skip: false }, (assert) => {
assert.ok(lib);

assert.end();
});
});
8 changes: 8 additions & 0 deletions plugins/exists/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/gallery/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
6 changes: 0 additions & 6 deletions plugins/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ const eslint = require('gulp-eslint');
const flags = require('yargs').argv;
const filter = require('gulp-filter');
const gulp = require('gulp');
const nsp = require('gulp-nsp');
const path = require('path');
const print = require('gulp-print');
const tape = require('gulp-tape');
const tapSummary = require('tap-summary');
Expand Down Expand Up @@ -52,7 +50,3 @@ gulp.task('test', () => {
.pipe(print())
.pipe(tape(options));
});

gulp.task('nsp', done => nsp({ package: path.join(__dirname, '../', 'package.json') }, done));

gulp.task('ci', ['lint', 'test', 'nsp']);
8 changes: 8 additions & 0 deletions plugins/home/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/log/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/rename/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/resize/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/utils/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
8 changes: 8 additions & 0 deletions plugins/video/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "airbnb",
"rules": {
"max-len": [2, 150, 4],
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"global-require": 0
}
}
Loading

0 comments on commit 447d0c6

Please sign in to comment.