eolang 0.2.3 → 0.3.0

package/README.md

@@ -16,14 +16,14 @@ in the current directory:
 
 ```
 [args...] > hello
-  Q.org.eolang.io.stdout > @
+  QQ.io.stdout > @
     "Hello, world!\n"
 ```
 
 Then, you run it:
 
 ```
-$ eoc run hello
+$ eoc dataize hello
 ```
 
 That's it.
@@ -60,4 +60,4 @@ If you want to run a single test:
 $ npm test -- test/test_mvnw.js
 ```
 
-Then, make a pull request.
+Then, make a pull request.

package/itest/README.md

@@ -0,0 +1,16 @@
+[![grunt](https://github.com/objectionary/eoc/actions/workflows/itest.yml/badge.svg)](https://github.com/objectionary/eoc/actions/workflows/itest.yml)
+
+There is a simple integration here. Just run this to make sure
+it works:
+
+```
+$ ../src/eoc.js dataize foo.program
+```
+
+Then, you can execute the unit tests too:
+
+```
+$ ../src/eoc.js test
+```
+
+If doesn't work, submit an issue.

package/itest/program.eo

@@ -0,0 +1,27 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Yegor Bugayenko
+#
+# 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 NON-INFRINGEMENT. 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.
+
++alias story
+
+[args...] > program
+  QQ.io.stdout > @
+    story

package/itest/story-test.eo

@@ -0,0 +1,31 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Yegor Bugayenko
+#
+# 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 NON-INFRINGEMENT. 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.
+
++junit
++alias org.eolang.hamcrest.assert-that
++alias story
+
+[] > story-is-long-enough
+  assert-that > @
+    story.length
+    $.is
+      $.greater-than 1

package/itest/story.eo

@@ -0,0 +1,29 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Yegor Bugayenko
+#
+# 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 NON-INFRINGEMENT. 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.
+
+[] > story
+  QQ.txt.sprintf > @
+    "Hello, Mr. #%d!\n"
+    as-int.
+      times.
+        random
+        100.0

package/mvnw/pom.xml

@@ -44,6 +44,7 @@ SOFTWARE.
     <sourceDirectory>${eo.generatedDir}</sourceDirectory>
     <directory>${eo.targetDir}</directory>
     <outputDirectory>${eo.targetDir}/classes</outputDirectory>
+    <testOutputDirectory>${eo.targetDir}/classes</testOutputDirectory>
     <plugins>
       <plugin>
         <groupId>org.eolang</groupId>
@@ -72,6 +73,13 @@ SOFTWARE.
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M7</version>
+        <configuration>
+          <failIfNoTests>true</failIfNoTests>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",

package/src/commands/test.js

@@ -0,0 +1,38 @@
+#! /usr/bin/env node
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Yegor Bugayenko
+ *
+ * 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 NON-INFRINGEMENT. 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.
+ */
+
+const mvnwSync = require('../mvnw');
+const path = require('path');
+
+/**
+ * Command to run all available unit tests.
+ * @param {Hash} opts - All options
+ */
+module.exports = function test(opts) {
+  mvnwSync([
+    'surefire:test',
+    `-Deo.targetDir=${path.resolve(opts.target)}`,
+  ]);
+};

package/src/eoc.js

@@ -26,6 +26,16 @@
 const {Command} = require('commander');
 const program = new Command();
 
+const audit = require('./commands/audit');
+const clean = require('./commands/clean');
+const assemble = require('./commands/assemble');
+const register = require('./commands/register');
+const transpile = require('./commands/transpile');
+const compile = require('./commands/compile');
+const link = require('./commands/link');
+const dataize = require('./commands/dataize');
+const test = require('./commands/test');
+
 program
   .name('eoc')
   .description('EO command-line toolkit')
@@ -33,79 +43,98 @@ program
 
 program
   .option('-s, --sources <path>', 'directory with .EO sources', '.')
-  .option('-t, --target <path>', 'directory with all generated files', '.eoc');
+  .option('-t, --target <path>', 'directory with all generated files', '.eoc')
+  .option('--alone', 'just run a single command without dependencies');
 
 program.command('audit')
   .description('inspects all packages and reports their status')
-  .action((str, options) => {
-    const audit = require('./commands/audit');
+  .action((str, opts) => {
     audit(program.opts());
   });
 
 program.command('clean')
   .description('delete all temporary files')
-  .action((str, options) => {
-    const clean = require('./commands/clean');
+  .action((str, opts) => {
     clean(program.opts());
   });
 
 program.command('register')
   .description('register all visible EO source files')
-  .action((str, options) => {
-    const register = require('./commands/register');
+  .action((str, opts) => {
     register(program.opts());
   });
 
 program.command('assemble')
   .description('parse EO files into XMIR and join them with required dependencies')
-  .action((str, options) => {
-    const assemble = require('./commands/assemble');
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+    }
     assemble(program.opts());
   });
 
 program.command('transpile')
   .description('converts EO files into target language')
-  .action((str, options) => {
-    const transpile = require('./commands/transpile');
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+    }
     transpile(program.opts());
   });
 
 program.command('compile')
   .description('compiles target language sources into binaries')
-  .action((str, options) => {
-    const compile = require('./commands/compile');
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+      transpile(program.opts());
+    }
     compile(program.opts());
   });
 
 program.command('link')
   .description('link together all binaries into a single executable binary')
-  .action((str, options) => {
-    const link = require('./commands/link');
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+      transpile(program.opts());
+      compile(program.opts());
+    }
     link(program.opts());
   });
 
 program.command('dataize')
   .description('run the single executable binary and dataize an object')
-  .action((str, options) => {
-    const dataize = require('./commands/dataize');
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+      transpile(program.opts());
+      compile(program.opts());
+      link(program.opts());
+    }
     dataize(program.args[1], program.opts());
   });
 
-program.command('run')
-  .description('register, assemble, transpile, compile, link, and dataize an object')
-  .action((str, options) => {
-    const register = require('./commands/register');
-    register(program.opts());
-    const assemble = require('./commands/assemble');
-    assemble(program.opts());
-    const transpile = require('./commands/transpile');
-    transpile(program.opts());
-    const compile = require('./commands/compile');
-    compile(program.opts());
-    const link = require('./commands/link');
-    link(program.opts());
-    const dataize = require('./commands/dataize');
-    dataize(program.args[1], program.opts());
+program.command('test')
+  .description('run all visible unit tests')
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+      transpile(program.opts());
+      compile(program.opts());
+      link(program.opts());
+    }
+    test(program.opts());
   });
 
-program.parse();
+try {
+  program.parse(process.argv);
+} catch (e) {
+  console.log('eoc failed: "' + e.message + '"');
+  process.exit(1);
+}

package/src/mvnw.js

@@ -70,6 +70,6 @@ module.exports = function mvnwSync(args) {
   console.log('+ ' + cmd);
   const result = spawnSync(bin, params, {cwd: home, stdio: 'inherit'});
   if (result.status != 0) {
-    throw new Error('Exit code: ' + result.status);
+    throw new Error('The command "' + cmd + '" exited with #' + result.status + ' code');
   }
 };

package/src/version.js

@@ -23,4 +23,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.2.3';
+module.exports = '0.3.0';