Merge pull request #285 from datajoint/stage2

Add Toolbox packaging

Author: Chris Turner

+dj/+lib/compareVersions.m

@@ -27,16 +27,7 @@
             % specify the connection to the database.
             % initQuery is the SQL query to be executed at the start
             % of each new session.
-            setupDJ(true);
-            try
-                mymVersion = mym('version');
-                assert(mymVersion.major > 2 || mymVersion.major==2 && mymVersion.minor>=6)
-            catch
-                error 'Outdated version of mYm.  Please upgrade to version 2.6 or later'
-            end
-            if verLessThan('matlab', '8.6')
-                error 'MATLAB version 8.6 (R2015b) or greater is required'
-            end
+            dj.setup('prompt', ~dj.set('suppressPrompt'));
             self.host = host;
             self.user = username;
             self.password = password;

+dj/Connection.m

@@ -45,7 +45,6 @@
         end
     end
 else
-    % invoke setupDJ
     % optional environment variables specifying the connection.
     env  = struct(...
         'host', 'DJ_HOST', ...

+dj/conn.m

@@ -0,0 +1,80 @@
+function setup(varargin)
+    p = inputParser;
+    addOptional(p, 'force', false);
+    addOptional(p, 'prompt', true);
+    parse(p, varargin{:});
+    force = p.Results.force;
+    prompt = p.Results.prompt;
+    persistent INVOKED
+    if ~isempty(INVOKED) && ~force
+        return
+    end
+    % check MATLAB
+    if verLessThan('matlab', '9.1')
+        error('DataJoint:System:UnsupportedMatlabVersion', ...
+              'MATLAB version 9.1 (R2016b) or greater is required');
+    end
+    % require certain toolboxes
+    requiredToolboxes = {...
+        struct(...
+            'Name', 'GHToolbox', ...
+            'ResolveTarget', 'datajoint/GHToolbox'...
+        ), ...
+        struct(...
+            'Name', 'mym', ...
+            'ResolveTarget', 'datajoint/mym', ...
+            'Version', @(v) compareVersions(v, '2.7.3', @(v_actual,v_ref) v_actual>=v_ref)...
+        )...
+    };
+    try
+        ghtb.require(requiredToolboxes, 'prompt', prompt);
+    catch ME
+        installPromptMsg = {
+            'Toolbox ''%s'' did not meet the minimum requirements.'
+            'Would you like to proceed with an upgrade?'
+        };
+        if strcmp(ME.identifier, 'MATLAB:undefinedVarOrClass') && (~prompt || strcmpi('yes',...
+                dj.internal.ask(sprintf(sprintf('%s\n', installPromptMsg{:}), 'GHToolbox'))))
+            % fetch
+            tmp_toolbox = [tempname '.mltbx'];
+            websave(tmp_toolbox, ['https://github.com/' requiredToolboxes{1}.ResolveTarget ...
+                                  '/releases/download/' ...
+                                  subsref(webread(['https://api.github.com/repos/' ...
+                                                   requiredToolboxes{1}.ResolveTarget ...
+                                                   '/releases/latest'], ...
+                                                  weboptions('Timeout', 60)), ...
+                                          substruct('.', 'tag_name')) ...
+                                  '/GHToolbox.mltbx'], weboptions('Timeout', 60));
+            % install
+            try
+                matlab.addons.install(tmp_toolbox, 'overwrite');
+            catch ME
+                if strcmp(ME.identifier, 'MATLAB:undefinedVarOrClass')
+                    matlab.addons.toolbox.installToolbox(tmp_toolbox);
+                else
+                    rethrow(ME);
+                end
+            end
+            % remove temp toolbox file
+            delete(tmp_toolbox);
+            % retrigger dependency validation
+            ghtb.require(requiredToolboxes, 'prompt', prompt);
+        elseif strcmp(ME.identifier, 'MATLAB:undefinedVarOrClass')
+            GHToolboxMsg = {
+                'Toolbox ''GHToolbox'' did not meet the minimum requirements.'
+                'Please proceed to install it.'
+            };
+            error('DataJoint:verifyGHToolbox:Failed', ...
+                  sprintf('%s\n', GHToolboxMsg{:}));
+        else
+            rethrow(ME)
+        end
+    end
+    % check mym
+    mymVersion = mym('version');
+    assert(mymVersion.major > 2 || mymVersion.major==2 && mymVersion.minor>=6, ...
+           'DataJoint:System:mYmIncompatible', ...
+           'Outdated version of mYm.  Please upgrade to version 2.6 or later');
+    % set cache
+    INVOKED = true;
+end

+dj/setup.m

@@ -1,7 +1,7 @@
 function varargout = version
 % report DataJoint version
 
-v = struct('major',3,'minor',3,'bugfix',1);
+v = struct('major',3,'minor',3,'bugfix',2);
 
 if nargout
     varargout{1}=v;

+dj/version.m

@@ -1,11 +1,12 @@
 *.m~
 mym/
-*.mltbx
 *.env
 notebook
 *getSchema.m
 docker-compose.yml
 .vscode
 matlab.prf
 win.*
-macos.*
+macos.*
+*.prj
+*.mltbx

+tests/+lib/compareVersions.m

@@ -24,7 +24,7 @@ jobs:
     - <<: *slim
       env:
       - MATLAB_VERSION: R2019a
-      - MYSQL_TAG: 8.0
+      - MYSQL_TAG: 8.0.18
     - <<: *slim
       env:
       - MATLAB_VERSION: R2019a
@@ -36,4 +36,8 @@ jobs:
     - <<: *slim
       env:
       - MATLAB_VERSION: R2018b
+      - MYSQL_TAG: 5.7
+    - <<: *slim
+      env:
+      - MATLAB_VERSION: R2016b
       - MYSQL_TAG: 5.7