Merge branch 'master' into master

.gitignore

 .DS_STORE
-*.sublime-project
-*.sublime-workspace
-vendor
-classes/log/error_log.txt
-composer.phar
-.idea/
+/.idea
+/*.sublime-project
+/*.sublime-workspace
+/classes/log/error_log.txt
+/composer.phar
+/node_modules
+/package-lock.json
+/vendor

.travis.yml

 language: php
-
 sudo: false
 
 cache:
-    directories:
-        - $HOME/.composer/cache
+  directories:
+    - $HOME/.composer/cache
 
 php:
-    - 5.6
-    - 7.0
-    - 7.1
+  - 5.6
+  - 7.0
+  - 7.1
 
 env:
-    global:
-        - MOODLE_BRANCH=MOODLE_32_STABLE
-    matrix:
-        - DB=pgsql
-#       - DB=mysqli
+  global:
+    - MOODLE_BRANCH=MOODLE_32_STABLE
+  matrix:
+    - DB=pgsql
+#   - DB=mysqli
 
 before_install:
-    - composer install --no-interaction
-    - phpenv config-rm xdebug.ini
-    - nvm install node
-    - cd ../..
-    - composer selfupdate
-    - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2
-    - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
+  - echo $TRAVIS_PHP_VERSION
+  - composer install --no-interaction
+  - phpenv config-rm xdebug.ini
+  - nvm install node
+  - cd ../..
+  - composer selfupdate
+  - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2
+  - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:
-    - moodle-plugin-ci install
+  - moodle-plugin-ci install
 
 script:
-#   - moodle-plugin-ci phplint
-#   - moodle-plugin-ci phpcpd
-#   - moodle-plugin-ci phpmd
-#   - moodle-plugin-ci codechecker
-    - moodle-plugin-ci validate
-    - moodle-plugin-ci savepoints
-#   - moodle-plugin-ci mustache
-#   - moodle-plugin-ci grunt
-    - moodle-plugin-ci phpunit
-#   - moodle-plugin-ci behat
-
-    # run codechecker without the vendor/ directory
-    - rm -rf "$(find -type d -name xapi)/vendor"
-    - moodle-plugin-ci codechecker
+# - moodle-plugin-ci phplint
+# - moodle-plugin-ci phpcpd
+# - moodle-plugin-ci phpmd
+# - moodle-plugin-ci codechecker
+  - moodle-plugin-ci validate
+  - moodle-plugin-ci savepoints
+# - moodle-plugin-ci mustache
+# - moodle-plugin-ci grunt
+  - moodle-plugin-ci phpunit
+# - moodle-plugin-ci behat
+
+  # run codechecker without the vendor/ directory
+  - rm -rf "$(find -type d -name xapi)/vendor"
+  - moodle-plugin-ci codechecker
+  - cd $TRAVIS_BUILD_DIR
+
+after_success:
+  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then
+    git fetch --tags;
+    npm i semantic-release;
+    npm i last-release-git;
+    ./node_modules/.bin/semantic-release pre;
+    ./node_modules/.bin/semantic-release post;
+    fi
+
+before_deploy:
+  - sh ./scripts/generateVersionFile.sh
+  - sh ./scripts/generateZipFile.sh
+
+deploy:
+  provider: releases
+  api_key: $GH_TOKEN
+  file: xapi.zip
+  skip_cleanup: true
+  on:
+    tags: true
+    php: 7.1

classes/log/store.php

@@ -65,10 +65,14 @@ class store extends php_obj implements log_writer {
      * @param log_manager $manager
      */
     public function __construct(log_manager $manager) {
+        global $CFG;
         $this->helper_setup($manager);
         $this->logguests = $this->get_config('logguests', 1);
         $routes = $this->get_config('routes', '');
         $this->routes = $routes === '' ? [] : explode(',', $routes);
+        if (!empty($CFG->debug) and $CFG->debug >= DEBUG_DEVELOPER) {
+            $this->loggingenabled = true;
+        }
     }
 
     /**

package.json

+{
+  "name": "moodle-logstore_xapi",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/xAPI-vle/moodle-logstore_xapi.git"
+  },
+  "release": {
+    "getLastRelease": "last-release-git"
+  }
+}

scripts/generateVersionFile.sh

+release=$(echo "${TRAVIS_TAG//v}")
+
+year=$(date +"%Y")
+
+today=$(date +"%Y-%m-%d")
+todaysReleases=$(git log --tags --simplify-by-decoration --pretty="format:%ai %d" | sort -r | grep "$today" | wc -l | tr -d '[:space:]')
+
+versionPrefix=$(date +"%Y%m%d")
+versionSuffix=$(printf %02d $todaysReleases)
+version="$versionPrefix$versionSuffix"
+
+template=$(cat templateVersionFile)
+eval "echo \"$template\"" > version.php

build.sh → scripts/generateZipFile.sh

@@ -14,13 +14,11 @@ find ../moodle_logstore_build -type f -name '.gitignore' | xargs rm -rf
 find ../moodle_logstore_build -type f -name 'composer.*' | xargs rm -rf
 find ../moodle_logstore_build -type f -name 'phpunit.*' | xargs rm -rf
 find ../moodle_logstore_build -type f -name '*.md' | xargs rm -rf
+find ../moodle_logstore_build -type f -name 'node_modules' | xargs rm -rf
+find ../moodle_logstore_build -type f -name 'package-lock.json' | xargs rm -rf
+find ../moodle_logstore_build -type f -name 'package.json' | xargs rm -rf
 
 # Creates the zip file.
 mv ../moodle_logstore_build xapi
 zip -r xapi.zip xapi -x "xapi/.git/**/*"
 rm -rf xapi
-
-# Updates Github.
-git add xapi.zip
-git commit -m "Builds zip file."
-git push

scripts/templateVersionFile

+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * External xapi log store plugin
+ *
+ * @package    logstore_xapi
+ * @copyright  $year Jerrett Fowler <jfowler@charitylearning.org>
+ *                  Ryan Smith <ryan.smith@ht2.co.uk>
+ *                  David Pesce <david.pesce@exputo.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+defined('MOODLE_INTERNAL') || die();
+\$plugin->component = 'logstore_xapi';
+\$plugin->version = $version;
+\$plugin->release = '$release';
+\$plugin->requires = 2014111000;
+\$plugin->maturity = MATURITY_STABLE;

version.php

@@ -28,6 +28,6 @@ defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'logstore_xapi';
 $plugin->version = 2017061100;
-$plugin->release = '2.0.0';
+$plugin->release = '0.0.0-development';
 $plugin->requires = 2014111000;
-$plugin->maturity = MATURITY_STABLE;
+$plugin->maturity = MATURITY_ALPHA;