eolang 0.8.2 → 0.8.3

package/itest/story.eo

@@ -26,5 +26,5 @@
     as-int.
       QQ.math.number
         times.
-          QQ.math.random
+          QQ.math.random.pseudo
           100.0

package/mvnw/pom.xml

@@ -34,12 +34,12 @@ SOFTWARE.
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.2</version>
+      <version>5.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.6.2</version>
+      <version>5.9.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -55,13 +55,15 @@ SOFTWARE.
         <version>${eo.version}</version>
         <configuration>
           <excludeSources>.eoc/**</excludeSources>
+          <gmiIncludes>${eo.gmiIncludes}</gmiIncludes>
+          <gmiExcludes>${eo.gmiExcludes}</gmiExcludes>
           <foreign>${project.build.directory}/eo-foreign.json</foreign>
           <foreignFormat>json</foreignFormat>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.8.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -31,7 +31,7 @@
     "eslint-config-google": "0.14.0",
     "grunt": "1.5.3",
     "grunt-contrib-clean": "2.0.1",
-    "grunt-eslint": "21.1.0",
+    "grunt-eslint": "24.0.0",
     "grunt-mocha-cli": "7.0.0",
     "mocha": "^10.0.0"
   },

package/src/commands/gmi.js

@@ -31,15 +31,36 @@ const parserVersion = require('../parser-version');
  * @param {Hash} opts - All options
  */
 module.exports = function(opts) {
-  mvnwSync([
+  const argv = [
     'eo:gmi',
     '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
     opts.verbose ? '' : '--quiet',
-    opts.gmiXml ? '-Deo.generateGmiXmlFiles' : '',
-    opts.gmiXembly ? '-Deo.generateXemblyFiles' : '',
-    opts.gmiGraph ? '-Deo.generateGraphFiles' : '',
-    opts.gmiDot ? '-Deo.generateDotFiles' : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
-  ]);
+  ];
+  if (opts.include) {
+    argv.push('-Deo.gmiIncludes=' + opts.include);
+  }
+  if (opts.exclude) {
+    argv.push('-Deo.gmiExcludes=' + opts.exclude);
+  }
+  if (opts.xml) {
+    argv.push('-Deo.generateGmiXmlFiles');
+  }
+  if (opts.xembly) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+  }
+  if (opts.graph) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+    argv.push('-Deo.generateGraphFiles');
+  }
+  if (opts.dot) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+    argv.push('-Deo.generateGraphFiles');
+    argv.push('-Deo.generateDotFiles');
+  }
+  mvnwSync(argv);
   console.info('GMI files generated in %s', path.resolve(opts.target));
 };

package/src/eoc.js

@@ -95,10 +95,12 @@ program.command('assemble')
 
 program.command('gmi')
   .description('generate GMI files from XMIR')
-  .option('--gmi-xml', 'generate .gmi.xml files')
-  .option('--gmi-xembly', 'generate .gmi.xe files')
-  .option('--gmi-graph', 'generate .gmi.graph files')
-  .option('--gmi-dot', 'generate .gmi.dot files')
+  .option('--xml', 'generate .gmi.xml files')
+  .option('--xembly', 'generate .gmi.xe files')
+  .option('--graph', 'generate .gmi.graph files')
+  .option('--dot', 'generate .gmi.dot files')
+  .option('--include <names>', 'generate GMI for these object names (using mask)')
+  .option('--exclude <names>', 'don\'t generate GMI for these objects')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts());

package/src/parser-version.js

@@ -45,6 +45,6 @@ module.exports = function() {
     version = xml.metadata.versioning.release;
     console.debug('The latest version of %s at %s is %s', repo, url, version);
   }
-  console.debug('Current version of %s is %s', repo, version);
+  console.info('EO version is %s', version);
   return version;
 };

package/src/version.js

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.8.2';
+module.exports = '0.8.3';