Merge pull request #123 from xow/fix-useremails

Use example.com for email addresses

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 04a26cc..8103502 100644 (file)
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+v1.5.3
+------
+
+- Really include ``phpunit`` does not require '_testuite' as suffix of the test suites
+
+v1.5.2
+------
+
+- Update default config for Moodle 3.0 release
+- New script to refresh the services and external functions
+- ``phpunit`` does not require '_testuite' as suffix of the test suites
+- New script to fix the version numbers - Adrian Greeve
+
 v1.5.1
 ------
 

diff --git a/mdk/commands/phpunit.py b/mdk/commands/phpunit.py
index a87f6c0..d1ab6dc 100644 (file)
--- a/mdk/commands/phpunit.py
+++ b/mdk/commands/phpunit.py
@@ -148,11 +148,16 @@ class PhpunitCommand(Command):
 
             PU.init(force=args.force, prefix=prefix)
 
+            # Automatically add the suffix _testsuite.
+            testsuite = args.testsuite
+            if testsuite and not testsuite.endswith('_testsuite'):
+                testsuite += '_testsuite'
+
             kwargs = {
                 'coverage': args.coverage,
                 'filter': args.filter,
                 'testcase': args.testcase,
-                'testsuite': args.testsuite,
+                'testsuite': testsuite,
                 'unittest': args.unittest
             }
 

diff --git a/mdk/config-dist.json b/mdk/config-dist.json
index aa0f099..87b0103 100644 (file)
--- a/mdk/config-dist.json
+++ b/mdk/config-dist.json
@@ -124,6 +124,10 @@
                 "branch" : "Pull 2.9 Branch",
                 "diffurl" : "Pull 2.9 Diff URL"
             },
+            "30" : {
+                "branch" : "Pull 3.0 Branch",
+                "diffurl" : "Pull 3.0 Diff URL"
+            },
             "master" : {
                 "branch" : "Pull Master Branch",
                 "diffurl" : "Pull Master Diff URL"
@@ -241,7 +245,7 @@
     "useCacheAsUpstreamRemote": true,
 
     // You should not edit this, this is the branch that is considered as master by developers.
-    "masterBranch": 30,
+    "masterBranch": 31,
 
     // Aliases for MDK commands.
     // An alias starting with a ! will be executed through the command line. Those also

diff --git a/mdk/scripts/external_functions.php b/mdk/scripts/external_functions.php
new file mode 100644 (file)
index 0000000..75c88e7
--- /dev/null
+++ b/mdk/scripts/external_functions.php
@@ -0,0 +1,41 @@
+<?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/>.
+
+/**
+ * Script to refresh the services and external functions.
+ *
+ * @package    mdk
+ * @copyright  2015 Frédéric Massart - FMCorz.net
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+require('config.php');
+require($CFG->libdir . '/upgradelib.php');
+
+mtrace('Updating services of core');
+external_update_descriptions('moodle');
+
+$plugintypes = core_component::get_plugin_types();
+foreach ($plugintypes as $plugintype => $dir) {
+    $plugins = core_component::get_plugin_list($plugintype);
+    foreach ($plugins as $plugin => $dir) {
+        $component = $plugintype . '_' . $plugin;
+        mtrace('Updating services of ' . $component);
+        external_update_descriptions($component);
+    }
+}
+

diff --git a/mdk/scripts/undev.php b/mdk/scripts/undev.php
index a27eebe..c046769 100644 (file)
--- a/mdk/scripts/undev.php
+++ b/mdk/scripts/undev.php
@@ -101,6 +101,8 @@ $resources = array('book', 'folder', 'imscp', 'page', 'resource', 'url');
 foreach ($resources as $r) {
     $settingpage = $adminroot->locate('modsetting' . $r, true);
     $settings = $settingpage->settings;
-    $default = $settings->requiremodintro->get_defaultsetting();
-    mdk_set_config('requiremodintro', $default, $r);
+    if (isset($settings->requiremodintro)) {
+        $default = $settings->requiremodintro->get_defaultsetting();
+        mdk_set_config('requiremodintro', $default, $r);
+    }
 }

diff --git a/mdk/version.py b/mdk/version.py
index 9894c4b..52c7c20 100644 (file)
--- a/mdk/version.py
+++ b/mdk/version.py
@@ -22,4 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 http://github.com/FMCorz/mdk
 """
 
-__version__ = "1.5.1"
+__version__ = "1.5.3"