diff --git a/.profile b/.profile index d196a932..2c3f0fc7 100644 --- a/.profile +++ b/.profile @@ -10,7 +10,7 @@ ys-local() { YS() ( set -e base=$YAMLSCRIPT_ROOT/ys - libyamlscript_version=0.1.61 + libyamlscript_version=0.1.62 jar=yamlscript.cli-$libyamlscript_version-SNAPSHOT-standalone.jar make --no-print-directory -C "$base" jar java -jar "$base/target/uberjar/$jar" "$@" diff --git a/.version.ys b/.version.ys index 063a04a8..bf506003 100644 --- a/.version.ys +++ b/.version.ys @@ -2,7 +2,7 @@ !yamlscript/v0 -v-api =: '0.1.61' +v-api =: '0.1.62' v-perl =: v-api v-python =: v-api diff --git a/Changes b/Changes index 8c7dd111..1152f55f 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,19 @@ +- version: 0.1.62 + date: Sat 15 Jun 2024 01:47:13 PM EDT + changes: + - doc: Move doc files from www/src/doc/ to doc/ + - doc: New pages /yaml and /gotcha + - core: Fix bug when $ alone in interpolated string + - core: Support + escaping like . escaping + - release: Bug fix in .version.sh + - ys: When file name is first, args go to file + - std: Add `in` and `has` functions + - sample: Add ollama.ys local LLM query utility + - core: Support ||= .= += -= *= /= operators + - core: Allow loop with no bindings (implies []) + - core: Support 'catch:_…' and 'catch e:_…' + - version: 0.1.61 date: Wed 12 Jun 2024 11:54:55 AM EDT changes: diff --git a/Meta b/Meta index 7eae7989..1aa9512d 100644 --- a/Meta +++ b/Meta @@ -1,7 +1,7 @@ =meta: 0.0.2 name: YAMLScript -version: 0.1.61 +version: 0.1.62 abstract: Program in YAML homepage: https://yamlscript.org license: mit diff --git a/ReadMe.md b/ReadMe.md index 9f5fe8c4..a51ac17f 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -228,7 +228,7 @@ Make sure `~/.local/bin` is in your `PATH` environment variable. You can use the following environment variables to control the installation: * `PREFIX=...` - The directory to install to. Default: `~/.local` -* `VERSION=...` - The YAMLScript version to install. Default: `0.1.61` +* `VERSION=...` - The YAMLScript version to install. Default: `0.1.62` * `BIN=1` - Only install the `PREFIX/bin/ys` command line tool. * `LIB=1` - Only install the `PREFIX/lib/libyamlscript` shared library. * `DEBUG=1` - Print the Bash commands that are being run. diff --git a/clojure/deps.edn b/clojure/deps.edn index a3e55d47..9e186090 100644 --- a/clojure/deps.edn +++ b/clojure/deps.edn @@ -4,4 +4,4 @@ org.clojure/data.json {:mvn/version "2.4.0"}, org.json/json {:mvn/version "20240205"}, net.java.dev.jna/jna {:mvn/version "5.14.0"}, - org.yamlscript/yamlscript {:mvn/version "0.1.61"}}} + org.yamlscript/yamlscript {:mvn/version "0.1.62"}}} diff --git a/clojure/project.clj b/clojure/project.clj index 58d12df0..83f7a947 100644 --- a/clojure/project.clj +++ b/clojure/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject org.yamlscript/clj-yamlscript "0.1.61" +(defproject org.yamlscript/clj-yamlscript "0.1.62" :description "YAMLScript is a functional programming language whose syntax is encoded in YAML." @@ -23,7 +23,7 @@ [org.clojure/data.json "2.4.0"] [org.json/json "20240205"] [net.java.dev.jna/jna "5.14.0"] - [org.yamlscript/yamlscript "0.1.61"]] + [org.yamlscript/yamlscript "0.1.62"]] :deploy-repositories [["releases" diff --git a/common/install.mk b/common/install.mk index 7243791a..5b5ff6bc 100644 --- a/common/install.mk +++ b/common/install.mk @@ -3,7 +3,7 @@ SHELL := bash ROOT := $(shell \ cd '$(abspath $(dir $(lastword $(MAKEFILE_LIST))))' && pwd -P) -YAMLSCRIPT_VERSION := 0.1.61 +YAMLSCRIPT_VERSION := 0.1.62 YS := $(wildcard ys) LIBYAMLSCRIPT := $(firstword $(wildcard libyamlscript.*)) diff --git a/common/project.clj b/common/project.clj index 7eed9b78..92f44541 100644 --- a/common/project.clj +++ b/common/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/docker "0.1.61" +(defproject yamlscript/docker "0.1.62" :description "Program in YAML" :dependencies [#__ diff --git a/common/release.md b/common/release.md index 5aa6c3e3..b7ed70db 100644 --- a/common/release.md +++ b/common/release.md @@ -14,5 +14,5 @@ $ curl https://yamlscript.org/install | bash See [Installing YAMLScript](https://github.com/yaml/yamlscript/wiki/Installing-YAMLScript) for more detailed information. -## Changes in YAMLScript version 0.1.61 +## Changes in YAMLScript version 0.1.62 diff --git a/core/project.clj b/core/project.clj index b946c4fd..6372f12a 100644 --- a/core/project.clj +++ b/core/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/core "0.1.61" +(defproject yamlscript/core "0.1.62" :description "Program in YAML" :url "https://github.com/yaml/yamlscript" diff --git a/core/src/yamlscript/runtime.clj b/core/src/yamlscript/runtime.clj index 3893e4e8..a311c937 100644 --- a/core/src/yamlscript/runtime.clj +++ b/core/src/yamlscript/runtime.clj @@ -30,7 +30,7 @@ :refer [abspath get-yspath]])) -(def ys-version "0.1.61") +(def ys-version "0.1.62") (def ARGS (sci/new-dynamic-var 'ARGS)) (def ARGV (sci/new-dynamic-var 'ARGV)) diff --git a/doc/ys.md b/doc/ys.md index b64025e5..606cbc46 100644 --- a/doc/ys.md +++ b/doc/ys.md @@ -11,7 +11,7 @@ as JSON. ```text $ ys --help -ys - The YAMLScript (YS) Command Line Tool - v0.1.61 +ys - The YAMLScript (YS) Command Line Tool - v0.1.62 Usage: ys [] [] diff --git a/java/Makefile b/java/Makefile index 494e28b4..ad2b2ebb 100644 --- a/java/Makefile +++ b/java/Makefile @@ -2,7 +2,7 @@ include ../common/base.mk include $(COMMON)/binding.mk include $(COMMON)/java.mk -YAMLSCRIPT_JAVA_JAR := target/yamlscript-0.1.61.jar +YAMLSCRIPT_JAVA_JAR := target/yamlscript-0.1.62.jar #------------------------------------------------------------------------------ diff --git a/java/pom.xml b/java/pom.xml index df4dd2b4..d48d7877 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -12,7 +12,7 @@ yamlscript - 0.1.61 + 0.1.62 yamlscript diff --git a/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java b/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java index ea366a06..8d8b0d9f 100644 --- a/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java +++ b/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java @@ -13,7 +13,7 @@ */ public class YAMLScript { - public static String YAMLSCRIPT_VERSION = "0.1.61"; + public static String YAMLSCRIPT_VERSION = "0.1.62"; public static Object load(String ysCode) { diff --git a/libyamlscript/deps.edn b/libyamlscript/deps.edn index 7958bdb2..3726205c 100644 --- a/libyamlscript/deps.edn +++ b/libyamlscript/deps.edn @@ -3,7 +3,7 @@ {org.clojure/clojure {:mvn/version "1.11.1"}, org.babashka/sci {:mvn/version "0.8.40"}, org.clojure/data.json {:mvn/version "2.4.0"}, - yamlscript/compiler {:mvn/version "0.1.61"}}, + yamlscript/compiler {:mvn/version "0.1.62"}}, :aliases {:lein2deps {:deps diff --git a/libyamlscript/project.clj b/libyamlscript/project.clj index 110bdedc..65ded95c 100644 --- a/libyamlscript/project.clj +++ b/libyamlscript/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/libyamlscript "0.1.61" +(defproject yamlscript/libyamlscript "0.1.62" :description "Shared Library for YAMLScript" :url "https://yamlscript.org" @@ -20,7 +20,7 @@ [[org.clojure/clojure "1.11.1"] [org.babashka/sci "0.8.41"] [org.clojure/data.json "2.4.0"] - [yamlscript/core "0.1.61"]] + [yamlscript/core "0.1.62"]] :plugins [[lein-exec "0.3.7"] diff --git a/nodejs/lib/yamlscript/index.js b/nodejs/lib/yamlscript/index.js index 1a7b27b8..d9e1af1e 100644 --- a/nodejs/lib/yamlscript/index.js +++ b/nodejs/lib/yamlscript/index.js @@ -1,4 +1,4 @@ -const yamlscriptVersion = '0.1.61'; +const yamlscriptVersion = '0.1.62'; const ffi = require('ffi-napi'); const ref = require('ref-napi'); diff --git a/nodejs/package.json b/nodejs/package.json index ee5d4842..630e7a8a 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@yaml/yamlscript", - "version": "0.1.61", + "version": "0.1.62", "description": "Program in YAML", "main": "lib/yamlscript/index.js", "author": "Ingy döt Net", diff --git a/perl-alien/Changes b/perl-alien/Changes index 4bca5359..78bb0635 100644 --- a/perl-alien/Changes +++ b/perl-alien/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.62 +date: Sat 15 Jun 2024 01:47:13 PM EDT +changes: +- libyamlscript 0.1.62 + --- version: 0.1.61 date: Wed 12 Jun 2024 11:54:55 AM EDT diff --git a/perl-alien/Meta b/perl-alien/Meta index 83c650e0..43dda6f6 100644 --- a/perl-alien/Meta +++ b/perl-alien/Meta @@ -3,7 +3,7 @@ base: ../Meta name: Alien-YAMLScript -version: 0.1.61 +version: 0.1.62 language: perl diff --git a/perl-alien/alienfile b/perl-alien/alienfile index 1ad5476d..8f94c8e8 100644 --- a/perl-alien/alienfile +++ b/perl-alien/alienfile @@ -1,6 +1,6 @@ use alienfile; -my $libyamlscript_version = '0.1.61'; +my $libyamlscript_version = '0.1.62'; # Always use a share install # We cannot use a system install, because we need to know exactly diff --git a/perl-alien/lib/Alien/YAMLScript.pm b/perl-alien/lib/Alien/YAMLScript.pm index 37d88196..5de81531 100644 --- a/perl-alien/lib/Alien/YAMLScript.pm +++ b/perl-alien/lib/Alien/YAMLScript.pm @@ -3,11 +3,11 @@ use warnings; package Alien::YAMLScript; -our $VERSION = '0.1.61'; +our $VERSION = '0.1.62'; use parent 'Alien::Base'; -our $libyamlscript_version = '0.1.61'; +our $libyamlscript_version = '0.1.62'; die "Alien::YAMLScript $VERSION requires libyamlscript $libyamlscript_version" . "but you have " . __PACKAGE__->version diff --git a/perl/Changes b/perl/Changes index 0288bfd4..01edd337 100644 --- a/perl/Changes +++ b/perl/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.62 +date: Sat 15 Jun 2024 01:47:13 PM EDT +changes: +- libyamlscript 0.1.62 + --- version: 0.1.61 date: Wed 12 Jun 2024 11:54:55 AM EDT diff --git a/perl/Meta b/perl/Meta index 922a71fe..144c8cc0 100644 --- a/perl/Meta +++ b/perl/Meta @@ -3,7 +3,7 @@ base: ../Meta name: YAMLScript -version: 0.1.61 +version: 0.1.62 language: perl @@ -12,7 +12,7 @@ author: requires: perl: 5.16.0 - Alien::YAMLScript: 0.1.61 + Alien::YAMLScript: 0.1.62 FFI::CheckLib: 0.31 FFI::Platypus: 2.08 Cpanel::JSON::XS: 4.37 diff --git a/perl/lib/YAMLScript.pm b/perl/lib/YAMLScript.pm index 782001f3..ce2d8a1f 100644 --- a/perl/lib/YAMLScript.pm +++ b/perl/lib/YAMLScript.pm @@ -10,9 +10,9 @@ use FFI::CheckLib (); use FFI::Platypus; use Cpanel::JSON::XS (); -our $VERSION = '0.1.61'; +our $VERSION = '0.1.62'; -our $libyamlscript_version = '0.1.61'; +our $libyamlscript_version = '0.1.62'; #------------------------------------------------------------------------------ diff --git a/python/lib/yamlscript/__init__.py b/python/lib/yamlscript/__init__.py index c04f58e5..f45c1830 100644 --- a/python/lib/yamlscript/__init__.py +++ b/python/lib/yamlscript/__init__.py @@ -16,7 +16,7 @@ # This value is automatically updated by 'make bump'. # The version number is used to find the correct shared library file. # We currently only support binding to an exact version of libyamlscript. -yamlscript_version = '0.1.61' +yamlscript_version = '0.1.62' import os, sys import ctypes diff --git a/python/setup.py b/python/setup.py index 2819a523..e3b9a8f1 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,4 +1,4 @@ -version = '0.1.61' +version = '0.1.62' from setuptools import setup import pathlib diff --git a/raku/META6.json b/raku/META6.json index 2f15ddca..25c7b646 100644 --- a/raku/META6.json +++ b/raku/META6.json @@ -1,6 +1,6 @@ { "api": 0 , "name": "YAMLScript" -, "version": "0.1.61" +, "version": "0.1.62" , "description": "Program in YAML" , "auth": "zef:ingy" , "provides": diff --git a/raku/lib/YAMLScript.rakumod b/raku/lib/YAMLScript.rakumod index 8be72063..dc69786d 100644 --- a/raku/lib/YAMLScript.rakumod +++ b/raku/lib/YAMLScript.rakumod @@ -6,7 +6,7 @@ unit class YAMLScript; use LibraryMake; use NativeCall; -constant YAMLSCRIPT_VERSION = v0.1.61; +constant YAMLSCRIPT_VERSION = v0.1.62; sub resolve-lib { state $ = do { diff --git a/ruby/ChangeLog.md b/ruby/ChangeLog.md index a5bec543..b526f77f 100644 --- a/ruby/ChangeLog.md +++ b/ruby/ChangeLog.md @@ -1,3 +1,7 @@ +## [0.1.62] - 2024-06-15 + +- libyamlscript 0.1.62 + ## [0.1.61] - 2024-06-12 - libyamlscript 0.1.61 diff --git a/ruby/lib/yamlscript.rb b/ruby/lib/yamlscript.rb index dec802d7..bd753887 100644 --- a/ruby/lib/yamlscript.rb +++ b/ruby/lib/yamlscript.rb @@ -16,7 +16,7 @@ class YAMLScript # This value is automatically updated by 'make bump'. # The version number is used to find the correct shared library file. # We currently only support binding to an exact version of libyamlscript. - YAMLSCRIPT_VERSION = '0.1.61' + YAMLSCRIPT_VERSION = '0.1.62' # A low-level interface to the native library module LibYAMLScript diff --git a/ruby/lib/yamlscript/version.rb b/ruby/lib/yamlscript/version.rb index ff1149e5..e4488d46 100644 --- a/ruby/lib/yamlscript/version.rb +++ b/ruby/lib/yamlscript/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class YAMLScript - VERSION = "0.1.61" + VERSION = "0.1.62" end diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c58cb984..6a01f8e1 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -174,7 +174,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "yamlscript" -version = "0.1.61" +version = "0.1.62" dependencies = [ "dlopen", "libc", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 2d3f6618..f1cd9fe4 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yamlscript" -version = "0.1.61" +version = "0.1.62" edition = "2021" description = "Program in YAML" license = "MIT" diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 475699f0..5e1f30cf 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -66,7 +66,7 @@ use crate::error::LibYAMLScriptError; const LIBYAMLSCRIPT_BASENAME: &str = "libyamlscript"; /// The version of the yamlscript library this bindings works with. -const LIBYAMLSCRIPT_VERSION: &str = "0.1.61"; +const LIBYAMLSCRIPT_VERSION: &str = "0.1.62"; /// The extension of the YAMLScript library. On Linux, it's a `.so` file. #[cfg(target_os = "linux")] diff --git a/www/src/index.md b/www/src/index.md index 7169932a..e1d0be8c 100644 --- a/www/src/index.md +++ b/www/src/index.md @@ -265,7 +265,7 @@ Test your new `ys` installation by running: ```text $ ys --help -ys - The YAMLScript (YS) Command Line Tool - v0.1.61 +ys - The YAMLScript (YS) Command Line Tool - v0.1.62 Usage: ys [] [] @@ -310,7 +310,7 @@ or: ```text $ ys --version -YAMLScript 0.1.61 +YAMLScript 0.1.62 ``` @@ -339,9 +339,9 @@ For Python you would do: ```bash $ pip install yamlscript -Successfully installed yamlscript-0.1.61 -$ curl https://yamlscript.org/install | VERSION=0.1.61 install -Installed ~/.local/lib/libyamlscript.so - version 0.1.61 +Successfully installed yamlscript-0.1.62 +$ curl https://yamlscript.org/install | VERSION=0.1.62 install +Installed ~/.local/lib/libyamlscript.so - version 0.1.62 ``` For some other language, use that language's library installer. diff --git a/www/src/install b/www/src/install index 925a23c5..b781c1b7 100644 --- a/www/src/install +++ b/www/src/install @@ -9,7 +9,7 @@ set -e -u -o pipefail -LIBYAMLSCRIPT_VERSION=0.1.61 +LIBYAMLSCRIPT_VERSION=0.1.62 VERSION=${VERSION:-$LIBYAMLSCRIPT_VERSION} export VERSION diff --git a/www/src/posts/advent-2023/dec-05.md b/www/src/posts/advent-2023/dec-05.md index e495d5ef..a4c380d9 100644 --- a/www/src/posts/advent-2023/dec-05.md +++ b/www/src/posts/advent-2023/dec-05.md @@ -108,7 +108,7 @@ $ ys --help It should display: ```text -ys - The YAMLScript (YS) Command Line Tool - v0.1.61 +ys - The YAMLScript (YS) Command Line Tool - v0.1.62 Usage: ys [] [] diff --git a/www/src/posts/advent-2023/dec-07.md b/www/src/posts/advent-2023/dec-07.md index a1991d17..72617272 100644 --- a/www/src/posts/advent-2023/dec-07.md +++ b/www/src/posts/advent-2023/dec-07.md @@ -25,7 +25,7 @@ Reminder, here's the quick way to install the latest version: $ curl https://yamlscript.org/install | PREFIX=~/.yamlscript bash $ export PATH=$HOME/.yamlscript/bin:$PATH $ ys --version -YAMLScript v0.1.61 +YAMLScript v0.1.62 ``` The best first command to run is `ys --help`: diff --git a/ys/deps.edn b/ys/deps.edn index f46b154a..eadd192f 100644 --- a/ys/deps.edn +++ b/ys/deps.edn @@ -7,7 +7,7 @@ org.babashka/sci {:mvn/version "0.8.41"}, babashka/process {:mvn/version "0.5.21"}, clj-commons/clj-yaml {:mvn/version "1.0.27"}, - yamlscript/core {:mvn/version "0.1.61"}}, + yamlscript/core {:mvn/version "0.1.62"}}, :aliases {:lein2deps {:deps diff --git a/ys/project.clj b/ys/project.clj index 3f9ef0e0..f7f91b7b 100644 --- a/ys/project.clj +++ b/ys/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript.cli "0.1.61-SNAPSHOT" +(defproject yamlscript.cli "0.1.62-SNAPSHOT" :description "YAMLScript Command Line Tool" :url "https://github.com/yaml/yamlscript" @@ -24,7 +24,7 @@ [org.babashka/sci "0.8.41"] [babashka/process "0.5.21"] [clj-commons/clj-yaml "1.0.27"] - [yamlscript/core "0.1.61"]] + [yamlscript/core "0.1.62"]] :main ^:skip-aot yamlscript.cli diff --git a/ys/share/ys-0.bash b/ys/share/ys-0.bash index 230caeab..e2d3875e 100755 --- a/ys/share/ys-0.bash +++ b/ys/share/ys-0.bash @@ -4,7 +4,7 @@ set -euo pipefail [[ ${YS_SH_DEBUG-} ]] && set -x -yamlscript_version=0.1.61 +yamlscript_version=0.1.62 main() ( setup "$@" diff --git a/ys/src/yamlscript/cli.clj b/ys/src/yamlscript/cli.clj index 6a1aaaa6..b0542d8f 100644 --- a/ys/src/yamlscript/cli.clj +++ b/ys/src/yamlscript/cli.clj @@ -21,7 +21,7 @@ [clojure.string :as str] [clojure.tools.cli :as cli])) -(def yamlscript-version "0.1.61") +(def yamlscript-version "0.1.62") (def testing (atom false)) diff --git a/ys/test/cli-usage.t b/ys/test/cli-usage.t index 98ffbd5b..cc2f666b 100644 --- a/ys/test/cli-usage.t +++ b/ys/test/cli-usage.t @@ -2,11 +2,11 @@ source test/init -VERSION=0.1.61 +VERSION=0.1.62 cmd='ys --version' -is "$($cmd)" "YAMLScript 0.1.61" "$cmd" +is "$($cmd)" "YAMLScript 0.1.62" "$cmd" cmd='ys'