Skip to content

Commit

Permalink
Release 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dotmpe committed Sep 18, 2016
1 parent 09d3359 commit 40e42f4
Show file tree
Hide file tree
Showing 40 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Change Log
- Minor bits for apply version.
Added .py support for version and __version__ attributes.

(0.1.2)
0.1.2
- Fixed `load()` and sub-cmd `check` to read `.versioned-files.list`
(``V_MAIN_DOC``) as a \*nix alike file.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ifeq ($(PROJECT),)
PROJECT := $(notdir $(BASE))
endif

VERSION := 0.1.2-dev# git-versioning
VERSION := 0.1.2# git-versioning
#ID := git-versioning/0.0.16-master
#VERSION := $(patsubst $(PROJECT)/%,%,$(ID))

Expand Down
8 changes: 4 additions & 4 deletions ReadMe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ GIT Versioning
==============
:Created: 2015-04-19
:Updated: 2016-06-16
:Version: 0.1.2-dev
:Status: Dev
:Version: 0.1.2
:Status: Release
:project:

.. image:: https://secure.travis-ci.org/dotmpe/git-versioning.png
Expand Down Expand Up @@ -84,7 +84,7 @@ Exact specs of variable rewrites may differ per format since its not always
possible to include a comment on the line (ie. JSON).

.. rSt example:
.. Id: git-versioning/0.1.2-dev ReadMe.rst
.. Id: git-versioning/0.1.2 ReadMe.rst
Other documents
Expand All @@ -99,4 +99,4 @@ Other documents
.. _sitefile: http://github.com/dotmpe/node-sitefile

.. Id: git-versioning/0.1.2-dev ReadMe.rst
.. Id: git-versioning/0.1.2 ReadMe.rst
2 changes: 1 addition & 1 deletion Rules.git-hooks.shared.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev Rules.git-hooks.shared.mk
# Id: git-versioning/0.1.2 Rules.git-hooks.shared.mk

# http://git-scm.com/docs/githooks

Expand Down
4 changes: 2 additions & 2 deletions Rules.git-versioning.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev Rules.git-versioning.mk
# Id: git-versioning/0.1.2 Rules.git-versioning.mk


empty :=
Expand Down Expand Up @@ -70,7 +70,7 @@ do-release:: cli-version-check
echo "Please fix version or the ChangeLog"; \
exit 2; }
ENV=testing ./configure.sh \
&& pd tcheck \
&& pd check \
&& git checkout .versioned-files.list
grep Status..Release ReadMe.rst
git commit -m "$(M) $(VERSION)"
Expand Down
2 changes: 1 addition & 1 deletion Rules.git-versioning.shared.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev Rules.git-versioning.shared.mk
# Id: git-versioning/0.1.2 Rules.git-versioning.shared.mk


# print version from main file
Expand Down
2 changes: 1 addition & 1 deletion Rules.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# created local Rules to configure and test git-versioning hooks

# Id: git-versioning/0.1.2-dev Rules.mk
# Id: git-versioning/0.1.2 Rules.mk


git-pre-commit::
Expand Down
2 changes: 1 addition & 1 deletion bin/cli-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TOOLS=$V_SH_SHARE/tools
# Path to versioned files
V_TOP_PATH=.

# Id: git-versioning/0.1.2-dev bin/cli-version.sh
# Id: git-versioning/0.1.2 bin/cli-version.sh

source $LIB/git-versioning.sh

Expand Down
2 changes: 1 addition & 1 deletion lib/formats.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Id: git-versioning/0.1.2-dev lib/formats.sh
# Id: git-versioning/0.1.2 lib/formats.sh

# reStructureText
RST_VER_TOKEN=':\([Vv]\)ersion:'
Expand Down
6 changes: 3 additions & 3 deletions lib/git-versioning.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ V_SH_LIB=$BASH_SOURCE
set -e


# Id: git-versioning/0.1.2-dev lib/git-versioning.sh
# version: 0.1.2-dev git-versioning lib/git-versioning.sh
# Id: git-versioning/0.1.2 lib/git-versioning.sh
# version: 0.1.2 git-versioning lib/git-versioning.sh

source $LIB/util.sh

version=0.1.2-dev # git-versioning
version=0.1.2 # git-versioning

[ -n "$V_SH_SHARE" ] || {
[ -n "$PREFIX" ] || {
Expand Down
2 changes: 1 addition & 1 deletion lib/util.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Id: git-versioning/0.1.2-dev lib/util.sh
# Id: git-versioning/0.1.2 lib/util.sh

gitAddAll()
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "git-versioning",
"version": "0.1.2-dev",
"version": "0.1.2",
"description": "Shell hooks and util for GIT versioning",
"homepage": "https://github.com/dotmpe/git-versioning",
"author": "B. van Berkum",
Expand Down
4 changes: 2 additions & 2 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Id: git-versioning/0.1.2-dev package.yaml
# Id: git-versioning/0.1.2 package.yaml
# Start

- type: application/x-project-mpe
main: git-versioning
id: git-versioning
version: 0.1.2-dev # git-versioning
version: 0.1.2 # git-versioning
environments: [ 'development' ]

pd-meta:
Expand Down
2 changes: 1 addition & 1 deletion test/example/build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project name="git-versioning">

<!-- Id: git-versioning/0.1.2-dev test/example/build.xml -->
<!-- Id: git-versioning/0.1.2 test/example/build.xml -->
<var value="0.0.28-test+20160321-0534" name="git-versioning.version" />

</project>
2 changes: 1 addition & 1 deletion test/example/clike_line_comment_id.jade
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

// Id: git-versioning/0.1.2-dev test/example/clike_line_comment_id.jade
// Id: git-versioning/0.1.2 test/example/clike_line_comment_id.jade
2 changes: 1 addition & 1 deletion test/example/clike_line_comment_id.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

// Id: git-versioning/0.1.2-dev test/example/clike_line_comment_id.js
// Id: git-versioning/0.1.2 test/example/clike_line_comment_id.js

2 changes: 1 addition & 1 deletion test/example/coffee_var_version.coffee
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

version = "0.1.2-dev" # git-versioning
version = "0.1.2" # git-versioning

2 changes: 1 addition & 1 deletion test/example/js_var_version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
var version = '0.1.2-dev'; // git-versioning
var version = '0.1.2'; // git-versioning
2 changes: 1 addition & 1 deletion test/example/json_version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.1.2-dev"
"version": "0.1.2"
}
2 changes: 1 addition & 1 deletion test/example/mk_var_version.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION := 0.1.2-dev# git-versioning
VERSION := 0.1.2# git-versioning
4 changes: 2 additions & 2 deletions test/example/properties_version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev test/example/properties_version.properties
# Id: git-versioning/0.1.2 test/example/properties_version.properties

git-versioning.version=0.1.2-dev
git-versioning.version=0.1.2

6 changes: 3 additions & 3 deletions test/example/py_mod.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Id: git-versioning/0.1.2-dev test/example/py_mod.py
__version__ = '0.1.2-dev' # git-versioning
version = '0.1.2-dev' # git-versioning
# Id: git-versioning/0.1.2 test/example/py_mod.py
__version__ = '0.1.2' # git-versioning
version = '0.1.2' # git-versioning
4 changes: 2 additions & 2 deletions test/example/rst_field_id.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

.. Id: git-versioning/0.1.2-dev test/example/rst_field_id.rst
.. Id: git-versioning/0.1.2 test/example/rst_field_id.rst
:Id: git-versioning/0.1.2-dev test/example/rst_field_id.rst
:Id: git-versioning/0.1.2 test/example/rst_field_id.rst

4 changes: 2 additions & 2 deletions test/example/rst_field_version.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

.. Id: git-versioning/0.1.2-dev test/example/rst_field_version.rst
.. Id: git-versioning/0.1.2 test/example/rst_field_version.rst
:Version: 0.1.2-dev (git-versioning)
:Version: 0.1.2 (git-versioning)

2 changes: 1 addition & 1 deletion test/example/sh_var_version.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=0.1.2-dev # git-versioning
version=0.1.2 # git-versioning
echo $version
2 changes: 1 addition & 1 deletion test/example/unix_comment_id.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

# Id: git-versioning/0.1.2-dev test/example/unix_comment_id.sh
# Id: git-versioning/0.1.2 test/example/unix_comment_id.sh

2 changes: 1 addition & 1 deletion test/example/unix_comment_version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

# version: 0.1.2-dev git-versioning
# version: 0.1.2 git-versioning

2 changes: 1 addition & 1 deletion test/example/yaml_version.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 0.1.2-dev # git-versioning
version: 0.1.2 # git-versioning
2 changes: 1 addition & 1 deletion test/git-versioning-spec.bats
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
load helpers

bin=bin/cli-version.sh
version=0.1.2-dev # git-versioning
version=0.1.2 # git-versioning

@test "no arguments prints application info" {
verbosity=3
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ output_lists_versioned_files()
rm $TMPF
}

# Id: git-versioning/0.1.2-dev test/helpers.bash
# Id: git-versioning/0.1.2 test/helpers.bash

2 changes: 1 addition & 1 deletion tools/ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

version=0.1.2-dev # git-versioning
version=0.1.2 # git-versioning

case "$ENV" in

Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/append-version-to-commit-msg.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Id: git-versioning/0.1.2-dev tools/cmd/append-version-to-commit-msg.sh
# Id: git-versioning/0.1.2 tools/cmd/append-version-to-commit-msg.sh
# 1:commit-msg-file 2:commit-msg-src 3:commit-updates-sha1
APP_ID=$(git-versioning app-id)
cp $1 $1.tmp
Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/prep-version.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Id: git-versioning/0.1.2-dev tools/cmd/prep-version.sh
# Id: git-versioning/0.1.2 tools/cmd/prep-version.sh

# Script to reset flags for (auto) increments

Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/src-files.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Id: git-versioning/0.1.2-dev tools/cmd/src-files.sh
# Id: git-versioning/0.1.2 tools/cmd/src-files.sh

# Seed code for 'src-files' command. Lists (versioned) src files.

Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/src-tree.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Id: git-versioning/0.1.2-dev tools/cmd/src-tree.sh
# Id: git-versioning/0.1.2 tools/cmd/src-tree.sh

# Seed code for 'src-tree' command. Formats indented tree with (versioned) src files.

Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/test-for-clean-branch.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Id: git-versioning/0.1.2-dev tools/cmd/test-for-clean-branch.sh
# Id: git-versioning/0.1.2 tools/cmd/test-for-clean-branch.sh
# 1:branchref 2:branchcommitsha1

# TODO: test wether V_MAIN_DOC version for pre-release tag
Expand Down
2 changes: 1 addition & 1 deletion tools/cmd/version-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

# Id: git-versioning/0.1.2-dev tools/cmd/version-check.sh
# Id: git-versioning/0.1.2 tools/cmd/version-check.sh

# External hook for git-versioning.
# See V_CHECK=$V_TOP_PATH/tools/version-check.sh
Expand Down
2 changes: 1 addition & 1 deletion tools/git-hooks/pre-commit.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev tools/git-hooks/pre-commit.sh
# Id: git-versioning/0.1.2 tools/git-hooks/pre-commit.sh
#make git-pre-commit
#pd check :make:git-pre-commit
#pd check
Expand Down
2 changes: 1 addition & 1 deletion tools/git-hooks/pre-push.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Id: git-versioning/0.1.2-dev tools/git-hooks/pre-push.sh
# Id: git-versioning/0.1.2 tools/git-hooks/pre-push.sh
while read LOCAL_REF LOCAL_SHA1 REMOTE_REF REMOTE_SHA1
do
make git-pre-push \
Expand Down
2 changes: 1 addition & 1 deletion tools/git-hooks/prepare-commit-msg.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Id: git-versioning/0.1.2-dev tools/git-hooks/prepare-commit-msg.sh
# Id: git-versioning/0.1.2 tools/git-hooks/prepare-commit-msg.sh
make git-prepare-commit-msg \
COMMIT_MSG=$1 COMMIT_MSG_SRC=$2 COMMIT_UPDATES=$3

0 comments on commit 40e42f4

Please sign in to comment.