Skip to content

Commit

Permalink
chore: Apply latest nlm generator
Browse files Browse the repository at this point in the history
  • Loading branch information
grpn-bulk-nlm committed Mar 7, 2016
1 parent 6d3be81 commit 05a2980
Show file tree
Hide file tree
Showing 7 changed files with 205 additions and 40 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
node_modules/
/tmp
npm-debug.log
tmp
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry=https://registry.npmjs.org
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
language: node_js
node_js:
- '0.10'
- '4.2'
- '4'
before_install:
- npm install -g npm@latest-2
- npm install -g npm@latest-2
before_deploy:
- git config --global user.email "opensource@groupon.com"
- git config --global user.name "CI"
- 'git config --global user.email "jan.krems@groupon.com"'
- 'git config --global user.name "Jan Krems"'
deploy:
provider: script
script: './bin/nlm.js release'
script: ./node_modules/.bin/nlm release
skip_cleanup: true
on:
'on':
branch: master
node: '4.2'
node: '4'
147 changes: 147 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<!-- Generated by generator-nlm -->

# Contributing

🎉🏅 Thanks for helping us improve this project! 🙏

This document outlines some of the practices we care about.
If you have any questions or suggestions about the process,
feel free to [open an issue](#reporting-issues)
.
## How Can I Contribute?

### Reporting Issues

If you find any mistakes in the docs or a bug in the code,
please [open an issue in Github](https://github.com/groupon/nlm/issues/new) so we can look into it.
You can also [create a PR](#contributing-code) fixing it yourself, or course.

If you report a bug, please follow these guidelines:

* Make sure the bug exists in the latest version.
* Include instructions on how to reproduce the issue.
The instructions should be as minimal as possible
and answer the three big questions:
1. What are the exact steps you took? This includes the exact versions of node, npm, and any packages involved.
1. What result are you expecting?
1. What is the actual result?

### Improving Documentation

For small documentation changes, you can use [Github's editing feature](https://help.github.com/articles/editing-files-in-another-user-s-repository/).
The only thing to keep in mind is to prefix the commit message with "docs: ".
The detault commit message generated by Github will lead to a failing CI build.

For larger updates to the documentation
it might be better to follow the [instructions for contributing code below](#contributing-code).

### Contributing Code

**Note:** If you're planning on making substantial changes,
please [open an issue first to discuss your idea](#reporting-issues).
Otherwise you might end up investing a lot of work
only to discover that it conflicts with plans the maintainers might have.

The general steps for creating a pull request are:

1. Create a branch for your change.
Always start your branch from the latest `master`.
We often prefix the branch name with our initials, e.g. `jk-a-change`.
1. Run `npm install` to install the dependencies.
1. If you're fixing a bug, be sure to write a test *first*.
That way you can validate that the test actually catches the bug and doesn't pass.
1. Make your changes to the code.
Remember to update the tests if you add new features or change behavior.
1. Run the tests via `npm test`. This will also run style checks and other validations.
You might see errors about uncommitted files.
This is expected until you commit your changes.
1. Once you're done, `git add .` and `git commit`.
Please follow the [commit message conventions](#commits--commit-messages) described below.
1. Push your branch to Github & create a PR.

#### Code Style

In addition to any linting rules the project might include,
a few general rules of thumb:

* Try to match the style of the rest of the code.
* We prefer simple code that is easy to understand over terse, expressive code.
* We try to structure projects by semantics instead of role.
E.g. we'd rather have a `tree.js` module that contains tree traversal-related helpers
than a `helpers.js` module.
* Actually, if you create helpers you might want to put those into a separate package.
That way it's easier to reuse them.

#### Commits & Commit Messages

Please follow the [angular commit message conventions](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#-git-commit-guidelines).
We use an automated tool for generating releases
that depends on the conventions to determine the next version and the content of the changelog.
Commit messages that don't follow the conventions will cause `npm test` (and thus CI) to fail.

The short summary - a commit message should look like this:

```
<type>: <subject>
<body>
<references>
<footer>
```

Everything but the first line is optional.
The empty lines between the different parts are required.

* `<type>`: One of the following:
- **feat:** Introduces a new feature. This will cause the minor version to go up.
- **fix:** A bug fix. Causes a patch version bump.
- **docs:** Changes to the documentation.
This will also cause an increase of the patch version so that the changes show up in the npm registry.
- **style:** Cleanup & lint rule fixes.
Note that often it's better to just amend the previous commit if it introduced lint errors.
- **refactor:** Changes to the code structure without fixing bugs or adding features.
- **perf:** Performance optimizations.
- **test:** Fixing existing tests or adding missing ones.
Just like with **style**, if you add tests to a feature you just introduced in the previous commit,
consider keeping the tests and the feature in the same commit instead.
- **chore:** Changes to the project setup and tools, dependency bumps, house-keeping.
* `<subject>`: A [good git commit message subject](http://chris.beams.io/posts/git-commit/#limit-50).
- Keep it brief. If possible the whole first line should have at most 50 characters.
- Use imperative mood. "Create" instead of "creates" or "created".
- No period (".") at the end.
* `<body>`: Motivation for the change and any context required for understanding the choices made.
Just like the subject, it should use imperative mood.
* `<references>`: Any URLs relevant to the PR go here.
Use one line per URL and prefix it with the kind of relationship, e.g. "Closes: " or "See: ".
If you are referencing an issue in your commit body or PR description,
never use `#123` but the full URL to the issue or PR you are referencing.
That way the reference is easy to resolve from the git history without having to "guess" the correct link
even if the commit got cherry-picked or merged into a different project.
* `<footer>`: This part only applies if your commit introduces a breaking change.
It's important this is present, otherwise the major version will not increase.
See below for an example.

##### Examples

A feature that introduces a breaking change:

```
feat: Support --yes CLI option
For existing projects all prompts can be inferred automatically.
Manual confirmation for each default provides no value in that case.
Closes https://github.com/my/project/issues/123
BREAKING CHANGE: This removes support for interactive password entry.
Users will have to login beforehand.
```

A simple bug fix:

```
fix: Handle multi-byte characters in search logic
```

69 changes: 37 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,63 @@
"name": "nlm",
"version": "2.2.0",
"description": "Lifecycle manager for node projects",
"license": "BSD-3-Clause",
"main": "lib/nlm.js",
"bin": "bin/nlm.js",
"files": [
"bin",
"lib"
],
"scripts": {
"postinstall": "./bin/post-install.js",
"test": "eslint lib test && mocha",
"posttest": "./bin/nlm.js verify"
},
"homepage": "https://github.com/groupon/nlm",
"repository": {
"type": "git",
"url": "https://github.com/groupon/nlm.git"
"url": "git+ssh://git@github.com/groupon/nlm"
},
"keywords": [
"publish",
"release",
"semver"
],
"author": "Jan Krems <jan.krems@groupon.com>",
"license": "BSD-3-Clause",
"bugs": {
"url": "https://github.com/groupon/nlm/issues"
},
"homepage": "https://github.com/groupon/nlm",
"devDependencies": {
"assertive": "^2.0.2",
"eslint": "^1.9.0",
"eslint-config-groupon": "^2.0.0",
"mocha": "^2.3.4"
"scripts": {
"postinstall": "./bin/post-install.js",
"pretest": "eslint lib test",
"test": "mocha",
"posttest": "nlm verify"
},
"nlm": {
"license": {
"files": [
"lib",
"test"
]
}
},
"dependencies": {
"bluebird": "^3.0.5",
"bluebird": "^3.3.3",
"conventional-commits-parser": "~0.1.2",
"debug": "^2.2.0",
"glob": "^6.0.1",
"gofer": "^2.4.5",
"inquirer": "~0.11.0",
"lodash": "^3.10.1",
"lodash": "^4.6.1",
"minimist": "^1.2.0",
"rc": "^1.1.5",
"semver": "^5.1.0"
},
"nlm": {
"license": {
"files": [
"lib",
"test"
]
}
"devDependencies": {
"assertive": "^2.0.0",
"eslint": "^1.0.0",
"eslint-config-groupon": "^2.0.0",
"mocha": "^2.0.0",
"nlm": "^2.0.0"
},
"author": {
"name": "Jan Krems",
"email": "jan.krems@groupon.com"
},
"keywords": [
"publish",
"release",
"semver"
],
"files": [
"bin",
"lib"
],
"publishConfig": {
"registry": "https://registry.npmjs.org"
}
Expand Down
File renamed without changes.

0 comments on commit 05a2980

Please sign in to comment.