Fix gcov bug and add FORD pages

 - automatically merge gcov reports
 - automatically add FoBiS.py procedure coverage report

Author: zbeekman

.gitignore

@@ -2,6 +2,8 @@ bin/
 lib/
 builds/
 doc/
+*.gcov
+*.gcov.md*
 *.mod
 *.o
 *.obj
@@ -17,4 +19,4 @@ visual_studio_2010/Debug/
 visual_studio_2010/Release/
 visual_studio_2010/x64
 FoBiS.py
-robodoc
+robodoc

.travis.yml

@@ -36,10 +36,11 @@ env:
       cd cmake-build &&
       cmake -DCMAKE_BUILD_TYPE=COVERAGE .. &&
       make -j 4 check"
-      CODE_COVERAGE="yes"
 
       # build with build.sh, make documentation, run unit tests and perform coverage analysis
-    - BUILD_SCRIPT="./build.sh --coverage --enable-unicode"
+    - >
+      BUILD_SCRIPT="./build.sh --coverage --skip-documentation &&
+      ./build.sh --coverage --enable-unicode"
       CODE_COVERAGE="yes"
 
 install:
@@ -81,7 +82,7 @@ after_success:
   - cd $TRAVIS_BUILD_DIR
   - |
     if [[ $CODE_COVERAGE == [yY]* ]]; then
-      bash <(curl -s https://codecov.io/bash)
+      bash <(curl -s https://codecov.io/bash) -f json_fortran.F90.gcov jf_test_*.[fF]90.gcov
     fi
   - git config --global user.name "TRAVIS-CI-for-$(git --no-pager show -s --format='%cn' $TRAVIS_COMMIT)"
   - git config --global user.email "$(git --no-pager show -s --format='%ce' $TRAVIS_COMMIT)"

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Looking to contribute something to [json-fortran](README.md)? **Here's how you c
 - Take a look at the [issues](https://github.com/jacobwilliams/json-fortran/issues) to see if there is an issue you'd like to help address. [Issues](https://github.com/jacobwilliams/json-fortran/issues) with the [ready label](https://github.com/jacobwilliams/json-fortran/issues?q=is%3Aopen+is%3Aissue+label%3A%22ready%22) or in the [ready column on waffle.io](https://waffle.io/jacobwilliams/json-fortran) are issues that are ready to be dealt with. (i.e., They are not blocked by other dependencies and are higher priority.)
 - Increasing the test coverage is another helpful way to
   contribute. Please take a look at
-  [this wiki page](https://github.com/jacobwilliams/json-fortran/wiki/Coverage-Analysis)
+  [the test coverage page](http://jacobwilliams.github.io/json-fortran/page/development-resources/json_module.F90.gcov.html)
   for a list of uncovered procedures, and at the
   [Codecov.io suggestions page](https://codecov.io/github/jacobwilliams/json-fortran/features/suggestions)
   to find procedures and lines of code that are still uncovered by the

LICENSE

@@ -1,5 +1,5 @@
 JSON-Fortran: A Fortran 2008 JSON API
-https://github.com/jacobwilliams/json-fortran
+<https://github.com/jacobwilliams/json-fortran>
 
 Copyright (c) 2014-2015, Jacob Williams
 All rights reserved.
@@ -14,7 +14,7 @@ are permitted provided that the following conditions are met:
   list of conditions and the following disclaimer in the documentation and/or
   other materials provided with the distribution.
 
-* The names of its contributors may not be used to endorse or promote products 
+* The names of its contributors may not be used to endorse or promote products
   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
@@ -28,26 +28,26 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-!-----------------------------------------------------------------------------------------
-!
-!	Original FSON License:
-!
-! Copyright (c) 2012 Joseph A. Levin
-!
-! Permission is hereby granted, free of charge, to any person obtaining a copy of this
-! software and associated documentation files (the "Software"), to deal in the Software
-! without restriction, including without limitation the rights to use, copy, modify, merge,
-! publish, distribute, sublicense, and/or sell copies of the Software, and to permit
-! persons to whom the Software is furnished to do so, subject to the following conditions:
-!
-! The above copyright notice and this permission notice shall be included in all copies or
-! substantial portions of the Software.
-!
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-! INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-! PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-! LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-! OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-! DEALINGS IN THE SOFTWARE.
-!
-!-----------------------------------------------------------------------------------------
+> -----------------------------------------------------------------------------------------
+>
+>	Original FSON License:
+>
+> Copyright (c) 2012 Joseph A. Levin
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy of this
+> software and associated documentation files (the "Software"), to deal in the Software
+> without restriction, including without limitation the rights to use, copy, modify, merge,
+> publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+> persons to whom the Software is furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in all copies or
+> substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+> INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+> PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+> OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+> DEALINGS IN THE SOFTWARE.
+>
+> -----------------------------------------------------------------------------------------

build.sh

@@ -280,19 +280,6 @@ else
     echo "Skip building the unit tests since \$JF_SKIP_TESTS has been set to 'true'."
 fi
 
-#build the documentation with ford (if present):
-echo ""
-if [[ $JF_SKIP_DOCS != [yY]* ]]; then
-    if hash ford 2>/dev/null; then
-	echo "Building documentation..."
-	ford $FORDMD
-    else
-	echo "FORD not found! Install using: sudo pip install ford"
-    fi
-else
-    echo "Skip building documentation since \$JF_SKIP_DOCS has been set to ${JF_SKIP_DOCS}."
-fi
-
 # Run all the tests unless $JF_SKIP_TESTS
 echo ""
 if [[ $JF_SKIP_TESTS != [yY]* ]] ; then
@@ -304,9 +291,49 @@ if [[ $JF_SKIP_TESTS != [yY]* ]] ; then
     for TEST in jf_test_*; do
 	# It would be nice to run json output printed to stdout through jsonlint, however,
 	# some tests output more than one json structure and these need to be split
+	echo "Running ${TEST}"
 	./${TEST}
     done
+    cd -
     GLOBIGNORE="$OLD_IGNORES"
+    if [[ $CODE_COVERAGE = [yY]* ]] ; then
+	[ -f json_module.F90.gcov ] && rm json_module.F90.gcov
+	gcov -o $LIBDIR ${SRCDIR}${MODCODE}
+	if [[ $TRY_UNICODE = [yY]* ]] ; then
+	    # gcov/gfortran bug work around
+	    awk -F':' '{line=""; for(i=2;i<=NF;i++){line=line":"$i}; if (NR > 1) print $1 prevline; prevline=line}; END{print "        -"prevline}' json_module.F90.gcov > json_module.F90.gcov.fixed && \
+		mv json_module.F90.gcov{.fixed,}
+	    # rename so we can merge coverage info
+	    mv json_module.F90.gcov json_module-unicode.F90.gcov
+	else
+	    # rename so we can merge coverage info
+	    mv json_module.F90.gcov json_module-no-unicode.F90.gcov
+	fi
+	if [ -f json_module-unicode.F90.gcov ] && [ -f json_module-no-unicode.F90.gcov ]; then
+	    # merge them
+	    ./pages/development-resources/gccr.pl -n -c json_module-no-unicode.F90.gcov no-unicode \
+						  json_module-unicode.F90.gcov unicode > json_module.F90.gcov
+	else
+	    cp json_module-*-unicode.F90.gcov json_module.F90.gcov
+	fi
+	FoBiS.py rule -gcov_analyzer .
+	sed -i"bak" -E 's; \*\*([a-zA-Z]+[a-zA-Z0-9_]*)\*\*; \*\*[[\1]]\*\*;' json_module.F90.gcov.md
+	sed -i"bak" -E 's;, line ([0-9]+);, line [\1](https://github.com/jacobwilliams/json-fortran/blob/master/src/json_module.F90#L\1);' json_module.F90.gcov.md
+	gcov -o $BINDIR ${TESTDIR}*.[Ff]90
+    fi
 else
     echo "Skip running the unit tests since \$JF_SKIP_TESTS has been set to ${JF_SKIP_TESTS}."
 fi
+
+#build the documentation with ford (if present):
+echo ""
+if [[ $JF_SKIP_DOCS != [yY]* ]]; then
+    if hash ford 2>/dev/null; then
+	echo "Building documentation..."
+	ford $FORDMD
+    else
+	echo "FORD not found! Install using: sudo pip install ford"
+    fi
+else
+    echo "Skip building documentation since \$JF_SKIP_DOCS has been set to ${JF_SKIP_DOCS}."
+fi

json-fortran.md

@@ -1,3 +1,4 @@
+page_dir: pages
 project: json-fortran
 favicon: ./media/json-fortran-32x32.png
 project_dir: ./src
@@ -35,6 +36,13 @@ modern Fortran (Fortran 2003+).  The source code is a single Fortran module file
 
 The json-fortran source code and related files and documentation are distributed under a permissive free software license (BSD-style).  See the [LICENSE](https://raw.githubusercontent.com/jacobwilliams/json-fortran/master/LICENSE) file for more details.
 
+# Offficial Releases
+
+Browse the documentation for a particular release
+[here](|url|releases/index.html) or download the latest official
+release
+[here](https://github.com/jacobwilliams/json-fortran/releases/tag/4.1.1).
+
 # Miscellaneous
 
 * For more information about JSON, see: <http://www.json.org/>

pages/README.md

@@ -0,0 +1,3 @@
+title: Github README
+
+{!README.md!}

pages/development-resources/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+title: Contributing Guidelines
+
+{!CONTRIBUTING.md!}

pages/development-resources/LICENSE.md

@@ -0,0 +1,3 @@
+title: JSON-Fortran License
+
+{!LICENSE!}