Merge branch 'refs/heads/package-manager' into latest

aNNiMON · aNNiMON · commit 94d0592b1c5e · 2024-09-29T23:40:54.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@
 /.idea/
 /.nb-gradle/
 **/build/
-/dist/
 /out/
 /store/
 /optimizations/
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ ext {
             slf4j: '2.0.13', // org.slf4j:slf4j-simple
             jackson: '2.17.0', // com.fasterxml.jackson.core:jackson-databind
 
-            junit: '5.10.2', // org.junit:junit-bom
+            junit: '5.11.0', // org.junit:junit-bom
             jmh: '1.37', // org.openjdk.jmh:jmh-core
             assertj: '3.25.3' // org.assertj:assertj-core
     ]
diff --git a/dist/icon.png b/dist/icon.png
diff --git a/dist/own b/dist/own
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+ownlang run own "$@"
diff --git a/dist/own.cmd b/dist/own.cmd
@@ -0,0 +1,2 @@
+@echo off
+ownlang run own %*
diff --git a/dist/ownlang b/dist/ownlang
@@ -0,0 +1,38 @@
+#!/usr/bin/env sh
+(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+PRGDIR=`dirname "$PRG"`
+
+_classpath=".:$PRGDIR/OwnLang.jar"
+if [ `uname -a | grep -i -c cygwin` -ne 0 ]; then # Cygwin, translate the path
+  for k in "$PRGDIR"/modules/*.jar
+  do
+    _classpath="${_classpath};`cygpath -w ${k}`"
+  done
+  for k in "$PRGDIR"/libs/*.jar
+  do
+    _classpath="${_classpath};`cygpath -w ${k}`"
+  done
+else
+  for k in "$PRGDIR"/modules/*.jar
+  do
+    _classpath="${_classpath}:${k}"
+  done
+  for k in "$PRGDIR"/libs/*.jar
+  do
+    _classpath="${_classpath}:${k}"
+  done
+fi
+
+java -cp "${_classpath}" com.annimon.ownlang.Main "$@"
diff --git a/dist/ownlang-runner.cmd b/dist/ownlang-runner.cmd
@@ -0,0 +1,4 @@
+@echo off
+set JAVA=java
+%JAVA% -cp "%~dp0/*;%~dp0modules/*;%~dp0libs/*" com.annimon.ownlang.Main --file %1
+pause
diff --git a/dist/ownlang.cmd b/dist/ownlang.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+set JAVA=java
+%JAVA% ^
+  -cp "%~dp0/*;%~dp0modules/*;%~dp0libs/*" com.annimon.ownlang.Main %*
diff --git a/docs/docs/en/changelog.md b/docs/docs/en/changelog.md
@@ -2,6 +2,9 @@
 
 ## Next
 
+### Changes
+- Add `own` package manager. Usage examples: `own`, `own init`, `own add openai`.
+
 ### Fixes
 - Fix passing command-line arguments to scripts.
 - Fix `this` in non-static class methods.
diff --git a/docs/docs/ru/changelog.md b/docs/docs/ru/changelog.md
@@ -2,6 +2,9 @@
 
 ## Next
 
+### Изменения
+- Добавлен `own` пакетный менеджер. Примеры испльзования: `own`, `own init`, `own add openai`.
+
 ### Исправления
 - Исправлена передача аргументов командной строки скриптам.
 - Исправлен `this` в нестатических методах классов.
diff --git a/modules/canvasfx/build.gradle b/modules/canvasfx/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.openjfx.javafxplugin' version '0.0.14'
+    id 'org.openjfx.javafxplugin' version "0.1.0"
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
diff --git a/modules/main/src/main/java/com/annimon/ownlang/modules/okhttp/Values.java b/modules/main/src/main/java/com/annimon/ownlang/modules/okhttp/Values.java
@@ -14,22 +14,22 @@
 public class Values {
 
     public static RequestBody getRequestBody(Value arg, String msg) {
-        if (arg.type() == Types.MAP && (arg instanceof RequestBodyValue)) {
-            return ((RequestBodyValue) arg).getRequestBody();
+        if (arg.type() == Types.MAP && (arg instanceof RequestBodyValue rbv)) {
+            return rbv.getRequestBody();
         }
         throw new TypeException("RequestBody value expected" + msg);
     }
 
     public static Request getRequest(Value arg, String msg) {
-        if (arg.type() == Types.MAP && (arg instanceof RequestBuilderValue)) {
-            return ((RequestBuilderValue) arg).getRequest();
+        if (arg.type() == Types.MAP && (arg instanceof RequestBuilderValue rbv)) {
+            return rbv.getRequest();
         }
         throw new TypeException("Request value expected" + msg);
     }
 
     public static OkHttpClient getHttpClient(Value arg, String msg) {
-        if (arg.type() == Types.MAP && (arg instanceof HttpClientValue)) {
-            return ((HttpClientValue) arg).getClient();
+        if (arg.type() == Types.MAP && (arg instanceof HttpClientValue hcv)) {
+            return hcv.getClient();
         }
         throw new TypeException("HttpClient value expected" + msg);
     }
diff --git a/ownlang-desktop/src/main/java/com/annimon/ownlang/Main.java b/ownlang-desktop/src/main/java/com/annimon/ownlang/Main.java
@@ -97,6 +97,10 @@ public static void main(String[] args) throws IOException {
                     return;
 
                 case "run":
+                    if (options.programPath != null) {
+                        // discard "run" if some programs already specified
+                        break;
+                    }
                     final String scriptName;
                     if (i + 1 < args.length) {
                         scriptName = args[i + 1];
diff --git a/ownlang-desktop/src/main/resources/scripts/listscripts.own b/ownlang-desktop/src/main/resources/scripts/listscripts.own
@@ -1,5 +1,6 @@
 println "Available scripts:
   checkUpdate - checks updates on GitHub
+  own - own package manager
 
 To run a script use command:
  ownlang run checkUpdate
diff --git a/ownlang-desktop/src/main/resources/scripts/own.own b/ownlang-desktop/src/main/resources/scripts/own.own
diff --git a/ownlang-parser/build.gradle b/ownlang-parser/build.gradle
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/Lexer.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/Lexer.java

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ ext {`
`12`	`12`	`slf4j: '2.0.13', // org.slf4j:slf4j-simple`
`13`	`13`	`jackson: '2.17.0', // com.fasterxml.jackson.core:jackson-databind`
`14`	`14`
`15`		`- junit: '5.10.2', // org.junit:junit-bom`
	`15`	`+ junit: '5.11.0', // org.junit:junit-bom`
`16`	`16`	`jmh: '1.37', // org.openjdk.jmh:jmh-core`
`17`	`17`	`assertj: '3.25.3' // org.assertj:assertj-core`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env sh`
	`2`	`+ownlang run own "$@"`