Release 0.1.0

B. van Berkum · B. van Berkum · commit a697f5d01803 · 2016-04-12T16:51:17.000+02:00
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -38,3 +38,7 @@ Change Log
 0.0.32
   - Testing packaging with Travis.
 
+0.1.0
+  - Incrementing minor because of V_CHECK change. And running production package
+    release again just for the heck of it.
+
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ ifeq ($(PROJECT),)
 PROJECT := $(notdir $(BASE))
 endif
 
-VERSION             := 0.0.32# git-versioning
+VERSION             := 0.1.0# git-versioning
 #ID                  := git-versioning/0.0.16-master
 #VERSION             := $(patsubst $(PROJECT)/%,%,$(ID))
 
diff --git a/ReadMe.rst b/ReadMe.rst
@@ -2,7 +2,7 @@ GIT Versioning
 ==============
 :Created: 2015-04-19
 :Updated: 2016-04-12
-:Version: 0.0.32
+:Version: 0.1.0
 :Status: Dev
 :project:
 
@@ -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.0.32 ReadMe.rst
+.. Id: git-versioning/0.1.0 ReadMe.rst
 
 
 Other documents
@@ -99,4 +99,4 @@ Other documents
 
 .. _sitefile: http://github.com/dotmpe/node-sitefile
 
-.. Id: git-versioning/0.0.32 ReadMe.rst
+.. Id: git-versioning/0.1.0 ReadMe.rst
diff --git a/Rules.git-hooks.shared.mk b/Rules.git-hooks.shared.mk
@@ -1,4 +1,4 @@
-# Id: git-versioning/0.0.32 Rules.git-hooks.shared.mk
+# Id: git-versioning/0.1.0 Rules.git-hooks.shared.mk
 
 # http://git-scm.com/docs/githooks
 
diff --git a/Rules.git-versioning.mk b/Rules.git-versioning.mk
@@ -1,4 +1,4 @@
-# Id: git-versioning/0.0.32 Rules.git-versioning.mk
+# Id: git-versioning/0.1.0 Rules.git-versioning.mk
 
 
 empty :=
@@ -65,8 +65,14 @@ do-release::
 do-release:: M=Release
 do-release:: cli-version-check
 	[ -n "$(VERSION)" ] || exit 1
-	git ci -m "$(M) $(VERSION)"
-	git tag $(VERSION)
+	grep '^'$(VERSION)'$$' ChangeLog.rst || { \
+		echo "Please fix version or the ChangeLog"; \
+		exit 2; }
+	ENV=testing ./configure.sh \
+			&& ./bin/cli-version.sh check \
+			&& git checkout .versioned-files.list 
+	git commit -m "$(M) $(VERSION)"
+	git tag -a -m "$(M) $(VERSION)" $(VERSION)
 	git push origin
 	git push --tags
 	./bin/cli-version.sh increment $(min) $(maj)
diff --git a/Rules.git-versioning.shared.mk b/Rules.git-versioning.shared.mk
@@ -1,4 +1,4 @@
-# Id: git-versioning/0.0.32 Rules.git-versioning.shared.mk
+# Id: git-versioning/0.1.0 Rules.git-versioning.shared.mk
 
 
 # print version from main file
diff --git a/Rules.mk b/Rules.mk
@@ -1,6 +1,6 @@
 # created local Rules to configure and test git-versioning hooks
 
-# Id: git-versioning/0.0.32 Rules.mk
+# Id: git-versioning/0.1.0 Rules.mk
 
 
 git-pre-commit::
diff --git a/bin/cli-version.sh b/bin/cli-version.sh
@@ -11,7 +11,7 @@ TOOLS=$V_SH_SHARE/tools
 # Path to versioned files
 V_TOP_PATH=.
 
-# Id: git-versioning/0.0.32 bin/cli-version.sh
+# Id: git-versioning/0.1.0 bin/cli-version.sh
 
 source $LIB/git-versioning.sh
 
diff --git a/ci-build.sh b/ci-build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version=0.0.32 # git-versioning
+version=0.1.0 # git-versioning
 
 case "$ENV" in
 
diff --git a/lib/formats.sh b/lib/formats.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Id: git-versioning/0.0.32 lib/formats.sh
+# Id: git-versioning/0.1.0 lib/formats.sh
 
 # reStructureText
 RST_VER_TOKEN=':\([Vv]\)ersion:'
diff --git a/lib/git-versioning.sh b/lib/git-versioning.sh
@@ -6,12 +6,12 @@ V_SH_LIB=$BASH_SOURCE
 set -e
 
 
-# Id: git-versioning/0.0.32 lib/git-versioning.sh
-# version: 0.0.32 git-versioning lib/git-versioning.sh
+# Id: git-versioning/0.1.0 lib/git-versioning.sh
+# version: 0.1.0 git-versioning lib/git-versioning.sh
 
 source $LIB/util.sh
 
-version=0.0.32 # git-versioning
+version=0.1.0 # git-versioning
 
 [ -n "$V_SH_SHARE" ] || {
   [ -n "$PREFIX" ] || {
diff --git a/lib/util.sh b/lib/util.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Id: git-versioning/0.0.32 lib/util.sh
+# Id: git-versioning/0.1.0 lib/util.sh
 
 gitAddAll()
 {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "git-versioning",
-  "version": "0.0.32",
+  "version": "0.1.0",
   "description": "Shell hooks and util for GIT versioning",
   "homepage": "https://github.com/dotmpe/git-versioning",
   "author": "B. van Berkum",
diff --git a/package.yaml b/package.yaml
@@ -1,13 +1,13 @@
 # git-versioning main: git-versioning
 
-# Id: git-versioning/0.0.32 package.yaml
+# Id: git-versioning/0.1.0 package.yaml
 # Start
 
 - type: application/x-project-mpe
   id: git-versioning
-  version: 0.0.32 # git-versioning
+  version: 0.1.0 # git-versioning
   environments: [ 'development' ]
 
 # End
-# Id: git-versioning/0.0.32 package.yaml
+# Id: git-versioning/0.1.0 package.yaml
 
diff --git a/test/example/build.xml b/test/example/build.xml
@@ -1,6 +1,6 @@
 <project name="git-versioning">
 
-  <!-- Id: git-versioning/0.0.32 test/example/build.xml -->
+  <!-- Id: git-versioning/0.1.0 test/example/build.xml -->
   <var value="0.0.28-test+20160321-0534" name="git-versioning.version" />
 
 </project>
diff --git a/test/example/clike_line_comment_id.jade b/test/example/clike_line_comment_id.jade
@@ -1,3 +1,3 @@
 
-// Id: git-versioning/0.0.32 test/example/clike_line_comment_id.jade
+// Id: git-versioning/0.1.0 test/example/clike_line_comment_id.jade
 
diff --git a/test/example/clike_line_comment_id.js b/test/example/clike_line_comment_id.js
@@ -1,3 +1,3 @@
 
-// Id: git-versioning/0.0.32 test/example/clike_line_comment_id.js
+// Id: git-versioning/0.1.0 test/example/clike_line_comment_id.js
 
diff --git a/test/example/coffee_var_version.coffee b/test/example/coffee_var_version.coffee
@@ -1,3 +1,3 @@
 
-version = "0.0.32" # git-versioning
+version = "0.1.0" # git-versioning
 
diff --git a/test/example/js_var_version.js b/test/example/js_var_version.js
@@ -1 +1 @@
-var version = '0.0.32'; // git-versioning
+var version = '0.1.0'; // git-versioning
diff --git a/test/example/json_version.json b/test/example/json_version.json
@@ -1,3 +1,3 @@
 {
-	"version": "0.0.32"
+	"version": "0.1.0"
 }
diff --git a/test/example/mk_var_version.mk b/test/example/mk_var_version.mk
@@ -1 +1 @@
-VERSION := 0.0.32# git-versioning
+VERSION := 0.1.0# git-versioning
diff --git a/test/example/properties_version.properties b/test/example/properties_version.properties
@@ -1,4 +1,4 @@
-# Id: git-versioning/0.0.32 test/example/properties_version.properties
+# Id: git-versioning/0.1.0 test/example/properties_version.properties
 
-git-versioning.version=0.0.32
+git-versioning.version=0.1.0
 
diff --git a/test/example/rst_field_id.rst b/test/example/rst_field_id.rst
@@ -1,5 +1,5 @@
 
-.. Id: git-versioning/0.0.32 test/example/rst_field_id.rst
+.. Id: git-versioning/0.1.0 test/example/rst_field_id.rst
 
-:Id: git-versioning/0.0.32 test/example/rst_field_id.rst
+:Id: git-versioning/0.1.0 test/example/rst_field_id.rst
 
diff --git a/test/example/rst_field_version.rst b/test/example/rst_field_version.rst
@@ -1,5 +1,5 @@
 
-.. Id: git-versioning/0.0.32 test/example/rst_field_version.rst
+.. Id: git-versioning/0.1.0 test/example/rst_field_version.rst
 
-:Version: 0.0.32 (git-versioning)
+:Version: 0.1.0 (git-versioning)
 
diff --git a/test/example/sh_var_version.sh b/test/example/sh_var_version.sh
@@ -1,2 +1,2 @@
-version=0.0.32 # git-versioning
+version=0.1.0 # git-versioning
 echo $version
diff --git a/test/example/unix_comment_id.sh b/test/example/unix_comment_id.sh
@@ -1,3 +1,3 @@
 
-# Id: git-versioning/0.0.32 test/example/unix_comment_id.sh
+# Id: git-versioning/0.1.0 test/example/unix_comment_id.sh
 
diff --git a/test/example/unix_comment_version.sh b/test/example/unix_comment_version.sh
@@ -1,3 +1,3 @@
 
-# version: 0.0.32 git-versioning
+# version: 0.1.0 git-versioning
 
diff --git a/test/example/yaml_version.yaml b/test/example/yaml_version.yaml
@@ -1 +1 @@
-    version: 0.0.32 # git-versioning
+    version: 0.1.0 # git-versioning
diff --git a/test/git-versioning-spec.bats b/test/git-versioning-spec.bats
@@ -3,7 +3,7 @@
 load helpers
 
 bin=bin/cli-version.sh
-version=0.0.32 # git-versioning
+version=0.1.0 # git-versioning
 
 @test "no arguments prints application info" {
   run ${bin}
diff --git a/test/helpers.bash b/test/helpers.bash
@@ -38,5 +38,5 @@ output_lists_versioned_files()
   rm $TMPF
 }
 
-# Id: git-versioning/0.0.32 test/helpers.bash
+# Id: git-versioning/0.1.0 test/helpers.bash
 
diff --git a/tools/cmd/append-version-to-commit-msg.sh b/tools/cmd/append-version-to-commit-msg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Id: git-versioning/0.0.32 tools/cmd/append-version-to-commit-msg.sh
+# Id: git-versioning/0.1.0 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
diff --git a/tools/cmd/prep-version.sh b/tools/cmd/prep-version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Id: git-versioning/0.0.32 tools/cmd/prep-version.sh
+# Id: git-versioning/0.1.0 tools/cmd/prep-version.sh
 
 # Script to reset flags for (auto) increments
 
diff --git a/tools/cmd/src-files.sh b/tools/cmd/src-files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Id: git-versioning/0.0.32 tools/cmd/src-files.sh
+# Id: git-versioning/0.1.0 tools/cmd/src-files.sh
 
 # Seed code for 'src-files' command. Lists (versioned) src files.
 
diff --git a/tools/cmd/src-tree.sh b/tools/cmd/src-tree.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Id: git-versioning/0.0.32 tools/cmd/src-tree.sh
+# Id: git-versioning/0.1.0 tools/cmd/src-tree.sh
 
 # Seed code for 'src-tree' command. Formats indented tree with (versioned) src files.
 
diff --git a/tools/cmd/test-for-clean-branch.sh b/tools/cmd/test-for-clean-branch.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Id: git-versioning/0.0.32 tools/cmd/test-for-clean-branch.sh
+# Id: git-versioning/0.1.0 tools/cmd/test-for-clean-branch.sh
 # 1:branchref 2:branchcommitsha1
 
 # TODO: test wether V_MAIN_DOC version for pre-release tag
diff --git a/tools/cmd/version-check.sh b/tools/cmd/version-check.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-# Id: git-versioning/0.0.32 tools/cmd/version-check.sh
+# Id: git-versioning/0.1.0 tools/cmd/version-check.sh
 
 # External hook for git-versioning.
 # See V_CHECK=$V_TOP_PATH/tools/version-check.sh
diff --git a/tools/git-hooks/pre-commit.sh b/tools/git-hooks/pre-commit.sh
@@ -1,2 +1,2 @@
-# Id: git-versioning/0.0.32 tools/git-hooks/pre-commit.sh
+# Id: git-versioning/0.1.0 tools/git-hooks/pre-commit.sh
 make git-pre-commit
diff --git a/tools/git-hooks/pre-push.sh b/tools/git-hooks/pre-push.sh
@@ -1,4 +1,4 @@
-# Id: git-versioning/0.0.32 tools/git-hooks/pre-push.sh
+# Id: git-versioning/0.1.0 tools/git-hooks/pre-push.sh
 while read LOCAL_REF LOCAL_SHA1 REMOTE_REF REMOTE_SHA1
 do
   make git-pre-push \
diff --git a/tools/git-hooks/prepare-commit-msg.sh b/tools/git-hooks/prepare-commit-msg.sh
@@ -1,3 +1,3 @@
-# Id: git-versioning/0.0.32 tools/git-hooks/prepare-commit-msg.sh
+# Id: git-versioning/0.1.0 tools/git-hooks/prepare-commit-msg.sh
 make git-prepare-commit-msg \
 	COMMIT_MSG=$1 COMMIT_MSG_SRC=$2 COMMIT_UPDATES=$3

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Id: git-versioning/0.0.32 Rules.git-hooks.shared.mk`
	`1`	`+# Id: git-versioning/0.1.0 Rules.git-hooks.shared.mk`
`2`	`2`
`3`	`3`	`# http://git-scm.com/docs/githooks`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Id: git-versioning/0.0.32 Rules.git-versioning.shared.mk`
	`1`	`+# Id: git-versioning/0.1.0 Rules.git-versioning.shared.mk`
`2`	`2`
`3`	`3`
`4`	`4`	`# print version from main file`