builtins_spreadsheet conflict resolution

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 
 permissions:
  contents: write
- # packages: write
+ packages: write
  # issues: write
 
 jobs:

.golangci.yml

@@ -35,7 +35,7 @@ linters-settings:
  - pattern: 'interface{}'
  replacement: 'any'
  goimports:
- local-prefixes: github.com/golangci/golangci-lint
+ local-prefixes: github.com/refaktor/rye
  gomnd:
  # don't include the "operation" and "assign"
  checks:
@@ -94,7 +94,7 @@ linters:
  # - gocritic
  # - gocyclo
  - gofmt
- # - goimports
+ - goimports
  # - gomnd
  - goprintffuncname
  - gosec

.goreleaser.yaml

@@ -58,6 +58,17 @@ archives:
  - goos: windows
  format: zip
 
+kos: # See https://goreleaser.com/customization/ko/
+ - repository: ghcr.io/refaktor/rye
+ tags:
+ - '{{.Version}}'
+ - latest
+ bare: true
+ preserve_import_paths: false
+ platforms:
+ - linux/amd64
+ - linux/arm64
+
 changelog:
  sort: asc
  filters:

README.md

@@ -2,26 +2,35 @@
 
 [![Build and Test](https:/refaktor/rye/actions/workflows/build.yml/badge.svg)](https:/refaktor/rye/actions/workflows/build.yml)
 [![golangci-lint](https:/refaktor/rye/actions/workflows/golangci-lint.yml/badge.svg)](https:/refaktor/rye/actions/workflows/golangci-lint.yml)
-
- * [What is Rye](#what-is-rye)
- * [Status: Alpha](#status-alpha)
- * [Overview](#overview)
- * [Some specifics](#some-specifics)
- * [Introductions](#introductions)
- * [Examples](#examples)
- * [Rye vs. Python](#rye-vs-python)
- * [Follow development](#follow-development)
- * [Rye blog](#rye-blog)
- * [Github](#github)
- * [Getting Rye](#getting-rye)
- * [Binaries](#binaries)
- * [Docker images](#docker-images)
- * [Forking Rye on Github](#forking-rye-on-github)
- * [Building Rye](#building-rye)
-  * [Build Rye with specific modules](#build-rye-with-specific-modules)
-  * [Build WASM version of Rye](#build-wasm-version-of-rye)
- * [Related links](#related-links)
- * [Questions, contact](#related-links)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/refaktor/rye/badge)](https://securityscorecards.dev/viewer/?uri=github.com/refaktor/rye)
+[![Go Reference](https://pkg.go.dev/badge/github.com/refaktor/rye.svg)](https://pkg.go.dev/github.com/refaktor/rye)
+
+- [Rye language 🌾](#rye-language-)
+ - [What is Rye](#what-is-rye)
+ - [Status: Alpha](#status-alpha)
+ - [Overview](#overview)
+ - [Some specifics](#some-specifics)
+ - [Introductions](#introductions)
+ - [Examples](#examples)
+ - [Rye vs. Python](#rye-vs-python)
+ - [Libraries](#libraries)
+ - [Base - official integrations](#base---official-integrations)
+ - [Contrib - will be community / third party integrations](#contrib---will-be-community--third-party-integrations)
+ - [Follow development](#follow-development)
+ - [Rye blog](#rye-blog)
+ - [Ryelang reddit](#ryelang-reddit)
+ - [Github](#github)
+ - [Getting Rye](#getting-rye)
+ - [Binaries](#binaries)
+ - [Docker images](#docker-images)
+ - [Binary Docker image](#binary-docker-image)
+ - [Dev Docker image](#dev-docker-image)
+ - [Forking Rye on Github](#forking-rye-on-github)
+ - [Building Rye](#building-rye)
+ - [Build Rye with specific modules](#build-rye-with-specific-modules)
+ - [Build WASM version of Rye](#build-wasm-version-of-rye)
+ - [Related links](#related-links)
+ - [Questions, contact](#questions-contact)
 
 *visit **[ryelang.org](https://ryelang.org/)**, **[our blog](https://ryelang.org/blog/)** or join our **[reddit group](https://reddit.com/r/ryelang/)** for latest examples and development updates*
 
@@ -267,14 +276,28 @@ If code speaks to you, our Github page is the central location for all things Ry
 
 ## Getting Rye
 
-Rye is developed on Linux, but has also been compiled on macOS and Docker. If you need aditional architecture or OS, post an Issue.
+Rye is developed on Linux, but has also been compiled on macOS and Docker. If you need additional architecture or OS, post an Issue.
 
 ### Binaries
 
-You can find precompiled Binaries for **Linux** and **macOS** under [Releases](https:/refaktor/rye/releases). 
+You can find precompiled Binaries for **Linux** and **macOS** under [Releases](https:/refaktor/rye/releases).
+
+Docker images are published under [Packages](https:/refaktor/rye/pkgs/container/rye).
 
 ### Docker images
 
+#### Binary Docker image
+
+This image includes Linux, Rye binary ready for use and Emacs-nox editor.
+
+Docker image: **[ghcr.io/refaktor/rye](https:/refaktor/rye/pkgs/container/rye)**
+
+Run it via:
+
+```bash
+docker run -ti ghcr.io/refaktor/rye
+```
+
 #### Dev Docker image
 
 The repository comes with a local [Docker image](./.docker/Dockerfile) that builds rye and allows you to do so.
@@ -330,20 +353,20 @@ Install build-esential if you don't already have it, for packages that require c
 
  sudo apt install build-essential
 
-# Build Rye with specific modules
+#### Build Rye with specific modules
 
 Rye has many bindings, that you can determine at build time, so (currently) you get a specific Rye binary for your specific project. This is an example of a build with many bindings. 
 I've been working on a way to make this more elegant and systematic, but the manual version is:
 
  go build -tags "b_tiny,b_sqlite,b_http,b_sql,b_postgres,b_openai,b_bson,b_crypto,b_smtpd,b_mail,b_postmark,b_bcrypt,b_telegram"
 
-# Build WASM version of Rye
+#### Build WASM version of Rye
 
 Rye can also work inside your browser or any other WASM container. I will add examples, html pages and info about it, but to build it:
 
  GOOS=js GOARCH=wasm go build -tags "b_tiny,b_norepl" -o wasm/rye.wasm main_wasm.go
 
-# Related links
+## Related links
 
  [**Rebol**](http://www.rebol.com) - Rebol's author Carl Sassenrath invented or combined together 90% of concepts that Rye builds upon.
 
@@ -357,7 +380,7 @@ Rye can also work inside your browser or any other WASM container. I will add ex
 
  [Ren-c](https:/metaeducation/ren-c) - Rebol 3 fork maintained by HostileFork, more liberal with changes to the language. 
 
- # Questions, contact
+ ## Questions, contact
 
 You can post an **[Issue](https:/refaktor/rye/issues)** visit github **[Discussions](https:/refaktor/rye/discussions)** or contact me through <a href="mailto:janko .itm+rye[ ]gmail .com">gmail</a> or <a href="https://twitter.com/refaktor">twitter</a>.</p>
 

evaldo/builtins.go

@@ -10,17 +10,19 @@ import (
  "os"
  "os/exec"
  "reflect"
- "rye/env"
- "rye/term"
  "sort"
 
- "rye/loader"
- // JM 20230825 "rye/term"
- "rye/util"
+ "github.com/refaktor/rye/env"
+ "github.com/refaktor/rye/term"
+
+ "github.com/refaktor/rye/loader"
+ // JM 20230825 "github.com/refaktor/rye/term"
  "strconv"
  "strings"
  "time"
 
+ "github.com/refaktor/rye/util"
+
  "golang.org/x/sync/errgroup"
  "golang.org/x/text/cases"
  "golang.org/x/text/language"

evaldo/builtins_bcrypt.go

@@ -6,7 +6,8 @@ package evaldo
 import (
  "crypto/rand"
  "encoding/hex"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 
  "golang.org/x/crypto/bcrypt"
 )

evaldo/builtins_bcrypt_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_bcrypt = map[string]*env.Builtin{}

evaldo/builtins_bson.go

@@ -5,7 +5,8 @@ package evaldo
 
 import (
  "fmt"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 
  "github.com/drewlanenga/govector"
  "go.mongodb.org/mongo-driver/bson"

evaldo/builtins_bson_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_bson = map[string]*env.Builtin{}

evaldo/builtins_cayley.go

@@ -5,7 +5,8 @@ package evaldo
 
 import (
  "fmt"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 
  "github.com/cayleygraph/cayley"
  "github.com/cayleygraph/cayley/graph"

evaldo/builtins_cayley_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_cayley = map[string]*env.Builtin{}

evaldo/builtins_conversion.go

@@ -1,7 +1,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 // Integer represents an integer.

evaldo/builtins_crypto.go

@@ -7,7 +7,8 @@ import (
  "crypto/ed25519"
  "crypto/sha512"
  "encoding/hex"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 )
 
 /* Our strategy to only support signed files

evaldo/builtins_crypto_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_crypto = map[string]*env.Builtin{}

evaldo/builtins_email.go

@@ -4,9 +4,10 @@
 package evaldo
 
 import (
- "rye/env"
  "strings"
 
+ "github.com/refaktor/rye/env"
+
  "github.com/go-gomail/gomail"
 )
 

evaldo/builtins_email_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_email = map[string]*env.Builtin{}

evaldo/builtins_eyr.go

@@ -4,7 +4,8 @@ package evaldo
 import (
  "fmt"
  "os"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 )
 
 // definiraj frame <builtin nargs arg0 arg1>

evaldo/builtins_goroutines.go

@@ -7,9 +7,10 @@ package evaldo
 
 import (
  "fmt"
- "rye/env"
  "time"
 
+ "github.com/refaktor/rye/env"
+
  "github.com/jinzhu/copier"
 )
 

evaldo/builtins_goroutines_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_goroutines = map[string]*env.Builtin{}

evaldo/builtins_gtk.go

@@ -6,7 +6,7 @@ package evaldo
 import "C"
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 
  "github.com/gotk3/gotk3/gtk"
 )

evaldo/builtins_gtk_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_gtk = map[string]*env.Builtin{}

evaldo/builtins_html.go

@@ -5,7 +5,8 @@ package evaldo
 
 import (
  "fmt"
- "rye/env"
+
+ "github.com/refaktor/rye/env"
 
  "golang.org/x/net/html"
 

evaldo/builtins_html_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_html = map[string]*env.Builtin{}

evaldo/builtins_http.go

@@ -12,9 +12,10 @@ import (
  "mime/multipart"
  "net/http"
  "net/url"
- "rye/env"
  "strings"
 
+ "github.com/refaktor/rye/env"
+
  //"time"
  //"golang.org/x/time/rate"
  // "nhooyr.io/websocket"

evaldo/builtins_http_not.go

@@ -4,7 +4,7 @@
 package evaldo
 
 import (
- "rye/env"
+ "github.com/refaktor/rye/env"
 )
 
 var Builtins_http = map[string]*env.Builtin{}

evaldo/builtins_io.go

@@ -12,10 +12,11 @@ import (
  "log"
  "os"
  "path/filepath"
- "rye/env"
  "strings"
  "time"
 
+ "github.com/refaktor/rye/env"
+
  "net/http"
  "net/http/cgi"
 )