Merge branch 'v1.0.3'

Tests/Demo/90%ileTemplate.template

@@ -0,0 +1,53 @@
+[Report]
+order = F44AE3793CA,F44AE3793D0,F44AE39D478
+title = quickdemo
+showtlogo = -1
+dateformat = yyyy-mm-dd
+timeformat = HH:MM
+timezone = Australia/Brisbane
+showstarttime = -1
+showendtime = -1
+font = Rasa
+fontsize = 12
+percentile = 90
+
+[F44AE3793CA]
+name = Template
+parent = TOP
+type = note
+changed = 1678765507.0670521
+note = Define your template by adding sections and configuring the section settingsx12Each section can be:x12 -  Note (like this) section, free textx12 -  Heading, usefull for grouping sectionsx12 -  Contents like a table of contents or figuresx12 -  Data Table, with data from test resultsx12 -  Data Graph, for graphical representation of test resultsx12x12Each section can also have sub sectionsx12x12The cover page and overall report settings can be found on the settings pane of the Report item abovex12
+
+[F44AE3793D0]
+name = Test Result Summary
+parent = TOP
+type = table
+changed = 1678765508.1276302
+colours = 0
+datatype = ResultSummary
+sql = SELECT r.result_name 'Result Name', round(min(rp.elapsed_time),3) 'Minimum', round(avg(rp.elapsed_time),3) 'Average', round(percentile(rp.elapsed_time, 90),3) '90x37ile', round(max(rp.elapsed_time),3) 'Maximum', round(stdev(rp.elapsed_time),3) 'Std. Dev.', count(rp.result) as 'Pass', count(rf.result) as 'Fail', count(ro.result) as 'Other' FROM Results as r LEFT JOIN Results as rp ON r.rowid == rp.rowid AND rp.result == 'PASS' LEFT JOIN Results as rf ON r.rowid == rf.rowid AND rf.result == 'FAIL' LEFT JOIN Results as ro ON r.rowid == ro.rowid AND ro.result <> 'PASS' AND ro.result <> 'FAIL' GROUP BY  r.result_name ORDER BY r.sequence
+
+[F44AE39D478]
+name = 90x37ile
+parent = TOP
+type = graph
+changed = 1678765549.428324
+order = F44AE3B7CF7
+isnumeric = 1
+datatype = Metric
+sql = SELECT MetricTime as 'Time' , MetricValue as 'Value' , PrimaryMetric as 'Name' FROM MetricData WHERE MetricType == 'Summary' AND SecondaryMetric == '90x37ile' ORDER BY MetricTime
+metrictype = Summary
+secondarymetric = 90x37ile
+
+[F44AE3B7CF7]
+name = 90x37ile Data
+parent = F44AE39D478
+changed = 1678765594.7107954
+type = table
+colours = 1
+datatype = Metric
+sql = SELECT PrimaryMetric , min(CAST(MetricValue AS NUMERIC)) AS 'Minimum' , round(avg(CAST(MetricValue AS NUMERIC)),3) AS 'Average' , round(percentile(CAST(MetricValue AS NUMERIC), 90),3) AS '90x37ile' , max(CAST(MetricValue AS NUMERIC)) AS 'Maximum' , round(stdev(CAST(MetricValue AS NUMERIC)),3) AS 'Std. Dev.' FROM MetricData WHERE MetricType == 'Summary' AND SecondaryMetric == '90x37ile' GROUP by PrimaryMetric
+metrictype = Summary
+secondarymetric = 90x37ile
+isnumeric = 1
+

git/hooks-bash/post-commit

@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# A hook script to update the version numbers
+#  post-commit
+OS=`uname -s`
+
+# git rev-parse --abbrev-ref HEAD
+version=$(git rev-parse --abbrev-ref HEAD)
+# version=$(git tag -l v* |tail -1)
+# echo "version: $version"
+if [[ "$version" =~ v[0-9]\. ]]; then
+	# echo "version: $version"
+	# numver=$(echo $version | sed -E 's/v(.*)/\1/')
+	# numver=$(echo $version | sed -E 's/v(.*)-.*/\1/')
+	numver=$(echo $version | sed -E 's/v([^-]*)/\1/')
+	# echo "numver: $numver"
+
+	if [ "$OS" == 'Darwin' ]; then
+		sed -i '' -e "s/version *= *\"[^\"]*\"/version = \"${numver}\"/" $(find . -name "*.py")
+		#	Version Test
+		sed -i '' -e "s/#    Version .*/#    Version ${numver}/" $(find . -name "*.py")
+	else
+		sed -i -e "s/version *= *\"[^\"]*\"/version = \"${numver}\"/" $(find . -name "*.py")
+		sed -i -e "s/#    Version .*/#    Version ${numver}\"/" $(find . -name "*.py")
+	fi
+
+
+	# git commit -m "Update version to ${version}"
+	if ! git diff-index --quiet HEAD --; then
+		# echo "commit: Update version to $version"
+		git add $(find . -name "*.py")
+	    git commit -m "Update version to ${numver}"
+	fi
+# else
+# 	echo "version ($version) not pattern 'v[0-9]\.'"
+fi
+
+
+
+# if [[ "$date" =~ "[0-9]\{8\}" ]]; then
+#     echo "Valid date"
+# else
+#     echo "Invalid date"
+# fi

git/readme.md

@@ -4,6 +4,6 @@ e.g. if you are contributing to this project you should link the git hooks on yo
 
 ```
 cd <rfswarm>/.git/hooks
-ln -s ../../git/hooks-mac/post-commit
-ln -s ../../git/hooks-mac/post-commit post-merge
+ln -s ../../git/hooks-bash/post-commit
+ln -s ../../git/hooks-bash/post-commit post-merge
 ```

pypi_dev.sh

@@ -2,6 +2,7 @@
 #
 #
 cd $(dirname "$0")
+OS=`uname -s`
 
 currversion=$(git describe --abbrev=0 --tags)
 echo $currversion
@@ -19,9 +20,16 @@ if [[ "$currversion" =~ v[0-9]\. ]]; then
 	version=$numver.$subver
 	echo version\: $version
 
-	sed -i '' -e "s/version *= *\"[^\"]*\"/version=\"${version}\"/" $(find . -name "*.py")
-	#	Version Test
-	sed -i '' -e "s/#    Version .*/#    Version ${version}/" $(find . -name "*.py")
+
+	if [ "$OS" == 'Darwin' ]; then
+		sed -i '' -e "s/version *= *\"[^\"]*\"/version=\"${version}\"/" $(find . -name "*.py")
+		#	Version Test
+		sed -i '' -e "s/#    Version .*/#    Version ${version}/" $(find . -name "*.py")
+	else
+		sed -i -e "s/version = \"[^\"]*\"/version = \"${version}\"/" $(find . -name "*.py")
+		sed -i -e "s/#    Version .*/#    Version${version}\"/" $(find . -name "*.py")
+	fi
+
 
 	rm -R dist/
 	# python3 setup*.py sdist bdist_wheel

pypi_relese.sh

@@ -2,6 +2,7 @@
 #
 #
 cd $(dirname "$0")
+OS=`uname -s`
 
 currversion=$(git rev-parse --abbrev-ref HEAD)
 echo $currversion
@@ -18,9 +19,14 @@ if [[ "$currversion" =~ v[0-9]\. ]]; then
 	version=$numver
 	echo version\: $version
 
-	sed -i '' -e "s/version *= *\"[^\"]*\"/version=\"${version}\"/" $(find . -name "*.py")
-	#	Version Test
-	sed -i '' -e "s/#    Version .*/#    Version ${version}/" $(find . -name "*.py")
+	if [ "$OS" == 'Darwin' ]; then
+		sed -i '' -e "s/version *= *\"[^\"]*\"/version=\"${version}\"/" $(find . -name "*.py")
+		#	Version Test
+		sed -i '' -e "s/#    Version .*/#    Version ${version}/" $(find . -name "*.py")
+	else
+		sed -i -e "s/version = \"[^\"]*\"/version = \"${version}\"/" $(find . -name "*.py")
+		sed -i -e "s/#    Version .*/#    Version${version}\"/" $(find . -name "*.py")
+	fi
 
 	rm -R dist/
 	# python3 setup*.py sdist bdist_wheel

rfswarm_agent/rfswarm_agent.py

@@ -2,7 +2,7 @@
 #
 #	Robot Framework Swarm
 #
-#    Version 1.0.0
+#    Version1.0.3"
 #
 
 
@@ -41,7 +41,7 @@
 
 class RFSwarmAgent():
 
-	version="1.0.0"
+	version = "1.0.3"
 	config = None
 	isconnected = False
 	isrunning = False