diff --git a/.profile b/.profile index 2c3f0fc7..7a1ec26e 100644 --- a/.profile +++ b/.profile @@ -10,7 +10,7 @@ ys-local() { YS() ( set -e base=$YAMLSCRIPT_ROOT/ys - libyamlscript_version=0.1.62 + libyamlscript_version=0.1.63 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 bf506003..e591b60b 100644 --- a/.version.ys +++ b/.version.ys @@ -2,7 +2,7 @@ !yamlscript/v0 -v-api =: '0.1.62' +v-api =: '0.1.63' v-perl =: v-api v-python =: v-api diff --git a/Changes b/Changes index 1152f55f..f0f9f772 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,24 @@ +- version: 0.1.63 + date: Wed 19 Jun 2024 12:51:46 PM EDT + changes: + - core: Add ys.std/qw macro for quoting words + - core: Add ys::std/rx for creating regex pattern from string + - core: Support _ in dot chain symbols + - core: Using 'catch' with no args should not bind to e + - core: Add ys::std/reverse polymorphic + - core: Add ys::std/split with string and re swappable + - core: Add ys::std/words (split on ws) + - core: Add ys::std/lines to split text into lines + - core: Make has and in work with strings + - core: Add std capitalize lower-case and upper-case + - core: Add std replace for arities 1, 2 (core) and 3 (string) + - core: Add std chomp trim triml trimr + - sample: Update sample code to use latest YS features + - core: Refactored yamlscript.debug completely + - core: Add support for .? debugging + - core: Clojure style comments `; ...` now longer supported + - version: 0.1.62 date: Sat 15 Jun 2024 01:47:13 PM EDT changes: diff --git a/Meta b/Meta index 1aa9512d..9fe7b34d 100644 --- a/Meta +++ b/Meta @@ -1,7 +1,7 @@ =meta: 0.0.2 name: YAMLScript -version: 0.1.62 +version: 0.1.63 abstract: Program in YAML homepage: https://yamlscript.org license: mit diff --git a/ReadMe.md b/ReadMe.md index a51ac17f..405f3750 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.62` +* `VERSION=...` - The YAMLScript version to install. Default: `0.1.63` * `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 9e186090..480ff294 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.62"}}} + org.yamlscript/yamlscript {:mvn/version "0.1.63"}}} diff --git a/clojure/project.clj b/clojure/project.clj index 83f7a947..d8ec0cb1 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.62" +(defproject org.yamlscript/clj-yamlscript "0.1.63" :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.62"]] + [org.yamlscript/yamlscript "0.1.63"]] :deploy-repositories [["releases" diff --git a/common/install.mk b/common/install.mk index 5b5ff6bc..709a1ae6 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.62 +YAMLSCRIPT_VERSION := 0.1.63 YS := $(wildcard ys) LIBYAMLSCRIPT := $(firstword $(wildcard libyamlscript.*)) diff --git a/common/project.clj b/common/project.clj index 92f44541..d29a9d84 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.62" +(defproject yamlscript/docker "0.1.63" :description "Program in YAML" :dependencies [#__ diff --git a/common/release.md b/common/release.md index b7ed70db..b222260d 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.62 +## Changes in YAMLScript version 0.1.63 diff --git a/core/project.clj b/core/project.clj index 6372f12a..12f68727 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.62" +(defproject yamlscript/core "0.1.63" :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 1941dc3f..8c816de1 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.62") +(def ys-version "0.1.63") (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 606cbc46..37e35f4c 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.62 +ys - The YAMLScript (YS) Command Line Tool - v0.1.63 Usage: ys [] [] diff --git a/java/Makefile b/java/Makefile index ad2b2ebb..d02f9dfa 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.62.jar +YAMLSCRIPT_JAVA_JAR := target/yamlscript-0.1.63.jar #------------------------------------------------------------------------------ diff --git a/java/pom.xml b/java/pom.xml index d48d7877..ec9e583f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -12,7 +12,7 @@ yamlscript - 0.1.62 + 0.1.63 yamlscript diff --git a/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java b/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java index 8d8b0d9f..3b089b00 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.62"; + public static String YAMLSCRIPT_VERSION = "0.1.63"; public static Object load(String ysCode) { diff --git a/libyamlscript/deps.edn b/libyamlscript/deps.edn index 3726205c..3c96fec0 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.62"}}, + yamlscript/compiler {:mvn/version "0.1.63"}}, :aliases {:lein2deps {:deps diff --git a/libyamlscript/project.clj b/libyamlscript/project.clj index 65ded95c..612c6ecc 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.62" +(defproject yamlscript/libyamlscript "0.1.63" :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.62"]] + [yamlscript/core "0.1.63"]] :plugins [[lein-exec "0.3.7"] diff --git a/nodejs/lib/yamlscript/index.js b/nodejs/lib/yamlscript/index.js index d9e1af1e..8b2b5647 100644 --- a/nodejs/lib/yamlscript/index.js +++ b/nodejs/lib/yamlscript/index.js @@ -1,4 +1,4 @@ -const yamlscriptVersion = '0.1.62'; +const yamlscriptVersion = '0.1.63'; const ffi = require('ffi-napi'); const ref = require('ref-napi'); diff --git a/nodejs/package.json b/nodejs/package.json index 630e7a8a..24ae5683 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@yaml/yamlscript", - "version": "0.1.62", + "version": "0.1.63", "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 78bb0635..df4d1767 100644 --- a/perl-alien/Changes +++ b/perl-alien/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.63 +date: Wed 19 Jun 2024 12:51:46 PM EDT +changes: +- libyamlscript 0.1.63 + --- version: 0.1.62 date: Sat 15 Jun 2024 01:47:13 PM EDT diff --git a/perl-alien/Meta b/perl-alien/Meta index 43dda6f6..b9a31327 100644 --- a/perl-alien/Meta +++ b/perl-alien/Meta @@ -3,7 +3,7 @@ base: ../Meta name: Alien-YAMLScript -version: 0.1.62 +version: 0.1.63 language: perl diff --git a/perl-alien/alienfile b/perl-alien/alienfile index 8f94c8e8..763f5b7f 100644 --- a/perl-alien/alienfile +++ b/perl-alien/alienfile @@ -1,6 +1,6 @@ use alienfile; -my $libyamlscript_version = '0.1.62'; +my $libyamlscript_version = '0.1.63'; # 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 5de81531..ba9f79fa 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.62'; +our $VERSION = '0.1.63'; use parent 'Alien::Base'; -our $libyamlscript_version = '0.1.62'; +our $libyamlscript_version = '0.1.63'; die "Alien::YAMLScript $VERSION requires libyamlscript $libyamlscript_version" . "but you have " . __PACKAGE__->version diff --git a/perl/Changes b/perl/Changes index 01edd337..3844d0b7 100644 --- a/perl/Changes +++ b/perl/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.63 +date: Wed 19 Jun 2024 12:51:46 PM EDT +changes: +- libyamlscript 0.1.63 + --- version: 0.1.62 date: Sat 15 Jun 2024 01:47:13 PM EDT diff --git a/perl/Meta b/perl/Meta index 144c8cc0..665e5b92 100644 --- a/perl/Meta +++ b/perl/Meta @@ -3,7 +3,7 @@ base: ../Meta name: YAMLScript -version: 0.1.62 +version: 0.1.63 language: perl @@ -12,7 +12,7 @@ author: requires: perl: 5.16.0 - Alien::YAMLScript: 0.1.62 + Alien::YAMLScript: 0.1.63 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 ce2d8a1f..51f67cba 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.62'; +our $VERSION = '0.1.63'; -our $libyamlscript_version = '0.1.62'; +our $libyamlscript_version = '0.1.63'; #------------------------------------------------------------------------------ diff --git a/python/lib/yamlscript/__init__.py b/python/lib/yamlscript/__init__.py index f45c1830..846300b3 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.62' +yamlscript_version = '0.1.63' import os, sys import ctypes diff --git a/python/setup.py b/python/setup.py index e3b9a8f1..1b947797 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,4 +1,4 @@ -version = '0.1.62' +version = '0.1.63' from setuptools import setup import pathlib diff --git a/raku/META6.json b/raku/META6.json index 25c7b646..1ee64c7f 100644 --- a/raku/META6.json +++ b/raku/META6.json @@ -1,6 +1,6 @@ { "api": 0 , "name": "YAMLScript" -, "version": "0.1.62" +, "version": "0.1.63" , "description": "Program in YAML" , "auth": "zef:ingy" , "provides": diff --git a/raku/lib/YAMLScript.rakumod b/raku/lib/YAMLScript.rakumod index dc69786d..07e06c64 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.62; +constant YAMLSCRIPT_VERSION = v0.1.63; sub resolve-lib { state $ = do { diff --git a/ruby/ChangeLog.md b/ruby/ChangeLog.md index b526f77f..8b01b125 100644 --- a/ruby/ChangeLog.md +++ b/ruby/ChangeLog.md @@ -1,3 +1,7 @@ +## [0.1.63] - 2024-06-19 + +- libyamlscript 0.1.63 + ## [0.1.62] - 2024-06-15 - libyamlscript 0.1.62 diff --git a/ruby/lib/yamlscript.rb b/ruby/lib/yamlscript.rb index bd753887..887e6c1d 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.62' + YAMLSCRIPT_VERSION = '0.1.63' # 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 e4488d46..50cb0148 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.62" + VERSION = "0.1.63" end diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6a01f8e1..74804a2e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -174,7 +174,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "yamlscript" -version = "0.1.62" +version = "0.1.63" dependencies = [ "dlopen", "libc", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index f1cd9fe4..cbd9773c 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yamlscript" -version = "0.1.62" +version = "0.1.63" edition = "2021" description = "Program in YAML" license = "MIT" diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 5e1f30cf..3166686f 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.62"; +const LIBYAMLSCRIPT_VERSION: &str = "0.1.63"; /// 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 e1d0be8c..e3fbee8c 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.62 +ys - The YAMLScript (YS) Command Line Tool - v0.1.63 Usage: ys [] [] @@ -310,7 +310,7 @@ or: ```text $ ys --version -YAMLScript 0.1.62 +YAMLScript 0.1.63 ``` @@ -339,9 +339,9 @@ For Python you would do: ```bash $ pip install yamlscript -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 +Successfully installed yamlscript-0.1.63 +$ curl https://yamlscript.org/install | VERSION=0.1.63 install +Installed ~/.local/lib/libyamlscript.so - version 0.1.63 ``` For some other language, use that language's library installer. diff --git a/www/src/install b/www/src/install index b781c1b7..edf616ef 100644 --- a/www/src/install +++ b/www/src/install @@ -9,7 +9,7 @@ set -e -u -o pipefail -LIBYAMLSCRIPT_VERSION=0.1.62 +LIBYAMLSCRIPT_VERSION=0.1.63 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 a4c380d9..2ea6886f 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.62 +ys - The YAMLScript (YS) Command Line Tool - v0.1.63 Usage: ys [] [] diff --git a/www/src/posts/advent-2023/dec-07.md b/www/src/posts/advent-2023/dec-07.md index 72617272..508cf9b0 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.62 +YAMLScript v0.1.63 ``` The best first command to run is `ys --help`: diff --git a/ys/deps.edn b/ys/deps.edn index eadd192f..1a79d197 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.62"}}, + yamlscript/core {:mvn/version "0.1.63"}}, :aliases {:lein2deps {:deps diff --git a/ys/project.clj b/ys/project.clj index f7f91b7b..af8067cc 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.62-SNAPSHOT" +(defproject yamlscript.cli "0.1.63-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.62"]] + [yamlscript/core "0.1.63"]] :main ^:skip-aot yamlscript.cli diff --git a/ys/share/ys-0.bash b/ys/share/ys-0.bash index e2d3875e..30335db7 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.62 +yamlscript_version=0.1.63 main() ( setup "$@" diff --git a/ys/src/yamlscript/cli.clj b/ys/src/yamlscript/cli.clj index 5f7f2fba..e6c00366 100644 --- a/ys/src/yamlscript/cli.clj +++ b/ys/src/yamlscript/cli.clj @@ -19,7 +19,7 @@ [clojure.string :as str] [clojure.tools.cli :as cli])) -(def yamlscript-version "0.1.62") +(def yamlscript-version "0.1.63") (def testing (atom false)) diff --git a/ys/test/cli-usage.t b/ys/test/cli-usage.t index cc2f666b..bb8ab673 100644 --- a/ys/test/cli-usage.t +++ b/ys/test/cli-usage.t @@ -2,11 +2,11 @@ source test/init -VERSION=0.1.62 +VERSION=0.1.63 cmd='ys --version' -is "$($cmd)" "YAMLScript 0.1.62" "$cmd" +is "$($cmd)" "YAMLScript 0.1.63" "$cmd" cmd='ys'