Skip to content

Commit

Permalink
Merge pull request #38 from deadratfink/development
Browse files Browse the repository at this point in the history
Merge for major release
  • Loading branch information
deadratfink committed Jul 22, 2016
2 parents 9487ade + fe0631d commit 9dee021
Show file tree
Hide file tree
Showing 27 changed files with 864 additions and 527 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/bin
/docs/API.md
.idea
*.iml
/VERSION.txt
node_modules
!/bin
/.project
/.settings/*
npm-debug.log
coverage
nohup.out
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Jens Krefeldt
Copyright (c) 2016 [Jens Krefeldt](https://github.com/deadratfink)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
433 changes: 231 additions & 202 deletions README.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions VERSION.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.3
30 changes: 30 additions & 0 deletions bin/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env bash

TMP=bin/tmp/
PREPARE_LOG=bin/tmp/release-prepare.log
file="VERSION.txt"
VERSION=$(cat "$file")
current=$(pwd)
echo -e $current
echo -e "Release prepare: $VERSION"
BIN=bin/prepare-release.sh

if [ ! -d "$TMP" ]; then
mkdir bin/tmp/
else
rm -Rf bin/tmp/
mkdir bin/tmp/
fi

#git reset --hard
#git checkout --track origin/master
#git checkout --track origin/development
#export GIT_MERGE_AUTOEDIT=no
#git config gitflow.branch.develop development
#git config gitflow.prefix.versiontag v
#git flow init -fd
#git flow release start $VERSION
#npm --no-git-tag-version version $VERSION
#json -I -o json-4 -f package.json
#git commit -am 'Published $VERSION release branch'
#git flow release publish $VERSION
24 changes: 18 additions & 6 deletions docs/BADGES.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
# Stats

| [Github License](https://github.com/deadratfink/jy-transform/blob/master/LICENSE.md) | [Github Issues](https://github.com/deadratfink/jy-transform/issues) | [Github Release](https://github.com/deadratfink/jy-transform/releases) | [Github Tags](https://github.com/deadratfink/jy-transform/tags) | [Travis CI](https://travis-ci.org) | [Waffle](https://waffle.io/deadratfink/jy-transform) | [Code Climate](https://codeclimate.com/github/deadratfink/jy-transform) |
## General

| [License](https://github.com/deadratfink/jy-transform/blob/master/LICENSE.md) | [Issues](https://github.com/deadratfink/jy-transform/issues) | [Releases](https://github.com/deadratfink/jy-transform/releases) | [Tags](https://github.com/deadratfink/jy-transform/tags) | [Travis CI](https://travis-ci.org) | [Waffle](https://waffle.io/deadratfink/jy-transform) | [Code Climate](https://codeclimate.com/github/deadratfink/jy-transform) |
| --- | --- | --- | --- | --- | --- | --- |
| [![License][gh-license-image]][gh-license-url] | [![Issue Stats][gh-issues-image]][gh-issues-url] | [![Github Releases][gh-releases-image]][gh-releases-url] | [![Github Tags][gh-tags-image]][gh-tags-url] | [![Build Status][ci-image]][ci-url] | [![Waffle][waffle-image]][waffle-url] | [![Code Climate][cocl-image]][cocl-url] |
| [![License][gh-license-image]][gh-license-url] | [![Issue Stats][gh-issues-image]][gh-issues-url] | [![Releases][gh-releases-image]][gh-releases-url] | [![Tags][gh-tags-image]][gh-tags-url] | [![Build Status][ci-image]][ci-url] | [![Waffle][waffle-image]][waffle-url] | [![Code Climate][cocl-image]][cocl-url] |

## Branches

| Branch | [Codecov](https://codecov.io) | [Coveralls](https://coveralls.io) | [Inch CI](http://inch-ci.org) | [David](https://david-dm.org) DM | [David](https://david-dm.org) DM (dev) |
| --- | --- | --- | --- | --- | --- |
| master | [![codecov.io][cc-image-master]][cc-url-master] | [![coveralls.io][ca-image-master]][ca-url-master] | [![inch-ci.org][inch-image-master]][inch-url-master] | [![Dependency Status][dep-image-master]][dep-url-master] | [![devDependency Status][devdep-image-master]][devdep-url-master] |
| development | [![codecov.io][cc-image-development]][cc-url-development] | [![coveralls.io][ca-image-development]][ca-url-development] | [![inch-ci.org][inch-image-development]][inch-url-development] | [![Dependency Status][dep-image-development]][dep-url-development] | [![devDependency Status][devdep-image-development]][devdep-url-development] |

## Coverage Graphs
### Coverage

| Branch | Graph |
| master | development |
| --- | --- |
| master | ![codecov.io](https://codecov.io/github/deadratfink/jy-transform/branch.svg?branch=master&vg=true) |
| development| ![codecov.io](https://codecov.io/github/deadratfink/jy-transform/branch.svg?branch=development&vg=true) |
| ![codecov.io](https://codecov.io/gh/deadratfink/jy-transform/branch/master/graphs/tree.svg) | ![codecov.io](https://codecov.io/gh/deadratfink/jy-transform/branch/development/graphs/tree.svg) |

<!--| Branch | Graph | -->
<!--| --- | --- | -->
<!--| master | ![codecov.io](https://codecov.io/github/deadratfink/jy-transform/branch.svg?branch=master&vg=true) | -->
<!--| development| ![codecov.io](https://codecov.io/github/deadratfink/jy-transform/branch.svg?branch=development&vg=true) | -->

## NPM

[![NPM](https://nodei.co/npm/jy-transform.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/jy-transform/)
[![NPM](https://nodei.co/npm-dl/jy-transform.png?height=3&months=9)](https://nodei.co/npm-dl/jy-transform/)

[gh-license-image]: https://img.shields.io/github/license/deadratfink/jy-transform.svg?style=flat-square
[gh-license-url]: https://github.com/deadratfink/jy-transform/blob/master/LICENSE.md
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md → docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
# Changelog

### v2.0.0


- [[#33](https://github.com/deadratfink/jy-transform/issues/33)] Enhance `LogWrapper` with `TRACE` level (API)
- [[#32](https://github.com/deadratfink/jy-transform/issues/32)] Introduce input and output on CLI as ARGS instead of OPTIONS (non-backwards compatible change for CLI usage, _no_ impact on API level!)
- e.g. on CLI type in `$ jyt foo.js bar.yaml` instead of `$ jyt -s foo.js -d bar.yaml`
- [[#31](https://github.com/deadratfink/jy-transform/issues/31)] Bugfix: given `Object` source results in 'yaml' for origin (API)
- [Cleanup] Update dependencies

### v1.0.2

- [[#30](https://github.com/deadratfink/jy-transform/issues/30)] Fix README and externalize API Reference to wiki
- [[#30](https://github.com/deadratfink/jy-transform/issues/30)] Fix README and externalize API reference to wiki
- [[#29](https://github.com/deadratfink/jy-transform/issues/29)] Fix Promise warning on write process

### v1.0.1

Initial release. This covers the basic implementation and tests. The following features and fixes and part of this release:
Initial public release. This covers the basic implementation and tests. The following features and fixes and part of this release:

- [[#27](https://github.com/deadratfink/jy-transform/issues/27)] Export variable for JS input
- [[#22](https://github.com/deadratfink/jy-transform/issues/22)] Integrate Coveralls
Expand Down
10 changes: 4 additions & 6 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Contributing

Pull requests and stars are always welcome. Anybody is invited to take part
into this project. For bugs and feature requests, please create an
[issue](https://github.com/deadratfink/jy-transform/issues).
When contributing as coder, please take care of the following conventions:

- Enter yourself in the `constributors` section of _package.json_.
- Enter yourself in the `contributors` section of _package.json_.
- We strictly follow [Semantic Versioning 2](http://semver.org) rules.
- The `development` branch is the leading branch and is protected. Create bugfix and feature
branches (or fork into you own namespace) and create pull
Expand All @@ -24,12 +21,13 @@ When contributing as coder, please take care of the following conventions:
- Doc everything with [JSDocs](http://usejsdoc.org/) and document concepts in
[README.md](https://github.com/deadratfink/jy-transform/blob/development/README.md)
or [Wiki](https://github.com/deadratfink/jy-transform/wiki).
- Use single parenthesis (`'...'`) in _*.js_ files instead of double parenthesis (`"..."`).
- Use _single_ parenthesis (`'...'`) in _*.js_ files instead of _double_ parenthesis (`"..."`).
- Avoid the of use parenthesis for keys in JSON objects.
- Use the strict mode (`'use strict';`) in _*.js_ files.
- File names should be lower-case with hyphens as divider, e.g. _options-handler.js_.
- Markdown documentation files should be upper-case with _.md_ as extension, placed
in _./docs_, e.g. _USAGE.md_. The _README.md_ is build up by these files concatenated
by `npm run docs` command. Any new files have to be added to `scripts.docs` section of
_package.json_. Don't forget to regenerate _README.md_ before committing.
_package.json_. Don't forget to regenerate _README.md_ (`$ npm run docs`) and wiki
(`$ npm run wiki`) before committing.

2 changes: 2 additions & 0 deletions docs/LOGO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![jy-transform logo](https://github.com/deadratfink/jy-transform/blob/master/image/jytransform.png)

0 comments on commit 9dee021

Please sign in to comment.