Develop

.gitignore

@@ -0,0 +1,19 @@
+.calva/
+target/
+
+pom.xml
+
+.lein-repl-history
+
+.lein-failures
+
+eastwood.txt
+
+.clj-kondo/
+.lsp/
+.project
+.settings/
+.nrepl-port
+.classpath
+
+test.html

README.md

@@ -13,6 +13,13 @@ You can see MicroWorld in action [here](http://www.journeyman.cc/microworld/) -
 but please don't be mean to my poor little server. If you want to run big maps
 or complex rule-sets, please run it on your own machines.
 
+### Version compatibility
+
+There are substantial changes in how rule functions are evaluated between 0.1.x 
+versions of MicroWorld libraries and 0.3.x versions. In particular, in 0.3.x 
+metadata is held on rule functions which is essential to the functioning of the
+engine. Consequently, you cannot mix 0.1.x and 0.3.x libraries: it will not work.
+
 ## Usage
 
 Primary entry points are make-world and run-world, both in mw-engine.core. See

buildall.sh

@@ -72,8 +72,9 @@ if [ $# -lt 1 ]
 then
 	cat <<-EOF 1>&2
 	Usage:
-      -archive           Create a tar archive of the current state of the source.
-	  -build             Build all components and commit to master.
+    -archive           Create a tar archive of the current state of the source.
+	  -build             Build all components, commit and push to origin.
+    -docker            Build and push a Docker image.
 	  -email [ADDRESS]   Your email address, to be recorded in the build signature.
 	  -fullname [NAME]   Your full name, to be recorded in the build signature.
 	  -pull				 Pull from remote git repository
@@ -87,12 +88,14 @@ fi
 while (( "$#" ))
 do
 	case $1 in
-    	-a|-archive)
-      		archive="TRUE";;
+    -a|-archive)
+      	archive="TRUE";;
 		-b|-build)
 			# 'build' is the expected normal case.
 			trial="FALSE";
 			;;
+    -d|-docker)
+      docker="TRUE";;
 		-e|-email)
 			shift;
 			email=$1;;
@@ -126,7 +129,7 @@ do
 	shift
 done
 
-echo "Trial: ${trial}; email: ${email}; fullname ${fullname}; release: ${release}; webapps: $webappsdir"
+echo "Trial: ${trial}; docker: ${docker}; email: ${email}; fullname ${fullname}; release: ${release}; webapps: $webappsdir"
 
 ls mw-* > /dev/null 2>&1
 if [ $? -ne 0 ]
@@ -137,132 +140,141 @@ fi
 
 for dir in mw-*
 do
-	pushd ${dir}
-
-	# Make a temporary directory to keep the work-in-progress files.
-	if [ ! -d "${tmp}" ]
-	then
-		rm -f "${tmp}"
-		mkdir "${tmp}"
-	fi
-
-	cat project.clj > ${tmp}/project.bak.1
-	old=`cat project.clj | grep 'defproject mw' | sed 's/.*defproject mw-[a-z]* "\([A-Za-z0-9_.-]*\)".*/\1/'`
-
-	if [ "${release}" != "" ]
-	then
-		message="Preparing ${old} for release"
-
-		# Does the 'old' version tag end with the token "-SNAPSHOT"? it probably does!
-		echo "${old}" | grep 'SNAPSHOT'
-		if [ $? -eq 0 ]
-		then
-			# It does...
-			interim=`echo ${old} | sed 's/\([A-Za-z0-9_.-]*\)-SNAPSHOT.*/\1/'`
-			if [ "${interim}" = "" ]
-			then
-				echo "Failed to compute interim version tag from '${old}'" 1>&2
-				exit 1;
-			fi
-			setup-build-sig "${old}" "${interim}" "${fullname}" "${email}"
-			message="Upversioned from ${old} to ${interim} for release"
-			old=${interim}
-		else
-			setup-build-sig "unset" "${old}" "${fullname}" "${email}"
-		fi
-	else
-		setup-build-sig "unset" "${old}" "${fullname}" "${email}"
-	fi
-
-	sed -f ${tmp}/manifest.sed ${tmp}/project.bak.1 > project.clj
-
-	echo $message
-
-	lein clean
-	lein compile
-	if [ $? -ne 0 ]
-	then
-		echo "Sub-project ${dir} failed in compile" 1>&2
-		exit 1
-	fi
-
-  	lein test
-	if [ $? -ne 0 ]
-	then
-		echo "Sub-project ${dir} failed in test" 1>&2
-		exit 1
-	fi
-
-	lein marg
-	lein install
-
-	# If we're in the UI project, build the uberwar - and should
-	# probably deploy it to local Tomcat for test
-	if [ "${dir}" = "mw-ui" -a "${webappsdir}" != "" ]
-	then
-    	lein ring uberwar
-		sudo cp target/microworld.war "${webappsdir}"
-		echo "Deployed new WAR file to local Tomcat at ${webappsdir}"
-	fi
-
-		# Then unset manifest properties prior to committing.
-	cat project.clj > ${tmp}/project.bak.2
-	setup-build-sig
-	sed -f ${tmp}/manifest.sed ${tmp}/project.bak.2 > project.clj
-
-	if [ "${trial}" = "FALSE" ]
-	then
-		if [ "${message}" = "" ]
-		then
-			git commit -a
-		else
-			git commit -a -m "$message"
-		fi
-		git push origin master
-	fi
+  if [ "${dir}" != "mw-explore" ]
+  then
+    pushd ${dir}
 
-	if [ "${release}" != "" ]
-	then
-		branch="${old}_MAINTENANCE"
-		if [ "${trial}" = "FALSE" ]
-		then
-			git branch "${branch}"
-			git push origin "${branch}"
-		fi
-
-		cat project.clj > ${tmp}/project.bak.3
-		setup-build-sig "${old}" "${release}-SNAPSHOT" "${fullname}" "${email}"
-		sed -f ${tmp}/manifest.sed ${tmp}/project.bak.3 > project.clj
-		message="Upversioned from ${interim} to ${release}-SNAPSHOT"
-
-		echo $message
-
-		lein clean
-		lein compile
-		if [ $? -ne 0 ]
-		then
-			echo "Sub-project ${dir} failed in compile after branch to ${release}!" 1>&2
-			exit 1
-		fi
-		lein marg
-		lein install
-
-		# Then unset manifest properties prior to committing.
-		cat project.clj > ${tmp}/project.bak.4
-		setup-build-sig
-		sed -f ${tmp}/manifest.sed ${tmp}/project.bak.4 > project.clj
-
-		if [ "${trial}" = "FALSE" ]
-		then
-			git commit -a -m "${message}"
-			echo ${message}
-			git push origin master
-		fi
-	fi
+    # Make a temporary directory to keep the work-in-progress files.
+    if [ ! -d "${tmp}" ]
+    then
+      rm -f "${tmp}"
+      mkdir "${tmp}"
+    fi
+
+    cat project.clj > ${tmp}/project.bak.1
+    old=`cat project.clj | grep 'defproject mw' | sed 's/.*defproject mw-[a-z]* "\([A-Za-z0-9_.-]*\)".*/\1/'`
+
+    if [ "${release}" != "" ]
+    then
+      message="Preparing ${old} for release"
+
+      # Does the 'old' version tag end with the token "-SNAPSHOT"? it probably does!
+      echo "${old}" | grep 'SNAPSHOT'
+      if [ $? -eq 0 ]
+      then
+        # It does...
+        interim=`echo ${old} | sed 's/\([A-Za-z0-9_.-]*\)-SNAPSHOT.*/\1/'`
+        if [ "${interim}" = "" ]
+        then
+          echo "Failed to compute interim version tag from '${old}'" 1>&2
+          exit 1;
+        fi
+        setup-build-sig "${old}" "${interim}" "${fullname}" "${email}"
+        message="Upversioned from ${old} to ${interim} for release"
+        old=${interim}
+      else
+        setup-build-sig "unset" "${old}" "${fullname}" "${email}"
+      fi
+    else
+      setup-build-sig "unset" "${old}" "${fullname}" "${email}"
+    fi
+
+    sed -f ${tmp}/manifest.sed ${tmp}/project.bak.1 > project.clj
+
+    echo $message
 
-	# if nothing broke so far, clean up...
-	rm -rf "${tmp}"
-	popd
+    lein clean
+    lein compile
+    if [ $? -ne 0 ]
+    then
+      echo "Sub-project ${dir} failed in compile" 1>&2
+      exit 1
+    fi
+
+      lein test
+    if [ $? -ne 0 ]
+    then
+      echo "Sub-project ${dir} failed in test" 1>&2
+      exit 1
+    fi
+
+    lein marg
+    lein install
+
+    # If we're in the UI project, build the uberwar - and should
+    # probably deploy it to local Tomcat for test
+    if [ "${dir}" = "mw-ui" -a "${webappsdir}" != "" ]
+    then
+      lein ring uberwar
+      sudo cp target/microworld.war "${webappsdir}"
+      echo "Deployed new WAR file to local Tomcat at ${webappsdir}"
+    fi
+
+    if [ "${dir}" = "mw-ui" -a "${docker}" = "TRUE" ]
+    then
+      lein docker build
+      lein docker push
+    fi
+
+    # Then unset manifest properties prior to committing.
+    cat project.clj > ${tmp}/project.bak.2
+    setup-build-sig
+    sed -f ${tmp}/manifest.sed ${tmp}/project.bak.2 > project.clj
+
+    if [ "${trial}" = "FALSE" ]
+    then
+      if [ "${message}" = "" ]
+      then
+        git commit -a
+      else
+        git commit -a -m "$message"
+      fi
+      git push origin master
+    fi
+
+    if [ "${release}" != "" ]
+    then
+      branch="${old}_MAINTENANCE"
+      if [ "${trial}" = "FALSE" ]
+      then
+        git branch "${branch}"
+        git push origin "${branch}"
+      fi
+
+      cat project.clj > ${tmp}/project.bak.3
+      setup-build-sig "${old}" "${release}-SNAPSHOT" "${fullname}" "${email}"
+      sed -f ${tmp}/manifest.sed ${tmp}/project.bak.3 > project.clj
+      message="Upversioned from ${interim} to ${release}-SNAPSHOT"
+
+      echo $message
+
+      lein clean
+      lein compile
+      if [ $? -ne 0 ]
+      then
+        echo "Sub-project ${dir} failed in compile after branch to ${release}!" 1>&2
+        exit 1
+      fi
+      lein marg
+      lein install
+
+      # Then unset manifest properties prior to committing.
+      cat project.clj > ${tmp}/project.bak.4
+      setup-build-sig
+      sed -f ${tmp}/manifest.sed ${tmp}/project.bak.4 > project.clj
+
+      if [ "${trial}" = "FALSE" ]
+      then
+        git commit -a -m "${message}"
+        echo ${message}
+        git push origin master
+      fi
+    fi
+
+    # if nothing broke so far, clean up...
+    rm -rf "${tmp}"
+    popd
+  fi
 done
 
 

docs/cloverage/coverage.css

@@ -0,0 +1,40 @@
+.covered {
+    font-family:  'Bitstream Vera Sans Mono', 'Courier', monospace;
+    background-color: #558B55;
+}
+
+.not-covered {
+    font-family:  'Bitstream Vera Sans Mono', 'Courier', monospace;
+    background-color: red;
+}
+
+.partial {
+    font-family:  'Bitstream Vera Sans Mono', 'Courier', monospace;
+    background-color: orange;
+}
+
+.not-tracked {
+    font-family:  'Bitstream Vera Sans Mono', 'Courier', monospace;
+}
+
+.blank {
+    font-family:  'Bitstream Vera Sans Mono', 'Courier', monospace;
+}
+
+td {
+    padding-right: 10px;
+}
+
+td.with-bar {
+    width: 250px;
+    text-align: center;
+}
+
+td.with-number {
+    text-align: right;
+}
+
+td.ns-name {
+    min-width: 150px;
+    padding-right: 25px;
+}