mirror of
https://github.com/JanDeDobbeleer/oh-my-posh.git
synced 2024-12-28 12:29:40 -08:00
feat: add lua segment
This commit is contained in:
parent
4f48c2b0d1
commit
f37e5767c2
|
@ -126,6 +126,8 @@ const (
|
||||||
KOTLIN SegmentType = "kotlin"
|
KOTLIN SegmentType = "kotlin"
|
||||||
// KUBECTL writes the Kubernetes context we're currently in
|
// KUBECTL writes the Kubernetes context we're currently in
|
||||||
KUBECTL SegmentType = "kubectl"
|
KUBECTL SegmentType = "kubectl"
|
||||||
|
// LUA writes the active lua version
|
||||||
|
LUA SegmentType = "lua"
|
||||||
// NBGV writes the nbgv version information
|
// NBGV writes the nbgv version information
|
||||||
NBGV SegmentType = "nbgv"
|
NBGV SegmentType = "nbgv"
|
||||||
// NIGHTSCOUT is an open source diabetes system
|
// NIGHTSCOUT is an open source diabetes system
|
||||||
|
@ -288,6 +290,7 @@ func (segment *Segment) mapSegmentWithWriter(env environment.Environment) error
|
||||||
JULIA: &segments.Julia{},
|
JULIA: &segments.Julia{},
|
||||||
KOTLIN: &segments.Kotlin{},
|
KOTLIN: &segments.Kotlin{},
|
||||||
KUBECTL: &segments.Kubectl{},
|
KUBECTL: &segments.Kubectl{},
|
||||||
|
LUA: &segments.Lua{},
|
||||||
NBGV: &segments.Nbgv{},
|
NBGV: &segments.Nbgv{},
|
||||||
NIGHTSCOUT: &segments.Nightscout{},
|
NIGHTSCOUT: &segments.Nightscout{},
|
||||||
NODE: &segments.Node{},
|
NODE: &segments.Node{},
|
||||||
|
|
48
src/segments/lua.go
Normal file
48
src/segments/lua.go
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
package segments
|
||||||
|
|
||||||
|
import (
|
||||||
|
"oh-my-posh/environment"
|
||||||
|
"oh-my-posh/properties"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Lua struct {
|
||||||
|
language
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
PreferredExecutable properties.Property = "preferred_executable"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (l *Lua) Template() string {
|
||||||
|
return languageTemplate
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Lua) Init(props properties.Properties, env environment.Environment) {
|
||||||
|
l.language = language{
|
||||||
|
env: env,
|
||||||
|
props: props,
|
||||||
|
extensions: []string{"*.lua", "*.rockspec"},
|
||||||
|
folders: []string{"lua"},
|
||||||
|
commands: []*cmd{
|
||||||
|
{
|
||||||
|
executable: "lua",
|
||||||
|
args: []string{"-v"},
|
||||||
|
regex: `Lua (?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+)(.(?P<patch>[0-9]+))?))`,
|
||||||
|
versionURLTemplate: "https://www.lua.org/manual/{{ .Major }}.{{ .Minor }}/readme.html#changes",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
executable: "luajit",
|
||||||
|
args: []string{"-v"},
|
||||||
|
regex: `LuaJIT (?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+)(.(?P<patch>[0-9]+))?))`,
|
||||||
|
versionURLTemplate: "https://github.com/LuaJIT/LuaJIT/tree/v{{ .Major}}.{{ .Minor}}",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if l.props.GetString(PreferredExecutable, "lua") == "luajit" {
|
||||||
|
l.commands = []*cmd{l.commands[1], l.commands[0]}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Lua) Enabled() bool {
|
||||||
|
return l.language.Enabled()
|
||||||
|
}
|
83
src/segments/lua_test.go
Normal file
83
src/segments/lua_test.go
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
package segments
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"oh-my-posh/environment"
|
||||||
|
"oh-my-posh/mock"
|
||||||
|
"oh-my-posh/properties"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLua(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
Case string
|
||||||
|
ExpectedString string
|
||||||
|
Version string
|
||||||
|
HasLua bool
|
||||||
|
HasLuaJit bool
|
||||||
|
Prefer string
|
||||||
|
ExpectedURL string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
Case: "Lua 5.4.4 - Prefer Lua",
|
||||||
|
ExpectedString: "5.4.4",
|
||||||
|
Version: "Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC-Rio",
|
||||||
|
ExpectedURL: "https://www.lua.org/manual/5.4/readme.html#changes",
|
||||||
|
HasLua: true,
|
||||||
|
HasLuaJit: true,
|
||||||
|
Prefer: "lua",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Case: "Lua 5.0 - Prefer luajit but missing so fallback to lua",
|
||||||
|
ExpectedString: "5.0",
|
||||||
|
Version: "Lua 5.0 Copyright (C) 1994-2003 Tecgraf, PUC-Rio",
|
||||||
|
ExpectedURL: "https://www.lua.org/manual/5.0/readme.html#changes",
|
||||||
|
HasLua: true,
|
||||||
|
Prefer: "luajit",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Case: "LuaJIT 2.0.5 - Prefer LuaJIT",
|
||||||
|
ExpectedString: "2.0.5",
|
||||||
|
Version: "LuaJIT 2.0.5 -- Copyright (C) 2005-2017 Mike Pall. http://luajit.org/",
|
||||||
|
HasLuaJit: true,
|
||||||
|
HasLua: true,
|
||||||
|
ExpectedURL: "https://github.com/LuaJIT/LuaJIT/tree/v2.0",
|
||||||
|
Prefer: "luajit",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Case: "LuaJIT 2.1.0-beta3 - Prefer Lua but missing so try luajit",
|
||||||
|
ExpectedString: "2.1.0",
|
||||||
|
Version: "LuaJIT 2.1.0-beta3 -- Copyright (C) 2005-2017 Mike Pall. http://luajit.org/",
|
||||||
|
HasLuaJit: true,
|
||||||
|
ExpectedURL: "https://github.com/LuaJIT/LuaJIT/tree/v2.1",
|
||||||
|
Prefer: "lua",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
env := new(mock.MockedEnvironment)
|
||||||
|
env.On("HasCommand", "lua").Return(tc.HasLua)
|
||||||
|
env.On("RunCommand", "lua", []string{"-v"}).Return(tc.Version, nil)
|
||||||
|
env.On("HasCommand", "luajit").Return(tc.HasLuaJit)
|
||||||
|
env.On("RunCommand", "luajit", []string{"-v"}).Return(tc.Version, nil)
|
||||||
|
env.On("HasFiles", "*.lua").Return(true)
|
||||||
|
env.On("Pwd").Return("/usr/home/project")
|
||||||
|
env.On("Home").Return("/usr/home")
|
||||||
|
env.On("TemplateCache").Return(&environment.TemplateCache{
|
||||||
|
Env: make(map[string]string),
|
||||||
|
})
|
||||||
|
props := properties.Map{
|
||||||
|
properties.FetchVersion: true,
|
||||||
|
}
|
||||||
|
props[PreferredExecutable] = tc.Prefer
|
||||||
|
l := &Lua{}
|
||||||
|
l.Init(props, env)
|
||||||
|
failMsg := fmt.Sprintf("Failed in case: %s", tc.Case)
|
||||||
|
assert.True(t, l.Enabled(), failMsg)
|
||||||
|
assert.Equal(t, tc.ExpectedString, renderTemplate(env, l.Template(), l), failMsg)
|
||||||
|
assert.Equal(t, tc.ExpectedURL, l.version.URL, failMsg)
|
||||||
|
assert.Equal(t, strings.ToLower(strings.Split(tc.Case, " ")[0]), l.version.Executable, failMsg)
|
||||||
|
}
|
||||||
|
}
|
|
@ -243,8 +243,9 @@
|
||||||
"iterm",
|
"iterm",
|
||||||
"julia",
|
"julia",
|
||||||
"java",
|
"java",
|
||||||
"kubectl",
|
|
||||||
"kotlin",
|
"kotlin",
|
||||||
|
"kubectl",
|
||||||
|
"lua",
|
||||||
"node",
|
"node",
|
||||||
"npm",
|
"npm",
|
||||||
"nx",
|
"nx",
|
||||||
|
@ -2579,6 +2580,47 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"if": {
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
"const": "lua"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"title": "Lua Segment",
|
||||||
|
"description": "https://ohmyposh.dev/docs/segments/lua",
|
||||||
|
"properties": {
|
||||||
|
"properties": {
|
||||||
|
"properties": {
|
||||||
|
"home_enabled": {
|
||||||
|
"$ref": "#/definitions/home_enabled"
|
||||||
|
},
|
||||||
|
"fetch_version": {
|
||||||
|
"$ref": "#/definitions/fetch_version"
|
||||||
|
},
|
||||||
|
"display_mode": {
|
||||||
|
"$ref": "#/definitions/display_mode"
|
||||||
|
},
|
||||||
|
"missing_command_text": {
|
||||||
|
"$ref": "#/definitions/missing_command_text"
|
||||||
|
},
|
||||||
|
"version_url_template": {
|
||||||
|
"$ref": "#/definitions/version_url_template"
|
||||||
|
},
|
||||||
|
"preferred_executable": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "Preferred Executable",
|
||||||
|
"description": "The preferred executable to use when fetching the version.",
|
||||||
|
"enum": ["lua", "luajit"],
|
||||||
|
"default": "lua"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"if": {
|
"if": {
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
61
website/docs/segments/lua.mdx
Normal file
61
website/docs/segments/lua.mdx
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
---
|
||||||
|
id: lua
|
||||||
|
title: Lua
|
||||||
|
sidebar_label: Lua
|
||||||
|
---
|
||||||
|
|
||||||
|
## What
|
||||||
|
|
||||||
|
Display the currently active [Lua][lua] or [LuaJIT][luajit] version.
|
||||||
|
|
||||||
|
## Sample Configuration
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "lua",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"foreground": "white",
|
||||||
|
"background": "blue",
|
||||||
|
"template": " \ue620 {{ .Full }} "
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Properties
|
||||||
|
|
||||||
|
- home_enabled: `boolean` - display the segment in the HOME folder or not - defaults to `false`
|
||||||
|
- fetch_version: `boolean` - display the lua version - defaults to `true`
|
||||||
|
- missing_command_text: `string` - text to display when the command is missing - defaults to empty
|
||||||
|
- display_mode: `string` - determines when the segment is displayed
|
||||||
|
- `always`: the segment is always displayed
|
||||||
|
- `files`: the segment is only displayed when `*.lua`, `*.rockspec` files or the `lua` folder are present (default)
|
||||||
|
- version_url_template: `string` - a go [text/template][go-text-template] [template][templates] that creates
|
||||||
|
the URL of the version info / release notes
|
||||||
|
- preferred_executable: `string` - the preferred executable to use when fetching the version
|
||||||
|
- `lua`: the Lua executable (default)
|
||||||
|
- `luajit`: the LuaJIT executable
|
||||||
|
|
||||||
|
## Template ([info][templates])
|
||||||
|
|
||||||
|
:::note default template
|
||||||
|
|
||||||
|
``` template
|
||||||
|
{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}
|
||||||
|
```
|
||||||
|
|
||||||
|
:::
|
||||||
|
|
||||||
|
### Properties
|
||||||
|
|
||||||
|
- `.Full`: `string` - the full version
|
||||||
|
- `.Major`: `string` - major number
|
||||||
|
- `.Minor`: `string` - minor number
|
||||||
|
- `.Patch`: `string` - patch number
|
||||||
|
- `.URL`: `string` - URL of the version info / release notes
|
||||||
|
- `.Error`: `string` - error encountered when fetching the version string
|
||||||
|
- `.Executable`: `string` - the executable used to fetch the version
|
||||||
|
|
||||||
|
[go-text-template]: https://golang.org/pkg/text/template/
|
||||||
|
[templates]: /docs/configuration/templates
|
||||||
|
[lua]: https://www.lua.org/
|
||||||
|
[luajit]: https://luajit.org/
|
|
@ -79,6 +79,7 @@ module.exports = {
|
||||||
"segments/julia",
|
"segments/julia",
|
||||||
"segments/kotlin",
|
"segments/kotlin",
|
||||||
"segments/kubectl",
|
"segments/kubectl",
|
||||||
|
"segments/lua",
|
||||||
"segments/nbgv",
|
"segments/nbgv",
|
||||||
"segments/nightscout",
|
"segments/nightscout",
|
||||||
"segments/npm",
|
"segments/npm",
|
||||||
|
|
Loading…
Reference in a new issue