Skip to content

Commit 58e9bda

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents e09d15d + 78789f6 commit 58e9bda

File tree

188 files changed

+5418
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+5418
-290
lines changed

.travis.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
language: node_js
22

33
node_js:
4-
- iojs
5-
- 0.10
6-
- 0.12
4+
- node
5+
- lts/*
6+
- 8
77

88
before_install:
99
- sudo apt-get update -qq
10-
- sudo apt-get install -qq --yes python3 php5-curl php5-cli
10+
- sudo apt-get install -qq php7.0 php7.0-curl php7.0-cli
1111

1212
after_script:
1313
- npm run codeclimate
14-
15-
notifications:
16-
webhooks:
17-
urls:
18-
- https://webhooks.gitter.im/e/95c4e911f2486588f98c
19-
on_success: always
20-
on_failure: always
21-
on_start: false

CONTRIBUTING.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Good bug reports are extremely helpful - thank you!
2828
Guidelines for bug reports:
2929

3030
1. **Use the GitHub issue search** — check if the issue has already been
31-
reported.
31+
reported.
3232

3333
2. **Check if the issue has been fixed** — try to reproduce it using the
34-
latest `master` or development branch in the repository.
34+
latest `master` or development branch in the repository.
3535

3636
3. **Isolate the problem** — create a [reduced test
37-
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
37+
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
3838

3939
A good bug report shouldn't leave others needing to chase you up for more
4040
information. Please try to be as detailed as possible in your report. What is
@@ -85,48 +85,48 @@ Follow this process if you'd like your work considered for inclusion in the
8585
project:
8686

8787
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
88-
and configure the remotes:
88+
and configure the remotes:
8989

90-
```bash
91-
# Clone your fork of the repo into the current directory
92-
git clone https://github.com/<your-username>/<repo-name>
93-
# Navigate to the newly cloned directory
94-
cd <repo-name>
95-
# Assign the original repo to a remote called "upstream"
96-
git remote add upstream https://github.com/Mashape/httpsnippet.git
97-
```
90+
```bash
91+
# Clone your fork of the repo into the current directory
92+
git clone https://github.com/<your-username>/<repo-name>
93+
# Navigate to the newly cloned directory
94+
cd <repo-name>
95+
# Assign the original repo to a remote called "upstream"
96+
git remote add upstream https://github.com/Mashape/httpsnippet.git
97+
```
9898

9999
2. If you cloned a while ago, get the latest changes from upstream:
100100

101-
```bash
102-
git checkout <dev-branch>
103-
git pull upstream <dev-branch>
104-
```
101+
```bash
102+
git checkout <dev-branch>
103+
git pull upstream <dev-branch>
104+
```
105105

106106
3. Create a new topic branch (off the main project development branch) to
107-
contain your feature, change, or fix:
107+
contain your feature, change, or fix:
108108

109-
```bash
110-
git checkout -b <topic-branch-name>
111-
```
109+
```bash
110+
git checkout -b <topic-branch-name>
111+
```
112112

113113
4. Commit your changes in logical chunks. Please adhere to these [git commit
114-
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
115-
or your code is unlikely be merged into the main project. Use Git's
116-
[interactive rebase](https://help.github.com/articles/interactive-rebase)
117-
feature to tidy up your commits before making them public.
114+
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
115+
or your code is unlikely be merged into the main project. Use Git's
116+
[interactive rebase](https://help.github.com/articles/interactive-rebase)
117+
feature to tidy up your commits before making them public.
118118
119119
5. Locally merge (or rebase) the upstream development branch into your topic branch:
120120
121-
```bash
122-
git pull [--rebase] upstream <dev-branch>
123-
```
121+
```bash
122+
git pull [--rebase] upstream <dev-branch>
123+
```
124124
125125
6. Push your topic branch up to your fork:
126126
127-
```bash
128-
git push origin <topic-branch-name>
129-
```
127+
```bash
128+
git push origin <topic-branch-name>
129+
```
130130
131131
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
132132
with a clear title and description.

Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# specify the node base image with your desired version node:<version>
2+
FROM node:8
3+
4+
ADD . /src
5+
WORKDIR /src
6+
7+
RUN apt-get update -qq
8+
RUN apt-get install -qq php7.0 php7.0-curl php7.0-cli
9+
RUN apt-get install -qq --yes python3

README.md

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ See it in action on companion service: [APIembed](https://apiembed.com/)
88

99
[![Build Status][travis-image]][travis-url]
1010
[![Downloads][npm-downloads]][npm-url]
11-
[![Code Climate][codeclimate-quality]][codeclimate-url]
12-
[![Coverage Status][codeclimate-coverage]][codeclimate-url]
13-
[![Dependencies][david-image]][david-url]
14-
[![Gitter][gitter-image]][gitter-url]
1511

1612
## Install
1713

@@ -171,9 +167,9 @@ Have a bug or a feature request? Please first read the [issue guidelines](CONTRI
171167

172168
Please read through our [contributing guidelines](CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
173169

174-
For a info on creating new conversion targets, please review this [guideline](https://github.com/Mashape/httpsnippet/wiki/Creating-Targets)
170+
For info on creating new conversion targets, please review this [guideline](https://github.com/Mashape/httpsnippet/wiki/Creating-Targets)
175171

176-
More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests.
172+
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests.
177173

178174
Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
179175

@@ -195,24 +191,14 @@ For more information on SemVer, please visit <http://semver.org/>.
195191

196192
## License
197193

198-
[MIT](LICENSE) &copy; [Mashape](https://www.mashape.com)
194+
[MIT](LICENSE) &copy; [Kong](https://konghq.com)
199195

200-
[license-url]: https://github.com/Mashape/httpsnippet/blob/master/LICENSE
196+
[license-url]: https://github.com/Kong/httpsnippet/blob/master/LICENSE
201197

202-
[travis-url]: https://travis-ci.org/Mashape/httpsnippet
203-
[travis-image]: https://img.shields.io/travis/Mashape/httpsnippet.svg?style=flat-square
198+
[travis-url]: https://travis-ci.org/Kong/httpsnippet
199+
[travis-image]: https://api.travis-ci.org/Kong/httpsnippet.svg?branch=master
204200

205201
[npm-url]: https://www.npmjs.com/package/httpsnippet
206202
[npm-license]: https://img.shields.io/npm/l/httpsnippet.svg?style=flat-square
207203
[npm-version]: https://img.shields.io/npm/v/httpsnippet.svg?style=flat-square
208204
[npm-downloads]: https://img.shields.io/npm/dm/httpsnippet.svg?style=flat-square
209-
210-
[codeclimate-url]: https://codeclimate.com/github/Mashape/httpsnippet
211-
[codeclimate-quality]: https://img.shields.io/codeclimate/github/Mashape/httpsnippet.svg?style=flat-square
212-
[codeclimate-coverage]: https://img.shields.io/codeclimate/coverage/github/Mashape/httpsnippet.svg?style=flat-square
213-
214-
[david-url]: https://david-dm.org/Mashape/httpsnippet
215-
[david-image]: https://img.shields.io/david/Mashape/httpsnippet.svg?style=flat-square
216-
217-
[gitter-url]: https://gitter.im/Mashape/httpsnippet
218-
[gitter-image]: https://img.shields.io/badge/Gitter-Join%20Chat-blue.svg?style=flat-square

docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: '3'
2+
services:
3+
httpsnippet:
4+
build: .
5+
command: [npm, test]

0 commit comments

Comments
 (0)